Merge branch 'master' into ci/update-gradle-dependencies-20250330

Author: amarziali

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit 9be8b2793d687c7d9b39f3265fef27b5ec91910c
+default_system_tests_commit: &default_system_tests_commit 1de04c42cbd9783432258004e46eb5982bbc9fe5
 
 parameters:
   nightly:
@@ -1333,6 +1333,7 @@ build_test_jobs: &build_test_jobs
       matrix:
         <<: *test_matrix
 
+{% if ssi_smoke %}
   - tests:
       requires:
         - ok_to_test
@@ -1346,6 +1347,7 @@ build_test_jobs: &build_test_jobs
       maxWorkers: 3
       matrix:
         <<: *test_matrix
+{% endif %}
 
   - tests:
       requires:
@@ -1389,6 +1391,7 @@ build_test_jobs: &build_test_jobs
       maxWorkers: 3
       testJvm: "8"
 
+{% if ssi_smoke %}
   - tests:
       requires:
         - ok_to_test
@@ -1401,13 +1404,16 @@ build_test_jobs: &build_test_jobs
       parallelism: 4
       maxWorkers: 3
       testJvm: "8"
+{% endif %}
 
   - fan_in:
       requires:
         - z_test_<< matrix.testJvm >>_base
         - z_test_<< matrix.testJvm >>_inst
         - z_test_<< matrix.testJvm >>_smoke
+{% if ssi_smoke %}
         - z_test_<< matrix.testJvm >>_ssi_smoke
+{% endif %}
       name: test_<< matrix.testJvm >>
       stage: tracing
       matrix:
@@ -1418,7 +1424,9 @@ build_test_jobs: &build_test_jobs
         - z_test_8_base
         - z_test_8_inst
         - z_test_8_smoke
+{% if ssi_smoke %}
         - z_test_8_ssi_smoke
+{% endif %}
       name: test_8
       stage: tracing
       testJvm: "8"
@@ -1512,6 +1520,14 @@ build_test_jobs: &build_test_jobs
       stage: required
 
 workflows:
+{% if skip_circleci %}
+  build_test:
+    jobs:
+      # Just a "required" job to make GitHub PR checks happy, and run nothing else.
+      - fan_in:
+          name: required
+          stage: required
+{% else %}
 {% if is_regular %}
   build_test:
     jobs:
@@ -1552,3 +1568,4 @@ workflows:
           gradleTarget: :profilingTest
           cacheType: profiling
 {% endif %}
+{% endif %}

.circleci/no_circleci_changes.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -eu
+git diff --name-only "$1" | grep --invert-match --quiet -E '^(.gitlab-ci.yml|.gitlab)'

.circleci/render_config.py

@@ -2,6 +2,7 @@
 
 import os
 import os.path
+import subprocess
 import time
 
 import jinja2
@@ -14,9 +15,10 @@
 GENERATED_CONFIG_PATH = os.path.join(SCRIPT_DIR, OUT_FILENAME)
 
 # JDKs that will run on every pipeline.
-ALWAYS_ON_JDKS = {"8", "11", "17", "21"}
+ALWAYS_ON_JDKS = {"8", "17", "21"}
 # And these will run only in master and release/ branches.
 MASTER_ONLY_JDKS = {
+    "11",
     "ibm8",
     "oracle8",
     "semeru8",
@@ -74,6 +76,13 @@
 run_all = "all" in labels
 is_master_or_release = branch == "master" or branch.startswith("release/v")
 
+skip_circleci = False
+if pr_base_ref:
+   ret = subprocess.call([".circleci/no_circleci_changes.sh", f"{pr_base_ref}..HEAD"], shell=False)
+   if ret == 1:
+       # Only GitLab-related files have changed, just skip Circle CI jobs.
+       skip_circleci = True
+
 if is_master_or_release or run_all:
     all_jdks = ALWAYS_ON_JDKS | MASTER_ONLY_JDKS
 else:
@@ -99,10 +108,12 @@
     "all_jdks": all_jdks,
     "all_debugger_jdks": all_debugger_jdks,
     "nocov_jdks": nocov_jdks,
-    "flaky": branch == "master" or "flaky" in labels or "all" in labels,
+    "flaky": "flaky" in labels or "all" in labels,
     "docker_image_prefix": "" if is_nightly else f"{DOCKER_IMAGE_VERSION}-",
     "use_git_changes": use_git_changes,
     "pr_base_ref": pr_base_ref,
+    "skip_circleci": skip_circleci,
+    "ssi_smoke": is_regular and is_master_or_release
 }
 
 print(f"Variables for this build: {vars}")

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

