Merge branch 'master' into mhlidd/implement_config_inversion_ci

mhlidd · web-flow · commit 4a8ee162236b · 2025-10-23T10:50:39.000-04:00
diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
@@ -15,7 +15,7 @@ jobs:
   create-release-branch:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write # Allow pushing the empty release branch
       id-token: write # Required for OIDC token federation
     steps:
       - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
@@ -45,8 +45,10 @@ jobs:
           BRANCH="release/${TAG%.0}.x"
           echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout dd-trace-java
+      - name: Checkout dd-trace-java at tag
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
+        with:
+          ref: ${{ github.sha }}
 
       - name: Check if branch already exists
         id: check-branch
@@ -60,22 +62,16 @@ jobs:
             echo "Branch $BRANCH does not exist - proceeding with following steps"
           fi
 
-      - name: Push empty release branch
+      - name: Create and push empty release branch
         if: steps.check-branch.outputs.creating_new_branch == 'true'
-        uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
-        with:
-          token: "${{ steps.octo-sts.outputs.token }}"
-          branch: "${{ steps.define-branch.outputs.branch }}"
-          head-sha: "${{ github.sha }}"
-          create-branch: true
-          command: push
+        run: |
+          git checkout -b "${{ steps.define-branch.outputs.branch }}"
+          git push -u origin "${{ steps.define-branch.outputs.branch }}"
 
       - name: Define temp branch name
         if: steps.check-branch.outputs.creating_new_branch == 'true'
         id: define-temp-branch
-        run: |
-          TEMP_BRANCH="${{ steps.define-branch.outputs.branch }}-pin-system-tests"
-          echo "branch=${TEMP_BRANCH}" >> "$GITHUB_OUTPUT"
+        run: echo "branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
 
       - name: Update system-tests references to latest commit SHA on main
         if: steps.check-branch.outputs.creating_new_branch == 'true'
diff --git a/.github/workflows/update-gradle-dependencies.yaml b/.github/workflows/update-gradle-dependencies.yaml
@@ -26,6 +26,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
         run: |
+          find . -name 'gradle.lockfile' -delete
           GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
           JAVA_HOME=$JAVA_HOME_8_X64 \
           JAVA_8_HOME=$JAVA_HOME_8_X64 \
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
@@ -297,7 +297,8 @@ public Status evaluate(
       ProbeImplementation probeImplementation,
       String thisClassName,
       long startTimestamp,
-      MethodLocation methodLocation) {
+      MethodLocation methodLocation,
+      boolean singleProbe) {
     Status status =
         statusByProbeId.computeIfAbsent(
             probeImplementation.getProbeId().getEncodedId(),
@@ -311,7 +312,7 @@ public Status evaluate(
     boolean shouldEvaluate =
         MethodLocation.isSame(methodLocation, probeImplementation.getEvaluateAt());
     if (shouldEvaluate) {
-      probeImplementation.evaluate(this, status, methodLocation);
+      probeImplementation.evaluate(this, status, methodLocation, singleProbe);
     }
     return status;
   }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
@@ -311,7 +311,11 @@ public static void evalContext(
         }
         CapturedContext.Status status =
             context.evaluate(
-                probeImplementation, callingClass.getTypeName(), startTimestamp, methodLocation);
+                probeImplementation,
+                callingClass.getTypeName(),
+                startTimestamp,
+                methodLocation,
+                false);
         needFreeze |= status.shouldFreezeContext();
       }
       // only freeze the context when we have at lest one snapshot probe, and we should send
@@ -343,7 +347,11 @@ public static void evalContext(
       }
       CapturedContext.Status status =
           context.evaluate(
-              probeImplementation, callingClass.getTypeName(), startTimestamp, methodLocation);
+              probeImplementation,
+              callingClass.getTypeName(),
+              startTimestamp,
+              methodLocation,
+              true);
       boolean needFreeze = status.shouldFreezeContext();
       // only freeze the context when we have at lest one snapshot probe, and we should send
       // snapshot
