Skip to content

Commit 7795dec

Browse files
trasktrask
committed
Simplify signatures
1 parent beec8e1 commit 7795dec

File tree

25 files changed

+61
-105
lines changed

25 files changed

+61
-105
lines changed

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,15 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
5050

5151
private final List<AttributesExtractor<? super REQUEST, ? super RESPONSE>> additionalExtractors =
5252
new ArrayList<>();
53-
private Function<
54-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
55-
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
53+
private Function<SpanStatusExtractor<REQUEST, RESPONSE>, SpanStatusExtractor<REQUEST, RESPONSE>>
5654
statusExtractorTransformer = Function.identity();
5755
private final HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE>
5856
httpAttributesExtractorBuilder;
5957
private final HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter;
6058
private final HttpSpanNameExtractorBuilder<REQUEST> httpSpanNameExtractorBuilder;
6159

6260
@Nullable private final TextMapSetter<REQUEST> headerSetter;
63-
private Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
61+
private Function<SpanNameExtractor<REQUEST>, ? extends SpanNameExtractor<REQUEST>>
6462
spanNameExtractorTransformer = Function.identity();
6563
private boolean emitExperimentalHttpClientMetrics = false;
6664
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
@@ -111,9 +109,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> addAttributesExtr
111109

112110
@CanIgnoreReturnValue
113111
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractor(
114-
Function<
115-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
116-
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
112+
Function<SpanStatusExtractor<REQUEST, RESPONSE>, SpanStatusExtractor<REQUEST, RESPONSE>>
117113
statusExtractor) {
118114
this.statusExtractorTransformer = statusExtractor;
119115
return this;
@@ -180,7 +176,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
180176
/** Sets custom {@link SpanNameExtractor} via transform function. */
181177
@CanIgnoreReturnValue
182178
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
183-
Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
179+
Function<SpanNameExtractor<REQUEST>, SpanNameExtractor<REQUEST>>
184180
spanNameExtractorTransformer) {
185181
this.spanNameExtractorTransformer = spanNameExtractorTransformer;
186182
return this;

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,14 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
4646

4747
private final List<AttributesExtractor<? super REQUEST, ? super RESPONSE>> additionalExtractors =
4848
new ArrayList<>();
49-
private Function<
50-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
51-
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
49+
private Function<SpanStatusExtractor<REQUEST, RESPONSE>, SpanStatusExtractor<REQUEST, RESPONSE>>
5250
statusExtractorTransformer = Function.identity();
5351
private final HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE>
5452
httpAttributesExtractorBuilder;
5553
private final HttpSpanNameExtractorBuilder<REQUEST> httpSpanNameExtractorBuilder;
5654

5755
@Nullable private final TextMapGetter<REQUEST> headerGetter;
58-
private Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
56+
private Function<SpanNameExtractor<REQUEST>, SpanNameExtractor<REQUEST>>
5957
spanNameExtractorTransformer = Function.identity();
6058
private final HttpServerRouteBuilder<REQUEST> httpServerRouteBuilder;
6159
private final HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter;
@@ -109,9 +107,7 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> addAttributesExtr
109107

110108
@CanIgnoreReturnValue
111109
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractor(
112-
Function<
113-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
114-
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
110+
Function<SpanStatusExtractor<REQUEST, RESPONSE>, SpanStatusExtractor<REQUEST, RESPONSE>>
115111
statusExtractor) {
116112
this.statusExtractorTransformer = statusExtractor;
117113
return this;
@@ -179,7 +175,7 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
179175
/** Sets custom {@link SpanNameExtractor} via transform function. */
180176
@CanIgnoreReturnValue
181177
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
182-
Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
178+
Function<SpanNameExtractor<REQUEST>, SpanNameExtractor<REQUEST>>
183179
spanNameExtractorTransformer) {
184180
this.spanNameExtractorTransformer = spanNameExtractorTransformer;
185181
return this;

‎instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
5252
*/
5353
@CanIgnoreReturnValue
5454
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
55-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
56-
attributesExtractor) {
55+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
5756
builder.addAttributesExtractor(attributesExtractor);
5857
return this;
5958
}
@@ -120,8 +119,8 @@ public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
120119
@CanIgnoreReturnValue
121120
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
122121
Function<
123-
SpanNameExtractor<? super ApacheHttpClientRequest>,
124-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
122+
SpanNameExtractor<ApacheHttpClientRequest>,
123+
SpanNameExtractor<ApacheHttpClientRequest>>
125124
spanNameExtractorTransformer) {
126125
builder.setSpanNameExtractor(spanNameExtractorTransformer);
127126
return this;

‎instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ public ApacheHttpClient5TelemetryBuilder setEmitExperimentalHttpClientMetrics(
112112
@CanIgnoreReturnValue
113113
public ApacheHttpClient5TelemetryBuilder setSpanNameExtractor(
114114
Function<
115-
SpanNameExtractor<? super ApacheHttpClient5Request>,
116-
? extends SpanNameExtractor<? super ApacheHttpClient5Request>>
115+
SpanNameExtractor<ApacheHttpClient5Request>,
116+
SpanNameExtractor<ApacheHttpClient5Request>>
117117
spanNameExtractorTransformer) {
118118
builder.setSpanNameExtractor(spanNameExtractorTransformer);
119119
return this;

‎instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ public final class ApacheHttpClientTelemetryBuilder {
3636
* items. The {@link AttributesExtractor} will be executed after all default extractors.
3737
*/
3838
@CanIgnoreReturnValue
39-
public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
40-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
41-
attributesExtractor) {
42-
builder.addAttributeExtractor(attributesExtractor);
39+
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
40+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
41+
builder.addAttributesExtractor(attributesExtractor);
4342
return this;
4443
}
4544

@@ -88,8 +87,8 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods
8887
@CanIgnoreReturnValue
8988
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
9089
Function<
91-
SpanNameExtractor<? super ApacheHttpClientRequest>,
92-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
90+
SpanNameExtractor<ApacheHttpClientRequest>,
91+
SpanNameExtractor<ApacheHttpClientRequest>>
9392
spanNameExtractorTransformer) {
9493
builder.setSpanNameExtractor(spanNameExtractorTransformer);
9594
return this;

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public final class ArmeriaClientTelemetryBuilder {
3737
@CanIgnoreReturnValue
3838
public ArmeriaClientTelemetryBuilder setStatusExtractor(
3939
Function<
40-
SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
41-
? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
40+
SpanStatusExtractor<ClientRequestContext, RequestLog>,
41+
SpanStatusExtractor<ClientRequestContext, RequestLog>>
4242
statusExtractor) {
4343
builder.setStatusExtractor(statusExtractor);
4444
return this;
@@ -50,8 +50,8 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor(
5050
*/
5151
@CanIgnoreReturnValue
5252
public ArmeriaClientTelemetryBuilder addAttributesExtractor(
53-
AttributesExtractor<? super ClientRequestContext, ? super RequestLog> attributesExtractor) {
54-
builder.addAttributeExtractor(attributesExtractor);
53+
AttributesExtractor<ClientRequestContext, RequestLog> attributesExtractor) {
54+
builder.addAttributesExtractor(attributesExtractor);
5555
return this;
5656
}
5757

@@ -99,9 +99,7 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
9999
/** Sets custom client {@link SpanNameExtractor} via transform function. */
100100
@CanIgnoreReturnValue
101101
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
102-
Function<
103-
SpanNameExtractor<? super ClientRequestContext>,
104-
? extends SpanNameExtractor<? super ClientRequestContext>>
102+
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
105103
clientSpanNameExtractor) {
106104
builder.setSpanNameExtractor(clientSpanNameExtractor);
107105
return this;

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public final class ArmeriaServerTelemetryBuilder {
3737
@CanIgnoreReturnValue
3838
public ArmeriaServerTelemetryBuilder setStatusExtractor(
3939
Function<
40-
SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>,
41-
? extends SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>>
40+
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
41+
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
4242
statusExtractor) {
4343
builder.setStatusExtractor(statusExtractor);
4444
return this;
@@ -50,7 +50,7 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor(
5050
*/
5151
@CanIgnoreReturnValue
5252
public ArmeriaServerTelemetryBuilder addAttributesExtractor(
53-
AttributesExtractor<? super ServiceRequestContext, ? super RequestLog> attributesExtractor) {
53+
AttributesExtractor<ServiceRequestContext, RequestLog> attributesExtractor) {
5454
builder.addAttributesExtractor(attributesExtractor);
5555
return this;
5656
}
@@ -99,9 +99,7 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
9999
/** Sets custom server {@link SpanNameExtractor} via transform function. */
100100
@CanIgnoreReturnValue
101101
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
102-
Function<
103-
SpanNameExtractor<? super ServiceRequestContext>,
104-
? extends SpanNameExtractor<? super ServiceRequestContext>>
102+
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
105103
serverSpanNameExtractor) {
106104
builder.setSpanNameExtractor(serverSpanNameExtractor);
107105
return this;

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java

+6-10
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
6969
@CanIgnoreReturnValue
7070
public ArmeriaTelemetryBuilder setClientStatusExtractor(
7171
Function<
72-
SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
73-
? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
72+
SpanStatusExtractor<ClientRequestContext, RequestLog>,
73+
SpanStatusExtractor<ClientRequestContext, RequestLog>>
7474
statusExtractor) {
7575
clientBuilder.setStatusExtractor(statusExtractor);
7676
return this;
@@ -85,8 +85,8 @@ public ArmeriaTelemetryBuilder setClientStatusExtractor(
8585
@CanIgnoreReturnValue
8686
public ArmeriaTelemetryBuilder setServerStatusExtractor(
8787
Function<
88-
SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>,
89-
? extends SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>>
88+
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
89+
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
9090
statusExtractor) {
9191
serverBuilder.setStatusExtractor(statusExtractor);
9292
return this;
@@ -270,9 +270,7 @@ public ArmeriaTelemetryBuilder setEmitExperimentalHttpServerMetrics(
270270
@Deprecated
271271
@CanIgnoreReturnValue
272272
public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
273-
Function<
274-
SpanNameExtractor<? super ClientRequestContext>,
275-
? extends SpanNameExtractor<? super ClientRequestContext>>
273+
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
276274
clientSpanNameExtractor) {
277275
clientBuilder.setSpanNameExtractor(clientSpanNameExtractor);
278276
return this;
@@ -286,9 +284,7 @@ public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
286284
@Deprecated
287285
@CanIgnoreReturnValue
288286
public ArmeriaTelemetryBuilder setServerSpanNameExtractor(
289-
Function<
290-
SpanNameExtractor<? super ServiceRequestContext>,
291-
? extends SpanNameExtractor<? super ServiceRequestContext>>
287+
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
292288
serverSpanNameExtractor) {
293289
serverBuilder.setSpanNameExtractor(serverSpanNameExtractor);
294290
return this;

‎instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public JavaHttpClientTelemetryBuilder addAttributeExtractor(
5050
*/
5151
@CanIgnoreReturnValue
5252
public JavaHttpClientTelemetryBuilder addAttributesExtractor(
53-
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
53+
AttributesExtractor<HttpRequest, HttpResponse<?>> attributesExtractor) {
5454
builder.addAttributesExtractor(attributesExtractor);
5555
return this;
5656
}
@@ -116,9 +116,7 @@ public JavaHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
116116
/** Sets custom {@link SpanNameExtractor} via transform function. */
117117
@CanIgnoreReturnValue
118118
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
119-
Function<
120-
SpanNameExtractor<? super HttpRequest>,
121-
? extends SpanNameExtractor<? super HttpRequest>>
119+
Function<SpanNameExtractor<HttpRequest>, SpanNameExtractor<HttpRequest>>
122120
spanNameExtractorTransformer) {
123121
builder.setSpanNameExtractor(spanNameExtractorTransformer);
124122
return this;

‎instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public JettyClientTelemetryBuilder addAttributeExtractor(
6565
*/
6666
@CanIgnoreReturnValue
6767
public JettyClientTelemetryBuilder addAttributesExtractor(
68-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
68+
AttributesExtractor<Request, Response> attributesExtractor) {
6969
builder.addAttributesExtractor(attributesExtractor);
7070
return this;
7171
}
@@ -130,7 +130,7 @@ public JettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
130130
/** Sets custom {@link SpanNameExtractor} via transform function. */
131131
@CanIgnoreReturnValue
132132
public JettyClientTelemetryBuilder setSpanNameExtractor(
133-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
133+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
134134
spanNameExtractorTransformer) {
135135
builder.setSpanNameExtractor(spanNameExtractorTransformer);
136136
return this;

‎instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public JettyClientTelemetryBuilder addAttributeExtractor(
6565
*/
6666
@CanIgnoreReturnValue
6767
public JettyClientTelemetryBuilder addAttributesExtractor(
68-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
68+
AttributesExtractor<Request, Response> attributesExtractor) {
6969
builder.addAttributesExtractor(attributesExtractor);
7070
return this;
7171
}
@@ -130,7 +130,7 @@ public JettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
130130
/** Sets custom {@link SpanNameExtractor} via transform function. */
131131
@CanIgnoreReturnValue
132132
public JettyClientTelemetryBuilder setSpanNameExtractor(
133-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
133+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
134134
spanNameExtractorTransformer) {
135135
builder.setSpanNameExtractor(spanNameExtractorTransformer);
136136
return this;

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/client/AbstractKtorClientTelemetryBuilder.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ abstract class AbstractKtorClientTelemetryBuilder(
6565

6666
fun attributesExtractor(extractorBuilder: ExtractorBuilder.() -> Unit = {}) {
6767
val builder = ExtractorBuilder().apply(extractorBuilder).build()
68-
this.builder.addAttributeExtractor(
68+
this.builder.addAttributesExtractor(
6969
object : AttributesExtractor<HttpRequestData, HttpResponse> {
7070
override fun onStart(attributes: AttributesBuilder, parentContext: Context, request: HttpRequestData) {
7171
builder.onStart(OnStartData(attributes, parentContext, request))

‎instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ public NettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
118118
/** Sets custom {@link SpanNameExtractor} via transform function. */
119119
@CanIgnoreReturnValue
120120
public NettyClientTelemetryBuilder setSpanNameExtractor(
121-
Function<
122-
SpanNameExtractor<? super HttpRequestAndChannel>,
123-
? extends SpanNameExtractor<? super HttpRequestAndChannel>>
121+
Function<SpanNameExtractor<HttpRequestAndChannel>, SpanNameExtractor<HttpRequestAndChannel>>
124122
spanNameExtractorTransformer) {
125123
builder.setSpanNameExtractor(spanNameExtractorTransformer);
126124
return this;

‎instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public OkHttpTelemetryBuilder addAttributeExtractor(
5050
*/
5151
@CanIgnoreReturnValue
5252
public OkHttpTelemetryBuilder addAttributesExtractor(
53-
AttributesExtractor<? super Interceptor.Chain, ? super Response> attributesExtractor) {
53+
AttributesExtractor<Interceptor.Chain, Response> attributesExtractor) {
5454
builder.addAttributesExtractor(attributesExtractor);
5555
return this;
5656
}
@@ -115,9 +115,7 @@ public OkHttpTelemetryBuilder setEmitExperimentalHttpClientMetrics(
115115
/** Sets custom {@link SpanNameExtractor} via transform function. */
116116
@CanIgnoreReturnValue
117117
public OkHttpTelemetryBuilder setSpanNameExtractor(
118-
Function<
119-
SpanNameExtractor<? super Interceptor.Chain>,
120-
? extends SpanNameExtractor<? super Interceptor.Chain>>
118+
Function<SpanNameExtractor<Interceptor.Chain>, SpanNameExtractor<Interceptor.Chain>>
121119
spanNameExtractorTransformer) {
122120
builder.setSpanNameExtractor(spanNameExtractorTransformer);
123121
return this;

‎instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public final class RatpackClientTelemetryBuilder {
3232

3333
@CanIgnoreReturnValue
3434
public RatpackClientTelemetryBuilder addAttributesExtractor(
35-
AttributesExtractor<? super RequestSpec, ? super HttpResponse> attributesExtractor) {
36-
builder.addAttributeExtractor(attributesExtractor);
35+
AttributesExtractor<RequestSpec, HttpResponse> attributesExtractor) {
36+
builder.addAttributesExtractor(attributesExtractor);
3737
return this;
3838
}
3939

@@ -81,9 +81,7 @@ public RatpackClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
8181
/** Sets custom client {@link SpanNameExtractor} via transform function. */
8282
@CanIgnoreReturnValue
8383
public RatpackClientTelemetryBuilder setSpanNameExtractor(
84-
Function<
85-
SpanNameExtractor<? super RequestSpec>,
86-
? extends SpanNameExtractor<? super RequestSpec>>
84+
Function<SpanNameExtractor<RequestSpec>, SpanNameExtractor<RequestSpec>>
8785
clientSpanNameExtractor) {
8886
builder.setSpanNameExtractor(clientSpanNameExtractor);
8987
return this;

0 commit comments

Comments
 (0)