Merge branch 'master' into adrien.boitreaud/no-sql-failed-reset

Author: aboitreaud

.github/g2j-migrated-modules.txt

@@ -7,4 +7,5 @@
 
 buildSrc/call-site-instrumentation-plugin
 components/json
+dd-java-agent/instrumentation/sofarpc/sofarpc-5.0
 dd-trace-api

.github/workflows/analyze-changes.yaml

@@ -20,7 +20,7 @@ jobs:
         with:
           submodules: 'recursive'
       - name: Cache Gradle dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.gradle/caches
@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
         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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
 
   trivy:
     name: Analyze changes with Trivy
@@ -60,7 +60,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.gradle/caches
@@ -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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/run-system-tests.yaml

@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.gradle/caches
@@ -75,7 +75,7 @@ jobs:
       desired_execution_time: 900  # 15 minutes
       scenarios_groups: tracer-release
       excluded_scenarios: APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING  # exclude flaky scenarios
-      skip_empty_scenarios: true
+      skip_empty_scenarios: ${{ github.event_name != 'push' && github.event_name != 'schedule' }}
       push_to_test_optimization: true
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

.gitlab-ci.yml

@@ -7,13 +7,26 @@ include:
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-spring-petclinic-parallel.yml'
     ref: 'main'
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-load-parallel.yml'
+    ref: 'main'
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-startup-parallel.yml'
+    ref: 'main'
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-dacapo-parallel.yml'
+    ref: 'main'
+  - local: ".gitlab/java-benchmark-configs.yml"
 
 stages:
   - build
   - publish
   # These benchmarks are intended to replace the legacy benchmarks in the future
   - java-spring-petclinic-parallel
   - java-spring-petclinic-parallel-slo
+  - java-startup-parallel
+  - java-load-parallel
+  - java-dacapo-parallel
   - shared-pipeline
   - benchmarks
   - macrobenchmarks
@@ -1023,11 +1036,12 @@ verify_maven_central_deployment:
         "https://repo1.maven.org/maven2/com/datadoghq/dd-trace-api/${VERSION}/dd-trace-api-${VERSION}.jar"
         "https://repo1.maven.org/maven2/com/datadoghq/dd-trace-ot/${VERSION}/dd-trace-ot-${VERSION}.jar"
       )
-      # Wait 5 mins initially, then try 5 times with a minute delay between each retry to see if the release artifacts are available
-      sleep 300
+      # Try once immediately (fast path on job retry), then wait 5 mins for initial propagation,
+      # then try 4 more times with a minute delay between each retry.
       TRY=0
-      MAX_TRIES=5
-      DELAY=60
+      MAX_TRIES=6
+      INITIAL_DELAY=300
+      RETRY_DELAY=60
       while [ $TRY -lt $MAX_TRIES ]; do
         ARTIFACTS_AVAILABLE=true
         for URL in "${ARTIFACT_URLS[@]}"; do
@@ -1044,7 +1058,11 @@ verify_maven_central_deployment:
           echo "The release was not available after 10 mins. Manually re-run the job to try again."
           exit 1
         fi
-        sleep $DELAY
+        if [ $TRY -eq 1 ]; then
+          sleep $INITIAL_DELAY
+        else
+          sleep $RETRY_DELAY
+        fi
       done
 
 publishing-gate:

.gitlab/java-benchmark-configs.yml

@@ -0,0 +1,21 @@
+# Ensure the tracer artifact publish finishes before the benchmark jobs start.
+linux-java-spring-petclinic-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-insecure-bank-load-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-spring-petclinic-load-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-insecure-bank-startup-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-spring-petclinic-startup-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-dacapo-parallel-1:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-dacapo-parallel-2:
+  needs: ["publish-artifacts-to-s3"]

.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/4667b01c6ae983f92ecf106e110ced3dac798b229cf2a0539c58aa22e95a99d5/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/0a900a87c53d3a57a5ab007b3147db4601f15c73ff31dc65f3791c803f2651d9/one-pipeline.yml

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

@@ -4,6 +4,7 @@
 import static datadog.communication.http.OkHttpUtils.msgpackRequestBodyOf;
 import static datadog.communication.http.OkHttpUtils.prepareRequest;
 import static datadog.communication.serialization.msgpack.MsgPackWriter.FIXARRAY;
+import static datadog.trace.api.ProtocolVersion.V0_4;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
@@ -17,10 +18,10 @@
 import datadog.metrics.api.Recording;
 import datadog.metrics.impl.statsd.DDAgentStatsDClientManager;
 import datadog.trace.api.BaseHash;
+import datadog.trace.api.ProtocolVersion;
 import datadog.trace.api.telemetry.LogCollector;
 import datadog.trace.util.Strings;
 import java.nio.ByteBuffer;
