Skip to content

Commit 95b4bc7

Browse files
trasktrask
authored
Remove deprecated methods in favor of Unary (#15324)
1 parent e36f355 commit 95b4bc7

File tree

23 files changed

+0
-439
lines changed

23 files changed

+0
-439
lines changed

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/InstrumenterCustomizer.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
1414
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
1515
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
16-
import java.util.function.Function;
1716
import java.util.function.UnaryOperator;
1817

1918
/**
@@ -82,21 +81,6 @@ InstrumenterCustomizer addAttributesExtractors(
8281
*/
8382
InstrumenterCustomizer addContextCustomizer(ContextCustomizer<?> customizer);
8483

85-
/**
86-
* Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows
87-
* customizing how span names are generated for the instrumented operations.
88-
*
89-
* @param spanNameExtractorTransformer function that transforms the original span name extractor
90-
* @return this InstrumenterCustomizer for method chaining
91-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
92-
*/
93-
@Deprecated
94-
@SuppressWarnings("FunctionalInterfaceClash")
95-
default InstrumenterCustomizer setSpanNameExtractor(
96-
Function<SpanNameExtractor<?>, SpanNameExtractor<?>> spanNameExtractorTransformer) {
97-
return setSpanNameExtractor(spanNameExtractorTransformer::apply);
98-
}
99-
10084
/**
10185
* Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows
10286
* customizing how span names are generated for the instrumented operations.

‎instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor;
2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import java.util.function.Function;
2625
import java.util.function.UnaryOperator;
2726
import javax.annotation.Nullable;
2827
import org.apache.dubbo.rpc.Result;
@@ -64,22 +63,6 @@ public DubboTelemetryBuilder addAttributesExtractor(
6463
return this;
6564
}
6665

67-
/**
68-
* Sets custom client {@link SpanNameExtractor} via transform function.
69-
*
70-
* @deprecated Use {@link #setClientSpanNameExtractor(UnaryOperator)} instead.
71-
*/
72-
@Deprecated
73-
@CanIgnoreReturnValue
74-
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<DubboRequest>
75-
public DubboTelemetryBuilder setClientSpanNameExtractor(
76-
Function<SpanNameExtractor<DubboRequest>, ? extends SpanNameExtractor<? super DubboRequest>>
77-
clientSpanNameExtractor) {
78-
return setClientSpanNameExtractor(
79-
(UnaryOperator<SpanNameExtractor<DubboRequest>>)
80-
input -> (SpanNameExtractor<DubboRequest>) clientSpanNameExtractor.apply(input));
81-
}
82-
8366
/** Sets custom client {@link SpanNameExtractor} via transform function. */
8467
@CanIgnoreReturnValue
8568
public DubboTelemetryBuilder setClientSpanNameExtractor(
@@ -88,22 +71,6 @@ public DubboTelemetryBuilder setClientSpanNameExtractor(
8871
return this;
8972
}
9073

91-
/**
92-
* Sets custom server {@link SpanNameExtractor} via transform function.
93-
*
94-
* @deprecated Use {@link #setServerSpanNameExtractor(UnaryOperator)} instead.
95-
*/
96-
@Deprecated
97-
@CanIgnoreReturnValue
98-
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<DubboRequest>
99-
public DubboTelemetryBuilder setServerSpanNameExtractor(
100-
Function<SpanNameExtractor<DubboRequest>, ? extends SpanNameExtractor<? super DubboRequest>>
101-
serverSpanNameExtractor) {
102-
return setServerSpanNameExtractor(
103-
(UnaryOperator<SpanNameExtractor<DubboRequest>>)
104-
input -> (SpanNameExtractor<DubboRequest>) serverSpanNameExtractor.apply(input));
105-
}
106-
10774
/** Sets custom server {@link SpanNameExtractor} via transform function. */
10875
@CanIgnoreReturnValue
10976
public DubboTelemetryBuilder setServerSpanNameExtractor(

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
1515
import java.util.Collection;
16-
import java.util.function.Function;
1716
import java.util.function.UnaryOperator;
1817
import org.apache.http.HttpResponse;
1918

@@ -90,23 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
9089
return this;
9190
}
9291

93-
/**
94-
* Sets custom {@link SpanNameExtractor} via transform function.
95-
*
96-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
97-
*/
98-
@Deprecated
99-
@CanIgnoreReturnValue
100-
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
101-
Function<
102-
SpanNameExtractor<ApacheHttpClientRequest>,
103-
SpanNameExtractor<ApacheHttpClientRequest>>
104-
spanNameExtractorTransformer) {
105-
return setSpanNameExtractor(
106-
(UnaryOperator<SpanNameExtractor<ApacheHttpClientRequest>>)
107-
spanNameExtractorTransformer::apply);
108-
}
109-
11092
/** Sets custom {@link SpanNameExtractor} via transform function. */
11193
@CanIgnoreReturnValue
11294
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
1515
import java.util.Collection;
16-
import java.util.function.Function;
1716
import java.util.function.UnaryOperator;
1817
import org.apache.hc.core5.http.HttpResponse;
1918

@@ -90,23 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
9089
return this;
9190
}
9291

