Merge branch 'master' into mhlidd/migrate_to_v2_format

Author: mhlidd

.github/chainguard/self.pin-system-tests.create-pr.sts.yaml

@@ -0,0 +1,12 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject_pattern: ^repo:DataDog/dd-trace-java:ref:refs/heads/.+$
+
+claim_pattern:
+  event_name: (push|workflow_dispatch)
+  ref: refs/heads/.+
+  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/pin-system-tests\.yaml@refs/heads/.+
+
+permissions:
+  contents: write
+  pull_requests: write

.gitlab-ci.yml

@@ -728,7 +728,7 @@ test_smoke:
     GRADLE_PARAMS: "-PskipFlakyTests"
     CACHE_TYPE: "smoke"
   parallel:
-    matrix: *test_matrix_4
+    matrix: *test_matrix_6
 
 test_ssi_smoke:
   extends: .test_job
@@ -739,7 +739,7 @@ test_ssi_smoke:
     DD_INJECT_FORCE: "true"
     DD_INJECTION_ENABLED: "tracer"
   parallel:
-    matrix: *test_matrix_4
+    matrix: *test_matrix_6
 
 test_smoke_graalvm:
   extends: .test_job

.gitlab/one-pipeline.locked.yml

@@ -1,4 +1,4 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/311d4ed6e0cd674e45520ecc38dfccff5c59bc987122305b2ae39600ce5e8a25/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/04f6a88e3db67cb88821632d138a2a5c3105ba59760bd3dfc60b54733501ecc3/one-pipeline.yml

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