-import java.security.NoSuchAlgorithmException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +51,7 @@ public class DDAgentFeaturesDiscovery implements DroppingPolicy {
   public static final String V03_ENDPOINT = "v0.3/traces";
   public static final String V04_ENDPOINT = "v0.4/traces";
   public static final String V05_ENDPOINT = "v0.5/traces";
+  public static final String V1_ENDPOINT = "v1.0/traces";
 
   public static final String V06_METRICS_ENDPOINT = "v0.6/stats";
   public static final String V07_CONFIG_ENDPOINT = "v0.7/config";
@@ -72,7 +74,7 @@ public class DDAgentFeaturesDiscovery implements DroppingPolicy {
   private final OkHttpClient client;
   private final HttpUrl agentBaseUrl;
   private final Recording discoveryTimer;
-  private final String[] traceEndpoints;
+  private final ProtocolVersion protocolVersion;
   private final String[] metricsEndpoints = {V06_METRICS_ENDPOINT};
   private final String[] configEndpoints = {V07_CONFIG_ENDPOINT};
   private final boolean metricsEnabled;
@@ -107,15 +109,12 @@ public DDAgentFeaturesDiscovery(
       OkHttpClient client,
       Monitoring monitoring,
       HttpUrl agentUrl,
-      boolean enableV05Traces,
+      ProtocolVersion protocolVersion,
       boolean metricsEnabled) {
     this.client = client;
     this.agentBaseUrl = agentUrl;
     this.metricsEnabled = metricsEnabled;
-    this.traceEndpoints =
-        enableV05Traces
-            ? new String[] {V05_ENDPOINT, V04_ENDPOINT, V03_ENDPOINT}
-            : new String[] {V04_ENDPOINT, V03_ENDPOINT};
+    this.protocolVersion = protocolVersion != null ? protocolVersion : V0_4;
     this.discoveryTimer = monitoring.newTimer("trace.agent.discovery.time");
     this.discoveryState = new State();
   }
@@ -173,10 +172,10 @@ private void doDiscovery(State newState) {
 
       // don't want to rewire the traces pipeline
       if (null == newState.traceEndpoint) {
-        newState.traceEndpoint = probeTracesEndpoint(newState, traceEndpoints);
+        newState.traceEndpoint = probeTracesEndpoint(newState, protocolVersion.endpointsToProbe());
       } else if (newState.state == null || newState.state.isEmpty()) {
         // Still need to probe so that state is correctly assigned
-        probeTracesEndpoint(newState, new String[] {newState.traceEndpoint});
+        probeTracesEndpoint(newState, singletonList(newState.traceEndpoint));
       }
     }
 
@@ -194,7 +193,7 @@ private void doDiscovery(State newState) {
     }
   }
 
-  private String probeTracesEndpoint(State newState, String[] endpoints) {
+  private String probeTracesEndpoint(State newState, List<String> endpoints) {
     for (String candidate : endpoints) {
       try (Response response =
           client
@@ -253,7 +252,7 @@ private boolean processInfoResponse(State newState, String response) {
       // This is done outside of the loop to set metricsEndpoint to null if not found
       newState.metricsEndpoint = foundMetricsEndpoint;
 
-      for (String endpoint : traceEndpoints) {
+      for (String endpoint : protocolVersion.endpointsToProbe()) {
         if (containsEndpoint(endpoints, endpoint)) {
           newState.traceEndpoint = endpoint;
           break;
@@ -311,7 +310,7 @@ private boolean processInfoResponse(State newState, String response) {
       }
       try {
         newState.state = Strings.sha256(response);
-      } catch (NoSuchAlgorithmException ex) {
+      } catch (Throwable ex) {
         log.debug(
             "Failed to hash trace agent /info response. Will probe {}", newState.traceEndpoint, ex);
       }

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

@@ -173,7 +173,7 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
                   agentHttpClient,
                   monitoring,
                   agentUrl,
-                  config.isTraceAgentV05Enabled(),
+                  config.getProtocolVersion(),
                   config.isTracerMetricsEnabled());
 
           if (paused) {

communication/src/main/java/datadog/communication/serialization/Writable.java

@@ -27,6 +27,14 @@ public interface Writable {
 
   void writeBinary(byte[] binary, int offset, int length);
 
+  /**
+   * Encodes 128 bits as binary.
+   *
+   * @param hi the high-order 64 bits.
+   * @param lo The low-order 64 bits.
+   */
+  void writeBinary(long hi, long lo);
+
   /**
    * Start a part of the message containing key-value pairs
    *

communication/src/main/java/datadog/communication/serialization/msgpack/MsgPackWriter.java

@@ -213,6 +213,13 @@ public void writeBinary(byte[] binary, int offset, int length) {
     buffer.put(binary, offset, length);
   }
 
+  @Override
+  public void writeBinary(long hi, long lo) {
+    writeBinaryHeader(16);
+    buffer.putLong(hi);
+    buffer.putLong(lo);
+  }
+
   @Override
   public void writeBinary(ByteBuffer binary) {
     ByteBuffer slice = binary.slice();