Merge branch 'master' into alexeyk/protocol-v1-1

Author: AlexeyKuznetsov-DD

.github/workflows/analyze-changes.yaml

@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -43,7 +43,7 @@ jobs:
           ./gradlew clean :dd-java-agent:shadowJar --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
-        uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
 
   trivy:
     name: Analyze changes with Trivy
@@ -89,7 +89,7 @@ jobs:
           ls -laR "./workspace/.trivy"
 
       - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # v0.34.2
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
         with:
           scan-type: rootfs
           scan-ref: './workspace/.trivy/'
@@ -102,7 +102,7 @@ jobs:
           TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleAction.kt

@@ -9,10 +9,14 @@ import java.net.URLClassLoader
 abstract class MuzzleAction : WorkAction<MuzzleWorkParameters> {
     companion object {
         private val lock = Any()
-        private var bootCL: ClassLoader? = null
-        private var toolCL: ClassLoader? = null
+        @Volatile
+        private var lastBootCL: ClassLoader? = null
+        @Volatile
+        private var lastToolCL: ClassLoader? = null
         @Volatile
         private var lastBuildStamp: Long = 0
+        @Volatile
+        private var lastBuildPathCount: Int = 0
 
         fun createClassLoader(cp: FileCollection, parent: ClassLoader = ClassLoader.getSystemClassLoader()): ClassLoader {
             val urls = cp.map { it.toURI().toURL() }.toTypedArray()
@@ -22,12 +26,21 @@ abstract class MuzzleAction : WorkAction<MuzzleWorkParameters> {
 
     override fun execute() {
         val buildStamp = parameters.buildStartedTime.get()
-        if (bootCL == null || toolCL == null || lastBuildStamp < buildStamp) {
+        val buildPathCount = parameters.bootstrapClassPath.count() + parameters.toolingClassPath.count()
+        var bootCL : ClassLoader? = lastBootCL
+        var toolCL : ClassLoader? = lastToolCL
+        // cache boot and tool classloaders for each run; rebuild if either class-path is extended mid-build
+        if (bootCL == null || toolCL == null || lastBuildStamp < buildStamp || lastBuildPathCount < buildPathCount) {
             synchronized(lock) {
-                if (bootCL == null || toolCL == null || lastBuildStamp < buildStamp) {
+                bootCL = lastBootCL
+                toolCL = lastToolCL
+                if (bootCL == null || toolCL == null || lastBuildStamp < buildStamp || lastBuildPathCount < buildPathCount) {
                     bootCL = createClassLoader(parameters.bootstrapClassPath)
                     toolCL = createClassLoader(parameters.toolingClassPath, bootCL!!)
+                    lastBootCL = bootCL
+                    lastToolCL = toolCL
                     lastBuildStamp = buildStamp
+                    lastBuildPathCount = buildPathCount
                 }
             }
         }

components/http/http-api/gradle.lockfile

@@ -0,0 +1,73 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
+com.github.javaparser:javaparser-core:3.25.6=codenarc
+com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
+com.github.spotbugs:spotbugs:4.9.8=spotbugs
+com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
+com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
+com.google.code.gson:gson:2.13.2=spotbugs
+com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
+com.thoughtworks.qdox:qdox:1.12.1=codenarc
+commons-io:commons-io:2.20.0=spotbugs
+de.thetaphi:forbiddenapis:3.10=compileClasspath
+io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
+jaxen:jaxen:2.0.0=spotbugs
+net.bytebuddy:byte-buddy-agent:1.12.8=testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.12.8=testRuntimeClasspath
+net.sf.saxon:Saxon-HE:12.9=spotbugs
+org.apache.ant:ant-antlr:1.10.14=codenarc
+org.apache.ant:ant-junit:1.10.14=codenarc
+org.apache.bcel:bcel:6.11.0=spotbugs
+org.apache.commons:commons-lang3:3.19.0=spotbugs
+org.apache.commons:commons-text:1.14.0=spotbugs
+org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
+org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.codehaus.groovy:groovy-ant:3.0.23=codenarc
+org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
+org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
+org.codehaus.groovy:groovy-json:3.0.23=codenarc
+org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath
+org.codehaus.groovy:groovy-templates:3.0.23=codenarc
+org.codehaus.groovy:groovy-xml:3.0.23=codenarc
+org.codehaus.groovy:groovy:3.0.23=codenarc
+org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath
+org.codenarc:CodeNarc:3.7.0=codenarc
+org.dom4j:dom4j:2.2.0=spotbugs
+org.gmetrics:GMetrics:2.1.0=codenarc
+org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=spotbugs
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.mock-server:mockserver-junit-jupiter-no-dependencies:5.14.0=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.mockito:mockito-core:4.4.0=testRuntimeClasspath
+org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm-analysis:9.9=spotbugs
+org.ow2.asm:asm-commons:9.9=jacocoAnt,spotbugs
+org.ow2.asm:asm-tree:9.9=jacocoAnt,spotbugs
+org.ow2.asm:asm-util:9.9=spotbugs
+org.ow2.asm:asm:9.9=jacocoAnt,spotbugs
+org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
+org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
+org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
+org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
+org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=spotbugs
+empty=annotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor,testFixturesAnnotationProcessor

components/json/gradle.lockfile

@@ -75,5 +75,7 @@ org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
 org.spockframework:spock-bom:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.tabletest:tabletest-junit:1.2.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.tabletest:tabletest-parser:1.2.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs
 empty=annotationProcessor,jmhAnnotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java

@@ -275,7 +275,9 @@ public byte[] transform(
         return null;
       }
       ClassNode classNode = parseClassFile(classFilePath, classfileBuffer);
-      checkMethodParameters(classNode);
+      if (!checkMethodParameters(classNode, definitions, fullyQualifiedClassName)) {
+        return null;
+      }
       if (!checkRecordTypeAnnotation(classNode, definitions, fullyQualifiedClassName)) {
         return null;
       }
@@ -306,10 +308,11 @@ public byte[] transform(
    * instrumented the class, we will retransform for removing the instrumentation and then the
    * attribute is stripped. That's why we are preventing it even at load time.
    */
-  private void checkMethodParameters(ClassNode classNode) {
+  private boolean checkMethodParameters(
+      ClassNode classNode, List<ProbeDefinition> definitions, String fullyQualifiedClassName) {
     if (JAVA_AT_LEAST_19) {
       // bug is fixed since JDK19, no need to perform check
-      return;
+      return true;
     }
     boolean isRecord = ASMHelper.isRecord(classNode);
     // capping scanning of methods to 100 to avoid generated class with thousand of methods
@@ -328,13 +331,17 @@ private void checkMethodParameters(ClassNode classNode) {
       if (methodNode.parameters != null
           && !methodNode.parameters.isEmpty()
           && SpringHelper.isSpringUsingOnlyMethodParameters(DebuggerAgent.getInstrumentation())) {
-        throw new RuntimeException(
+        reportInstrumentationFails(
+            definitions,
+            fullyQualifiedClassName,
             "Method Parameters attribute detected, instrumentation not supported");
+        return false;
       } else {
         // we found at leat a method with one parameter if name is not present we can stop there
         break;
       }
     }
+    return true;
   }
 
   /*

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java

@@ -220,13 +220,11 @@ public void addDiagnostics(ProbeId probeId, List<DiagnosticMessage> messages) {
     for (DiagnosticMessage msg : messages) {
       switch (msg.getKind()) {
         case INFO:
-          LOGGER.info(msg.getMessage());
-          break;
         case WARN:
-          LOGGER.warn(msg.getMessage());
+          LOGGER.debug(msg.getMessage());
           break;
         case ERROR:
-          LOGGER.error(msg.getMessage());
+          LOGGER.debug(msg.getMessage());
           reportError(probeId, msg);
           break;
       }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java

@@ -390,13 +390,24 @@ private static void extractScopesFromVariables(
       List<Symbol> varSymbols = new ArrayList<>();
       int minLine = Integer.MAX_VALUE;
       for (LocalVariableNode var : entry.getValue()) {
-        int line = monotonicLineMap.get(var.start.getLabel());
+        Integer line = monotonicLineMap.get(var.start.getLabel());
+        if (line == null) {
+          LOGGER.debug(
+              "Cannot find the line for variable {} idx={} in local variables",
+              var.name,
+              var.index);
+          continue;
+        }
         minLine = Math.min(line, minLine);
         varSymbols.add(
             new Symbol(
                 SymbolType.LOCAL, var.name, line, Type.getType(var.desc).getClassName(), null));
       }
-      int endLine = monotonicLineMap.get(entry.getKey().getLabel());
+      Integer endLine = monotonicLineMap.get(entry.getKey().getLabel());
+      if (endLine == null) {
+        LOGGER.debug("Cannot find the line from end label");
+        continue;
+      }
       Scope varScope =
           Scope.builder(ScopeType.LOCAL, sourceFile, minLine, endLine)
               .symbols(varSymbols)

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

@@ -3059,7 +3059,7 @@ public void methodParametersAttribute() throws Exception {
       verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
       assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
       assertEquals(
-          "Instrumentation failed for CapturedSnapshot01: java.lang.RuntimeException: Method Parameters attribute detected, instrumentation not supported",
+          "Instrumentation failed for CapturedSnapshot01: Method Parameters attribute detected, instrumentation not supported",
           strCaptor.getAllValues().get(0));
     } else {
       Snapshot snapshot = assertOneSnapshot(listener);
@@ -3069,9 +3069,17 @@ public void methodParametersAttribute() throws Exception {
 
   @Test
   @EnabledForJreRange(min = JRE.JAVA_17)
-  public void methodParametersAttributeRecord() throws IOException, URISyntaxException {
+  public void methodParametersAttributeRecord() throws Exception {
     final String CLASS_NAME = "com.datadog.debugger.CapturedSnapshot29";
     final String RECORD_NAME = "com.datadog.debugger.MyRecord1";
+    Config config = mock(Config.class);
+    when(config.isDebuggerCodeOriginEnabled()).thenReturn(false);
+    when(config.isDebuggerExceptionEnabled()).thenReturn(false);
+    when(config.isDynamicInstrumentationEnabled()).thenReturn(false);
+    Instrumentation inst = mock(Instrumentation.class);
+    Class<?> springClass = Class.forName("org.springframework.core.SpringVersion");
+    when(inst.getAllLoadedClasses()).thenReturn(new Class[] {springClass});
+    DebuggerAgent.run(config, inst, null);
     TestSnapshotListener listener = installMethodProbeAtExit(RECORD_NAME, "<init>", null);
     Map<String, byte[]> buffers =
         compile(CLASS_NAME, SourceCompiler.DebugInfo.ALL, "17", Arrays.asList("-parameters"));
@@ -3089,7 +3097,7 @@ public void methodParametersAttributeRecord() throws IOException, URISyntaxExcep
       verify(probeStatusSink, times(1)).addError(probeIdCaptor.capture(), strCaptor.capture());
       assertEquals(PROBE_ID.getId(), probeIdCaptor.getAllValues().get(0).getId());
       assertEquals(
-          "Instrumentation failed for com.datadog.debugger.MyRecord1: java.lang.RuntimeException: Method Parameters attribute detected, instrumentation not supported",
+          "Instrumentation failed for com.datadog.debugger.MyRecord1: Method Parameters attribute detected, instrumentation not supported",
           strCaptor.getAllValues().get(0));
     }
   }

dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile

@@ -4,7 +4,7 @@
 ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
 ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-instrument-java:0.0.3=compileClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testRuntimeClasspath
+com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath
 com.github.javaparser:javaparser-core:3.25.6=codenarc
 com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.github.spotbugs:spotbugs:4.9.8=spotbugs
@@ -85,12 +85,11 @@ org.ow2.asm:asm:9.9=jacocoAnt,spotbugs
 org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
 org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath
+org.slf4j:slf4j-api:1.7.30=compileClasspath
 org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=runtimeClasspath,testRuntimeClasspath
 org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs
-empty=annotationProcessor,shadow,spotbugsPlugins,testAnnotationProcessor
+empty=annotationProcessor,runtimeClasspath,shadow,spotbugsPlugins,testAnnotationProcessor

…metry/shim/OtelInstrumentationScope.java …tel/common/OtelInstrumentationScope.javadd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/OtelInstrumentationScope.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/OtelInstrumentationScope.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java

@@ -1,4 +1,4 @@
-package datadog.opentelemetry.shim;
+package datadog.trace.bootstrap.otel.common;
 
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import java.util.Objects;