Skip to content

Commit 5796077

Browse files
trasktrask
committed
Simplify signatures
1 parent f932301 commit 5796077

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‎

Lines changed: 4 additions & 8 deletions
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‎

Lines changed: 4 additions & 8 deletions
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‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
5757
*/
5858
@CanIgnoreReturnValue
5959
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
60-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
61-
attributesExtractor) {
60+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
6261
builder.addAttributesExtractor(attributesExtractor);
6362
return this;
6463
}
@@ -125,8 +124,8 @@ public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
125124
@CanIgnoreReturnValue
126125
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
127126
Function<
128-
SpanNameExtractor<? super ApacheHttpClientRequest>,
129-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
127+
SpanNameExtractor<ApacheHttpClientRequest>,
128+
SpanNameExtractor<ApacheHttpClientRequest>>
130129
spanNameExtractorTransformer) {
131130
builder.setSpanNameExtractor(spanNameExtractorTransformer);
132131
return this;

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

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ public final class ApacheHttpClientTelemetryBuilder {
4242
*/
4343
@CanIgnoreReturnValue
4444
public ApacheHttpClientTelemetryBuilder addAttributesExtractor(
45-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
46-
attributesExtractor) {
45+
AttributesExtractor<ApacheHttpClientRequest, HttpResponse> attributesExtractor) {
4746
builder.addAttributesExtractor(attributesExtractor);
4847
return this;
4948
}
@@ -93,8 +92,8 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods
9392
@CanIgnoreReturnValue
9493
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
9594
Function<
96-
SpanNameExtractor<? super ApacheHttpClientRequest>,
97-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
95+
SpanNameExtractor<ApacheHttpClientRequest>,
96+
SpanNameExtractor<ApacheHttpClientRequest>>
9897
spanNameExtractorTransformer) {
9998
builder.setSpanNameExtractor(spanNameExtractorTransformer);
10099
return this;

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public final class ArmeriaClientTelemetryBuilder {
4141
@CanIgnoreReturnValue
4242
public ArmeriaClientTelemetryBuilder setStatusExtractor(
4343
Function<
44-
SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
45-
? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
44+
SpanStatusExtractor<ClientRequestContext, RequestLog>,
45+
SpanStatusExtractor<ClientRequestContext, RequestLog>>
4646
statusExtractor) {
4747
builder.setStatusExtractor(statusExtractor);
4848
return this;
@@ -54,7 +54,7 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor(
5454
*/
5555
@CanIgnoreReturnValue
5656
public ArmeriaClientTelemetryBuilder addAttributesExtractor(
57-
AttributesExtractor<? super ClientRequestContext, ? super RequestLog> attributesExtractor) {
57+
AttributesExtractor<ClientRequestContext, RequestLog> attributesExtractor) {
5858
builder.addAttributesExtractor(attributesExtractor);
5959
return this;
6060
}
@@ -103,9 +103,7 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
103103
/** Sets custom client {@link SpanNameExtractor} via transform function. */
104104
@CanIgnoreReturnValue
105105
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
106-
Function<
107-
SpanNameExtractor<? super ClientRequestContext>,
108-
? extends SpanNameExtractor<? super ClientRequestContext>>
106+
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
109107
clientSpanNameExtractor) {
110108
builder.setSpanNameExtractor(clientSpanNameExtractor);
111109
return this;

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public final class ArmeriaServerTelemetryBuilder {
3939
@CanIgnoreReturnValue
4040
public ArmeriaServerTelemetryBuilder setStatusExtractor(
4141
Function<
42-
SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>,
43-
? extends SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>>
42+
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
43+
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
4444
statusExtractor) {
4545
builder.setStatusExtractor(statusExtractor);
4646
return this;
@@ -52,7 +52,7 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor(
5252
*/
5353
@CanIgnoreReturnValue
5454
public ArmeriaServerTelemetryBuilder addAttributesExtractor(
55-
AttributesExtractor<? super ServiceRequestContext, ? super RequestLog> attributesExtractor) {
55+
AttributesExtractor<ServiceRequestContext, RequestLog> attributesExtractor) {
5656
builder.addAttributesExtractor(attributesExtractor);
5757
return this;
5858
}
@@ -101,9 +101,7 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
101101
/** Sets custom server {@link SpanNameExtractor} via transform function. */
102102
@CanIgnoreReturnValue
103103
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
104-
Function<
105-
SpanNameExtractor<? super ServiceRequestContext>,
106-
? extends SpanNameExtractor<? super ServiceRequestContext>>
104+
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
107105
serverSpanNameExtractor) {
108106
builder.setSpanNameExtractor(serverSpanNameExtractor);
109107
return this;

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

Lines changed: 6 additions & 10 deletions
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‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public JavaHttpClientTelemetryBuilder addAttributeExtractor(
5555
*/
5656
@CanIgnoreReturnValue
5757
public JavaHttpClientTelemetryBuilder addAttributesExtractor(
58-
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
58+
AttributesExtractor<HttpRequest, HttpResponse<?>> attributesExtractor) {
5959
builder.addAttributesExtractor(attributesExtractor);
6060
return this;
6161
}
@@ -121,9 +121,7 @@ public JavaHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
121121
/** Sets custom {@link SpanNameExtractor} via transform function. */
122122
@CanIgnoreReturnValue
123123
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
124-
Function<
125-
SpanNameExtractor<? super HttpRequest>,
126-
? extends SpanNameExtractor<? super HttpRequest>>
124+
Function<SpanNameExtractor<HttpRequest>, SpanNameExtractor<HttpRequest>>
127125
spanNameExtractorTransformer) {
128126
builder.setSpanNameExtractor(spanNameExtractorTransformer);
129127
return this;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public JettyClientTelemetryBuilder addAttributeExtractor(
7070
*/
7171
@CanIgnoreReturnValue
7272
public JettyClientTelemetryBuilder addAttributesExtractor(
73-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
73+
AttributesExtractor<Request, Response> attributesExtractor) {
7474
builder.addAttributesExtractor(attributesExtractor);
7575
return this;
7676
}
@@ -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;

0 commit comments

Comments
 (0)