fix missing helper class definition in jdbc instrumentations

na-ji · na-ji · commit 4a4b35f07485 · 2025-12-22T14:13:49.000+01:00
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java
@@ -33,7 +33,7 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".JDBCDecorator",
+      "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
@@ -40,7 +40,7 @@ public AbstractPreparedStatementInstrumentation(
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".JDBCDecorator",
+      "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
@@ -78,6 +78,7 @@ public DBMCompatibleConnectionInstrumentation() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
+      "datadog.trace.core.propagation.W3CTraceParent",
       packageName + ".JDBCDecorator",
       packageName + ".SQLCommenter",
       "datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter",
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
@@ -49,7 +49,7 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".JDBCDecorator",
+      "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
@@ -60,6 +60,7 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
+      "datadog.trace.core.propagation.W3CTraceParent",
       packageName + ".JDBCDecorator",
       packageName + ".SQLCommenter",
       "datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter",

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public Map<String, String> contextStore() {`
`33`	`33`	`@Override`
`34`	`34`	`public String[] helperClassNames() {`
`35`	`35`	`return new String[] {`
`36`		`- packageName + ".JDBCDecorator",`
	`36`	`+ "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",`
`37`	`37`	`};`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public AbstractPreparedStatementInstrumentation(`
`40`	`40`	`@Override`
`41`	`41`	`public String[] helperClassNames() {`
`42`	`42`	`return new String[] {`
`43`		`- packageName + ".JDBCDecorator",`
	`43`	`+ "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",`
`44`	`44`	`};`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public Map<String, String> contextStore() {`
`49`	`49`	`@Override`
`50`	`50`	`public String[] helperClassNames() {`
`51`	`51`	`return new String[] {`
`52`		`- packageName + ".JDBCDecorator",`
	`52`	`+ "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",`
`53`	`53`	`};`
`54`	`54`	`}`
`55`	`55`