Skip to content

Commit a34694a

Browse files
trasktrask
committed
Simplify signatures
1 parent e5a9d1c commit a34694a

File tree

30 files changed

+69
-113
lines changed

30 files changed

+69
-113
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
@@ -56,8 +56,7 @@ public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
5656
*/
5757
@CanIgnoreReturnValue
5858
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
59-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
60-
attributesExtractor) {
59+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
6160
builder.addAttributesExtractor(attributesExtractor);
6261
return this;
6362
}
@@ -126,8 +125,8 @@ public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
126125
@CanIgnoreReturnValue
127126
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
128127
Function<
129-
SpanNameExtractor<? super ApacheHttpClientRequest>,
130-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
128+
SpanNameExtractor<ApacheHttpClientRequest>,
129+
SpanNameExtractor<ApacheHttpClientRequest>>
131130
spanNameExtractorTransformer) {
132131
builder.setSpanNameExtractor(spanNameExtractorTransformer);
133132
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

+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/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
@@ -70,8 +70,8 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
7070
@CanIgnoreReturnValue
7171
public ArmeriaTelemetryBuilder setClientStatusExtractor(
7272
Function<
73-
SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
74-
? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
73+
SpanStatusExtractor<ClientRequestContext, RequestLog>,
74+
SpanStatusExtractor<ClientRequestContext, RequestLog>>
7575
statusExtractor) {
7676
clientBuilder.setStatusExtractor(statusExtractor);
7777
return this;
@@ -86,8 +86,8 @@ public ArmeriaTelemetryBuilder setClientStatusExtractor(
8686
@CanIgnoreReturnValue
8787
public ArmeriaTelemetryBuilder setServerStatusExtractor(
8888
Function<
89-
SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>,
90-
? extends SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>>
89+
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
90+
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
9191
statusExtractor) {
9292
serverBuilder.setStatusExtractor(statusExtractor);
9393
return this;
@@ -275,9 +275,7 @@ public ArmeriaTelemetryBuilder setEmitExperimentalHttpServerMetrics(
275275
@Deprecated
276276
@CanIgnoreReturnValue
277277
public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
278-
Function<
279-
SpanNameExtractor<? super ClientRequestContext>,
280-
? extends SpanNameExtractor<? super ClientRequestContext>>
278+
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
281279
clientSpanNameExtractor) {
282280
clientBuilder.setSpanNameExtractor(clientSpanNameExtractor);
283281
return this;
@@ -291,9 +289,7 @@ public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
291289
@Deprecated
292290
@CanIgnoreReturnValue
293291
public ArmeriaTelemetryBuilder setServerSpanNameExtractor(
294-
Function<
295-
SpanNameExtractor<? super ServiceRequestContext>,
296-
? extends SpanNameExtractor<? super ServiceRequestContext>>
292+
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
297293
serverSpanNameExtractor) {
298294
serverBuilder.setSpanNameExtractor(serverSpanNameExtractor);
299295
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
@@ -54,7 +54,7 @@ public JavaHttpClientTelemetryBuilder addAttributeExtractor(
5454
*/
5555
@CanIgnoreReturnValue
5656
public JavaHttpClientTelemetryBuilder addAttributesExtractor(
57-
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
57+
AttributesExtractor<HttpRequest, HttpResponse<?>> attributesExtractor) {
5858
builder.addAttributesExtractor(attributesExtractor);
5959
return this;
6060
}
@@ -122,9 +122,7 @@ public JavaHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
122122
/** Sets custom {@link SpanNameExtractor} via transform function. */
123123
@CanIgnoreReturnValue
124124
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
125-
Function<
126-
SpanNameExtractor<? super HttpRequest>,
127-
? extends SpanNameExtractor<? super HttpRequest>>
125+
Function<SpanNameExtractor<HttpRequest>, SpanNameExtractor<HttpRequest>>
128126
spanNameExtractorTransformer) {
129127
builder.setSpanNameExtractor(spanNameExtractorTransformer);
130128
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
@@ -69,7 +69,7 @@ public JettyClientTelemetryBuilder addAttributeExtractor(
6969
*/
7070
@CanIgnoreReturnValue
7171
public JettyClientTelemetryBuilder addAttributesExtractor(
72-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
72+
AttributesExtractor<Request, Response> attributesExtractor) {
7373
builder.addAttributesExtractor(attributesExtractor);
7474
return this;
7575
}
@@ -135,7 +135,7 @@ public JettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
135135
/** Sets custom {@link SpanNameExtractor} via transform function. */
136136
@CanIgnoreReturnValue
137137
public JettyClientTelemetryBuilder setSpanNameExtractor(
138-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
138+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
139139
spanNameExtractorTransformer) {
140140
builder.setSpanNameExtractor(spanNameExtractorTransformer);
141141
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
@@ -69,7 +69,7 @@ public JettyClientTelemetryBuilder addAttributeExtractor(
6969
*/
7070
@CanIgnoreReturnValue
7171
public JettyClientTelemetryBuilder addAttributesExtractor(
72-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
72+
AttributesExtractor<Request, Response> attributesExtractor) {
7373
builder.addAttributesExtractor(attributesExtractor);
7474
return this;
7575
}
@@ -135,7 +135,7 @@ public JettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
135135
/** Sets custom {@link SpanNameExtractor} via transform function. */
136136
@CanIgnoreReturnValue
137137
public JettyClientTelemetryBuilder setSpanNameExtractor(
138-
Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
138+
Function<SpanNameExtractor<Request>, SpanNameExtractor<Request>>
139139
spanNameExtractorTransformer) {
140140
builder.setSpanNameExtractor(spanNameExtractorTransformer);
141141
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 { spanStatusBuilder: SpanStatusBuilder,
@@ -61,7 +61,7 @@ class KtorServerTelemetry private constructor(
6161
this.spanKindExtractor = extractor
6262
}
6363

64-
fun addAttributesExtractor(extractor: AttributesExtractor<in ApplicationRequest, in ApplicationResponse>) {
64+
fun addAttributesExtractor(extractor: AttributesExtractor<ApplicationRequest, ApplicationResponse>) {
6565
builder.addAttributesExtractor(extractor)
6666
}
6767

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class KtorServerTracing private constructor(
4646
}
4747

4848
fun setStatusExtractor(
49-
extractor: (SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>
49+
extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<ApplicationRequest, in ApplicationResponse>
5050
) {
5151
builder.setStatusExtractor { prevExtractor ->
5252
SpanStatusExtractor { spanStatusBuilder: SpanStatusBuilder,
@@ -62,7 +62,7 @@ class KtorServerTracing private constructor(
6262
this.spanKindExtractor = extractor
6363
}
6464

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

‎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
@@ -82,7 +82,7 @@ abstract class AbstractKtorClientTelemetryBuilder(
8282
})
8383
}
8484

85-
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<in HttpRequestData>, out SpanNameExtractor<in HttpRequestData>>) {
85+
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<HttpRequestData>, SpanNameExtractor<HttpRequestData>>) {
8686
builder.setSpanNameExtractor(spanNameExtractorTransformer)
8787
}
8888

‎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 { spanStatusBuilder: SpanStatusBuilder,
4848
request: ApplicationRequest,
@@ -86,7 +86,7 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam
8686
)
8787
}
8888

89-
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<in ApplicationRequest>, out SpanNameExtractor<in ApplicationRequest>>) {
89+
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<ApplicationRequest>, SpanNameExtractor<ApplicationRequest>>) {
9090
builder.setSpanNameExtractor(spanNameExtractorTransformer)
9191
}
9292

0 commit comments

Comments
 (0)