Skip to content

Commit c64f892

Browse files
trasktrask
committed
Remove deprecated methods from HTTP library instrumentations
1 parent b056aa1 commit c64f892

File tree

21 files changed

+0
-302
lines changed

21 files changed

+0
-302
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
8989
return this;
9090
}
9191

92-
/**
93-
* Sets custom {@link SpanNameExtractor} via transform function.
94-
*
95-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
96-
*/
97-
@Deprecated
98-
@CanIgnoreReturnValue
99-
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
100-
UnaryOperator<SpanNameExtractor<ApacheHttpClientRequest>> spanNameExtractorTransformer) {
101-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
102-
}
103-
10492
/**
10593
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
10694
* one.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
8989
return this;
9090
}
9191

92-
/**
93-
* Sets custom {@link SpanNameExtractor} via transform function.
94-
*
95-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
96-
*/
97-
@Deprecated
98-
@CanIgnoreReturnValue
99-
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
100-
UnaryOperator<SpanNameExtractor<ApacheHttpClientRequest>> spanNameExtractorTransformer) {
101-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
102-
}
103-
10492
/**
10593
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
10694
* one.

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@ public final class ArmeriaClientTelemetryBuilder {
3636
builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry);
3737
}
3838

39-
/**
40-
* Sets the status extractor for client spans.
41-
*
42-
* @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead.
43-
*/
44-
@Deprecated
45-
@CanIgnoreReturnValue
46-
public ArmeriaClientTelemetryBuilder setStatusExtractor(
47-
UnaryOperator<SpanStatusExtractor<ClientRequestContext, RequestLog>> statusExtractor) {
48-
return setSpanStatusExtractorCustomizer(statusExtractor);
49-
}
50-
5139
/**
5240
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
5341
* customized one.
@@ -114,18 +102,6 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
114102
return this;
115103
}
116104

117-
/**
118-
* Sets custom client {@link SpanNameExtractor} via transform function.
119-
*
120-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
121-
*/
122-
@Deprecated
123-
@CanIgnoreReturnValue
124-
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
125-
UnaryOperator<SpanNameExtractor<ClientRequestContext>> clientSpanNameExtractor) {
126-
return setSpanNameExtractorCustomizer(clientSpanNameExtractor);
127-
}
128-
129105
/**
130106
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
131107
* one.

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@ public final class ArmeriaServerTelemetryBuilder {
3434
builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry);
3535
}
3636

37-
/**
38-
* Sets the status extractor for server spans.
39-
*
40-
* @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead.
41-
*/
42-
@Deprecated
43-
@CanIgnoreReturnValue
44-
public ArmeriaServerTelemetryBuilder setStatusExtractor(
45-
UnaryOperator<SpanStatusExtractor<ServiceRequestContext, RequestLog>> statusExtractor) {
46-
return setSpanStatusExtractorCustomizer(statusExtractor);
47-
}
48-
4937
/**
5038
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
5139
* customized one.
@@ -112,18 +100,6 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
112100
return this;
113101
}
114102

115-
/**
116-
* Sets custom server {@link SpanNameExtractor} via transform function.
117-
*
118-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
119-
*/
120-
@Deprecated
121-
@CanIgnoreReturnValue
122-
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
123-
UnaryOperator<SpanNameExtractor<ServiceRequestContext>> serverSpanNameExtractor) {
124-
return setSpanNameExtractorCustomizer(serverSpanNameExtractor);
125-
}
126-
127103
/**
128104
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
129105
* one.

‎instrumentation/helidon-4.3/library/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonTelemetryBuilder.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,6 @@ public final class HelidonTelemetryBuilder {
4040
HelidonRequestGetter.INSTANCE);
4141
}
4242

43-
/**
44-
* Sets the status extractor for server spans.
45-
*
46-
* @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead.
47-
*/
48-
@Deprecated
49-
@CanIgnoreReturnValue
50-
public HelidonTelemetryBuilder setStatusExtractor(
51-
UnaryOperator<SpanStatusExtractor<ServerRequest, ServerResponse>> statusExtractor) {
52-
return setSpanStatusExtractorCustomizer(statusExtractor);
53-
}
54-
5543
/**
5644
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
5745
* customized one.
@@ -116,18 +104,6 @@ public HelidonTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
116104
return this;
117105
}
118106

119-
/**
120-
* Sets custom server {@link SpanNameExtractor} via transform function.
121-
*
122-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
123-
*/
124-
@Deprecated
125-
@CanIgnoreReturnValue
126-
public HelidonTelemetryBuilder setSpanNameExtractor(
127-
UnaryOperator<SpanNameExtractor<ServerRequest>> serverSpanNameExtractor) {
128-
return setSpanNameExtractorCustomizer(serverSpanNameExtractor);
129-
}
130-
131107
/**
132108
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
133109
* one.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMe
8888
return this;
8989
}
9090

91-
/**
92-
* Sets custom {@link SpanNameExtractor} via transform function.
93-
*
94-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
95-
*/
96-
@Deprecated
97-
@CanIgnoreReturnValue
98-
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
99-
UnaryOperator<SpanNameExtractor<HttpRequest>> spanNameExtractorTransformer) {
100-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
101-
}
102-
10391
/**
10492
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
10593
* one.

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ public final class JavaHttpServerTelemetryBuilder {
3939
JavaHttpServerExchangeGetter.INSTANCE);
4040
}
4141

42-
/**
43-
* Sets the status extractor for server spans.
44-
*
45-
* @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead.
46-
*/
47-
@Deprecated
48-
@CanIgnoreReturnValue
49-
public JavaHttpServerTelemetryBuilder setStatusExtractor(
50-
UnaryOperator<SpanStatusExtractor<HttpExchange, HttpExchange>> statusExtractor) {
51-
return setSpanStatusExtractorCustomizer(statusExtractor);
52-
}
53-
5442
/**
5543
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
5644
* customized one.
@@ -118,18 +106,7 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection<String> knownMe
118106
}
119107

120108
/**
121-
* Sets custom {@link SpanNameExtractor} via transform function.
122-
*
123-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
124-
*/
125-
@Deprecated
126-
@CanIgnoreReturnValue
127-
public JavaHttpServerTelemetryBuilder setSpanNameExtractor(
128-
UnaryOperator<SpanNameExtractor<HttpExchange>> spanNameExtractorTransformer) {
129-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
130-
}
131109
132-
/**
133110
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
134111
* one.
135112
*/

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
102102
return this;
103103
}
104104

