DRAFT

DataDog · Jan 20, 2025 · b18c40d · b18c40d
1 parent 25f6ed0
commit b18c40d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -101,8 +101,8 @@ jobs:
     secrets: inherit
     with:
       library: ${{ matrix.library }}
-      scenarios: ${{ needs.scenarios.outputs.scenarios }}
-      scenarios_groups: ${{ needs.scenarios.outputs.scenarios_groups }}
+      scenarios: DEBUGGER_EXCEPTION_REPLAY
+      # scenarios_groups: ${{ needs.scenarios.outputs.scenarios_groups }}
       binaries_artifact: ${{ matrix.version == 'dev' && format('binaries_dev_{0}', matrix.library) || '' }}
       ci_environment: ${{ matrix.version }}
       build_python_base_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-python-base-images') }}

diff --git a/tests/debugger/test_debugger_exception_replay.py b/tests/debugger/test_debugger_exception_replay.py
@@ -345,31 +345,31 @@ def setup_exception_replay_recursion_3(self):
 
     @bug(context.library == "dotnet", reason="DEBUG-2799, DEBUG-3283")
     @bug(context.library == "python", reason="DEBUG-3257, DEBUG-3282")
-    @bug(context.library == "java", reason="DEBUG-3284, DEBUG-3285")
+    # @bug(context.library == "java", reason="DEBUG-3284, DEBUG-3285")
     def test_exception_replay_recursion_3(self):
         self._assert("exception_replay_recursion_3", ["recursion exception depth 3"])
         self._validate_recursion_snapshots(self.snapshots, 3)
 
-    def setup_exception_replay_recursion_5(self):
-        self._setup("/exceptionreplay/recursion?depth=5", "recursion exception depth 5")
-
-    @bug(context.library == "dotnet", reason="DEBUG-2799, DEBUG-3283")
-    @bug(context.library == "python", reason="DEBUG-3257, DEBUG-3282")
-    @bug(context.library == "java", reason="DEBUG-3284, DEBUG-3285")
-    def test_exception_replay_recursion_5(self):
-        self._assert("exception_replay_recursion_5", ["recursion exception depth 5"])
-        self._validate_recursion_snapshots(self.snapshots, 5)
-
-    def setup_exception_replay_recursion_20(self):
-        self._setup("/exceptionreplay/recursion?depth=20", "recursion exception depth 20")
-
-    @bug(context.library == "dotnet", reason="DEBUG-2799, DEBUG-3283")
-    @bug(context.library == "python", reason="DEBUG-3257, DEBUG-3282")
-    @bug(context.library == "java", reason="DEBUG-3284, DEBUG-3285")
-    def test_exception_replay_recursion_20(self):
-        self._assert("exception_replay_recursion_20", ["recursion exception depth 20"])
-        self._validate_recursion_snapshots(self.snapshots, 10)
-
+    # def setup_exception_replay_recursion_5(self):
+    #     self._setup("/exceptionreplay/recursion?depth=5", "recursion exception depth 5")
+    #
+    # @bug(context.library == "dotnet", reason="DEBUG-2799, DEBUG-3283")
+    # @bug(context.library == "python", reason="DEBUG-3257, DEBUG-3282")
+    # @bug(context.library == "java", reason="DEBUG-3284, DEBUG-3285")
+    # def test_exception_replay_recursion_5(self):
+    #     self._assert("exception_replay_recursion_5", ["recursion exception depth 5"])
+    #     self._validate_recursion_snapshots(self.snapshots, 5)
+    #
+    # def setup_exception_replay_recursion_20(self):
+    #     self._setup("/exceptionreplay/recursion?depth=20", "recursion exception depth 20")
+    #
+    # @bug(context.library == "dotnet", reason="DEBUG-2799, DEBUG-3283")
+    # @bug(context.library == "python", reason="DEBUG-3257, DEBUG-3282")
+    # @bug(context.library == "java", reason="DEBUG-3284, DEBUG-3285")
+    # def test_exception_replay_recursion_20(self):
+    #     self._assert("exception_replay_recursion_20", ["recursion exception depth 20"])
+    #     self._validate_recursion_snapshots(self.snapshots, 10)
+    #
     ############ Inner ############
     def setup_exception_replay_inner(self):
         self._setup("/exceptionreplay/inner", "outer exception")

diff --git a/utils/_context/_scenarios/__init__.py b/utils/_context/_scenarios/__init__.py
@@ -580,9 +580,11 @@ class _Scenarios:
         rc_api_enabled=True,
         weblog_env={
             "DD_DYNAMIC_INSTRUMENTATION_ENABLED": "1",
+            "DD_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED": "true",
             "DD_REMOTE_CONFIG_ENABLED": "true",
             "DD_EXCEPTION_DEBUGGING_ENABLED": "true",
             "DD_EXCEPTION_REPLAY_CAPTURE_MAX_FRAMES": "10",
+            "JAVA_OPTS": " -Ddatadog.slf4j.simpleLogger.log.com.datadog.debugger=debug ",
         },
         library_interface_timeout=5,
         doc="Check exception replay",

diff --git a/...c/main/java/com/datadoghq/system_tests/springboot/debugger/ExceptionReplayController.java b/...c/main/java/com/datadoghq/system_tests/springboot/debugger/ExceptionReplayController.java
@@ -19,7 +19,7 @@ public String exceptionReplayRecursion(@RequestParam(required = true) Integer de
     }
 
     private String exceptionReplayRecursionHelper(Integer originalDepth, Integer currentDepth) {
-        if (currentDepth > 0) {
+        System.err.println("=====> exceptionReplayRecursionHelper " + originalDepth + " " + currentDepth); if (currentDepth > 0) {
             return exceptionReplayRecursionHelper(originalDepth, currentDepth - 1);
         } else {
             throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, "recursion exception depth " + originalDepth);