Merge branch 'master' into ci/update-gradle-dependencies-instrumentation-20260222

ygree · web-flow · commit a35ca042cef9 · 2026-02-26T23:05:23.000+01:00
diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle
@@ -43,7 +43,7 @@ dependencies {
   testImplementation group: 'org.testcontainers', name:'mysql', version: libs.versions.testcontainers.get()
   testImplementation group: 'org.testcontainers', name:'postgresql', version: libs.versions.testcontainers.get()
   testImplementation group: 'org.testcontainers', name:'mssqlserver', version: libs.versions.testcontainers.get()
-  testImplementation group: 'org.testcontainers', name:'oracle-xe', version: '1.20.4'
+  testImplementation group: 'org.testcontainers', name:'oracle-xe', version: libs.versions.testcontainers.get()
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
 
@@ -101,4 +101,3 @@ tasks.named("latestDepJava11Test", Test) {
     minJavaVersion = JavaVersion.VERSION_11
   }
 }
-
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[] {
-      "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",
+      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[] {
-      "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",
+      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
@@ -79,10 +79,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",
+      packageName + ".JDBCDecorator", packageName + ".SQLCommenter",
     };
   }
 
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[] {
-      "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",
+      packageName + ".JDBCDecorator",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
@@ -11,6 +11,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.api.propagation.W3CTraceParent;
 import datadog.trace.api.telemetry.LogCollector;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -23,7 +24,6 @@
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBQueryInfo;
 import datadog.trace.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser;
-import datadog.trace.core.propagation.W3CTraceParent;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.sql.Connection;
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
@@ -17,13 +17,13 @@
 import datadog.appsec.api.blocking.BlockingException;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.api.propagation.W3CTraceParent;
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
-import datadog.trace.core.propagation.W3CTraceParent;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -60,10 +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",
+      packageName + ".JDBCDecorator", packageName + ".SQLCommenter",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy
@@ -223,6 +223,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
     postgres?.close()
     mysql?.close()
     sqlserver?.close()
+    oracle?.close()
   }
 
   def "basic statement with #connection.getClass().getCanonicalName() on #driver generates spans"() {
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java
@@ -4,9 +4,9 @@
 import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DBM_TRACE_INJECTED;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.propagation.W3CTraceParent;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter;
-import datadog.trace.core.propagation.W3CTraceParent;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java
@@ -32,11 +32,9 @@ public String instrumentedType() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.core.propagation.W3CTraceParent",
       packageName + ".BsonScrubber",
       packageName + ".MongoCommentInjector",
       packageName + ".MongoDecorator",
-      "datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java
@@ -32,8 +32,6 @@ public String instrumentedType() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter",
-      "datadog.trace.core.propagation.W3CTraceParent",
       packageName + ".MongoDecorator",
       packageName + ".MongoCommentInjector",
       packageName + ".BsonScrubber",
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
@@ -276,6 +276,7 @@ private void initApplicationSpanIfNotInitialized() {
     }
 
     captureApplicationParameters(builder);
+    captureEmrStepId(builder);
 
     Optional<OpenlineageParentContext> openlineageParentContext =
         OpenlineageParentContext.from(sparkConf);
@@ -1210,6 +1211,13 @@ private void captureApplicationParameters(AgentTracer.SpanBuilder builder) {
     builder.withTag("config.spark_version", sparkVersion);
   }
 
+  private static void captureEmrStepId(AgentTracer.SpanBuilder builder) {
+    String stepId = EmrUtils.getEmrStepId();
+    if (stepId != null) {
+      builder.withTag("emr_step_id", stepId);
+    }
+  }
+
   private void captureJobParameters(AgentTracer.SpanBuilder builder, Properties properties) {
     for (Tuple2<String, String> conf : sparkConf.getAll()) {
       if (SparkConfAllowList.canCaptureJobParameter(conf._1)) {
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java
@@ -0,0 +1,42 @@
+package datadog.trace.instrumentation.spark;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Extracts the AWS EMR Step ID from the working directory name (e.g. s-07767992IY7VC5NVV854). */
+class EmrUtils {
+
+  private static final Logger log = LoggerFactory.getLogger(EmrUtils.class);
+
+  /** EMR step ID is a 20 character string with numbers and uppercase letters only */
+  private static final Pattern EMR_STEP_ID_PATTERN = Pattern.compile("^(s-[0-9A-Z]{20})$");
+
+  @Nullable
+  static String getEmrStepId() {
+    try {
+      String userDir = System.getProperty("user.dir");
+      if (userDir == null) {
+        return null;
+      }
+      Path workDir = Paths.get(userDir).getFileName();
+      if (workDir == null) {
+        return null;
+      }
+      Matcher matcher = EMR_STEP_ID_PATTERN.matcher(workDir.toString());
+      if (matcher.matches()) {
+        log.debug("EMR step ID extracted: {}", matcher.group(1));
+        return matcher.group(1);
+      }
+    } catch (Throwable t) {
+      log.debug("Unable to extract EMR step ID from working directory", t);
+    }
+    return null;
+  }
+
+  private EmrUtils() {}
+}
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java
@@ -32,7 +32,9 @@ public String instrumentedType() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".SparkConfAllowList", packageName + ".SparkLauncherListener",
+      packageName + ".EmrUtils",
+      packageName + ".SparkConfAllowList",
+      packageName + ".SparkLauncherListener",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java
@@ -39,6 +39,7 @@ public static synchronized void createLauncherSpan(Object launcher) {
             .start();
     span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DATA_JOBS);
     setLauncherConfigTags(span, launcher);
+    captureEmrStepId(span);
     launcherSpan = span;
 
     if (!shutdownHookRegistered) {
@@ -131,6 +132,13 @@ public void infoChanged(SparkAppHandle handle) {
     }
   }
 
+  private static void captureEmrStepId(AgentSpan span) {
+    String stepId = EmrUtils.getEmrStepId();
+    if (stepId != null) {
+      span.setTag("emr_step_id", stepId);
+    }
+  }
+
   /**
    * Extract launcher configuration via reflection and set as span tags. Secret redaction uses the
    * default pattern only (not spark.redaction.regex) because the SparkLauncher conf map is a plain
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/EmrUtilsTest.java b/dd-java-agent/instrumentation/spark/spark-common/src/test/java/datadog/trace/instrumentation/spark/EmrUtilsTest.java
@@ -0,0 +1,41 @@
+package datadog.trace.instrumentation.spark;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class EmrUtilsTest {
+
+  private String originalUserDir;
+
+  @BeforeEach
+  void saveUserDir() {
+    originalUserDir = System.getProperty("user.dir");
+  }
+
+  @AfterEach
+  void restoreUserDir() {
+    System.setProperty("user.dir", originalUserDir);
+  }
+
+  @Test
+  void returnsStepIdWhenWorkdirMatchesEmrPattern() {
+    System.setProperty("user.dir", "/mnt/var/lib/hadoop/steps/s-07767992IY7VC5NVV854");
+    assertEquals("s-07767992IY7VC5NVV854", EmrUtils.getEmrStepId());
+  }
+
+  @Test
+  void returnsNullWhenWorkdirDoesNotMatchEmrPattern() {
+    System.setProperty("user.dir", "/home/hadoop");
+    assertNull(EmrUtils.getEmrStepId());
+  }
+
+  @Test
+  void returnsNullForApplicationIdWorkdir() {
+    System.setProperty("user.dir", "/home/hadoop/application_1234567890_0001");
+    assertNull(EmrUtils.getEmrStepId());
+  }
+}
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java
@@ -26,6 +26,7 @@ public String[] helperClassNames() {
       packageName + ".AbstractSparkPlanSerializer",
       packageName + ".AbstractSparkPlanUtils",
       packageName + ".DatabricksParentContext",
+      packageName + ".EmrUtils",
       packageName + ".OpenlineageParentContext",
       packageName + ".DatadogSpark212Listener",
       packageName + ".PredeterminedTraceIdContext",
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java
@@ -26,6 +26,7 @@ public String[] helperClassNames() {
       packageName + ".AbstractSparkPlanSerializer",
       packageName + ".AbstractSparkPlanUtils",
       packageName + ".DatabricksParentContext",
+      packageName + ".EmrUtils",
       packageName + ".OpenlineageParentContext",
       packageName + ".DatadogSpark213Listener",
       packageName + ".PredeterminedTraceIdContext",
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
@@ -17,6 +17,7 @@
 import datadog.trace.api.TraceConfig;
 import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.internal.util.LongStringUtils;
+import datadog.trace.api.propagation.W3CTraceParent;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.api.sampling.SamplingMechanism;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
@@ -70,7 +71,9 @@ public <C> void inject(
     }
 
     private <C> void injectTraceParent(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
-      String traceparent = W3CTraceParent.from(context);
+      String traceparent =
+          W3CTraceParent.from(
+              context.getTraceId(), context.getSpanId(), context.getSamplingPriority() > 0);
       setter.set(carrier, TRACE_PARENT_KEY, traceparent);
     }
 
diff --git a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java
@@ -1,9 +1,8 @@
-package datadog.trace.core.propagation;
+package datadog.trace.api.propagation;
 
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.core.DDSpanContext;
 
 /**
  * Utility class for building W3C traceparent headers.
@@ -40,9 +39,4 @@ public static String from(DDTraceId traceId, long spanId, boolean isSampled) {
   public static String from(AgentSpan span) {
     return from(span.getTraceId(), span.getSpanId(), span.context().getSamplingPriority() > 0);
   }
-
-  public static String from(DDSpanContext spanContext) {
-    return from(
-        spanContext.getTraceId(), spanContext.getSpanId(), spanContext.getSamplingPriority() > 0);
-  }
 }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/propagation/W3CTraceParentTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/propagation/W3CTraceParentTest.groovy
@@ -1,4 +1,4 @@
-package datadog.trace.core.propagation
+package datadog.trace.api.propagation
 
 import datadog.trace.api.DDTraceId
 import datadog.trace.test.util.DDSpecification

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ dependencies {`
`43`	`43`	`testImplementation group: 'org.testcontainers', name:'mysql', version: libs.versions.testcontainers.get()`
`44`	`44`	`testImplementation group: 'org.testcontainers', name:'postgresql', version: libs.versions.testcontainers.get()`
`45`	`45`	`testImplementation group: 'org.testcontainers', name:'mssqlserver', version: libs.versions.testcontainers.get()`
`46`		`- testImplementation group: 'org.testcontainers', name:'oracle-xe', version: '1.20.4'`
	`46`	`+ testImplementation group: 'org.testcontainers', name:'oracle-xe', version: libs.versions.testcontainers.get()`
`47`	`47`
`48`	`48`	`testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')`
`49`	`49`
`@@ -101,4 +101,3 @@ tasks.named("latestDepJava11Test", Test) {`
`101`	`101`	`minJavaVersion = JavaVersion.VERSION_11`
`102`	`102`	`}`
`103`	`103`	`}`
`104`		`-`
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`		`- "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",`
	`36`	`+ 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`		`- "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",`
	`43`	`+ 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`		`- "datadog.trace.core.propagation.W3CTraceParent", packageName + ".JDBCDecorator",`
	`52`	`+ packageName + ".JDBCDecorator",`
`53`	`53`	`};`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {`
`223`	`223`	`postgres?.close()`
`224`	`224`	`mysql?.close()`
`225`	`225`	`sqlserver?.close()`
	`226`	`+ oracle?.close()`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`def "basic statement with #connection.getClass().getCanonicalName() on #driver generates spans"() {`