Skip to content

Commit ffda571

Browse files
trasktrask
authored
Remove deprecated HTTP library methods (#13150)
1 parent eb2a4f3 commit ffda571

File tree

7 files changed

+3
-171
lines changed

7 files changed

+3
-171
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
- `io.opentelemetry.instrumentation.api.incubator.semconv.util.SpanNames` has been deprecated,
88
replaced by the stable `io.opentelemetry.instrumentation.api.semconv.util.SpanNames`
9+
- In preparation for stabilizing HTTP library instrumentation, the classes and methods
10+
that were deprecated in the prior two releases have now been removed
911

1012
## Version 2.12.0 (2025-01-17)
1113

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,6 @@ public final class ApacheHttpClientTelemetryBuilder {
3535
this.openTelemetry = openTelemetry;
3636
}
3737

38-
/**
39-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
40-
* items. The {@link AttributesExtractor} will be executed after all default extractors.
41-
*
42-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
43-
*/
44-
@Deprecated
45-
@CanIgnoreReturnValue
46-
public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
47-
AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
48-
attributesExtractor) {
49-
builder.addAttributesExtractor(attributesExtractor);
50-
return this;
51-
}
52-
5338
/**
5439
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5540
* items. The {@link AttributesExtractor} will be executed after all default extractors.
@@ -105,23 +90,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
10590
return this;
10691
}
10792

108-
/**
109-
* Configures the instrumentation to emit experimental HTTP client metrics.
110-
*
111-
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
112-
* are to be emitted.
113-
* @deprecated Use {@link
114-
* Experimental#setEmitExperimentalTelemetry(ApacheHttpClientTelemetryBuilder, boolean)}
115-
* instead.
116-
*/
117-
@Deprecated
118-
@CanIgnoreReturnValue
119-
public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
120-
boolean emitExperimentalHttpClientMetrics) {
121-
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
122-
return this;
123-
}
124-
12593
/** Sets custom {@link SpanNameExtractor} via transform function. */
12694
@CanIgnoreReturnValue
12795
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,6 @@ public final class JavaHttpClientTelemetryBuilder {
3434
this.openTelemetry = openTelemetry;
3535
}
3636

37-
/**
38-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
39-
* items. The {@link AttributesExtractor} will be executed after all default extractors.
40-
*
41-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
42-
*/
43-
@Deprecated
44-
@CanIgnoreReturnValue
45-
public JavaHttpClientTelemetryBuilder addAttributeExtractor(
46-
AttributesExtractor<? super HttpRequest, ? super HttpResponse<?>> attributesExtractor) {
47-
builder.addAttributesExtractor(attributesExtractor);
48-
return this;
49-
}
50-
5137
/**
5238
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5339
* items. The {@link AttributesExtractor} will be executed after all default extractors.
@@ -102,23 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMe
10288
return this;
10389
}
10490

105-
/**
106-
* Configures the instrumentation to emit experimental HTTP client metrics.
107-
*
108-
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
109-
* are to be emitted.
110-
* @deprecated Use {@link
111-
* Experimental#setEmitExperimentalTelemetry(JavaHttpClientTelemetryBuilder, boolean)}
112-
* instead.
113-
*/
114-
@Deprecated
115-
@CanIgnoreReturnValue
116-
public JavaHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
117-
boolean emitExperimentalHttpClientMetrics) {
118-
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
119-
return this;
120-
}
121-
12291
/** Sets custom {@link SpanNameExtractor} via transform function. */
12392
@CanIgnoreReturnValue
12493
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,6 @@ public JettyClientTelemetryBuilder setSslContextFactory(
4949
return this;
5050
}
5151

52-
/**
53-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
54-
* items.
55-
*
56-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
57-
*/
58-
@Deprecated
59-
@CanIgnoreReturnValue
60-
public JettyClientTelemetryBuilder addAttributeExtractor(
61-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
62-
builder.addAttributesExtractor(attributesExtractor);
63-
return this;
64-
}
65-
6652
/**
6753
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
6854
* items.
@@ -116,22 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
116102
return this;
117103
}
118104

119-
/**
120-
* Configures the instrumentation to emit experimental HTTP client metrics.
121-
*
122-
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
123-
* are to be emitted.
124-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(JettyClientTelemetryBuilder,
125-
* boolean)} instead.
126-
*/
127-
@Deprecated
128-
@CanIgnoreReturnValue
129-
public JettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
130-
boolean emitExperimentalHttpClientMetrics) {
131-
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
132-
return this;
133-
}
134-
135105
/** Sets custom {@link SpanNameExtractor} via transform function. */
136106
@CanIgnoreReturnValue
137107
public JettyClientTelemetryBuilder setSpanNameExtractor(

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,6 @@ public JettyClientTelemetryBuilder setSslContextFactory(SslContextFactory sslCon
4949
return this;
5050
}
5151

52-
/**
53-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
54-
* items.
55-
*
56-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
57-
*/
58-
@Deprecated
59-
@CanIgnoreReturnValue
60-
public JettyClientTelemetryBuilder addAttributeExtractor(
61-
AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
62-
builder.addAttributesExtractor(attributesExtractor);
63-
return this;
64-
}
65-
6652
/**
6753
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
6854
* items.
@@ -116,22 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
116102
return this;
117103
}
118104

119-
/**
120-
* Configures the instrumentation to emit experimental HTTP client metrics.
121-
*
122-
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
123-
* are to be emitted.
124-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(JettyClientTelemetryBuilder,
125-
* boolean)} instead.
126-
*/
127-
@Deprecated
128-
@CanIgnoreReturnValue
129-
public JettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
130-
boolean emitExperimentalHttpClientMetrics) {
131-
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
132-
return this;
133-
}
134-
135105
/** Sets custom {@link SpanNameExtractor} via transform function. */
136106
@CanIgnoreReturnValue
137107
public JettyClientTelemetryBuilder setSpanNameExtractor(

‎instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetry.java‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,6 @@ public static OkHttpTelemetryBuilder builder(OpenTelemetry openTelemetry) {
4040
this.propagators = propagators;
4141
}
4242

43-
/**
44-
* Returns a new {@link Interceptor} that can be used with methods like {@link
45-
* okhttp3.OkHttpClient.Builder#addInterceptor(Interceptor)}.
46-
*
47-
* <p>Important: asynchronous calls using {@link okhttp3.Call.Factory#enqueue(Callback)} will
48-
* *not* work correctly using just this interceptor.
49-
*
50-
* <p>It is strongly recommended that you use the {@link #newCallFactory(OkHttpClient)} method to
51-
* decorate your {@link OkHttpClient}, rather than using this method directly.
52-
*
53-
* @deprecated Please use the {@link #newCallFactory(OkHttpClient)} method instead.
54-
*/
55-
@Deprecated
56-
public Interceptor newInterceptor() {
57-
return new TracingInterceptor(instrumenter, propagators);
58-
}
59-
6043
/**
6144
* Construct a new OpenTelemetry tracing-enabled {@link okhttp3.Call.Factory} using the provided
6245
* {@link OkHttpClient} instance.
@@ -72,7 +55,7 @@ public Call.Factory newCallFactory(OkHttpClient baseClient) {
7255
// add our interceptors before other interceptors
7356
builder.interceptors().add(0, new ContextInterceptor());
7457
builder.interceptors().add(1, new ConnectionErrorSpanInterceptor(instrumenter));
75-
builder.networkInterceptors().add(0, newInterceptor());
58+
builder.networkInterceptors().add(0, new TracingInterceptor(instrumenter, propagators));
7659
OkHttpClient tracingClient = builder.build();
7760
return new TracingCallFactory(tracingClient);
7861
}

‎instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,6 @@ public final class OkHttpTelemetryBuilder {
3434
this.openTelemetry = openTelemetry;
3535
}
3636

37-
/**
38-
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
39-
* items.
40-
*
41-
* @deprecated Use {@link #addAttributesExtractor(AttributesExtractor)} instead.
42-
*/
43-
@Deprecated
44-
@CanIgnoreReturnValue
45-
public OkHttpTelemetryBuilder addAttributeExtractor(
46-
AttributesExtractor<? super Interceptor.Chain, ? super Response> attributesExtractor) {
47-
builder.addAttributesExtractor(attributesExtractor);
48-
return this;
49-
}
50-
5137
/**
5238
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5339
* items.
@@ -100,22 +86,6 @@ public OkHttpTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
10086
return this;
10187
}
10288

103-
/**
104-
* Configures the instrumentation to emit experimental HTTP client metrics.
105-
*
106-
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
107-
* are to be emitted.
108-
* @deprecated Use {@link Experimental#setEmitExperimentalTelemetry(OkHttpTelemetryBuilder,
109-
* boolean)} instead.
110-
*/
111-
@Deprecated
112-
@CanIgnoreReturnValue
113-
public OkHttpTelemetryBuilder setEmitExperimentalHttpClientMetrics(
114-
boolean emitExperimentalHttpClientMetrics) {
115-
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
116-
return this;
117-
}
118-
11989
/** Sets custom {@link SpanNameExtractor} via transform function. */
12090
@CanIgnoreReturnValue
12191
public OkHttpTelemetryBuilder setSpanNameExtractor(

0 commit comments

Comments
 (0)