Fixing issues with dropping baggage when TracePropagationBehaviorExtract = IGNORE

Author: mhlidd

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

@@ -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;
@@ -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
@@ -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();