Skip to content

🍒 9037 - Drop Baggage when TracePropagationBehaviorExtract=IGNORE #9052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bm1549 merged 5 commits into from
Jun 27, 2025
Merged

🍒 9037 - Drop Baggage when TracePropagationBehaviorExtract=IGNORE #9052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73d4442
Fixing issues with dropping baggage when TracePropagationBehaviorExtr…
mhlidd Jun 25, 2025
b4959ad
updating calls to BaggagePropagator from unit tests
mhlidd Jun 25, 2025
6109546
fixing call to base constructor
mhlidd Jun 26, 2025
c08ecaa
updating to handle behaviorExtract=IGNORE in CoreTracer rather than B…
mhlidd Jun 26, 2025
375af54
Merge branch 'release/v1.50.x' into matthew.li/backport-pr-9037
mhlidd Jun 27, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static datadog.trace.api.DDTags.DJM_ENABLED;
import static datadog.trace.api.DDTags.DSM_ENABLED;
import static datadog.trace.api.DDTags.PROFILING_CONTEXT_ENGINE;
import static datadog.trace.api.TracePropagationBehaviorExtract.RESTART;
import static datadog.trace.api.TracePropagationBehaviorExtract.IGNORE;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.BAGGAGE_CONCERN;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.DSM_CONCERN;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.TRACING_CONCERN;
Expand Down Expand Up @@ -716,7 +716,8 @@ private CoreTracer(
if (config.isDataStreamsEnabled()) {
Propagators.register(DSM_CONCERN, this.dataStreamsMonitoring.propagator());
}
if (config.isBaggagePropagationEnabled()) {
if (config.isBaggagePropagationEnabled()
&& config.getTracePropagationBehaviorExtract() != IGNORE) {
Propagators.register(BAGGAGE_CONCERN, new BaggagePropagator(config));
}

Expand Down
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class BaggagePropagator implements Propagator {
public BaggagePropagator(Config config) {
this(
config.isBaggageInject(),
config.isBaggageInject(),
config.isBaggageExtract(),
config.getTraceBaggageMaxItems(),
config.getTraceBaggageMaxBytes());
}
Expand Down