Skip to content

Commit dbe9679

Browse files
trasktrask
authored
Simplify Http *TelemetryBuilder generic signatures (#12858)
1 parent 43cc57c commit dbe9679

File tree

23 files changed

+48
-81
lines changed

23 files changed

+48
-81
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
@@ -51,17 +51,15 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
5151

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

6361
@Nullable private final TextMapSetter<REQUEST> headerSetter;
64-
private Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
62+
private Function<SpanNameExtractor<REQUEST>, ? extends SpanNameExtractor<REQUEST>>
6563
spanNameExtractorTransformer = Function.identity();
6664
private boolean emitExperimentalHttpClientMetrics = false;
6765
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
@@ -112,9 +110,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> addAttributesExtr
112110

113111
@CanIgnoreReturnValue
114112
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractor(
115-
Function<
116-
SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
117-
? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
113+
Function<SpanStatusExtractor<REQUEST, RESPONSE>, SpanStatusExtractor<REQUEST, RESPONSE>>
118114
statusExtractor) {
119115
this.statusExtractorTransformer = statusExtractor;
120116
return this;
@@ -193,7 +189,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setRedactQueryPar
193189
/** Sets custom {@link SpanNameExtractor} via transform function. */
194190
@CanIgnoreReturnValue
195191
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
196-
Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
192+
Function<SpanNameExtractor<REQUEST>, SpanNameExtractor<REQUEST>>
197193
spanNameExtractorTransformer) {
198194
this.spanNameExtractorTransformer = spanNameExtractorTransformer;
199195
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
@@ -41,8 +41,7 @@ public final class ApacheHttpClientTelemetryBuilder {
4141
*/
4242
@CanIgnoreReturnValue
4343
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
44-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
45-
attributesExtractor) {
44+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
4645
builder.addAttributesExtractor(attributesExtractor);
4746
return this;
4847
}
@@ -94,8 +93,8 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
9493
@CanIgnoreReturnValue
9594
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
9695
Function<
97-
SpanNameExtractor<? super ApacheHttpClientRequest>,
98-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
96+
SpanNameExtractor<ApacheHttpClientRequest>,
97+
SpanNameExtractor<ApacheHttpClientRequest>>
9998
spanNameExtractorTransformer) {
10099
builder.setSpanNameExtractor(spanNameExtractorTransformer);
101100
return this;

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public final class ApacheHttpClientTelemetryBuilder {
4141
*/
4242
@CanIgnoreReturnValue
4343
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
44-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
45-
attributesExtractor) {
44+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
4645
builder.addAttributesExtractor(attributesExtractor);
4746
return this;
4847
}
@@ -94,8 +93,8 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
9493
@CanIgnoreReturnValue
9594
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
9695
Function<
97-
SpanNameExtractor<? super ApacheHttpClientRequest>,
98-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
96+
SpanNameExtractor<ApacheHttpClientRequest>,
97+
SpanNameExtractor<ApacheHttpClientRequest>>
9998
spanNameExtractorTransformer) {
10099
builder.setSpanNameExtractor(spanNameExtractorTransformer);
101100
return this;

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public final class ArmeriaClientTelemetryBuilder {
4040
@CanIgnoreReturnValue
4141
public ArmeriaClientTelemetryBuilder setStatusExtractor(
4242
Function<
43-
SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
44-
? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
43+
SpanStatusExtractor<ClientRequestContext, RequestLog>,
44+
SpanStatusExtractor<ClientRequestContext, RequestLog>>
4545
statusExtractor) {
4646
builder.setStatusExtractor(statusExtractor);
4747
return this;
@@ -53,7 +53,7 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor(
5353
*/
5454
@CanIgnoreReturnValue
5555
public ArmeriaClientTelemetryBuilder addAttributesExtractor(
56-
AttributesExtractor<? super ClientRequestContext, ? super RequestLog> attributesExtractor) {
56+
AttributesExtractor<ClientRequestContext, RequestLog> attributesExtractor) {
5757
builder.addAttributesExtractor(attributesExtractor);
5858
return this;
5959
}
@@ -104,9 +104,7 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
104104
/** Sets custom client {@link SpanNameExtractor} via transform function. */
105105
@CanIgnoreReturnValue
106106
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
107-
Function<
108-
SpanNameExtractor<? super ClientRequestContext>,
109-
? extends SpanNameExtractor<? super ClientRequestContext>>
107+
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
110108
clientSpanNameExtractor) {
111109
builder.setSpanNameExtractor(clientSpanNameExtractor);
112110
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
@@ -38,8 +38,8 @@ public final class ArmeriaServerTelemetryBuilder {
3838
@CanIgnoreReturnValue
3939
public ArmeriaServerTelemetryBuilder setStatusExtractor(
4040
Function<
41-
SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>,
42-
? extends SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>>
41+
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
42+
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
4343
statusExtractor) {
4444
builder.setStatusExtractor(statusExtractor);
4545
return this;
@@ -51,7 +51,7 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor(
5151
*/
5252
@CanIgnoreReturnValue
5353
public ArmeriaServerTelemetryBuilder addAttributesExtractor(
54-
AttributesExtractor<? super ServiceRequestContext, ? super RequestLog> attributesExtractor) {
54+
AttributesExtractor<ServiceRequestContext, RequestLog> attributesExtractor) {
5555
builder.addAttributesExtractor(attributesExtractor);
5656
return this;
5757
}
@@ -102,9 +102,7 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
102102
/** Sets custom server {@link SpanNameExtractor} via transform function. */
103103
@CanIgnoreReturnValue
104104
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
105-
Function<
106-
SpanNameExtractor<? super ServiceRequestContext>,
107-
? extends SpanNameExtractor<? super ServiceRequestContext>>
105+
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
108106
serverSpanNameExtractor) {
109107
builder.setSpanNameExtractor(serverSpanNameExtractor);
110108
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
@@ -45,7 +45,7 @@ public final class JavaHttpClientTelemetryBuilder {
4545
*/
4646
@CanIgnoreReturnValue
4747
public JavaHttpClientTelemetryBuilder addAttributesExtractor(
48-
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
48+
AttributesExtractor<HttpRequest, HttpResponse<?>> attributesExtractor) {
4949
builder.addAttributesExtractor(attributesExtractor);
5050
return this;
5151
}
@@ -96,9 +96,7 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMe
9696
/** Sets custom {@link SpanNameExtractor} via transform function. */
9797
@CanIgnoreReturnValue
9898
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
99-
Function<
100-
SpanNameExtractor<? super HttpRequest>,
101-
? extends SpanNameExtractor<? super HttpRequest>>
99+
Function<SpanNameExtractor<HttpRequest>, SpanNameExtractor<HttpRequest>>
102100
spanNameExtractorTransformer) {
103101
builder.setSpanNameExtractor(spanNameExtractorTransformer);
104102
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
@@ -55,7 +55,7 @@ public JettyClientTelemetryBuilder setSslContextFactory(
5555
*/
5656
@CanIgnoreReturnValue
5757
public JettyClientTelemetryBuilder addAttributesExtractor(
58-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
58+
AttributesExtractor<Request, Response> attributesExtractor) {
5959
builder.addAttributesExtractor(attributesExtractor);
6060
return this;
6161
}
@@ -105,7 +105,7 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
105105
/** Sets custom {@link SpanNameExtractor} via transform function. */
106106
@CanIgnoreReturnValue
107107
public JettyClientTelemetryBuilder setSpanNameExtractor(
108-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
108+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
109109
spanNameExtractorTransformer) {
110110
builder.setSpanNameExtractor(spanNameExtractorTransformer);
111111
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
@@ -55,7 +55,7 @@ public JettyClientTelemetryBuilder setSslContextFactory(SslContextFactory sslCon
5555
*/
5656
@CanIgnoreReturnValue
5757
public JettyClientTelemetryBuilder addAttributesExtractor(
58-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
58+
AttributesExtractor<Request, Response> attributesExtractor) {
5959
builder.addAttributesExtractor(attributesExtractor);
6060
return this;
6161
}
@@ -105,7 +105,7 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
105105
/** Sets custom {@link SpanNameExtractor} via transform function. */
106106
@CanIgnoreReturnValue
107107
public JettyClientTelemetryBuilder setSpanNameExtractor(
108-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
108+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
109109
spanNameExtractorTransformer) {
110110
builder.setSpanNameExtractor(spanNameExtractorTransformer);
111111
return this;

‎instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTelemetry.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class KtorServerTelemetry private constructor(
4545
}
4646

4747
fun setStatusExtractor(
48-
extractor: (SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>
48+
extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<ApplicationRequest, ApplicationResponse>
4949
) {
5050
builder.setStatusExtractor { prevExtractor ->
5151
SpanStatusExtractor {
@@ -63,7 +63,7 @@ class KtorServerTelemetry private constructor(
6363
this.spanKindExtractor = extractor
6464
}
6565

66-
fun addAttributesExtractor(extractor: AttributesExtractor<in ApplicationRequest, in ApplicationResponse>) {
66+
fun addAttributesExtractor(extractor: AttributesExtractor<ApplicationRequest, ApplicationResponse>) {
6767
builder.addAttributesExtractor(extractor)
6868
}
6969

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ abstract class AbstractKtorClientTelemetryBuilder(
7878
})
7979
}
8080

81-
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<in HttpRequestData>, out SpanNameExtractor<in HttpRequestData>>) {
81+
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<HttpRequestData>, SpanNameExtractor<HttpRequestData>>) {
8282
builder.setSpanNameExtractor(spanNameExtractorTransformer)
8383
}
8484

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam
4242
)
4343
}
4444

45-
fun spanStatusExtractor(extract: SpanStatusData.(SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) -> Unit) {
45+
fun spanStatusExtractor(extract: SpanStatusData.(SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> Unit) {
4646
builder.setStatusExtractor { prevExtractor ->
4747
SpanStatusExtractor {
4848
spanStatusBuilder: SpanStatusBuilder,
@@ -88,7 +88,7 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam
8888
)
8989
}
9090

91-
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<in ApplicationRequest>, out SpanNameExtractor<in ApplicationRequest>>) {
91+
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<ApplicationRequest>, SpanNameExtractor<ApplicationRequest>>) {
9292
builder.setSpanNameExtractor(spanNameExtractorTransformer)
9393
}
9494

‎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
@@ -124,9 +124,7 @@ public NettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
124124
/** Sets custom {@link SpanNameExtractor} via transform function. */
125125
@CanIgnoreReturnValue
126126
public NettyClientTelemetryBuilder setSpanNameExtractor(
127-
Function<
128-
SpanNameExtractor<? super HttpRequestAndChannel>,
129-
? extends SpanNameExtractor<? super HttpRequestAndChannel>>
127+
Function<SpanNameExtractor<HttpRequestAndChannel>, SpanNameExtractor<HttpRequestAndChannel>>
130128
spanNameExtractorTransformer) {
131129
builder.setSpanNameExtractor(spanNameExtractorTransformer);
132130
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
@@ -40,7 +40,7 @@ public final class OkHttpTelemetryBuilder {
4040
*/
4141
@CanIgnoreReturnValue
4242
public OkHttpTelemetryBuilder addAttributesExtractor(
43-
AttributesExtractor<? super Interceptor.Chain, ? super Response> attributesExtractor) {
43+
AttributesExtractor<Interceptor.Chain, Response> attributesExtractor) {
4444
builder.addAttributesExtractor(attributesExtractor);
4545
return this;
4646
}
@@ -89,9 +89,7 @@ public OkHttpTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
8989
/** Sets custom {@link SpanNameExtractor} via transform function. */
9090
@CanIgnoreReturnValue
9191
public OkHttpTelemetryBuilder setSpanNameExtractor(
92-
Function<
93-
SpanNameExtractor<? super Interceptor.Chain>,
94-
? extends SpanNameExtractor<? super Interceptor.Chain>>
92+
Function<SpanNameExtractor<Interceptor.Chain>, SpanNameExtractor<Interceptor.Chain>>
9593
spanNameExtractorTransformer) {
9694
builder.setSpanNameExtractor(spanNameExtractorTransformer);
9795
return this;

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public final class RatpackClientTelemetryBuilder {
3636

3737
@CanIgnoreReturnValue
3838
public RatpackClientTelemetryBuilder addAttributesExtractor(
39-
AttributesExtractor<? super RequestSpec, ? super HttpResponse> attributesExtractor) {
39+
AttributesExtractor<RequestSpec, HttpResponse> attributesExtractor) {
4040
builder.addAttributesExtractor(attributesExtractor);
4141
return this;
4242
}
@@ -87,9 +87,7 @@ public RatpackClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
8787
/** Sets custom client {@link SpanNameExtractor} via transform function. */
8888
@CanIgnoreReturnValue
8989
public RatpackClientTelemetryBuilder setSpanNameExtractor(
90-
Function<
91-
SpanNameExtractor<? super RequestSpec>,
92-
? extends SpanNameExtractor<? super RequestSpec>>
90+
Function<SpanNameExtractor<RequestSpec>, SpanNameExtractor<RequestSpec>>
9391
clientSpanNameExtractor) {
9492
builder.setSpanNameExtractor(clientSpanNameExtractor);
9593
return this;

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public final class RatpackServerTelemetryBuilder {
4040
*/
4141
@CanIgnoreReturnValue
4242
public RatpackServerTelemetryBuilder addAttributesExtractor(
43-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
43+
AttributesExtractor<Request, Response> attributesExtractor) {
4444
builder.addAttributesExtractor(attributesExtractor);
4545
return this;
4646
}
@@ -91,8 +91,7 @@ public RatpackServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
9191
/** Sets custom server {@link SpanNameExtractor} via transform function. */
9292
@CanIgnoreReturnValue
9393
public RatpackServerTelemetryBuilder setSpanNameExtractor(
94-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
95-
serverSpanNameExtractor) {
94+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>> serverSpanNameExtractor) {
9695
builder.setSpanNameExtractor(serverSpanNameExtractor);
9796
return this;
9897
}

‎instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
103103
/** Sets custom {@link SpanNameExtractor} via transform function. */
104104
@CanIgnoreReturnValue
105105
public RestletTelemetryBuilder setSpanNameExtractor(
106-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
106+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
107107
spanNameExtractorTransformer) {
108108
builder.setSpanNameExtractor(spanNameExtractorTransformer);
109109
return this;

‎instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
103103
/** Sets custom {@link SpanNameExtractor} via transform function. */
104104
@CanIgnoreReturnValue
105105
public RestletTelemetryBuilder setSpanNameExtractor(
106-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
106+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
107107
spanNameExtractorTransformer) {
108108
builder.setSpanNameExtractor(spanNameExtractorTransformer);
109109
return this;

0 commit comments

Comments
 (0)