Merge branch 'master' into mtoff/stable_cfg_2

Author: mtoffl01

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit 1de04c42cbd9783432258004e46eb5982bbc9fe5
+default_system_tests_commit: &default_system_tests_commit 55cc62fb333b8de1466f8a0ecfdfa55fe9f57031
 
 parameters:
   nightly:

.gitlab-ci.yml

@@ -23,7 +23,8 @@ variables:
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
   GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties
-  MAVEN_REPOSITORY_PROXY: "https://artifactual.us1.prod.dog/repository/maven-central/"
+  MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
+  GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
   JAVA_BUILD_IMAGE_VERSION: "v25.01"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   PROFILE_TESTS:
@@ -75,7 +76,7 @@ default:
       policy: $BUILD_CACHE_POLICY
   before_script:
     - export GRADLE_USER_HOME=`pwd`/.gradle
-    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY"
+    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY -PgradlePluginProxy=$GRADLE_PLUGIN_PROXY"
     - *normalize_node_index
     # for weird reasons, gradle will always "chmod 700" the .gradle folder
     # with Gitlab caching, .gradle is always owned by root and thus gradle's chmod invocation fails

build.gradle

@@ -32,6 +32,7 @@ description = 'dd-trace-java'
 
 def isCI = System.getenv("CI") != null
 