93-
/**
94-
* Sets custom {@link SpanNameExtractor} via transform function.
95-
*
96-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
97-
*/
98-
@Deprecated
99-
@CanIgnoreReturnValue
100-
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
101-
Function<
102-
SpanNameExtractor<ApacheHttpClientRequest>,
103-
SpanNameExtractor<ApacheHttpClientRequest>>
104-
spanNameExtractorTransformer) {
105-
return setSpanNameExtractor(
106-
(UnaryOperator<SpanNameExtractor<ApacheHttpClientRequest>>)
107-
spanNameExtractorTransformer::apply);
108-
}
109-
11092
/** Sets custom {@link SpanNameExtractor} via transform function. */
11193
@CanIgnoreReturnValue
11294
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
1919
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
2020
import java.util.Collection;
21-
import java.util.function.Function;
2221
import java.util.function.UnaryOperator;
2322

2423
public final class ArmeriaClientTelemetryBuilder {
@@ -37,23 +36,6 @@ public final class ArmeriaClientTelemetryBuilder {
3736
builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry);
3837
}
3938

40-
/**
41-
* Sets the status extractor for client spans.
42-
*
43-
* @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead.
44-
*/
45-
@Deprecated
46-
@CanIgnoreReturnValue
47-
public ArmeriaClientTelemetryBuilder setStatusExtractor(
48-
Function<
49-
SpanStatusExtractor<ClientRequestContext, RequestLog>,
50-
SpanStatusExtractor<ClientRequestContext, RequestLog>>
51-
statusExtractor) {
52-
return setStatusExtractor(
53-
(UnaryOperator<SpanStatusExtractor<ClientRequestContext, RequestLog>>)
54-
statusExtractor::apply);
55-
}
56-
5739
/** Sets the status extractor for client spans. */
5840
@CanIgnoreReturnValue
5941
public ArmeriaClientTelemetryBuilder setStatusExtractor(
@@ -116,20 +98,6 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
11698
return this;
11799
}
118100

119-
/**
120-
* Sets custom client {@link SpanNameExtractor} via transform function.
121-
*
122-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
123-
*/
124-
@Deprecated
125-
@CanIgnoreReturnValue
126-
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
127-
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
128-
clientSpanNameExtractor) {
129-
return setSpanNameExtractor(
130-
(UnaryOperator<SpanNameExtractor<ClientRequestContext>>) clientSpanNameExtractor::apply);
131-
}
132-
133101
/** Sets custom client {@link SpanNameExtractor} via transform function. */
134102
@CanIgnoreReturnValue
135103
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
1919
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
2020
import java.util.Collection;
21-
import java.util.function.Function;
2221
import java.util.function.UnaryOperator;
2322

2423
public final class ArmeriaServerTelemetryBuilder {
@@ -35,23 +34,6 @@ public final class ArmeriaServerTelemetryBuilder {
3534
builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry);
3635
}
3736

38-
/**
39-
* Sets the status extractor for server spans.
40-
*
41-
* @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead.
42-
*/
43-
@Deprecated
44-
@CanIgnoreReturnValue
45-
public ArmeriaServerTelemetryBuilder setStatusExtractor(
46-
Function<
47-
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
48-
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
49-
statusExtractor) {
50-
return setStatusExtractor(
51-
(UnaryOperator<SpanStatusExtractor<ServiceRequestContext, RequestLog>>)
52-
statusExtractor::apply);
53-
}
54-
5537
/** Sets the status extractor for server spans. */
5638
@CanIgnoreReturnValue
5739
public ArmeriaServerTelemetryBuilder setStatusExtractor(
@@ -114,20 +96,6 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
11496
return this;
11597
}
11698

