Avoid NPE on DSM context extraction (#10491)

amarziali · web-flow · commit 482bd1e95c48 · 2026-02-02T09:46:21.000Z
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
@@ -200,10 +200,10 @@ private static class PathwayContextExtractor implements BiConsumer<String, Strin
 
     @Override
     public void accept(String key, String value) {
-      if (PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {
+      if (value != null && PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {
         try {
           extractedContext = decode(timeSource, serviceNameOverride, value);
-        } catch (IOException ignored) {
+        } catch (Throwable ignored) {
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,10 @@ private static class PathwayContextExtractor implements BiConsumer<String, Strin`
`200`	`200`
`201`	`201`	`@Override`
`202`	`202`	`public void accept(String key, String value) {`
`203`		`- if (PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {`
	`203`	`+ if (value != null && PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {`
`204`	`204`	`try {`
`205`	`205`	`extractedContext = decode(timeSource, serviceNameOverride, value);`
`206`		`- } catch (IOException ignored) {`
	`206`	`+ } catch (Throwable ignored) {`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`	`}`