105-
/**
106-
* Sets custom {@link SpanNameExtractor} via transform function.
107-
*
108-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
109-
*/
110-
@Deprecated
111-
@CanIgnoreReturnValue
112-
public JettyClientTelemetryBuilder setSpanNameExtractor(
113-
UnaryOperator<SpanNameExtractor<Request>> spanNameExtractorTransformer) {
114-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
115-
}
116-
117105
/**
118106
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
119107
* one.

‎instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
102102
return this;
103103
}
104104

105-
/**
106-
* Sets custom {@link SpanNameExtractor} via transform function.
107-
*
108-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
109-
*/
110-
@Deprecated
111-
@CanIgnoreReturnValue
112-
public JettyClientTelemetryBuilder setSpanNameExtractor(
113-
UnaryOperator<SpanNameExtractor<Request>> spanNameExtractorTransformer) {
114-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
115-
}
116-
117105
/**
118106
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
119107
* one.

‎instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,7 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
9494
}
9595

9696
/**
97-
* Sets custom {@link SpanNameExtractor} via transform function.
98-
*
99-
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
100-
*/
101-
@Deprecated
102-
@CanIgnoreReturnValue
103-
public NettyClientTelemetryBuilder setSpanNameExtractor(
104-
UnaryOperator<SpanNameExtractor<NettyRequest>> spanNameExtractorTransformer) {
105-
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
106-
}
10797
108-
/**
10998
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
11099
* one.
111100
*/

0 commit comments

Comments
 (0)