117-
/**
118-
* Sets custom server {@link SpanNameExtractor} via transform function.
119-
*
120-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
121-
*/
122-
@Deprecated
123-
@CanIgnoreReturnValue
124-
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
125-
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
126-
serverSpanNameExtractor) {
127-
return setSpanNameExtractor(
128-
(UnaryOperator<SpanNameExtractor<ServiceRequestContext>>) serverSpanNameExtractor::apply);
129-
}
130-
13199
/** Sets custom server {@link SpanNameExtractor} via transform function. */
132100
@CanIgnoreReturnValue
133101
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(

‎instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.ArrayList;
2727
import java.util.Collections;
2828
import java.util.List;
29-
import java.util.function.Function;
3029
import java.util.function.UnaryOperator;
3130
import javax.annotation.Nullable;
3231

@@ -95,22 +94,6 @@ public GrpcTelemetryBuilder addServerAttributeExtractor(
9594
return this;
9695
}
9796

98-
/**
99-
* Sets custom client {@link SpanNameExtractor} via transform function.
100-
*
101-
* @deprecated Use {@link #setClientSpanNameExtractor(UnaryOperator)} instead.
102-
*/
103-
@Deprecated
104-
@CanIgnoreReturnValue
105-
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<GrpcRequest>
106-
public GrpcTelemetryBuilder setClientSpanNameExtractor(
107-
Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
108-
clientSpanNameExtractor) {
109-
return setClientSpanNameExtractor(
110-
(UnaryOperator<SpanNameExtractor<GrpcRequest>>)
111-
input -> (SpanNameExtractor<GrpcRequest>) clientSpanNameExtractor.apply(input));
112-
}
113-
11497
/** Sets custom client {@link SpanNameExtractor} via transform function. */
11598
@CanIgnoreReturnValue
11699
public GrpcTelemetryBuilder setClientSpanNameExtractor(
@@ -119,22 +102,6 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor(
119102
return this;
120103
}
121104

122-
/**
123-
* Sets custom server {@link SpanNameExtractor} via transform function.
124-
*
125-
* @deprecated Use {@link #setServerSpanNameExtractor(UnaryOperator)} instead.
126-
*/
127-
@Deprecated
128-
@CanIgnoreReturnValue
129-
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<GrpcRequest>
130-
public GrpcTelemetryBuilder setServerSpanNameExtractor(
131-
Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
132-
serverSpanNameExtractor) {
133-
return setServerSpanNameExtractor(
134-
(UnaryOperator<SpanNameExtractor<GrpcRequest>>)
135-
input -> (SpanNameExtractor<GrpcRequest>) serverSpanNameExtractor.apply(input));
136-
}
137-
138105
/** Sets custom server {@link SpanNameExtractor} via transform function. */
139106
@CanIgnoreReturnValue
140107
public GrpcTelemetryBuilder setServerSpanNameExtractor(

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.net.http.HttpRequest;
1818
import java.net.http.HttpResponse;
1919
import java.util.Collection;
20-
import java.util.function.Function;
2120
import java.util.function.UnaryOperator;
2221

2322
public final class JavaHttpClientTelemetryBuilder {
@@ -89,20 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMe
8988
return this;
9089
}
9190

92-
/**
93-
* Sets custom {@link SpanNameExtractor} via transform function.
94-
*
95-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
96-
*/
97-
@Deprecated
98-
@CanIgnoreReturnValue
99-
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
100-
Function<SpanNameExtractor<HttpRequest>, SpanNameExtractor<HttpRequest>>
101-
spanNameExtractorTransformer) {
102-
return setSpanNameExtractor(
103-
(UnaryOperator<SpanNameExtractor<HttpRequest>>) spanNameExtractorTransformer::apply);
104-
}
105-
10691
/** Sets custom {@link SpanNameExtractor} via transform function. */
10792
@CanIgnoreReturnValue
10893
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(

‎instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import io.opentelemetry.instrumentation.javahttpserver.internal.Experimental;
1717
import io.opentelemetry.instrumentation.javahttpserver.internal.JavaHttpServerInstrumenterBuilderUtil;
1818
import java.util.Collection;
19-
import java.util.function.Function;
2019
import java.util.function.UnaryOperator;
2120

2221
public final class JavaHttpServerTelemetryBuilder {
@@ -40,22 +39,6 @@ public final class JavaHttpServerTelemetryBuilder {
4039
JavaHttpServerExchangeGetter.INSTANCE);
4140
}
4241

43-
/**
44-
* Sets the status extractor for server spans.
45-
*
46-
* @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead.
47-
*/
48-
@Deprecated
49-
@CanIgnoreReturnValue
50-
public JavaHttpServerTelemetryBuilder setStatusExtractor(
51-
Function<
52-
SpanStatusExtractor<HttpExchange, HttpExchange>,
53-
SpanStatusExtractor<HttpExchange, HttpExchange>>
54-
statusExtractor) {
55-
return setStatusExtractor(
56-
(UnaryOperator<SpanStatusExtractor<HttpExchange, HttpExchange>>) statusExtractor::apply);
57-
}
58-
5942
/** Sets the status extractor for server spans. */
6043
@CanIgnoreReturnValue
6144
public JavaHttpServerTelemetryBuilder setStatusExtractor(
@@ -118,20 +101,6 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection<String> knownMe
118101
return this;
119102
}
120103

121-
/**
122-
* Sets custom {@link SpanNameExtractor} via transform function.
123-
*
124-
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
125-
*/
126-
@Deprecated
127-
@CanIgnoreReturnValue
128-
public JavaHttpServerTelemetryBuilder setSpanNameExtractor(
129-
Function<SpanNameExtractor<HttpExchange>, SpanNameExtractor<HttpExchange>>
130-
spanNameExtractorTransformer) {
131-
return setSpanNameExtractor(
132-
(UnaryOperator<SpanNameExtractor<HttpExchange>>) spanNameExtractorTransformer::apply);
133-
}
134-
135104
/** Sets custom {@link SpanNameExtractor} via transform function. */
136105
@CanIgnoreReturnValue
137106
public JavaHttpServerTelemetryBuilder setSpanNameExtractor(

0 commit comments

Comments
 (0)