From ad80be391cc7fb0ec7349be9e141ec32711b505a Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Thu, 16 Jul 2026 12:20:42 +0200
Subject: [PATCH 1/2] Avoid false warning when no stacktrace

---
 .../datadog/debugger/exception/AbstractExceptionDebugger.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
index fe789d43329..16848217a9a 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
@@ -197,6 +197,9 @@ private static boolean sanityCheckSnapshotAssignment(
       Snapshot snapshot, StackTraceElement[] innerTrace, int currentIdx) {
     String className = snapshot.getProbe().getLocation().getType();
     String methodName = snapshot.getProbe().getLocation().getMethod();
+    if (innerTrace.length == 0) {
+      return true;
+    }
     if (currentIdx < 0 || currentIdx >= innerTrace.length) {
       LOGGER.warn(
           "currentIdx={} out of bounds of innerTrace array length={}",

From 4356d4bd002b24f48df81af3ab5710dbf54b54b7 Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Fri, 17 Jul 2026 09:09:56 +0200
Subject: [PATCH 2/2] fix to skip mapping

---
 .../datadog/debugger/exception/AbstractExceptionDebugger.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
index 16848217a9a..26b9973fd8c 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
@@ -198,7 +198,8 @@ private static boolean sanityCheckSnapshotAssignment(
     String className = snapshot.getProbe().getLocation().getType();
     String methodName = snapshot.getProbe().getLocation().getMethod();
     if (innerTrace.length == 0) {
-      return true;
+      LOGGER.debug("innerTrace is empty");
+      return false;
     }
     if (currentIdx < 0 || currentIdx >= innerTrace.length) {
       LOGGER.warn(