Merge branch 'master' into dougqh/collection-benchmarks

Author: dougqh

.claude/skills/migrate-groovy-to-java/SKILL.md

@@ -21,3 +21,4 @@ When converting Groovy code to Java code, make sure that:
 - Do not wrap checked exceptions and throw a Runtime exception; prefer adding a throws clause at method declaration
 - Do not mark local variables `final`
 - Ensure variables are human-readable; avoid single-letter names and pre-define variables that are referenced multiple times
+- When translating Spock `Mock(...)` usage, use `libs.bundles.mockito` instead of writing manual recording/stub implementations

.github/g2j-migrated-modules.txt

@@ -7,3 +7,4 @@
 
 buildSrc/call-site-instrumentation-plugin
 components/json
+dd-trace-api

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -174,6 +174,14 @@ public Context startSpan(REQUEST_CARRIER carrier, Context parentContext) {
     extracted = startInferredProxySpan(parentContext, extracted);
     AgentSpan span =
         tracer().startSpan(instrumentationName, spanName(), extracted).setMeasured(true);
+    // Register service-entry span with inferred proxy span (if present) so that premature
+    // finish calls from child spans (e.g., Spring MVC handler) are deferred until the
+    // service-entry span finishes (after the response status is known).
+    registerServiceEntrySpanInInferredProxy(parentContext, span);
+    // Reset service name inherited from inferred proxy parent: the inferred span uses the
+    // gateway domain name as service name, but the service-entry span should identify
+    // the application (configured DD_SERVICE), not the upstream gateway.
+    resetServiceNameIfUnderInferredProxy(parentContext, span);
     // Apply RequestBlockingAction if any
     Flow<Void> flow = callIGCallbackRequestHeaders(span, carrier);
     if (flow.getAction() instanceof RequestBlockingAction) {
@@ -193,6 +201,20 @@ protected AgentSpanContext startInferredProxySpan(Context context, AgentSpanCont
     return span.start(extracted);
   }
 
+  private void registerServiceEntrySpanInInferredProxy(
+      Context parentContext, AgentSpan serviceEntrySpan) {
+    InferredProxySpan inferredProxy = InferredProxySpan.fromContext(parentContext);
+    if (inferredProxy != null) {
+      inferredProxy.registerServiceEntrySpan(serviceEntrySpan);
+    }
+  }
+
+  private void resetServiceNameIfUnderInferredProxy(Context parentContext, AgentSpan span) {
+    if (InferredProxySpan.fromContext(parentContext) != null) {
+      span.setServiceName(Config.get().getServiceName());
+    }
+  }
+
   private final DataStreamsTransactionTracker.TransactionSourceReader
       DSM_TRANSACTION_SOURCE_READER =
           (source, headerName) -> {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java

@@ -1,5 +1,6 @@
 package datadog.trace.bootstrap.instrumentation.jdbc;
 
+import datadog.trace.util.HashingUtils;
 import java.util.Objects;
 
 public final class DBInfo {
@@ -256,17 +257,18 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(
-        type,
-        subtype,
-        fullPropagationSupport,
-        url,
-        user,
-        instance,
-        db,
-        host,
-        port,
-        warehouse,
-        schema);
+    int hash = 0;
+    hash = HashingUtils.addToHash(hash, type);
+    hash = HashingUtils.addToHash(hash, subtype);
+    hash = HashingUtils.addToHash(hash, fullPropagationSupport);
+    hash = HashingUtils.addToHash(hash, url);
+    hash = HashingUtils.addToHash(hash, user);
+    hash = HashingUtils.addToHash(hash, instance);
+    hash = HashingUtils.addToHash(hash, db);
+    hash = HashingUtils.addToHash(hash, host);
+    hash = HashingUtils.addToHash(hash, port);
+    hash = HashingUtils.addToHash(hash, warehouse);
+    hash = HashingUtils.addToHash(hash, schema);
+    return hash;
   }
 }

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

@@ -98,23 +98,27 @@ public byte[] transform(
   }
 
   private void registerSourceFile(String className, byte[] classfileBuffer) {
-    String javaClassName = Strings.getClassName(className);
-    if (classNameFilter.isExcluded(javaClassName)) {
-      return;
-    }
-    String sourceFile = ClassFileHelper.extractSourceFile(classfileBuffer);
-    if (sourceFile == null) {
-      return;
-    }
-    if (!isExtensionAllowed(sourceFile)) {
-      return;
-    }
-    String simpleClassName = stripPackagePath(className);
-    String simpleSourceFile = removeExtension(sourceFile);
-    if (simpleClassName.equals(simpleSourceFile)) {
-      return;
+    try {
+      String javaClassName = Strings.getClassName(className);
+      if (classNameFilter.isExcluded(javaClassName)) {
+        return;
+      }
+      String sourceFile = ClassFileHelper.extractSourceFile(classfileBuffer);
+      if (sourceFile == null) {
+        return;
+      }
+      if (!isExtensionAllowed(sourceFile)) {
+        return;
+      }
+      String simpleClassName = stripPackagePath(className);
+      String simpleSourceFile = removeExtension(sourceFile);
+      if (simpleClassName.equals(simpleSourceFile)) {
+        return;
+      }
+      finder.register(sourceFile, className);
+    } catch (Exception e) {
+      LOGGER.debug("Error registering source file {}: {}", className, e);
     }
-    finder.register(sourceFile, className);
   }
 
   private boolean isExtensionAllowed(String sourceFile) {

dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/groovy/AkkaActorTest.groovy

@@ -1,4 +1,5 @@
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import spock.lang.Shared
 
@@ -82,3 +83,11 @@ class AkkaActorTest extends InstrumentationSpecification {
     }
   }
 }
+
+class AkkaActorContextSwapTest extends AkkaActorTest {
+  @Override
+  void configurePreAgent() {
+    super.configurePreAgent()
+    injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false")
+  }
+}

dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java

@@ -3,13 +3,16 @@
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.checkpointActiveForRollback;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.rollbackActiveToCheckpoint;
+import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getCurrentContext;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 
 import akka.dispatch.Envelope;
 import com.google.auto.service.AutoService;
+import datadog.context.Context;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.java.concurrent.AdviceUtils;
@@ -54,24 +57,34 @@ public void methodAdvice(MethodTransformer transformer) {
    */
   public static class InvokeAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AgentScope enter(@Advice.Argument(value = 0) Envelope envelope) {
+    public static Context enter(
+        @Advice.Argument(value = 0) Envelope envelope,
+        @Advice.Local("taskScope") AgentScope taskScope) {
 
       // do this before checkpointing, as the envelope's task scope may already be active
-      AgentScope taskScope =
+      taskScope =
           AdviceUtils.startTaskScope(
               InstrumentationContext.get(Envelope.class, State.class), envelope);
 
-      // remember the currently active scope so we can roll back to this point
-      checkpointActiveForRollback();
-
-      return taskScope;
+      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+        // remember the currently active scope so we can roll back to this point
+        checkpointActiveForRollback();
+        return null;
+      } else {
+        return getCurrentContext().swap();
+      }
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit(@Advice.Enter AgentScope taskScope) {
+    public static void exit(
+        @Advice.Local("taskScope") AgentScope taskScope, @Advice.Enter Context checkpointContext) {
 
-      // Clean up any leaking scopes from akka-streams/akka-http etc.
-      rollbackActiveToCheckpoint();
+      if (checkpointContext == null) {
+        // Clean up any leaking scopes from akka-streams/akka-http etc.
+        rollbackActiveToCheckpoint();
+      } else {
+        checkpointContext.swap();
+      }
 
       // close envelope's task scope if we previously started it
       if (taskScope != null) {

dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java

@@ -3,13 +3,16 @@
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.checkpointActiveForRollback;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.rollbackActiveToCheckpoint;
+import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getCurrentContext;
 import static java.util.Collections.singletonList;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 
 import com.google.auto.service.AutoService;
+import datadog.context.Context;
 import datadog.trace.agent.tooling.ExcludeFilterProvider;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
 import java.util.Collection;
 import java.util.EnumMap;
@@ -59,15 +62,24 @@ public void methodAdvice(MethodTransformer transformer) {
    */
   public static final class SuppressMailboxRunAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void enter() {
-      // remember the currently active scope so we can roll back to this point
-      checkpointActiveForRollback();
+    public static Context enter() {
+      if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
+        // remember the currently active scope so we can roll back to this point
+        checkpointActiveForRollback();
+        return null;
+      } else {
+        return getCurrentContext().swap();
+      }
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void exit() {
-      // Clean up any leaking scopes from akka-streams/akka-http etc.
-      rollbackActiveToCheckpoint();
+    public static void exit(@Advice.Enter final Context checkpointContext) {
+      if (checkpointContext == null) {
+        // Clean up any leaking scopes from akka-streams/akka-http etc.
+        rollbackActiveToCheckpoint();
+      } else {
+        checkpointContext.swap();
+      }
     }
   }
 }

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTestBase.groovy

@@ -135,7 +135,7 @@ abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
     config.addDataSourceProperty("prepStmtCacheSize", "250")
     config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048")
     config.setMaximumPoolSize(1)
-    config.setConnectionTimeout(1000)
+    config.setConnectionTimeout(5000)
 
     return new HikariDataSource(config)
   }
@@ -948,7 +948,7 @@ abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
     connectionPoolName | exhaustPoolForMillis | expectException
     "hikari"           | 500                  | false
     "dbcp2"            | 500                  | false
-    "hikari"           | 1500                 | true
+    "hikari"           | 6000                 | true
     "dbcp2"            | 1500                 | true
   }
 

dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java

@@ -98,6 +98,7 @@ public static MessageConsumerState beforeReceive(@Advice.This final MessageConsu
       } else {
         final AgentSpan previousSpan = spanFromContext(getRootContext().swap());
         if (previousSpan != null) {
+          CONSUMER_DECORATE.beforeFinish(previousSpan);
           previousSpan.finishWithEndToEnd();
         }
       }
@@ -178,6 +179,7 @@ public static void afterReceive(
       } else {
         final AgentSpan previousSpan = spanFromContext(span.swap());
         if (previousSpan != null) {
+          CONSUMER_DECORATE.beforeFinish(previousSpan);
           previousSpan.finishWithEndToEnd();
         }
       }