Skip to content

Commit 3495320

Browse files
PerfectSlayerPerfectSlayer
committed
feat(core): Clean up old propagation API
1 parent dbe9364 commit 3495320

File tree

26 files changed

+81
-87
lines changed

26 files changed

+81
-87
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/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-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-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/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java‎

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

33
import static datadog.trace.api.datastreams.DataStreamsContext.fromTags;
44
import static datadog.trace.api.gateway.Events.EVENTS;
5+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
56
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
6-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
77
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
88
import static datadog.trace.instrumentation.armeria.grpc.server.GrpcExtractAdapter.GETTER;
99
import static datadog.trace.instrumentation.armeria.grpc.server.GrpcServerDecorator.DECORATE;
@@ -62,7 +62,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
6262
return next.startCall(call, headers);
6363
}
6464

65-
AgentSpanContext spanContext = propagate().extract(headers, GETTER);
65+
AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
6666
AgentTracer.TracerAPI tracer = tracer();
6767
spanContext = callIGCallbackRequestStarted(tracer, spanContext);
6868

‎dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package datadog.trace.instrumentation.aws.v1.sqs;
22

33
import static datadog.trace.api.datastreams.DataStreamsContext.create;
4+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
45
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
56
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
6-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
77
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
88
import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
99
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_IN;
@@ -65,7 +65,9 @@ protected void startNewMessageSpan(Message message) {
6565
if (batchContext == null) {
6666
// first grab any incoming distributed context
6767
AgentSpanContext spanContext =
68-
Config.get().isSqsPropagationEnabled() ? propagate().extract(message, GETTER) : null;
68+
Config.get().isSqsPropagationEnabled()
69+
? extractContextAndGetSpanContext(message, GETTER)
70+
: null;
6971
// next add a time-in-queue span for non-legacy SQS traces
7072
if (TIME_IN_QUEUE_ENABLED) {
7173
long timeInQueueStart = GETTER.extractTimeInQueueStart(message);

‎dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package datadog.trace.instrumentation.aws.v2.sqs;
22

33
import static datadog.trace.api.datastreams.DataStreamsContext.create;
4+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
45
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
56
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
6-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
77
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
88
import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
99
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_IN;
@@ -67,7 +67,9 @@ protected void startNewMessageSpan(Message message) {
6767
if (batchContext == null) {
6868
// first grab any incoming distributed context
6969
AgentSpanContext spanContext =
70-
Config.get().isSqsPropagationEnabled() ? propagate().extract(message, GETTER) : null;
70+
Config.get().isSqsPropagationEnabled()
71+
? extractContextAndGetSpanContext(message, GETTER)
72+
: null;
7173
// next add a time-in-queue span for non-legacy SQS traces
7274
if (TIME_IN_QUEUE_ENABLED) {
7375
long timeInQueueStart = GETTER.extractTimeInQueueStart(message);

‎dd-java-agent/instrumentation/google-pubsub/src/main/java/datadog/trace/instrumentation/googlepubsub/PubSubDecorator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.googlepubsub;
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.api.AgentTracer.startSpan;
55
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_IN;
66
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_TAG;
@@ -129,7 +129,8 @@ protected String spanKind() {
129129
}
130130

131131
public AgentSpan onConsume(final PubsubMessage message, final String subscription) {
132-
final AgentSpanContext spanContext = propagate().extract(message, TextMapExtractAdapter.GETTER);
132+
final AgentSpanContext spanContext =
133+
extractContextAndGetSpanContext(message, TextMapExtractAdapter.GETTER);
133134
final AgentSpan span = startSpan(PUBSUB_CONSUME, spanContext);
134135
final CharSequence parsedSubscription = extractSubscription(subscription);
135136
final LinkedHashMap<String, String> sortedTags = new LinkedHashMap<>(3);

‎dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java‎

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

33
import static datadog.trace.api.datastreams.DataStreamsContext.fromTags;
44
import static datadog.trace.api.gateway.Events.EVENTS;
5+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
56
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
6-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
77
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
88
import static datadog.trace.instrumentation.grpc.server.GrpcExtractAdapter.GETTER;
99
import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.DECORATE;
@@ -62,7 +62,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
6262
return next.startCall(call, headers);
6363
}
6464

65-
AgentSpanContext spanContext = propagate().extract(headers, GETTER);
65+
AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
6666
AgentTracer.TracerAPI tracer = tracer();
6767
spanContext = callIGCallbackRequestStarted(tracer, spanContext);
6868

‎dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java‎

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

3+
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
34
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
55
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
66
import static datadog.trace.instrumentation.jms.JMSDecorator.BROKER_DECORATE;
77
import static datadog.trace.instrumentation.jms.JMSDecorator.CONSUMER_DECORATE;
@@ -40,7 +40,7 @@ public void onMessage(Message message) {
4040
AgentSpan span;
4141
AgentSpanContext propagatedContext = null;
4242
if (!consumerState.isPropagationDisabled()) {
43-
propagatedContext = propagate().extract(message, GETTER);
43+
propagatedContext = extractContextAndGetSpanContext(message, GETTER);
4444
}
4545
long startMillis = GETTER.extractTimeInQueueStart(message);
4646
if (startMillis == 0 || !TIME_IN_QUEUE_ENABLED) {

0 commit comments

Comments
 (0)