Skip to content

Commit c548516

Browse files
PerfectSlayerPerfectSlayer
authored
Remove old context propagation API (#8271)
* feat(core): Clean up old propagation API * feat(core): Refactor disabled tracing propagator
1 parent 08e0fa3 commit c548516

File tree

86 files changed

+274
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+274
-295
lines changed

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static datadog.trace.api.cache.RadixTreeCache.UNSET_STATUS;
44
import static datadog.trace.api.datastreams.DataStreamsContext.fromTags;
55
import static datadog.trace.api.gateway.Events.EVENTS;
6+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
67
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
78
import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
89

@@ -128,7 +129,7 @@ public AgentSpanContext.Extracted extract(REQUEST_CARRIER carrier) {
128129
if (null == carrier || null == getter) {
129130
return null;
130131
}
131-
return tracer().propagate().extract(carrier, getter);
132+
return extractContextAndGetSpanContext(carrier, getter);
132133
}
133134

134135
/** Deprecated. Use {@link #startSpan(String, Object, AgentSpanContext.Extracted)} instead. */

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HeadersInjectAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package datadog.trace.bootstrap.instrumentation.httpurlconnection;
22

3-
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
3+
import datadog.context.propagation.CarrierSetter;
44
import java.net.HttpURLConnection;
55
import javax.annotation.ParametersAreNonnullByDefault;
66

77
@ParametersAreNonnullByDefault
8-
public class HeadersInjectAdapter implements AgentPropagation.Setter<HttpURLConnection> {
8+
public class HeadersInjectAdapter implements CarrierSetter<HttpURLConnection> {
99

1010
public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
1111

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextDispatcher.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.bootstrap.instrumentation.rmi;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
44
import static datadog.trace.bootstrap.instrumentation.rmi.ContextPropagator.DD_CONTEXT_CALL_ID;
55
import static datadog.trace.bootstrap.instrumentation.rmi.ContextPropagator.PROPAGATOR;
66
import static datadog.trace.bootstrap.instrumentation.rmi.ThreadLocalContext.THREAD_LOCAL_CONTEXT;
@@ -43,7 +43,8 @@ public void dispatch(final Remote obj, final RemoteCall call) throws IOException
4343
final ContextPayload payload = ContextPayload.read(in);
4444
if (payload != null) {
4545
final AgentSpanContext context =
46-
propagate().extract(payload.getContext(), ContextVisitors.stringValuesMap());
46+
extractContextAndGetSpanContext(
47+
payload.getContext(), ContextVisitors.stringValuesMap());
4748
THREAD_LOCAL_CONTEXT.set(context);
4849
}
4950
}

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPayload.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static datadog.context.propagation.Propagators.defaultPropagator;
44

5-
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
5+
import datadog.context.propagation.CarrierSetter;
66
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
77
import java.io.IOException;
88
import java.io.ObjectInput;
@@ -56,7 +56,7 @@ public void write(final ObjectOutput out) throws IOException {
5656
}
5757

5858
@ParametersAreNonnullByDefault
59-
public static class InjectAdapter implements AgentPropagation.Setter<ContextPayload> {
59+
public static class InjectAdapter implements CarrierSetter<ContextPayload> {
6060
@Override
6161
public void set(final ContextPayload carrier, final String key, final String value) {
6262
carrier.getContext().put(key, value);

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private boolean checkIfContextCanBePassed(
6262
return result;
6363
}
6464

65-
/** @returns true when no error happened during call */
65+
/** @return {@code true} when no error happened during call */
6666
private boolean syntheticCall(
6767
final Connection c, final ContextPayload payload, final int operationId) {
6868
final StreamRemoteCall shareContextCall = new StreamRemoteCall(c);

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.civisibility;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
44

55
import datadog.trace.api.config.CiVisibilityConfig;
66
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
@@ -33,7 +33,8 @@ public void forEachKey(Properties carrier, AgentPropagation.KeyClassifier classi
3333

3434
ProcessHierarchy() {
3535
parentProcessModuleContext =
36-
propagate().extract(System.getProperties(), SystemPropertiesPropagationGetter.INSTANCE);
36+
extractContextAndGetSpanContext(
37+
System.getProperties(), SystemPropertiesPropagationGetter.INSTANCE);
3738
}
3839

3940
/**

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static datadog.context.propagation.Propagators.defaultPropagator;
44

55
import datadog.communication.ddagent.TracerVersion;
6+
import datadog.context.propagation.CarrierSetter;
67
import datadog.trace.api.Config;
78
import datadog.trace.api.DDTags;
89
import datadog.trace.api.civisibility.CIConstants;
@@ -12,7 +13,6 @@
1213
import datadog.trace.api.civisibility.domain.JavaAgent;
1314
import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
1415
import datadog.trace.api.config.CiVisibilityConfig;
15-
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
1616
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1717
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
1818
import datadog.trace.bootstrap.instrumentation.api.Tags;
@@ -112,8 +112,8 @@ public <T extends CoverageCalculator> BuildSystemModuleImpl(
112112

113113
@ParametersAreNonnullByDefault
114114
private static final class ChildProcessPropertiesPropagationSetter
115-
implements AgentPropagation.Setter<Map<String, String>> {
116-
static final AgentPropagation.Setter<Map<String, String>> INSTANCE =
115+
implements CarrierSetter<Map<String, String>> {
116+
static final CarrierSetter<Map<String, String>> INSTANCE =
117117
new ChildProcessPropertiesPropagationSetter();
118118

119119
private ChildProcessPropertiesPropagationSetter() {}

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static datadog.context.propagation.Propagators.defaultPropagator;
44
import static datadog.opentelemetry.shim.trace.OtelSpanContext.fromRemote;
55
import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
6+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
67

78
import datadog.opentelemetry.shim.context.OtelContext;
89
import datadog.opentelemetry.shim.trace.OtelExtractedContext;
@@ -11,7 +12,6 @@
1112
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1213
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
1314
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext.Extracted;
14-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
1515
import datadog.trace.bootstrap.instrumentation.api.TagContext;
1616
import datadog.trace.util.PropagationUtils;
1717
import io.opentelemetry.api.trace.Span;
@@ -47,14 +47,13 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
4747
return context;
4848
}
4949
Extracted extracted =
50-
AgentTracer.propagate()
51-
.extract(
52-
carrier,
53-
(carrier1, classifier) -> {
54-
for (String key : getter.keys(carrier1)) {
55-
classifier.accept(key, getter.get(carrier1, key));
56-
}
57-
});
50+
extractContextAndGetSpanContext(
51+
carrier,
52+
(carrier1, classifier) -> {
53+
for (String key : getter.keys(carrier1)) {
54+
classifier.accept(key, getter.get(carrier1, key));
55+
}
56+
});
5857
if (extracted == null) {
5958
return context;
6059
} else {

‎dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientHelpers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import akka.http.scaladsl.model.HttpRequest;
77
import akka.http.scaladsl.model.HttpResponse;
88
import akka.http.scaladsl.model.headers.CustomHeader;
9-
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
9+
import datadog.context.propagation.CarrierSetter;
1010
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1111
import javax.annotation.ParametersAreNonnullByDefault;
1212
import scala.runtime.AbstractFunction1;
@@ -33,7 +33,7 @@ public Void apply(final Try<HttpResponse> result) {
3333
}
3434
}
3535

36-
public static class AkkaHttpHeaders implements AgentPropagation.Setter<HttpRequest> {
36+
public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
3737
private HttpRequest request;
3838
// Did this request have a span when the AkkaHttpHeaders object was created?
3939
private final boolean hadSpan;

‎dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/AkkaHttpClientHelpers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import akka.http.scaladsl.model.HttpRequest;
55
import akka.http.scaladsl.model.HttpResponse;
66
import akka.http.scaladsl.model.headers.CustomHeader;
7-
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
7+
import datadog.context.propagation.CarrierSetter;
88
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
99
import scala.runtime.AbstractFunction1;
1010
import scala.util.Try;
@@ -30,7 +30,7 @@ public Void apply(final Try<HttpResponse> result) {
3030
}
3131
}
3232

33-
public static class AkkaHttpHeaders implements AgentPropagation.Setter<HttpRequest> {
33+
public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
3434
private HttpRequest request;
3535
// Did this request have a span when the AkkaHttpHeaders object was created?
3636
private boolean hadSpan;

0 commit comments

Comments
 (0)