Skip to content

Commit 1dc2b66

Browse files
trasktrask
committed
Simplify signatures
1 parent 9676f9c commit 1dc2b66

File tree

26 files changed

+137
-86
lines changed

26 files changed

+137
-86
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> addAttributeExtra
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-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientTelemetryBuilder.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.api.semconv.http;
7+
8+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
9+
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
10+
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
11+
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
12+
import java.util.List;
13+
import java.util.Set;
14+
import java.util.function.Function;
15+
16+
public interface HttpClientTelemetryBuilder<REQUEST, RESPONSE> {
17+
18+
@CanIgnoreReturnValue
19+
HttpClientTelemetryBuilder<REQUEST, RESPONSE> addAttributesExtractor(
20+
AttributesExtractor<REQUEST, RESPONSE> attributesExtractor);
21+
22+
@CanIgnoreReturnValue
23+
HttpClientTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
24+
Function<
25+
SpanStatusExtractor<REQUEST, RESPONSE>,
26+
SpanStatusExtractor<REQUEST, RESPONSE>>
27+
statusExtractor);
28+
29+
@CanIgnoreReturnValue
30+
HttpClientTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
31+
List<String> requestHeaders);
32+
33+
@CanIgnoreReturnValue
34+
HttpClientTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
35+
List<String> responseHeaders);
36+
37+
@CanIgnoreReturnValue
38+
HttpClientTelemetryBuilder<REQUEST, RESPONSE> setKnownMethods(Set<String> knownMethods);
39+
40+
@CanIgnoreReturnValue
41+
HttpClientTelemetryBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
42+
Function<SpanNameExtractor<REQUEST>, SpanNameExtractor< REQUEST>>
43+
spanNameExtractorTransformer);
44+
45+
Object build();
46+
}

‎instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerTelemetryBuilder.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.api.semconv.http;
7+
8+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
9+
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
10+
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
11+
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
12+
13+
import java.util.List;
14+
import java.util.Set;
15+
import java.util.function.Function;
16+
17+
public interface HttpServerTelemetryBuilder<REQUEST, RESPONSE> {
18+
19+
@CanIgnoreReturnValue
20+
HttpServerTelemetryBuilder<REQUEST, RESPONSE> addAttributesExtractor(
21+
AttributesExtractor<REQUEST, RESPONSE> attributesExtractor);
22+
23+
@CanIgnoreReturnValue
24+
HttpServerTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
25+
Function<
26+
SpanStatusExtractor<REQUEST, RESPONSE>,
27+
SpanStatusExtractor<REQUEST, RESPONSE>>
28+
statusExtractor);
29+
30+
@CanIgnoreReturnValue
31+
HttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
32+
List<String> requestHeaders);
33+
34+
@CanIgnoreReturnValue
35+
HttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
36+
List<String> responseHeaders);
37+
38+
@CanIgnoreReturnValue
39+
HttpServerTelemetryBuilder<REQUEST, RESPONSE> setKnownMethods(Set<String> knownMethods);
40+
41+
@CanIgnoreReturnValue
42+
HttpServerTelemetryBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
43+
Function<SpanNameExtractor<REQUEST>, SpanNameExtractor< REQUEST>>
44+
spanNameExtractorTransformer);
45+
46+
Object build();
47+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
105105
@CanIgnoreReturnValue
106106
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
107107
Function<
108-
SpanNameExtractor<? super ApacheHttpClientRequest>,
109-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
108+
SpanNameExtractor<ApacheHttpClientRequest>,
109+
SpanNameExtractor<ApacheHttpClientRequest>>
110110
spanNameExtractorTransformer) {
111111
builder.setSpanNameExtractor(spanNameExtractorTransformer);
112112
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
105105
@CanIgnoreReturnValue
106106
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
107107
Function<
108-
SpanNameExtractor<? super ApacheHttpClientRequest>,
109-
? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
108+
SpanNameExtractor<ApacheHttpClientRequest>,
109+
SpanNameExtractor<ApacheHttpClientRequest>>
110110
spanNameExtractorTransformer) {
111111
builder.setSpanNameExtractor(spanNameExtractorTransformer);
112112
return this;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public final class ArmeriaClientTelemetryBuilder {
3838
@CanIgnoreReturnValue
3939
public ArmeriaClientTelemetryBuilder setStatusExtractor(
4040
Function<
41-
SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
42-
? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
41+
SpanStatusExtractor<ClientRequestContext, RequestLog>,
42+
SpanStatusExtractor<ClientRequestContext, RequestLog>>
4343
statusExtractor) {
4444
builder.setStatusExtractor(statusExtractor);
4545
return this;
@@ -131,9 +131,7 @@ public ArmeriaClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
131131
/** Sets custom client {@link SpanNameExtractor} via transform function. */
132132
@CanIgnoreReturnValue
133133
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
134-
Function<
135-
SpanNameExtractor<? super ClientRequestContext>,
136-
? extends SpanNameExtractor<? super ClientRequestContext>>
134+
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
137135
clientSpanNameExtractor) {
138136
builder.setSpanNameExtractor(clientSpanNameExtractor);
139137
return this;

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

Lines changed: 3 additions & 5 deletions
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;
@@ -118,9 +118,7 @@ public ArmeriaServerTelemetryBuilder setEmitExperimentalHttpServerMetrics(
118118
/** Sets custom server {@link SpanNameExtractor} via transform function. */
119119
@CanIgnoreReturnValue
120120
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
121-
Function<
122-
SpanNameExtractor<? super ServiceRequestContext>,
123-
? extends SpanNameExtractor<? super ServiceRequestContext>>
121+
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
124122
serverSpanNameExtractor) {
125123
builder.setSpanNameExtractor(serverSpanNameExtractor);
126124
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;

0 commit comments

Comments
 (0)