code clean up season 2

DataDog · Feb 6, 2025 · 9a1fa20 · 9a1fa20
1 parent afd99de
commit 9a1fa20
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/packages/dd-trace/src/opentracing/propagation/text_map.js b/packages/dd-trace/src/opentracing/propagation/text_map.js
@@ -325,9 +325,7 @@ class TextMapPropagator {
       if (context === null) {
         context = extractedContext
         if (this._config.tracePropagationExtractFirst) {
-          if (this._hasPropagationStyle('extract', 'baggage') && carrier.baggage) {
-            this._extractBaggageItems(carrier, context)
-          }
+          this._extractBaggageItems(carrier, context)
           return context
         }
       } else {
@@ -347,9 +345,7 @@ class TextMapPropagator {
       }
     }
 
-    if (this._hasPropagationStyle('extract', 'baggage') && carrier.baggage) {
-      this._extractBaggageItems(carrier, context)
-    }
+    this._extractBaggageItems(carrier, context)
 
     return context || this._extractSqsdContext(carrier)
   }
@@ -598,6 +594,8 @@ class TextMapPropagator {
   }
 
   _extractBaggageItems (carrier, spanContext) {
+    if (!this._hasPropagationStyle('extract', 'baggage')) return
+    if (!carrier.baggage) return
     if (!spanContext) return
     const baggages = carrier.baggage.split(',')
     for (const keyValue of baggages) {