+apply from: "$rootDir/gradle/repositories.gradle"
 apply from: "$rootDir/gradle/scm.gradle"
 spotless {
   // only resolve the spotless dependencies once in the build
@@ -79,12 +80,6 @@ allprojects {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
-}
-
 tasks.register("latestDepTest")
 
 nexusPublishing {

buildSrc/build.gradle.kts

@@ -22,10 +22,8 @@ gradlePlugin {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
+apply {
+  from("$rootDir/../gradle/repositories.gradle")
 }
 
 dependencies {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -24,10 +24,8 @@ spotless {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
+apply {
+  from("$rootDir/../gradle/repositories.gradle")
 }
 
 dependencies {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -250,6 +250,11 @@ public static void start(
       setSystemPropertyDefault(
           propertyNameToSystemPropertyName("integration.kafka.enabled"), "true");
 
+      if (Config.get().isDataJobsOpenLineageEnabled()) {
+        setSystemPropertyDefault(
+            propertyNameToSystemPropertyName("integration.spark-openlineage.enabled"), "true");
+      }
+
       String javaCommand = System.getProperty("sun.java.command");
       String dataJobsCommandPattern = Config.get().getDataJobsCommandPattern();
       if (!isDataJobsSupported(javaCommand, dataJobsCommandPattern)) {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java

@@ -61,17 +61,17 @@ public Object apply(Object result, AgentSpan span) {
       }
       return null;
     }
+  }
 
-    private <T> BiConsumer<T, Throwable> finishSpan(AgentSpan span) {
-      return (o, throwable) -> {
-        if (throwable != null) {
-          span.addThrowable(
-              throwable instanceof ExecutionException || throwable instanceof CompletionException
-                  ? throwable.getCause()
-                  : throwable);
-        }
-        span.finish();
-      };
-    }
+  public static <T> BiConsumer<T, Throwable> finishSpan(AgentSpan span) {
+    return (o, throwable) -> {
+      if (throwable != null) {
+        span.addThrowable(
+            throwable instanceof ExecutionException || throwable instanceof CompletionException
+                ? throwable.getCause()
+                : throwable);
+      }
+      span.finish();
+    };
   }
 }

dd-java-agent/agent-ci-visibility/build.gradle

@@ -1,5 +1,19 @@
 buildscript {
   repositories {
+    mavenLocal()
+    if (project.rootProject.hasProperty("gradlePluginProxy")) {
+      maven {
+        url project.rootProject.property("gradlePluginProxy")
+        allowInsecureProtocol true
+      }
+    }
+    if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+      maven {
+        url project.rootProject.property("mavenRepositoryProxy")
+        allowInsecureProtocol true
+      }
+    }
+    gradlePluginPortal()
     mavenCentral()
   }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java

@@ -210,7 +210,7 @@ public boolean isModified(@Nonnull TestSourceData testSourceData) {
           .contains(sourcePath, lines.getStartLineNumber(), lines.getEndLineNumber());
 
     } catch (Exception e) {
-      LOGGER.error("Could not determine if {} was modified, assuming false", testSourceData, e);
+      LOGGER.debug("Could not determine if {} was modified, assuming false", testSourceData, e);
       return false;
     }
   }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumentor.java

@@ -4,13 +4,17 @@
 import static com.datadog.debugger.instrumentation.ASMHelper.ldc;
 import static com.datadog.debugger.instrumentation.Types.DEBUGGER_CONTEXT_TYPE;
 import static com.datadog.debugger.instrumentation.Types.STRING_TYPE;
+import static java.lang.Integer.parseInt;
 
 import com.datadog.debugger.instrumentation.InstrumentationResult.Status;
+import com.datadog.debugger.probe.CodeOriginProbe;
 import com.datadog.debugger.probe.ProbeDefinition;
 import datadog.trace.bootstrap.debugger.ProbeId;
 import java.util.List;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.LabelNode;
 
 public class CodeOriginInstrumentor extends Instrumentor {
   public CodeOriginInstrumentor(
@@ -26,11 +30,21 @@ public Status instrument() {
     InsnList insnList = new InsnList();
 
     ldc(insnList, probeIds.get(0).getEncodedId());
-
     invokeStatic(insnList, DEBUGGER_CONTEXT_TYPE, "codeOrigin", Type.VOID_TYPE, STRING_TYPE);
-
-    methodNode.instructions.insert(methodEnterLabel, insnList);
+    methodNode.instructions.insert(findInsertionPoint(), insnList);
 
     return InstrumentationResult.Status.INSTALLED;
   }
+
+  private AbstractInsnNode findInsertionPoint() {
+    CodeOriginProbe probe = (CodeOriginProbe) definition;
+    List<String> lines = probe.getLocation().getLines();
+    if (!probe.entrySpanProbe() && lines != null && !lines.isEmpty()) {
+      LabelNode lineLabel = classFileLines.getLineLabel(parseInt(lines.get(0)));
+      if (lineLabel != null) {
+        return lineLabel.getNext();
+      }
+    }
+    return methodEnterLabel;
+  }
 }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java

@@ -82,14 +82,14 @@ public boolean entrySpanProbe() {
   public void buildLocation(MethodInfo methodInfo) {
     String type = where.getTypeName();
     String method = where.getMethodName();
-    List<String> lines = null;
+    List<String> lines = where.getLines() != null ? asList(where.getLines()) : null;
 
     String file = where.getSourceFile();
 
     if (methodInfo != null) {
       type = methodInfo.getTypeName();
       method = methodInfo.getMethodName();
-      if (methodInfo.getMethodStart() != -1) {
+      if (entrySpanProbe || where.getLines() == null) {
         lines = singletonList(String.valueOf(methodInfo.getMethodStart()));
       }
       if (file == null) {

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java

@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static utils.InstrumentationTestHelper.compileAndLoadClass;
+import static utils.InstrumentationTestHelper.getLineForLineProbe;
 import static utils.TestHelper.setFieldInConfig;
 
 import com.datadog.debugger.agent.CapturingTestBase;
@@ -130,12 +131,25 @@ public void doubleEntry() throws IOException, URISyntaxException {
     final String className = "com.datadog.debugger.CodeOrigin05";
 
     installProbes(
-        new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(className, "entry", "()", "53"), true),
-        new CodeOriginProbe(CODE_ORIGIN_ID2, false, Where.of(className, "exit", "()", "62"), true),
+        new CodeOriginProbe(
+            CODE_ORIGIN_ID1,
+            true,
+            Where.of(
+                className, "entry", "()", "" + getLineForLineProbe(className, CODE_ORIGIN_ID1)),
+            true),
+        new CodeOriginProbe(
+            CODE_ORIGIN_ID2,
+            false,
+            Where.of(className, "exit", "()", "" + getLineForLineProbe(className, CODE_ORIGIN_ID2)),
+            true),
         new CodeOriginProbe(
             CODE_ORIGIN_DOUBLE_ENTRY_ID,
             true,
-            Where.of(className, "doubleEntry", "()", "66"),
+            Where.of(
+                className,
+                "doubleEntry",
+                "()",
+                "" + getLineForLineProbe(className, CODE_ORIGIN_DOUBLE_ENTRY_ID)),
             true));
     final Class<?> testClass = compileAndLoadClass(className);
     checkResults(testClass, "fullTrace", 0);

dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin05.java

@@ -49,21 +49,21 @@ private static AgentSpan newSpan(String name) {
 
   public static void entry() throws NoSuchMethodException {
     // just to fill out the method body
-    boolean dummyCode = true;
+    boolean dummyCode = true; // code origin 1
     if (!dummyCode) {
       dummyCode = false;
     }
     doubleEntry();
   }
 
   private static void exit() {
-    int x = 47 / 3;
+    int x = 47 / 3; // code origin 2
   }
 
   public static void doubleEntry() throws NoSuchMethodException {
     // just to fill out the method body
     boolean dummyCode = true;
-    if (!dummyCode) {
+    if (!dummyCode) { // double entry code origin
       dummyCode = false;
     }
   }