[mq] [skip ddci] working branch - merge 78dd710 on top of master at e16815c

{"baseBranch":"master","baseCommit":"e16815c31c6967487bdd39fb3d84cfcb83d45a5f","createdAt":"2026-04-03T14:24:43.962575Z","headSha":"78dd710a894571a9c01fe1b1c7ddbbd81050c1b6","id":"7568b180-0008-49b5-90fd-fa99797a6885","priority":"200","pullRequestNumber":"11051","queuedAt":"2026-04-03T14:24:43.961264Z","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java

@@ -95,6 +95,10 @@ public void evaluate(
       return;
     }
     Throwable innerMostThrowable = getInnerMostThrowable(throwable);
+    if (innerMostThrowable == null) {
+      LOGGER.debug("Cannot get inner most throwable (cycle?)");
+      return;
+    }
     String fingerprint =
         Fingerprinter.fingerprint(innerMostThrowable, exceptionProbeManager.getClassNameFilter());
     if (exceptionProbeManager.shouldCaptureException(fingerprint)) {

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ExceptionHelperTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
@@ -74,7 +75,7 @@ public void foldExceptionStackTrace() {
     String strStackTrace = ExceptionHelper.foldExceptionStackTrace(new Exception());
     assertTrue(
         strStackTrace.startsWith(
-            "java.lang.Exception at com.datadog.debugger.util.ExceptionHelperTest.foldExceptionStackTrace(ExceptionHelperTest.java:74) at "),
+            "java.lang.Exception at com.datadog.debugger.util.ExceptionHelperTest.foldExceptionStackTrace(ExceptionHelperTest.java:75) at "),
         strStackTrace);
     assertFalse(strStackTrace.contains("\n"));
     assertFalse(strStackTrace.contains("\t"));
@@ -96,6 +97,10 @@ public void innerMostException() {
     assertEquals(nested, exceptions.pollLast());
     assertEquals(nested.getCause(), exceptions.pollLast());
     assertEquals(nested.getCause().getCause(), exceptions.pollLast());
+    // create a cycle and make sure we handle it gracefully
+    Exception ex2 = new RuntimeException("test2", ex);
+    ex.initCause(ex2);
+    assertNull(ExceptionHelper.getInnerMostThrowable(ex2));
   }
 
   @Test