Merge branch 'master' into dougqh/cache-span-kind-ordinal

Author: dougqh

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

@@ -20,6 +20,7 @@ When converting Groovy code to Java code, make sure that:
 - `@TableTest` and `@MethodSource` may be combined on the same `@ParameterizedTest` when most cases are tabular but a few cases require programmatic setup.
 - In combined mode, keep table-friendly cases in `@TableTest`, and put only non-tabular/complex cases in `@MethodSource`.
 - If `@TableTest` is not viable for the test at all, use `@MethodSource` only.
+- If `@TableTest` was successfully used and if the `@ParameterizedTest` is not used to specify the test name, `@ParameterizedTest` can then be removed as `@TableTest` replace it fully.
 - For `@MethodSource`, name the arguments method `<testMethodName>Arguments` (camelCase, e.g. `testMethodArguments`) and return `Stream<Arguments>` using `Stream.of(...)` and `arguments(...)` with static import.
 - Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.arguments(...)` value or index the test case
 - When converting tuples, create a light dedicated structure instead to keep the typing system

dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java

@@ -69,6 +69,7 @@ public BadConfigurationException(final String message) {
   static final String ACTION_TAG = "ai_guard.action";
   static final String REASON_TAG = "ai_guard.reason";
   static final String BLOCKED_TAG = "ai_guard.blocked";
+  static final String EVENT_TAG = "ai_guard.event";
   static final String META_STRUCT_TAG = "ai_guard";
   static final String META_STRUCT_MESSAGES = "messages";
   static final String META_STRUCT_CATEGORIES = "attack_categories";
@@ -227,6 +228,7 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
     final AgentSpan localRootSpan = span.getLocalRootSpan();
     if (localRootSpan != null) {
       localRootSpan.setTag(Tags.AI_GUARD_KEEP, true);
+      localRootSpan.setTag(EVENT_TAG, true);
     }
     try (final AgentScope scope = tracer.activateSpan(span)) {
       final Message last = messages.get(messages.size() - 1);

dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy

@@ -190,6 +190,7 @@ class AIGuardInternalTests extends DDSpecification {
     then:
     1 * span.setTag(AIGuardInternal.TARGET_TAG, suite.target)
     1 * localRootSpan.setTag(Tags.AI_GUARD_KEEP, true)
+    1 * localRootSpan.setTag(AIGuardInternal.EVENT_TAG, true)
     if (suite.target == 'tool') {
       1 * span.setTag(AIGuardInternal.TOOL_TAG, 'calc')
     }

dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java

@@ -24,6 +24,7 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 import org.apache.axis2.context.MessageContext;
+import org.apache.http.HttpInetConnection;
 import org.apache.http.HttpResponse;
 import org.apache.http.nio.NHttpClientConnection;
 import org.apache.synapse.transport.passthru.TargetContext;
@@ -107,6 +108,13 @@ public static void requestSubmitted(
       // populate span using details from the submitted HttpRequest (resolved URI, etc.)
       AgentSpan span = spanFromContext(scope.context());
       DECORATE.onRequest(span, TargetContext.getRequest(connection).getRequest());
+
+      // set peer info from the connection since request URIs are relative paths
+      if (connection instanceof HttpInetConnection) {
+        HttpInetConnection inetConn = (HttpInetConnection) connection;
+        DECORATE.onPeerConnection(span, inetConn.getRemoteAddress());
+        DECORATE.setPeerPort(span, inetConn.getRemotePort());
+      }
       scope.close();
     }
   }

dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapsePassthruInstrumentation.java

@@ -2,10 +2,13 @@
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
+import static datadog.trace.instrumentation.synapse3.SynapseClientDecorator.SYNAPSE_CONTEXT_KEY;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 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.bootstrap.instrumentation.api.AgentSpan;
@@ -14,6 +17,7 @@
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import org.apache.axis2.context.MessageContext;
+import org.apache.http.nio.NHttpServerConnection;
 
 /** Helps propagate parent spans over 'passthru' mechanism to synapse-client instrumentation. */
 @AutoService(InstrumenterModule.class)
@@ -53,10 +57,26 @@ public static void submit(@Advice.Argument(0) final MessageContext message) {
         }
       }
 
-      // use message context to propagate active spans across Synapse's 'passthru' mechanism
-      AgentSpan span = activeSpan();
+      // Propagate the server span to the client via the message context.
+      // Prefer reading the span directly from the source connection's context (where
+      // SynapseServerInstrumentation stored it) over activeSpan(). SourceHandler dispatches
+      // request processing to a worker thread pool, and while java-concurrent instrumentation
+      // normally propagates context across ThreadPoolExecutor, the connection-based lookup is
+      // more robust as it doesn't depend on automatic context propagation.
+      AgentSpan span = null;
+      Object sourceConn = message.getProperty("pass-through.Source-Connection");
+      if (sourceConn instanceof NHttpServerConnection) {
+        Object ctx =
+            ((NHttpServerConnection) sourceConn).getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
+        if (ctx instanceof Context) {
+          span = spanFromContext((Context) ctx);
+        }
+      }
+      if (null == span) {
+        span = activeSpan();
+      }
       if (null != span) {
-        message.setNonReplicableProperty("dd.trace.synapse.span", span);
+        message.setNonReplicableProperty(SYNAPSE_CONTEXT_KEY, span);
       }
     }
   }

dd-java-agent/instrumentation/synapse-3.0/src/test/groovy/datadog/trace/instrumentation/synapse3/SynapseTest.groovy

@@ -247,7 +247,7 @@ abstract class SynapseTest extends VersionedNamingTestBase {
         "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
         "$Tags.PEER_HOST_IPV4" "127.0.0.1"
         "$Tags.PEER_PORT" Integer
-        "$Tags.HTTP_URL" "/services/SimpleStockQuoteService"
+        "$Tags.HTTP_URL" query ? "/services/SimpleStockQuoteService?${query}" : "/services/SimpleStockQuoteService"
         "$DDTags.HTTP_QUERY" query
         "$Tags.HTTP_METHOD" method
         "$Tags.HTTP_STATUS" statusCode
@@ -302,6 +302,9 @@ abstract class SynapseTest extends VersionedNamingTestBase {
       tags {
         "$Tags.COMPONENT" "synapse-client"
         "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
+        "$Tags.PEER_HOSTNAME" String
+        "$Tags.PEER_HOST_IPV4" "127.0.0.1"
+        "$Tags.PEER_PORT" Integer
         "$Tags.HTTP_URL" "/services/SimpleStockQuoteService"
         "$Tags.HTTP_METHOD" method
         "$Tags.HTTP_STATUS" statusCode
@@ -311,7 +314,6 @@ abstract class SynapseTest extends VersionedNamingTestBase {
   }
 }
 
-@Flaky("Occasionally times out when receiving traces")
 class SynapseV0ForkedTest extends SynapseTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
 
@@ -321,7 +323,6 @@ class SynapseV0ForkedTest extends SynapseTest implements TestingGenericHttpNamin
   }
 }
 
-@Flaky("Occasionally times out when receiving traces")
 class SynapseV1ForkedTest extends SynapseTest implements TestingGenericHttpNamingConventions.ClientV1 {
 
   @Override

dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy

@@ -1,5 +1,6 @@
 package datadog.smoketest
 
+import com.google.common.collect.ImmutableSet
 import datadog.trace.agent.test.utils.PortUtils
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -15,6 +16,7 @@ abstract class ProcessManager extends Specification {
   public static final String SERVICE_NAME = "smoke-test-java-app"
   public static final String ENV = "smoketest"
   public static final String VERSION = "99"
+  public static final Set<String> NOISY_ENVIRONMENT_VARIABLES = ImmutableSet.of('CI_COMMIT_MESSAGE')
 
   @Shared
   protected String buildDirectory = System.getProperty("datadog.smoketest.builddir")
@@ -77,8 +79,10 @@ abstract class ProcessManager extends Specification {
     (0..<numberOfProcesses).each { idx ->
       ProcessBuilder processBuilder = createProcessBuilder(idx)
 
-      processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"))
-      processBuilder.environment().put("DD_API_KEY", apiKey())
+      Map<String, String> env = processBuilder.environment()
+      env.put("JAVA_HOME", System.getProperty("java.home"))
+      env.put("DD_API_KEY", apiKey())
+      muteNoisyEnvironmentVariables(env)
 
       processBuilder.redirectErrorStream(true)
 
@@ -191,6 +195,14 @@ abstract class ProcessManager extends Specification {
     || line.contains("Failed to handle exception in instrumentation")
   }
 
+  /**
+   * Some variable can be printed in smoke application logs and result into false-positive test result.
+   * @param env environment variables to process.
+   */
+  void muteNoisyEnvironmentVariables(Map<String, String> env) {
+    env.keySet().removeAll(NOISY_ENVIRONMENT_VARIABLES)
+  }
+
   /**
    * Asserts that there are no errors printed by the application to the log.
    * This should usually be called after the process exits, otherwise it's not guaranteed that reading the log file will

dd-trace-core/build.gradle

@@ -107,6 +107,7 @@ dependencies {
   testImplementation group: 'com.amazonaws', name: 'aws-lambda-java-events', version:'3.11.0'
   testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.14.0'
   testImplementation libs.testcontainers
+  testImplementation project(':utils:junit-utils')
 
   traceAgentTestImplementation libs.testcontainers
 }

dd-trace-core/src/main/java/datadog/trace/core/LongRunningTracesTracker.java

@@ -139,4 +139,14 @@ private void flushStats() {
     write = 0;
     expired = 0;
   }
+
+  // @VisibleForTesting
+  int trackedCount() {
+    return traceArray.size();
+  }
+
+  // @VisibleForTesting
+  int getDropped() {
+    return dropped;
+  }
 }

dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java

@@ -223,6 +223,16 @@ boolean compareAndSetLongRunningState(int expected, int newState) {
     return LONG_RUNNING_STATE.compareAndSet(this, expected, newState);
   }
 
+  // @VisibleForTesting
+  int getLongRunningTrackedState() {
+    return longRunningTrackedState;
+  }
+
+  // @VisibleForTesting
+  void setLongRunningTrackedState(int state) {
+    LONG_RUNNING_STATE.set(this, state);
+  }
+
   boolean empty() {
     return 0 >= COMPLETED_SPAN_COUNT.get(this) + PENDING_REFERENCE_COUNT.get(this);
   }