Use Throwable

kr-igor · kr-igor · commit 791045757ced · 2026-02-17T16:03:41.000-06:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java
@@ -75,7 +75,7 @@ protected boolean shouldSetResourceName() {
           (source, headerName) -> {
             try {
               return getRequestHeader((REQUEST) source, headerName);
-            } catch (Exception e) {
+            } catch (Throwable ignored) {
               return null;
             }
           };
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
@@ -188,7 +188,7 @@ protected AgentSpanContext startInferredProxySpan(Context context, AgentSpanCont
           (source, headerName) -> {
             try {
               return getRequestHeader((REQUEST) source, headerName);
-            } catch (Exception e) {
+            } catch (Throwable ignored) {
               return null;
             }
           };
diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java b/dd-java-agent/instrumentation/kafka/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
@@ -14,7 +14,7 @@ private Utils() {} // prevent instantiation
           (source, headerName) -> {
             try {
               return new String(((Headers) source).lastHeader(headerName).value());
-            } catch (Exception e) {
+            } catch (Throwable ignored) {
               return null;
             }
           };

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected boolean shouldSetResourceName() {`
`75`	`75`	`(source, headerName) -> {`
`76`	`76`	`try {`
`77`	`77`	`return getRequestHeader((REQUEST) source, headerName);`
`78`		`- } catch (Exception e) {`
	`78`	`+ } catch (Throwable ignored) {`
`79`	`79`	`return null;`
`80`	`80`	`}`
`81`	`81`	`};`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ protected AgentSpanContext startInferredProxySpan(Context context, AgentSpanCont`
`188`	`188`	`(source, headerName) -> {`
`189`	`189`	`try {`
`190`	`190`	`return getRequestHeader((REQUEST) source, headerName);`
`191`		`- } catch (Exception e) {`
	`191`	`+ } catch (Throwable ignored) {`
`192`	`192`	`return null;`
`193`	`193`	`}`
`194`	`194`	`};`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ private Utils() {} // prevent instantiation`
`14`	`14`	`(source, headerName) -> {`
`15`	`15`	`try {`
`16`	`16`	`return new String(((Headers) source).lastHeader(headerName).value());`
`17`		`- } catch (Exception e) {`
	`17`	`+ } catch (Throwable ignored) {`
`18`	`18`	`return null;`
`19`	`19`	`}`
`20`	`20`	`};`