@@ -106,7 +106,8 @@ class MuzzlePlugin : Plugin<Project> {
       // removing leading ':' if present
       val muzzleTaskName = taskName.removePrefix(":")
       val projectPath = project.path.removePrefix(":")
-      muzzleTaskName == "muzzle" || "$projectPath:muzzle" == muzzleTaskName
+      muzzleTaskName == "muzzle" || "$projectPath:muzzle" == muzzleTaskName ||
+          muzzleTaskName == "runMuzzle"
     }
     if (!hasRelevantTask) {
       // Adding muzzle dependencies has a large config overhead. Stop unless muzzle is explicitly run.

buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts

@@ -74,7 +74,7 @@ tasks.register("allTests") {
 // This is used when we want to run tests against the latest dependency versions.
 tasks.register("allLatestDepTests") {
   dependsOn(tasks.withType<Test>().matching { testTask ->
-    !testTask.name.contains("latest", ignoreCase = true)
+    testTask.name.contains("latest", ignoreCase = true)
   })
 }
 

communication/gradle.lockfile

@@ -28,43 +28,40 @@ com.github.jnr:jnr-posix:3.1.19=runtimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-unixsocket:0.36=compileClasspath,testCompileClasspath
 com.github.jnr:jnr-unixsocket:0.38.22=runtimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
+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.9.1=spotbugs
+com.google.code.gson:gson:2.13.2=spotbugs
+com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
 com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
 com.squareup.okio:okio:1.17.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.thoughtworks.qdox:qdox:1.12.1=codenarc,testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
 commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
+commons-io:commons-io:2.20.0=spotbugs
+de.thetaphi:forbiddenapis:3.10=compileClasspath
 info.picocli:picocli:4.6.3=testRuntimeClasspath
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
+jaxen:jaxen:2.0.0=spotbugs
 jline:jline:2.14.6=testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.1=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.1=testCompileClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
+net.sf.saxon:Saxon-HE:12.9=spotbugs
 org.apache.ant:ant-antlr:1.10.14=codenarc
 org.apache.ant:ant-antlr:1.10.15=testRuntimeClasspath
 org.apache.ant:ant-junit:1.10.14=codenarc
 org.apache.ant:ant-junit:1.10.15=testRuntimeClasspath
 org.apache.ant:ant-launcher:1.10.15=testRuntimeClasspath
 org.apache.ant:ant:1.10.15=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
+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-all:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:3.0.23=codenarc
@@ -96,8 +93,8 @@ org.codehaus.groovy:groovy-xml:3.0.23=codenarc
 org.codehaus.groovy:groovy-xml:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy:3.0.23=codenarc
 org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
-org.codenarc:CodeNarc:3.6.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
+org.codenarc:CodeNarc:3.7.0=codenarc
+org.dom4j:dom4j:2.2.0=spotbugs
 org.gmetrics:GMetrics:2.1.0=codenarc
 org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
@@ -113,42 +110,38 @@ org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testRuntim
 org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.12.2=testRuntimeClasspath
 org.junit:junit-bom:5.12.2=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
+org.junit:junit-bom:5.14.0=spotbugs
 org.mockito:mockito-core:4.4.0=testRuntimeClasspath
 org.msgpack:jackson-dataformat-msgpack:0.8.20=testCompileClasspath,testRuntimeClasspath
 org.msgpack:msgpack-core:0.8.20=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm-analysis:9.2=runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
+org.ow2.asm:asm-analysis:9.9=spotbugs
 org.ow2.asm:asm-commons:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm-commons:9.2=runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.9=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt,spotbugs
 org.ow2.asm:asm-tree:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm-tree:9.2=runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.9=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt,spotbugs
 org.ow2.asm:asm-util:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm-util:9.2=runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
+org.ow2.asm:asm-util:9.9=spotbugs
 org.ow2.asm:asm:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm:9.2=runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.9=jacocoAnt
+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.32=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
+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-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
 org.testng:testng:7.5.1=testRuntimeClasspath
 org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
+org.xmlresolver:xmlresolver:5.3.3=spotbugs
 empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

@@ -86,8 +86,8 @@ private static class State {
     String metricsEndpoint;
     String dataStreamsEndpoint;
     boolean supportsLongRunning;
-    boolean supportsDropping;
     boolean supportsClientSideStats;
+    boolean supportsDropping;
     String state;
     String configEndpoint;
     String debuggerLogEndpoint;
@@ -166,7 +166,7 @@ private void doDiscovery(State newState) {
         errorQueryingEndpoint("info", error);
       }
       if (fallback) {
-        newState.supportsDropping = false;
+        newState.supportsClientSideStats = false;
         newState.supportsLongRunning = false;
         log.debug("Falling back to probing, client dropping will be disabled");
         // disable metrics unless the info endpoint is present, which prevents
@@ -307,13 +307,15 @@ private boolean processInfoResponse(State newState, String response) {
           Boolean.TRUE.equals(map.getOrDefault("long_running_spans", false));
 
       if (metricsEnabled) {
-        newState.supportsClientSideStats = !AgentVersion.isVersionBelow(newState.version, 7, 65, 0);
         Object canDrop = map.get("client_drop_p0s");
         newState.supportsDropping =
             null != canDrop
                 && ("true".equalsIgnoreCase(String.valueOf(canDrop))
                     || Boolean.TRUE.equals(canDrop));
 
+        newState.supportsClientSideStats =
+            newState.supportsDropping && !AgentVersion.isVersionBelow(newState.version, 7, 65, 0);
+
         Object peer_tags = map.get("peer_tags");
         newState.peerTags =
             peer_tags instanceof List
@@ -360,7 +362,6 @@ private static void discoverStatsDPort(final Map<String, Object> info) {
   public boolean supportsMetrics() {
     return metricsEnabled
         && null != discoveryState.metricsEndpoint
-        && discoveryState.supportsDropping
         && discoveryState.supportsClientSideStats;
   }
 
@@ -380,10 +381,6 @@ public boolean supportsDebuggerDiagnostics() {
     return discoveryState.debuggerDiagnosticsEndpoint != null;
   }
 
-  public boolean supportsDropping() {
-    return discoveryState.supportsDropping;
-  }
-
   public boolean supportsLongRunning() {
     return discoveryState.supportsLongRunning;
   }

communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy

@@ -60,7 +60,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.5/traces"
-    !features.supportsDropping()
     features.getDataStreamsEndpoint() == V01_DATASTREAMS_ENDPOINT
     features.supportsDataStreams()
     features.state() == INFO_STATE
@@ -118,7 +117,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.5/traces"
-    !features.supportsDropping()
     features.getDataStreamsEndpoint() == V01_DATASTREAMS_ENDPOINT
     features.supportsDataStreams()
     features.state() == INFO_STATE
@@ -145,7 +143,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
     features.supportsMetrics()
     features.getTraceEndpoint() == "v0.5/traces"
-    features.supportsDropping()
     features.state() == INFO_WITH_CLIENT_DROPPING_STATE
     0 * _
   }
@@ -201,7 +198,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == null
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.5/traces"
-    !features.supportsDropping()
     !features.supportsLongRunning()
     features.state() == PROBE_STATE
     0 * _
@@ -222,7 +218,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == null
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.5/traces"
-    !features.supportsDropping()
     !features.supportsLongRunning()
     features.state() == PROBE_STATE
     0 * _
@@ -245,7 +240,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == null
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.4/traces"
-    !features.supportsDropping()
     features.state() == PROBE_STATE
     0 * _
   }
@@ -267,7 +261,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     features.getMetricsEndpoint() == null
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.4/traces"
-    !features.supportsDropping()
     features.state() == PROBE_STATE
     0 * _
   }
@@ -290,7 +283,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     !features.supportsMetrics()
     features.getTraceEndpoint() == "v0.3/traces"
     !features.supportsLongRunning()
-    !features.supportsDropping()
     features.state() == PROBE_STATE
     0 * _
   }
@@ -308,7 +300,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.5/traces" }) >> { Request request -> success(request) }
     0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.6/stats" })
     !features.supportsMetrics()
-    !features.supportsDropping()
     !(features as DroppingPolicy).active()
     features.state() == PROBE_STATE
 
@@ -318,7 +309,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     then: "metrics and dropping not supported"
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, INFO_WITH_CLIENT_DROPPING_RESPONSE) }
     !features.supportsMetrics()
-    !features.supportsDropping()
     !(features as DroppingPolicy).active()
     features.state() == INFO_WITH_CLIENT_DROPPING_STATE
 
@@ -328,7 +318,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     then: "metrics and dropping not supported"
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, INFO_RESPONSE) }
     !features.supportsMetrics()