@@ -371,7 +379,7 @@ public static void evalContextAndCommit(
           continue;
         }
         context.evaluate(
-            probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT);
+            probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT, false);
         probeImplementations.add(probeImplementation);
       }
       for (ProbeImplementation probeImplementation : probeImplementations) {
@@ -395,7 +403,8 @@ public static void evalContextAndCommit(
       if (probeImplementation == null) {
         return;
       }
-      context.evaluate(probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT);
+      context.evaluate(
+          probeImplementation, callingClass.getTypeName(), -1, MethodLocation.DEFAULT, true);
       probeImplementation.commit(context, line);
     } catch (Exception ex) {
       LOGGER.debug("Error in evalContextAndCommit: ", ex);
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeImplementation.java
@@ -17,7 +17,10 @@ public interface ProbeImplementation {
   String getStrTags();
 
   void evaluate(
-      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation);
+      CapturedContext context,
+      CapturedContext.Status status,
+      MethodLocation methodLocation,
+      boolean singleProbe);
 
   void commit(
       CapturedContext entryContext,
@@ -82,7 +85,10 @@ public String getStrTags() {
 
     @Override
     public void evaluate(
-        CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {}
+        CapturedContext context,
+        CapturedContext.Status status,
+        MethodLocation methodLocation,
+        boolean singleProbe) {}
 
     @Override
     public void commit(
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java
@@ -71,7 +71,10 @@ public CapturedContext.Status createStatus() {
 
   @Override
   public void evaluate(
-      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {
+      CapturedContext context,
+      CapturedContext.Status status,
+      MethodLocation methodLocation,
+      boolean singleProbe) {
     ExceptionProbeStatus exceptionStatus;
     if (status instanceof ExceptionProbeStatus) {
       exceptionStatus = (ExceptionProbeStatus) status;
@@ -108,7 +111,7 @@ public void evaluate(
         exceptionStatus.setForceSampling(true);
       }
       exceptionStatus.setCapture(true);
-      super.evaluate(context, status, methodLocation);
+      super.evaluate(context, status, methodLocation, singleProbe);
     }
   }
 
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
@@ -485,7 +485,7 @@ public InstrumentationResult.Status instrument(
 
   @Override
   public boolean isReadyToCapture() {
-    if (isLineProbe() && !hasCondition()) {
+    if (!hasCondition()) {
       // we are sampling here to avoid creating CapturedContext when the sampling result is negative
       return ProbeRateLimiter.tryProbe(id);
     }
@@ -494,20 +494,25 @@ public boolean isReadyToCapture() {
 
   @Override
   public void evaluate(
-      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {
+      CapturedContext context,
+      CapturedContext.Status status,
+      MethodLocation methodLocation,
+      boolean singleProbe) {
     if (!(status instanceof LogStatus)) {
       throw new IllegalStateException("Invalid status: " + status.getClass());
     }
     LogStatus logStatus = (LogStatus) status;
-    if (isLineProbe() && !hasCondition()) {
-      // sampling was already done in isReadToCapture so we assume that if we are executing the
-      // current method it means the status should be sampled
-      if (!logStatus.getDebugSessionStatus().isDisabled()) {
-        logStatus.setSampled(true);
+    if (!hasCondition()) {
+      if (singleProbe) {
+        // sampling was already done in isReadToCapture so we assume that if we are executing the
+        // current method it means the status should be sampled
+        if (!logStatus.getDebugSessionStatus().isDisabled()) {
+          logStatus.setSampled(true);
+        }
+      } else {
+        // sample when no condition associated
+        sample(logStatus, methodLocation);
       }
-    } else if (!hasCondition()) {
-      // sample when no condition associated
-      sample(logStatus, methodLocation);
     }
     logStatus.setCondition(evaluateCondition(context, logStatus));
     CapturedContext.CapturedThrowable throwable = context.getCapturedThrowable();
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java
@@ -137,7 +137,10 @@ public ProbeLocation getLocation() {
 
   @Override
   public void evaluate(
-      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {}
+      CapturedContext context,
+      CapturedContext.Status status,
+      MethodLocation methodLocation,
+      boolean singleProbe) {}
 
   @Override
   public void commit(
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java
@@ -143,7 +143,10 @@ public InstrumentationResult.Status instrument(
 
   @Override
   public void evaluate(
-      CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {
+      CapturedContext context,
+      CapturedContext.Status status,
+      MethodLocation methodLocation,
+      boolean singleProbe) {
     for (Decoration decoration : decorations) {
       if (decoration.when != null) {
         try {
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java
@@ -96,7 +96,10 @@ public TriggerProbe setProbeCondition(ProbeCondition probeCondition) {
 
   @Override
   public void evaluate(
-      CapturedContext context, CapturedContext.Status status, MethodLocation location) {
+      CapturedContext context,
+      CapturedContext.Status status,
+      MethodLocation location,
+      boolean singleProbe) {
 
     Sampling sampling = getSampling();
     if (sampling == null || !sampling.inCoolDown()) {
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java
@@ -127,7 +127,8 @@ public void roundTripCapturedValue() throws IOException, URISyntaxException {
         new ProbeImplementation.NoopProbeImplementation(PROBE_ID, PROBE_LOCATION),
         String.class.getTypeName(),
         -1,
-        MethodLocation.EXIT);
+        MethodLocation.EXIT,
+        false);
     snapshot.setExit(context);
     String buffer = adapter.toJson(snapshot);
     Snapshot deserializedSnapshot = adapter.fromJson(buffer);
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java
@@ -367,7 +367,8 @@ private void evalAndCommitProbe(RuntimeException exception, ExceptionProbe excep
     exceptionProbe.buildLocation(null);
     CapturedContext capturedContext = new CapturedContext();
     capturedContext.addThrowable(exception);
-    capturedContext.evaluate(exceptionProbe, "", System.currentTimeMillis(), MethodLocation.EXIT);
+    capturedContext.evaluate(
+        exceptionProbe, "", System.currentTimeMillis(), MethodLocation.EXIT, false);
     exceptionProbe.commit(CapturedContext.EMPTY_CAPTURING_CONTEXT, capturedContext, emptyList());
   }
 
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java
@@ -147,8 +147,8 @@ private int runTrace(TracerAPI tracer, boolean captureSnapshot, Integer line, St
 
       CapturedContext entryContext = capturedContext(span, logProbe);
       CapturedContext exitContext = capturedContext(span, logProbe);
-      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY);
-      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT);
+      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
+      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
 
       int budget =
           logProbe.isCaptureSnapshot()
@@ -193,8 +193,8 @@ private boolean fillSnapshot(DebugSessionStatus status) {
 
       CapturedContext entryContext = capturedContext(span, logProbe);
       CapturedContext exitContext = capturedContext(span, logProbe);
-      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY);
-      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT);
+      logProbe.evaluate(entryContext, new LogStatus(logProbe), MethodLocation.ENTRY, false);
+      logProbe.evaluate(exitContext, new LogStatus(logProbe), MethodLocation.EXIT, false);
 
       return logProbe.fillSnapshot(
           entryContext, exitContext, emptyList(), new Snapshot(currentThread(), logProbe, 3));
@@ -204,7 +204,11 @@ private boolean fillSnapshot(DebugSessionStatus status) {
   private static CapturedContext capturedContext(AgentSpan span, ProbeDefinition probeDefinition) {
     CapturedContext context = new CapturedContext();
     context.evaluate(
-        probeDefinition, "Log Probe test", System.currentTimeMillis(), MethodLocation.DEFAULT);
+        probeDefinition,
+        "Log Probe test",
+        System.currentTimeMillis(),
+        MethodLocation.DEFAULT,
+        false);
     return context;
   }
 
@@ -283,7 +287,7 @@ private void fillStatus(
 
   private LogStatus prepareContext(
       CapturedContext context, LogProbe logProbe, MethodLocation methodLocation) {
-    context.evaluate(logProbe, "", 0, methodLocation);
+    context.evaluate(logProbe, "", 0, methodLocation, false);
     return (LogStatus) context.getStatus(PROBE_ID.getEncodedId());
   }
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java
@@ -1,5 +1,6 @@
 package datadog.trace.core;
 
+import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.TRACE_MONITOR;
 import static datadog.trace.util.AgentThreadFactory.THREAD_JOIN_TIMOUT_MS;
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
@@ -58,6 +59,7 @@ private static class DelayingPendingTraceBuffer extends PendingTraceBuffer {
     private static final long SLEEP_TIME_MS = 100;
     private static final CommandElement FLUSH_ELEMENT = new CommandElement();
     private static final CommandElement DUMP_ELEMENT = new CommandElement();
+    private static final CommandElement STAND_IN_ELEMENT = new CommandElement();
 
     private final MpscBlockingConsumerArrayQueue<Element> queue;
     private final Thread worker;
@@ -145,6 +147,7 @@ public void accept(Element pendingTrace) {
 
     private static final class DumpDrain
         implements MessagePassingQueue.Consumer<Element>, MessagePassingQueue.Supplier<Element> {
+      private static final Logger LOGGER = LoggerFactory.getLogger(DumpDrain.class);
       private static final DumpDrain DUMP_DRAIN = new DumpDrain();
       private static final int MAX_DUMPED_TRACES = 50;
 
@@ -154,7 +157,7 @@ private static final class DumpDrain
           element -> !(element instanceof PendingTrace);
 
       private volatile List<Element> data = new ArrayList<>();
-      private int index = 0;
+      private volatile int index = 0;
 
       @Override
       public void accept(Element pendingTrace) {
@@ -166,13 +169,21 @@ public Element get() {
         if (index < data.size()) {
           return data.get(index++);
         }
-        return null; // Should never reach here or else queue may break according to
-        // MessagePassingQueue docs
+        // Should never reach here or else queue may break according to
+        // MessagePassingQueue docs if we return a null. Return a stand-in
+        // Element instead.
+        LOGGER.warn(
+            SEND_TELEMETRY,
+            "Index {} is out of bounds for data size {} in DumpDrain.get so returning filler CommandElement to prevent pending trace queue from breaking.",
+            index,
+            data.size());
+        return STAND_IN_ELEMENT;
       }
 
       public List<Element> collectTraces() {
         List<Element> traces = data;
         data = new ArrayList<>();
+        index = 0;
         traces.removeIf(NOT_PENDING_TRACE);
         // Storing oldest traces first
         traces.sort(TRACE_BY_START_TIME);
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,10 @@ public CapturedContext.Status createStatus() {`
`71`	`71`
`72`	`72`	`@Override`
`73`	`73`	`public void evaluate(`
`74`		`- CapturedContext context, CapturedContext.Status status, MethodLocation methodLocation) {`
	`74`	`+ CapturedContext context,`
	`75`	`+ CapturedContext.Status status,`
	`76`	`+ MethodLocation methodLocation,`
	`77`	`+ boolean singleProbe) {`
`75`	`78`	`ExceptionProbeStatus exceptionStatus;`
`76`	`79`	`if (status instanceof ExceptionProbeStatus) {`
`77`	`80`	`exceptionStatus = (ExceptionProbeStatus) status;`
`@@ -108,7 +111,7 @@ public void evaluate(`
`108`	`111`	`exceptionStatus.setForceSampling(true);`
`109`	`112`	`}`
`110`	`113`	`exceptionStatus.setCapture(true);`
`111`		`- super.evaluate(context, status, methodLocation);`
	`114`	`+ super.evaluate(context, status, methodLocation, singleProbe);`
`112`	`115`	`}`
`113`	`116`	`}`
`114`	`117`