Merge branch 'master' into alejandro.gonzalez/APPSEC-61873-5-jersey-resteasy

Author: jandro996

.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
@@ -76,7 +76,10 @@ jobs:
       scenarios_groups: tracer-release
       excluded_scenarios: APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING  # exclude flaky scenarios
       skip_empty_scenarios: true
-      push_to_test_optimization: false # disabled to avoid pushing to Test Optimization while API key is transitioning to system-tests
+      push_to_test_optimization: true
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   # Ensure the main job is run to completion
   check:

.gitlab-ci.yml

@@ -4,10 +4,16 @@ include:
   - local: ".gitlab/macrobenchmarks.yml"
   - local: ".gitlab/exploration-tests.yml"
   - local: ".gitlab/ci-visibility-tests.yml"
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-spring-petclinic-parallel.yml'
+    ref: 'main'
 
 stages:
   - build
   - publish
+  # These benchmarks are intended to replace the legacy benchmarks in the future
+  - java-spring-petclinic-parallel
+  - java-spring-petclinic-parallel-slo
   - shared-pipeline
   - benchmarks
   - macrobenchmarks

dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java

@@ -353,10 +353,10 @@ public int offsetOf(String attribute) {
     return contextSetter.offsetOf(attribute);
   }
 
-  public void setSpanContext(long spanId, long rootSpanId) {
+  public void setSpanContext(long rootSpanId, long spanId, long traceIdHigh, long traceIdLow) {
     debugLogging(rootSpanId);
     try {
-      profiler.setContext(spanId, rootSpanId);
+      profiler.setContext(rootSpanId, spanId, traceIdHigh, traceIdLow);
     } catch (Throwable e) {
       log.debug("Failed to clear context", e);
     }
@@ -365,28 +365,16 @@ public void setSpanContext(long spanId, long rootSpanId) {
   public void clearSpanContext() {
     debugLogging(0L);
     try {
-      profiler.setContext(0L, 0L);
+      profiler.setContext(0L, 0L, 0L, 0L);
     } catch (Throwable e) {
       log.debug("Failed to set context", e);
     }
   }
 
-  public boolean setContextValue(int offset, int encoding) {
-    if (contextSetter != null && offset >= 0) {
-      try {
-        return contextSetter.setContextValue(offset, encoding);
-      } catch (Throwable e) {
-        log.debug("Failed to set context", e);
-      }
-    }
-    return false;
-  }
-
   public boolean setContextValue(int offset, CharSequence value) {
-    if (contextSetter != null && offset >= 0) {
-      int encoding = encode(value);
+    if (contextSetter != null && offset >= 0 && value != null) {
       try {
-        return contextSetter.setContextValue(offset, encoding);
+        return contextSetter.setContextValue(offset, value.toString());
       } catch (Throwable e) {
         log.debug("Failed to set context", e);
       }
@@ -425,13 +413,6 @@ private void debugLogging(long localRootSpanId) {
     }
   }
 
-  int encode(CharSequence constant) {
-    if (constant != null && profiler != null) {
-      return contextSetter.encode(constant.toString());
-    }
-    return 0;
-  }
-
   public int[] snapshot() {
     if (contextSetter != null) {
       return contextSetter.snapshotTags();

dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java

@@ -41,9 +41,13 @@ public void close() {
         public void activate(Object context) {
           if (context instanceof ProfilerContext) {
             ProfilerContext profilerContext = (ProfilerContext) context;
-            DDPROF.setSpanContext(profilerContext.getSpanId(), profilerContext.getRootSpanId());
-            DDPROF.setContextValue(SPAN_NAME_INDEX, profilerContext.getEncodedOperationName());
-            DDPROF.setContextValue(RESOURCE_NAME_INDEX, profilerContext.getEncodedResourceName());
+            DDPROF.setSpanContext(
+                profilerContext.getRootSpanId(),
+                profilerContext.getSpanId(),
+                profilerContext.getTraceIdHigh(),
+                profilerContext.getTraceIdLow());
+            DDPROF.setContextValue(SPAN_NAME_INDEX, profilerContext.getOperationName());
+            DDPROF.setContextValue(RESOURCE_NAME_INDEX, profilerContext.getResourceName());
           }
         }
       };
@@ -67,27 +71,6 @@ public void onDetach() {
     }
   }
 
-  @Override
-  public int encode(CharSequence constant) {
-    return DDPROF.encode(constant);
-  }
-
-  @Override
-  public int encodeOperationName(CharSequence constant) {
-    if (SPAN_NAME_INDEX >= 0) {
-      return DDPROF.encode(constant);
-    }
-    return 0;
-  }
-
-  @Override
-  public int encodeResourceName(CharSequence constant) {
-    if (RESOURCE_NAME_INDEX >= 0) {
-      return DDPROF.encode(constant);
-    }
-    return 0;
-  }
-
   @Override
   public String name() {
     return "ddprof";

dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java

@@ -5,11 +5,9 @@
 
 public class DatadogProfilingScope implements ProfilingScope {
   private final DatadogProfiler profiler;
-  private final int[] snapshot;
 
   public DatadogProfilingScope(DatadogProfiler profiler) {
     this.profiler = profiler;
-    this.snapshot = profiler.snapshot();
   }
 
   @Override
@@ -38,8 +36,7 @@ public void clearContextValue(ProfilingContextAttribute attribute) {
 
   @Override
   public void close() {
-    for (int i = 0; i < snapshot.length; i++) {
-      profiler.setContextValue(i, snapshot[i]);
-    }
+    // ddprof 1.41.0 removed the int-encoding setter; snapshot/restore of tag
+    // context across nested scopes is no longer supported by the library.
   }
 }

dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java

@@ -1,6 +1,5 @@
 package com.datadog.profiling.ddprof;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -180,7 +179,6 @@ public void testContextRegistration() {
 
     DatadogProfilerContextSetter fooSetter = new DatadogProfilerContextSetter("foo", profiler);
     DatadogProfilerContextSetter barSetter = new DatadogProfilerContextSetter("bar", profiler);
-    int[] snapshot0 = profiler.snapshot();
     try (ProfilingScope ignored = new DatadogProfilingScope(profiler)) {
       fooSetter.set("foo0");
       barSetter.set("bar0");
@@ -194,9 +192,7 @@ public void testContextRegistration() {
         inner.setContextValue("bar", "bar2");
         assertFalse(Arrays.equals(snapshot2, profiler.snapshot()));
       }
-      assertArrayEquals(snapshot1, profiler.snapshot());
     }
-    assertArrayEquals(snapshot0, profiler.snapshot());
   }
 
   private static ConfigProvider configProvider(

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java

@@ -422,7 +422,7 @@ public void maybeSubscribeConfigPolling() {
       } else {
         subscribeConfigurationPoller();
       }
-    } else {
+    } else if (!tracerConfig.isAwsServerless()) {
       log.info("Remote config is disabled; AppSec will not be able to use it");
     }
   }

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy

@@ -1170,6 +1170,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     }
 
     response.body().contentLength() < 1 || redirectHasBody()
+    response.close()
 
     and:
     assertTraces(1) {
@@ -1210,6 +1211,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     if (bubblesResponse()) {
       assert response.body().string().contains(ERROR.body)
       assert response.code() == ERROR.status
+    } else {
+      response.close()
     }
 
     and:
@@ -1255,6 +1258,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     response.code() == EXCEPTION.status
     if (testExceptionBody()) {
       assert response.body().string() == EXCEPTION.body
+    } else {
+      response.close()
     }
 
     and:
@@ -1299,6 +1304,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
 
     expect:
     response.code() == NOT_FOUND.status
+    response.close()
 
     and:
     assertTraces(1) {
@@ -1836,6 +1842,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     response.code() == 301
     response.header('location') == 'https://www.google.com/'
     !handlerRan
+    response.close()
 
     when:
     TEST_WRITER.waitForTraces(1)
@@ -2117,6 +2124,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     }
     response.code() == 301
     response.header("Location") == 'https://www.google.com/'
+    response.close()
     TEST_WRITER.waitForTraces(1)
     def trace = TEST_WRITER.get(0)