Skip to content

🍒 9037 - Fixing bug with dropping baggage when TracePropagationBehaviorExtract=IGNORE #9051

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

Closed
mhlidd wants to merge 4 commits into from
Closed

🍒 9037 - Fixing bug with dropping baggage when TracePropagationBehaviorExtract=IGNORE #9051

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8f8a3b
Fixing issues with dropping baggage when TracePropagationBehaviorExtr…
mhlidd Jun 25, 2025
61bc04f
updating calls to BaggagePropagator from unit tests
mhlidd Jun 25, 2025
8777d87
fixing call to base constructor
mhlidd Jun 26, 2025
83958a5
updating to handle behaviorExtract=IGNORE in CoreTracer rather than B…
mhlidd Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixing issues with dropping baggage when TracePropagationBehaviorExtr… 
…act = IGNORE

(cherry picked from commit 5facbfd)
  • Loading branch information
@mhlidd
mhlidd committed Jun 27, 2025
commit a8f8a3bc7e7beb592e1a2b9fe4bdc254836603fa
20 changes: 17 additions & 3 deletions 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
@@ -1,12 +1,14 @@
package datadog.trace.core.baggage;

import static datadog.trace.api.TracePropagationBehaviorExtract.IGNORE;
import static java.util.Collections.emptyMap;

import datadog.context.Context;
import datadog.context.propagation.CarrierSetter;
import datadog.context.propagation.CarrierVisitor;
import datadog.context.propagation.Propagator;
import datadog.trace.api.Config;
import datadog.trace.api.TracePropagationBehaviorExtract;
import datadog.trace.bootstrap.instrumentation.api.Baggage;
import datadog.trace.core.util.PercentEscaper;
import datadog.trace.core.util.PercentEscaper.Escaped;
Expand All @@ -28,21 +30,29 @@ public class BaggagePropagator implements Propagator {
private final boolean extractBaggage;
private final int maxItems;
private final int maxBytes;
private final TracePropagationBehaviorExtract behaviorExtract;

public BaggagePropagator(Config config) {
this(
config.isBaggageInject(),
config.isBaggageInject(),
config.getTraceBaggageMaxItems(),
config.getTraceBaggageMaxBytes());
config.getTraceBaggageMaxBytes(),
config.getTracePropagationBehaviorExtract());
}

// use primarily for testing purposes
BaggagePropagator(boolean injectBaggage, boolean extractBaggage, int maxItems, int maxBytes) {
BaggagePropagator(
boolean injectBaggage,
boolean extractBaggage,
int maxItems,
int maxBytes,
TracePropagationBehaviorExtract behaviorExtract) {
this.injectBaggage = injectBaggage;
this.extractBaggage = extractBaggage;
this.maxItems = maxItems;
this.maxBytes = maxBytes;
this.behaviorExtract = behaviorExtract;
}

@Override
Expand Down Expand Up @@ -104,7 +114,11 @@ public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {

@Override
public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
if (!this.extractBaggage || context == null || carrier == null || visitor == null) {
if (!this.extractBaggage
|| this.behaviorExtract == IGNORE
|| context == null
|| carrier == null
|| visitor == null) {
return context;
}
BaggageExtractor baggageExtractor = new BaggageExtractor();
Expand Down