Skip to content

Commit 7e22911

Browse files
authored
🍒 9037 - Fixing bug with dropping baggage when TracePropagationBehaviorExtract=IGNORE (#9052)
* Fixing issues with dropping baggage when TracePropagationBehaviorExtract = IGNORE (cherry picked from commit 5facbfd) * updating calls to BaggagePropagator from unit tests (cherry picked from commit 917c6c0) * fixing call to base constructor (cherry picked from commit 0be2fc1) * updating to handle behaviorExtract=IGNORE in CoreTracer rather than BaggagePropagator (cherry picked from commit a26badd)
1 parent 6e237a2 commit 7e22911

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

‎dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static datadog.trace.api.DDTags.DJM_ENABLED;
55
import static datadog.trace.api.DDTags.DSM_ENABLED;
66
import static datadog.trace.api.DDTags.PROFILING_CONTEXT_ENGINE;
7-
import static datadog.trace.api.TracePropagationBehaviorExtract.RESTART;
7+
import static datadog.trace.api.TracePropagationBehaviorExtract.IGNORE;
88
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.BAGGAGE_CONCERN;
99
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.DSM_CONCERN;
1010
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.TRACING_CONCERN;
@@ -716,7 +716,8 @@ private CoreTracer(
716716
if (config.isDataStreamsEnabled()) {
717717
Propagators.register(DSM_CONCERN, this.dataStreamsMonitoring.propagator());
718718
}
719-
if (config.isBaggagePropagationEnabled()) {
719+
if (config.isBaggagePropagationEnabled()
720+
&& config.getTracePropagationBehaviorExtract() != IGNORE) {
720721
Propagators.register(BAGGAGE_CONCERN, new BaggagePropagator(config));
721722
}
722723

‎dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class BaggagePropagator implements Propagator {
3232
public BaggagePropagator(Config config) {
3333
this(
3434
config.isBaggageInject(),
35-
config.isBaggageInject(),
35+
config.isBaggageExtract(),
3636
config.getTraceBaggageMaxItems(),
3737
config.getTraceBaggageMaxBytes());
3838
}

0 commit comments

Comments
 (0)