fix(core): Fix tracing propagator

PerfectSlayer · PerfectSlayer · commit 7ff13cba28e3 · 2025-01-28T17:23:22.000+01:00
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java
@@ -58,6 +58,11 @@ public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor
       return context;
     }
     TagContext spanContext = this.extractor.extract(carrier, toContextVisitor(visitor));
+    // If the extraction fails, return the original context
+    if (spanContext == null) {
+      return context;
+    }
+    // Otherwise, append a fake span wrapper to context
     return context.with(fromSpanContext(spanContext));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,11 @@ public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor`
`58`	`58`	`return context;`
`59`	`59`	`}`
`60`	`60`	`TagContext spanContext = this.extractor.extract(carrier, toContextVisitor(visitor));`
	`61`	`+ // If the extraction fails, return the original context`
	`62`	`+ if (spanContext == null) {`
	`63`	`+ return context;`
	`64`	`+ }`
	`65`	`+ // Otherwise, append a fake span wrapper to context`
`61`	`66`	`return context.with(fromSpanContext(spanContext));`
`62`	`67`	`}`
`63`	`68`