Merge branch 'master' into dougqh/list-iteration-benchmark

Author: dougqh

.github/workflows/analyze-changes.yaml

@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
         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@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
 
   trivy:
     name: Analyze changes with 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@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/upload-sarif@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.gitlab/collect_results.sh

@@ -12,7 +12,13 @@ WORKSPACE_DIR=workspace
 mkdir -p $TEST_RESULTS_DIR
 mkdir -p $WORKSPACE_DIR
 
-mapfile -t TEST_RESULT_DIRS < <(find $WORKSPACE_DIR -name test-results -type d)
+# Main project modules redirect their build directory to workspace/<project-path>/build/ in CI
+# (see build.gradle.kts layout.buildDirectory override). buildSrc is a separate Gradle build
+# that runs before the main build is configured, so this redirect never applies to it;
+# its test results always land in buildSrc/**/build/test-results/, not under workspace/.
+SEARCH_DIRS=($WORKSPACE_DIR buildSrc)
+
+mapfile -t TEST_RESULT_DIRS < <(find "${SEARCH_DIRS[@]}" -name test-results -type d)
 
 if [[ ${#TEST_RESULT_DIRS[@]} -eq 0 ]]; then
   echo "No test results found"

buildSrc/src/test/kotlin/datadog/gradle/plugin/GradleFixture.kt

@@ -23,7 +23,12 @@ internal open class GradleFixture(protected val projectDir: File) {
    */
   fun run(vararg args: String, expectFailure: Boolean = false, env: Map<String, String> = emptyMap()): BuildResult {
     val runner = GradleRunner.create()
-      .withTestKitDir(File(projectDir, ".gradle-test-kit"))
+      // Use a testkit dir scoped to this fixture's projectDir. The Tooling API always uses a
+      // daemon and ignores org.gradle.daemon=false. By giving each test its own testkit dir,
+      // we force a fresh daemon per test — ensuring withEnvironment() vars (e.g.
+      // MAVEN_REPOSITORY_PROXY) are correctly set on the daemon JVM and not inherited from
+      // a previously-started daemon with a different test's environment.
+      .withTestKitDir(file(".testkit"))
       .withPluginClasspath()
       .withProjectDir(projectDir)
       .withEnvironment(System.getenv() + env)

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java

@@ -3,6 +3,7 @@
 import static datadog.opentelemetry.shim.trace.OtelConventions.SPAN_KIND_INTERNAL;
 
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -11,9 +12,12 @@
 final class OtelTracer implements Tracer {
   private static final String INSTRUMENTATION_NAME = otelInstrumentationName();
 
+  private final OtelInstrumentationScope instrumentationScope;
+
   private final AgentTracer.TracerAPI tracer;
 
-  OtelTracer(@SuppressWarnings("unused") String instrumentationScopeName) {
+  OtelTracer(OtelInstrumentationScope instrumentationScope) {
+    this.instrumentationScope = instrumentationScope;
     this.tracer = AgentTracer.get();
   }
 
@@ -24,6 +28,11 @@ public SpanBuilder spanBuilder(String spanName) {
     return new OtelSpanBuilder(delegate);
   }
 
+  @Override
+  public String toString() {
+    return "OtelTracer{instrumentationScope=" + instrumentationScope + "}";
+  }
+
   @SuppressWarnings("ConstantConditions")
   private static String otelInstrumentationName() {
     // is this the bootstrap shim for drop-in support, or the shim for manual instrumentation?

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerBuilder.java

@@ -2,12 +2,16 @@
 
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerBuilder;
+import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
 final class OtelTracerBuilder implements TracerBuilder {
   private final OtelTracerProvider tracerProvider;
+
   private final String instrumentationScopeName;
+  @Nullable private String instrumentationScopeVersion;
+  @Nullable private String schemaUrl;
 
   OtelTracerBuilder(OtelTracerProvider tracerProvider, String instrumentationScopeName) {
     this.tracerProvider = tracerProvider;
@@ -16,18 +20,19 @@ final class OtelTracerBuilder implements TracerBuilder {
 
   @Override
   public TracerBuilder setInstrumentationVersion(String instrumentationScopeVersion) {
-    // Not supported
+    this.instrumentationScopeVersion = instrumentationScopeVersion;
     return this;
   }
 
   @Override
   public TracerBuilder setSchemaUrl(String schemaUrl) {
-    // Not supported
+    this.schemaUrl = schemaUrl;
     return this;
   }
 
   @Override
   public Tracer build() {
-    return tracerProvider.getTracerShim(instrumentationScopeName);
+    return tracerProvider.getTracerShim(
+        instrumentationScopeName, instrumentationScopeVersion, schemaUrl);
   }
 }

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracerProvider.java

@@ -1,11 +1,13 @@
 package datadog.opentelemetry.shim.trace;
 
+import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
 import datadog.trace.util.Strings;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerBuilder;
 import io.opentelemetry.api.trace.TracerProvider;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,31 +19,35 @@ public final class OtelTracerProvider implements TracerProvider {
 
   public static final TracerProvider INSTANCE = new OtelTracerProvider();
 
-  /** Tracer shims, indexed by instrumentation scope name. */
-  private final Map<String, OtelTracer> tracers = new ConcurrentHashMap<>();
+  /** Tracer shims, indexed by instrumentation scope. */
+  private final Map<OtelInstrumentationScope, OtelTracer> tracers = new ConcurrentHashMap<>();
 
   @Override
   public Tracer get(String instrumentationScopeName) {
-    return getTracerShim(instrumentationScopeName);
+    return getTracerShim(instrumentationScopeName, null, null);
   }
 
   @Override
-  public Tracer get(
-      String instrumentationScopeName,
-      @SuppressWarnings("unused") String instrumentationScopeVersion) {
-    return getTracerShim(instrumentationScopeName);
+  public Tracer get(String instrumentationScopeName, String instrumentationScopeVersion) {
+    return getTracerShim(instrumentationScopeName, instrumentationScopeVersion, null);
   }
 
   @Override
   public TracerBuilder tracerBuilder(String instrumentationScopeName) {
     return new OtelTracerBuilder(this, instrumentationScopeName);
   }
 
-  OtelTracer getTracerShim(String instrumentationScopeName) {
+  OtelTracer getTracerShim(
+      String instrumentationScopeName,
+      @Nullable String instrumentationScopeVersion,
+      @Nullable String schemaUrl) {
     if (Strings.isBlank(instrumentationScopeName)) {
       LOGGER.debug("Tracer requested without instrumentation scope name.");
       instrumentationScopeName = DEFAULT_TRACER_NAME;
     }
-    return tracers.computeIfAbsent(instrumentationScopeName, OtelTracer::new);
+    return tracers.computeIfAbsent(
+        new OtelInstrumentationScope(
+            instrumentationScopeName, instrumentationScopeVersion, schemaUrl),
+        OtelTracer::new);
   }
 }

dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerFlareReporter.java

@@ -345,14 +345,6 @@ private String getProfilerConfig() {
             ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
             ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT),
         ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT);
-    appendConfig(
-        sb,
-        "DDProf Wall JVMTI",
-        configProvider.getBoolean(
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI,
-            ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT),
-        ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT);
-
     sb.append("\n=== DDProf Allocation Profiling ===\n");
     appendConfig(
         sb,

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

@@ -22,7 +22,6 @@
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isTrackingGenerations;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isWallClockProfilerEnabled;
 import static com.datadog.profiling.ddprof.DatadogProfilerConfig.omitLineNumbers;
-import static com.datadog.profiling.ddprof.DatadogProfilerConfig.useJvmtiWallclockSampler;
 import static com.datadog.profiling.utils.ProfilingMode.ALLOCATION;
 import static com.datadog.profiling.utils.ProfilingMode.CPU;
 import static com.datadog.profiling.utils.ProfilingMode.MEMLEAK;
@@ -313,9 +312,6 @@ String cmdStartProfiling(Path file) throws IllegalStateException {
       } else {
         cmd.append(",filter=");
       }
-      if (useJvmtiWallclockSampler(configProvider)) {
-        cmd.append(",wallsampler=jvmti");
-      }
     }
     cmd.append(",loglevel=").append(getLogLevel(configProvider));
     if (profilingModes.contains(ALLOCATION) || profilingModes.contains(MEMLEAK)) {

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

@@ -43,8 +43,6 @@
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT;
-import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI;
-import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED;
@@ -440,13 +438,6 @@ public static long getLong(ConfigProvider configProvider, String key) {
     return configProvider.getLong(key, configProvider.getLong(normalizeKey(key), -1));
   }
 
-  public static boolean useJvmtiWallclockSampler(ConfigProvider configProvider) {
-    return getBoolean(
-        configProvider,
-        PROFILING_DATADOG_PROFILER_WALL_JVMTI,
-        PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT);
-  }
-
   private static String normalizeKey(String key) {
     return key.replace(".ddprof.", ".async.");
   }

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.akkahttp;
 
+import static datadog.trace.agent.tooling.InstrumenterModule.TargetSystem.CONTEXT_TRACKING;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
@@ -16,6 +17,7 @@
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.agent.tooling.annotation.AppliesOn;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
@@ -47,20 +49,23 @@ public String[] helperClassNames() {
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     // This is mainly for compatibility with 10.0
-    transformer.applyAdvice(
+    transformer.applyAdvices(
         named("singleRequest").and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
-        AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice");
+        AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
+        AkkaHttpSingleRequestInstrumentation.class.getName()
+            + "$SingleRequestContextPropagationAdvice");
     // This is for 10.1+
-    transformer.applyAdvice(
+    transformer.applyAdvices(
         named("singleRequestImpl")
             .and(takesArgument(0, named("akka.http.scaladsl.model.HttpRequest"))),
-        AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice");
+        AkkaHttpSingleRequestInstrumentation.class.getName() + "$SingleRequestAdvice",
+        AkkaHttpSingleRequestInstrumentation.class.getName()
+            + "$SingleRequestContextPropagationAdvice");
   }
 
   public static class SingleRequestAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AgentScope methodEnter(
-        @Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
+    public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) {
       /*
       Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here
       we cast 'wider net' and avoid instrumenting twice.
@@ -75,12 +80,6 @@ public static AgentScope methodEnter(
       final AgentSpan span = startSpan("akka-http", AKKA_CLIENT_REQUEST);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request);
-
-      if (request != null) {
-        DECORATE.injectContext(getCurrentContext().with(span), request, headers);
-        // Request is immutable, so we have to assign new value once we update headers
-        request = headers.getRequest();
-      }
       return activateSpan(span);
     }
 
@@ -106,4 +105,18 @@ public static void methodExit(
       scope.close();
     }
   }
+
+  @AppliesOn(CONTEXT_TRACKING)
+  public static class SingleRequestContextPropagationAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void methodEnter(
+        @Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
+      if (request == null) {
+        return;
+      }
+      final AkkaHttpHeaders headers = new AkkaHttpHeaders(request);
+      DECORATE.injectContext(getCurrentContext(), request, headers);
+      request = headers.getRequest();
+    }
+  }
 }