-    !features.supportsDropping()
     !(features as DroppingPolicy).active()
     features.state() == INFO_STATE
     0 * _
@@ -346,7 +335,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> notFound(request) }
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
     0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.6/stats" })
-    !features.supportsDropping()
     !features.supportsMetrics()
     !(features as DroppingPolicy).active()
     features.state() == PROBE_STATE
@@ -357,7 +345,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     then: "metrics endpoint not probed, metrics and dropping enabled"
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, INFO_WITH_CLIENT_DROPPING_RESPONSE) }
     0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
-    features.supportsDropping()
     features.supportsMetrics()
     (features as DroppingPolicy).active()
     features.state() == INFO_WITH_CLIENT_DROPPING_STATE
@@ -376,7 +363,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, INFO_WITH_CLIENT_DROPPING_RESPONSE) }
     0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
     0 * client.newCall(_)
-    features.supportsDropping()
     features.supportsMetrics()
     (features as DroppingPolicy).active()
     features.state() == INFO_WITH_CLIENT_DROPPING_STATE
@@ -388,7 +374,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> notFound(request) }
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
     0 * client.newCall(_)
-    !features.supportsDropping()
     !features.supportsMetrics()
     !(features as DroppingPolicy).active()
     features.state() == PROBE_STATE
@@ -407,7 +392,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, INFO_WITH_CLIENT_DROPPING_RESPONSE) }
     0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
     0 * client.newCall(_)
-    features.supportsDropping()
     features.supportsMetrics()
     (features as DroppingPolicy).active()
     features.state() == INFO_WITH_CLIENT_DROPPING_STATE
@@ -418,8 +402,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     then: "metrics and dropping not supported"
     1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, INFO_WITHOUT_METRICS_RESPONSE) }
     0 * client.newCall(_)
-    // misconfigured agent allows dropping but not metrics
-    features.supportsDropping()
     !features.supportsMetrics()
     // but we don't permit dropping anyway
     !(features as DroppingPolicy).active()
@@ -481,7 +463,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     then:
     1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_WITH_PEER_TAG_BACK_PROPAGATION_RESPONSE) }
     features.state() == INFO_WITH_PEER_TAG_BACK_PROPAGATION_STATE
-    features.supportsDropping()
     features.peerTags().containsAll(
     "_dd.base_service",
     "active_record.db.vendor",
@@ -519,7 +500,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
       infoResponse(request, response)
     }
     features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
-    features.supportsDropping() == true
     features.supportsMetrics() == expected
 
     where: