Skip to content

Commit b56bc54

Browse files
authored
Deprecate JaegerPropagator (#8019)
1 parent 0a1980b commit b56bc54

13 files changed

Lines changed: 66 additions & 86 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
Comparing source compatibility of opentelemetry-extension-trace-propagators-1.59.0-SNAPSHOT.jar against opentelemetry-extension-trace-propagators-1.58.0.jar
2+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.extension.trace.propagation.JaegerPropagator (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW ANNOTATION: java.lang.Deprecated
25
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.extension.trace.propagation.OtTracePropagator (not serializable)
36
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
47
+++ NEW ANNOTATION: java.lang.Deprecated

exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
* href="https://github.com/census-instrumentation/opencensus-java/tree/c960b19889de5e4a7b25f90919d28b066590d4f0/exporters/trace/zipkin">OpenCensus
3535
* zipkin exporter</a> code.
3636
*
37-
* @deprecated Zipkin exporter is deprecated in OpenTelemetry spec (see the <a
38-
* href="https://github.com/open-telemetry/opentelemetry-specification/pull/4715">PR</a>).
37+
* @deprecated Zipkin exporter is deprecated in the OpenTelemetry specification (see <a
38+
* href="https://github.com/open-telemetry/opentelemetry-specification/pull/4715">#4715</a>).
3939
* Expect this artifact to no longer be published in approximately 6 months (mid 2026).
4040
*/
4141
@Deprecated

extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextExtractBenchmark.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,25 @@ public void tearDown() {
7272
}
7373

7474
/** Benchmark for extracting context from Jaeger headers. */
75+
@SuppressWarnings("deprecation")
7576
public static class JaegerContextExtractBenchmark extends AbstractContextExtractBenchmark {
7677

7778
private static final List<Map<String, String>> traceHeaders =
7879
Arrays.asList(
7980
Collections.singletonMap(
80-
JaegerPropagator.PROPAGATION_HEADER,
81+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
8182
"905734c59b913b4a905734c59b913b4a:9909983295041501:0:1"),
8283
Collections.singletonMap(
83-
JaegerPropagator.PROPAGATION_HEADER,
84+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
8485
"21196a77f299580e21196a77f299580e:993a97ee3691eb26:0:0"),
8586
Collections.singletonMap(
86-
JaegerPropagator.PROPAGATION_HEADER,
87+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
8788
"2e7d0ad2390617702e7d0ad239061770:d49582a2de984b86:0:1"),
8889
Collections.singletonMap(
89-
JaegerPropagator.PROPAGATION_HEADER,
90+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
9091
"905734c59b913b4a905734c59b913b4a:776ff807b787538a:0:0"),
9192
Collections.singletonMap(
92-
JaegerPropagator.PROPAGATION_HEADER,
93+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
9394
"68ec932c33b3f2ee68ec932c33b3f2ee:68ec932c33b3f2ee:0:0"));
9495

9596
private final TextMapGetter<Map<String, String>> getter =
@@ -105,7 +106,8 @@ public String get(Map<String, String> carrier, String key) {
105106
}
106107
};
107108

108-
private final JaegerPropagator jaegerPropagator = JaegerPropagator.getInstance();
109+
private final io.opentelemetry.extension.trace.propagation.JaegerPropagator jaegerPropagator =
110+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.getInstance();
109111

110112
@Override
111113
protected Context doExtract() {
@@ -119,25 +121,26 @@ protected List<Map<String, String>> getHeaders() {
119121
}
120122

121123
/** Benchmark for extracting context from Jaeger headers which are url encoded. */
124+
@SuppressWarnings("deprecation")
122125
public static class JaegerUrlEncodedContextExtractBenchmark
123126
extends AbstractContextExtractBenchmark {
124127

125128
private static final List<Map<String, String>> traceHeaders =
126129
Arrays.asList(
127130
Collections.singletonMap(
128-
JaegerPropagator.PROPAGATION_HEADER,
131+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
129132
"905734c59b913b4a905734c59b913b4a%3A9909983295041501%3A0%3A1"),
130133
Collections.singletonMap(
131-
JaegerPropagator.PROPAGATION_HEADER,
134+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
132135
"21196a77f299580e21196a77f299580e%3A993a97ee3691eb26%3A0%3A0"),
133136
Collections.singletonMap(
134-
JaegerPropagator.PROPAGATION_HEADER,
137+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
135138
"2e7d0ad2390617702e7d0ad239061770%3Ad49582a2de984b86%3A0%3A1"),
136139
Collections.singletonMap(
137-
JaegerPropagator.PROPAGATION_HEADER,
140+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
138141
"905734c59b913b4a905734c59b913b4a%3A776ff807b787538a%3A0%3A0"),
139142
Collections.singletonMap(
140-
JaegerPropagator.PROPAGATION_HEADER,
143+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER,
141144
"68ec932c33b3f2ee68ec932c33b3f2ee%3A68ec932c33b3f2ee%3A0%3A0"));
142145

143146
private final TextMapGetter<Map<String, String>> getter =
@@ -153,7 +156,8 @@ public String get(Map<String, String> carrier, String key) {
153156
}
154157
};
155158

156-
private final JaegerPropagator jaegerPropagator = JaegerPropagator.getInstance();
159+
private final io.opentelemetry.extension.trace.propagation.JaegerPropagator jaegerPropagator =
160+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.getInstance();
157161

158162
@Override
159163
protected Context doExtract() {

extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextInjectBenchmark.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ private static SpanContext createTestSpanContext(String traceId, String spanId)
8181
/** Benchmark for injecting trace context into Jaeger headers. */
8282
public static class JaegerContextInjectBenchmark extends AbstractContextInjectBenchmark {
8383

84-
private final JaegerPropagator jaegerPropagator = JaegerPropagator.getInstance();
84+
@SuppressWarnings("deprecation")
85+
private final io.opentelemetry.extension.trace.propagation.JaegerPropagator jaegerPropagator =
86+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.getInstance();
87+
8588
private final TextMapSetter<Map<String, String>> setter = Map::put;
8689

8790
@Override

extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerConfigurablePropagator.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider;
1111

1212
/**
13-
* A {@link ConfigurablePropagatorProvider} which allows enabling the {@link JaegerPropagator} with
14-
* the propagator name {@code jaeger}.
13+
* A {@link ConfigurablePropagatorProvider} which allows enabling the {@link
14+
* io.opentelemetry.extension.trace.propagation.JaegerPropagator} with the propagator name {@code
15+
* jaeger}.
1516
*/
17+
@SuppressWarnings("deprecation")
1618
public final class JaegerConfigurablePropagator implements ConfigurablePropagatorProvider {
1719
@Override
1820
public TextMapPropagator getPropagator(ConfigProperties config) {
19-
return JaegerPropagator.getInstance();
21+
return io.opentelemetry.extension.trace.propagation.JaegerPropagator.getInstance();
2022
}
2123

2224
@Override

extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.opentelemetry.api.trace.TraceFlags;
1616
import io.opentelemetry.api.trace.TraceId;
1717
import io.opentelemetry.api.trace.TraceState;
18+
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
1819
import io.opentelemetry.context.Context;
1920
import io.opentelemetry.context.propagation.TextMapGetter;
2021
import io.opentelemetry.context.propagation.TextMapPropagator;
@@ -32,8 +33,13 @@
3233
* Implementation of the Jaeger propagation protocol. See <a
3334
* href="https://www.jaegertracing.io/docs/client-libraries/#propagation-format">Jaeger Propagation
3435
* Format</a>.
36+
*
37+
* @deprecated the jaeger propagation format is deprecated in the OpenTelemetry specification (see
38+
* <a href="https://github.com/open-telemetry/opentelemetry-specification/pull/4827">#4827</a>).
39+
* Please use {@link W3CTraceContextPropagator} instead.
3540
*/
3641
@Immutable
42+
@Deprecated
3743
public final class JaegerPropagator implements TextMapPropagator {
3844

3945
private static final Logger logger = Logger.getLogger(JaegerPropagator.class.getName());

extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/internal/JaegerComponentProvider.java

Lines changed: 0 additions & 35 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
io.opentelemetry.extension.trace.propagation.internal.B3ComponentProvider
22
io.opentelemetry.extension.trace.propagation.internal.B3MultiComponentProvider
3-
io.opentelemetry.extension.trace.propagation.internal.JaegerComponentProvider

extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/JaegerPropagatorTest.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
package io.opentelemetry.extension.trace.propagation;
77

88
import static io.opentelemetry.api.baggage.Baggage.fromContext;
9-
import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.BAGGAGE_HEADER;
10-
import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.BAGGAGE_PREFIX;
11-
import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.DEPRECATED_PARENT_SPAN;
12-
import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER;
13-
import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER_DELIMITER;
149
import static org.assertj.core.api.Assertions.assertThat;
1510

1611
import com.google.common.collect.ImmutableMap;
@@ -36,8 +31,20 @@
3631
import org.junit.jupiter.api.Test;
3732

3833
/** Unit tests for {@link io.opentelemetry.extension.trace.propagation.JaegerPropagator}. */
34+
@SuppressWarnings("deprecation")
3935
class JaegerPropagatorTest {
4036

37+
private static final String BAGGAGE_HEADER =
38+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.BAGGAGE_HEADER;
39+
private static final String BAGGAGE_PREFIX =
40+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.BAGGAGE_PREFIX;
41+
private static final char DEPRECATED_PARENT_SPAN =
42+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.DEPRECATED_PARENT_SPAN;
43+
private static final String PROPAGATION_HEADER =
44+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER;
45+
private static final char PROPAGATION_HEADER_DELIMITER =
46+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER_DELIMITER;
47+
4148
private static final long TRACE_ID_HI = 77L;
4249
private static final long TRACE_ID_LOW = 22L;
4350
private static final String TRACE_ID = "000000000000004d0000000000000016";
@@ -62,7 +69,8 @@ public String get(Map<String, String> carrier, String key) {
6269
}
6370
};
6471

65-
private final JaegerPropagator jaegerPropagator = JaegerPropagator.getInstance();
72+
private final io.opentelemetry.extension.trace.propagation.JaegerPropagator jaegerPropagator =
73+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.getInstance();
6674

6775
private static SpanContext getSpanContext(Context context) {
6876
return Span.fromContext(context).getSpanContext();

sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.opentelemetry.api.metrics.Meter;
2424
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
2525
import io.opentelemetry.extension.trace.propagation.B3Propagator;
26-
import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
2726
import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
2827
import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
2928
import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
@@ -175,7 +174,8 @@ void configures() throws Exception {
175174
keys.addAll(W3CBaggagePropagator.getInstance().fields());
176175
keys.addAll(B3Propagator.injectingSingleHeader().fields());
177176
keys.addAll(B3Propagator.injectingMultiHeaders().fields());
178-
keys.addAll(JaegerPropagator.getInstance().fields());
177+
keys.addAll(
178+
io.opentelemetry.extension.trace.propagation.JaegerPropagator.getInstance().fields());
179179
keys.addAll(
180180
io.opentelemetry.extension.trace.propagation.OtTracePropagator.getInstance().fields());
181181
// Added by TestPropagatorProvider

0 commit comments

Comments
 (0)