@@ -264,9 +264,8 @@ public void registerContinuation(final AgentScope.Continuation continuation) {
   }
 
   @Override
-  public void cancelContinuation(final AgentScope.Continuation continuation) {
+  public void removeContinuation(final AgentScope.Continuation continuation) {
     decrementRefAndMaybeWrite(false);
-    healthMetrics.onCancelContinuation();
   }
 
   private PublishState decrementRefAndMaybeWrite(boolean isRootSpan) {

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

@@ -82,7 +82,7 @@ public void registerContinuation(AgentScope.Continuation continuation) {
   }
 
   @Override
-  public void cancelContinuation(AgentScope.Continuation continuation) {
+  public void removeContinuation(AgentScope.Continuation continuation) {
     // do nothing
   }
 }

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java

@@ -107,10 +107,7 @@ public AgentScope.Continuation captureSpan(final AgentSpan span) {
   }
 
   private AgentScope.Continuation captureSpan(final AgentSpan span, byte source) {
-    ScopeContinuation continuation = new ScopeContinuation(this, span, source);
-    continuation.register();
-    healthMetrics.onCaptureContinuation();
-    return continuation;
+    return new ScopeContinuation(this, span, source).register();
   }
 
   private AgentScope activate(
@@ -207,7 +204,6 @@ public void closePrevious(final boolean finishSpan) {
       scopeStack.cleanup();
       if (finishSpan) {
         top.span.finishWithEndToEnd();
-        healthMetrics.onFinishContinuation();
       }
     }
   }

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java

@@ -62,6 +62,7 @@ final class ScopeContinuation implements AgentScope.Continuation {
 
   ScopeContinuation register() {
     traceCollector.registerContinuation(this);
+    scopeManager.healthMetrics.onCaptureContinuation();
     return this;
   }
 
@@ -95,17 +96,20 @@ public void cancel() {
     while (current == 0) {
       // no outstanding activations and hold has been removed
       if (COUNT.compareAndSet(this, current, CANCELLED)) {
-        traceCollector.cancelContinuation(this);
+        traceCollector.removeContinuation(this);
+        scopeManager.healthMetrics.onFinishContinuation();
         return;
       }
       current = count;
     }
+    scopeManager.healthMetrics.onCancelContinuation();
   }
 
   void cancelFromContinuedScopeClose() {
     if (COUNT.compareAndSet(this, 1, CANCELLED)) {
       // fast path: only one activation of the continuation (no hold)
-      traceCollector.cancelContinuation(this);
+      traceCollector.removeContinuation(this);
+      scopeManager.healthMetrics.onFinishContinuation();
     } else if (COUNT.decrementAndGet(this) == 0) {
       // slow path: multiple activations, all have now closed (no hold)
       cancel();

dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceStrictWriteTest.groovy

@@ -56,8 +56,8 @@ class PendingTraceStrictWriteTest extends PendingTraceTestBase {
 
     when: "continuation is finished the second time"
     // Yes this should be guarded by the used flag in the continuation,
-    // so cancel it anyway to trigger the exception
-    traceCollector.cancelContinuation(continuation)
+    // so remove it anyway to trigger the exception
+    traceCollector.removeContinuation(continuation)
 
     then:
     thrown IllegalStateException

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTraceCollector.java

@@ -3,5 +3,5 @@
 public interface AgentTraceCollector {
   void registerContinuation(AgentScope.Continuation continuation);
 
-  void cancelContinuation(AgentScope.Continuation continuation);
+  void removeContinuation(AgentScope.Continuation continuation);
 }

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

@@ -679,7 +679,7 @@ public static class NoopAgentTraceCollector implements AgentTraceCollector {
     public void registerContinuation(final AgentScope.Continuation continuation) {}
 
     @Override
-    public void cancelContinuation(final AgentScope.Continuation continuation) {}
+    public void removeContinuation(final AgentScope.Continuation continuation) {}
   }
 
   public static class NoopAgentHistogram implements AgentHistogram {