Skip to content

Commit 1ed0a23

Browse files
committed
feat(aws-sns): Switch AWS SNS to default propagator (like AWS SNS 2)
1 parent c414845 commit 1ed0a23

File tree

1 file changed

+2
-7
lines changed
  • dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns

1 file changed

+2
-7
lines changed

dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.instrumentation.aws.v1.sns;
22

3+
import static datadog.context.propagation.Propagators.defaultPropagator;
34
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
45
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
56
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_OUT;
@@ -14,7 +15,6 @@
1415
import com.amazonaws.services.sns.model.PublishBatchRequest;
1516
import com.amazonaws.services.sns.model.PublishBatchRequestEntry;
1617
import com.amazonaws.services.sns.model.PublishRequest;
17-
import datadog.trace.api.TracePropagationStyle;
1818
import datadog.trace.bootstrap.ContextStore;
1919
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
2020
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
@@ -37,12 +37,7 @@ private ByteBuffer getMessageAttributeValueToInject(
3737
final AgentSpan span = newSpan(request);
3838
StringBuilder jsonBuilder = new StringBuilder();
3939
jsonBuilder.append('{');
40-
propagate()
41-
.inject(
42-
span,
43-
jsonBuilder,
44-
SETTER,
45-
TracePropagationStyle.DATADOG); // TODO Is forcing Datadog encoding on purpose?
40+
defaultPropagator().inject(span, jsonBuilder, SETTER);
4641
if (traceConfig().isDataStreamsEnabled()) {
4742
propagate().injectPathwayContext(span, jsonBuilder, SETTER, getTags(snsTopicName));
4843
}

0 commit comments

Comments
 (0)