From 8765c57a96dd60e502a5a3c2c01720dd46d3133a Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Thu, 30 Oct 2025 12:24:08 +0100
Subject: [PATCH 1/3] update snapshot for code origin default on

---
 ...exception_replay_async_spans_expected.json |  6 ++
 ...exception_replay_inner_spans_expected.json |  6 ++
 ...tion_replay_multiframe_spans_expected.json | 24 ++++++++
 ...on_replay_recursion_20_spans_expected.json | 60 +++++++++++++++++++
 ...ion_replay_recursion_3_spans_expected.json | 30 ++++++++++
 ...ion_replay_recursion_5_spans_expected.json | 42 +++++++++++++
 ...play_rockpaperscissors_spans_expected.json | 18 ++++++
 ...xception_replay_simple_spans_expected.json |  6 ++
 8 files changed, 192 insertions(+)

diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json
index 09ff21acd51..f985f3affa5 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "81",
+      "_dd.code_origin.frames.0.method": "exceptionReplayAsync",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json
index d3f286b852e..883b9cd7f30 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "32",
+      "_dd.code_origin.frames.0.method": "exceptionReplayInner",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.94.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json
index 9962e470bc8..4c414d40822 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "69",
+      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -38,6 +44,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "69",
+      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -73,6 +85,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "69",
+      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -108,6 +126,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "69",
+      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json
index 0c5c75b1de0..32acc4ed009 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -44,6 +50,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -85,6 +97,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -126,6 +144,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -167,6 +191,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -208,6 +238,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -249,6 +285,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -290,6 +332,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -331,6 +379,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -372,6 +426,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json
index bf5d927ad24..041435a47e4 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -39,6 +45,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -75,6 +87,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -111,6 +129,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -147,6 +171,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json
index 3c1396990e1..465c42f146d 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -41,6 +47,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -79,6 +91,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -117,6 +135,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -155,6 +179,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -193,6 +223,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -231,6 +267,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "18",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
+      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json
index 3f7d6465472..3940da0aff0 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "40",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRockPaperScissors",
+      "_dd.code_origin.frames.0.signature": "(java.lang.String)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
@@ -35,6 +41,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "40",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRockPaperScissors",
+      "_dd.code_origin.frames.0.signature": "(java.lang.String)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
@@ -67,6 +79,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "40",
+      "_dd.code_origin.frames.0.method": "exceptionReplayRockPaperScissors",
+      "_dd.code_origin.frames.0.signature": "(java.lang.String)",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json
index cc66503de70..1893e63c8d0 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json
@@ -3,6 +3,12 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
+      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
+      "_dd.code_origin.frames.0.line": "13",
+      "_dd.code_origin.frames.0.method": "exceptionReplaySimple",
+      "_dd.code_origin.frames.0.signature": "()",
+      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
+      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",

From 42911c418c44019e35e8b90bd8cc813f5c2fe055 Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Thu, 30 Oct 2025 17:57:46 +0100
Subject: [PATCH 2/3] enable code origin for exception replay

---
 utils/_context/_scenarios/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/_context/_scenarios/__init__.py b/utils/_context/_scenarios/__init__.py
index f14c2440ba4..f4f171146a3 100644
--- a/utils/_context/_scenarios/__init__.py
+++ b/utils/_context/_scenarios/__init__.py
@@ -702,6 +702,7 @@ class _Scenarios:
         "DEBUGGER_EXCEPTION_REPLAY",
         weblog_env={
             "DD_EXCEPTION_DEBUGGING_ENABLED": "1",
+            "DD_CODE_ORIGIN_FOR_SPANS_ENABLED": "1",
             "DD_EXCEPTION_REPLAY_CAPTURE_MAX_FRAMES": "10",
         },
         doc="Check exception replay",

From 5445de44a34d3dbd2e7ccf3a63182a553e992f45 Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Thu, 30 Oct 2025 20:38:13 +0100
Subject: [PATCH 3/3] revert code origin spans for ER

---
 ...exception_replay_async_spans_expected.json |  6 --
 ...exception_replay_inner_spans_expected.json |  6 --
 ...tion_replay_multiframe_spans_expected.json | 24 --------
 ...on_replay_recursion_20_spans_expected.json | 60 -------------------
 ...ion_replay_recursion_3_spans_expected.json | 30 ----------
 ...ion_replay_recursion_5_spans_expected.json | 42 -------------
 ...play_rockpaperscissors_spans_expected.json | 18 ------
 ...xception_replay_simple_spans_expected.json |  6 --
 utils/_context/_scenarios/__init__.py         |  2 +-
 9 files changed, 1 insertion(+), 193 deletions(-)

diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json
index f985f3affa5..09ff21acd51 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_async_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "81",
-      "_dd.code_origin.frames.0.method": "exceptionReplayAsync",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json
index 883b9cd7f30..d3f286b852e 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_inner_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "32",
-      "_dd.code_origin.frames.0.method": "exceptionReplayInner",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.94.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json
index 4c414d40822..9962e470bc8 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_multiframe_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "69",
-      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -44,12 +38,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "69",
-      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -85,12 +73,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "69",
-      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -126,12 +108,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "69",
-      "_dd.code_origin.frames.0.method": "exceptionReplayMultiframe",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json
index 32acc4ed009..0c5c75b1de0 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_20_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -50,12 +44,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -97,12 +85,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -144,12 +126,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -191,12 +167,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -238,12 +208,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -285,12 +249,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -332,12 +290,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -379,12 +331,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -426,12 +372,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json
index 041435a47e4..bf5d927ad24 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_3_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -45,12 +39,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -87,12 +75,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -129,12 +111,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -171,12 +147,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json
index 465c42f146d..3c1396990e1 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_recursion_5_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -47,12 +41,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -91,12 +79,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -135,12 +117,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -179,12 +155,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -223,12 +193,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
@@ -267,12 +231,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "18",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRecursion",
-      "_dd.code_origin.frames.0.signature": "(java.lang.Integer)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.1.snapshot_id": "<scrubbed>",
       "_dd.debug.error.2.snapshot_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json
index 3940da0aff0..3f7d6465472 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_rockpaperscissors_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "40",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRockPaperScissors",
-      "_dd.code_origin.frames.0.signature": "(java.lang.String)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
@@ -41,12 +35,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "40",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRockPaperScissors",
-      "_dd.code_origin.frames.0.signature": "(java.lang.String)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
@@ -79,12 +67,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "40",
-      "_dd.code_origin.frames.0.method": "exceptionReplayRockPaperScissors",
-      "_dd.code_origin.frames.0.signature": "(java.lang.String)",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json
index 1893e63c8d0..cc66503de70 100644
--- a/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json
+++ b/tests/debugger/utils/approvals/java/1.5.0/exception_replay_simple_spans_expected.json
@@ -3,12 +3,6 @@
     "duration": "<scrubbed>",
     "error": 1,
     "meta": {
-      "_dd.code_origin.frames.0.file": "ExceptionReplayController.java",
-      "_dd.code_origin.frames.0.line": "13",
-      "_dd.code_origin.frames.0.method": "exceptionReplaySimple",
-      "_dd.code_origin.frames.0.signature": "()",
-      "_dd.code_origin.frames.0.type": "com.datadoghq.system_tests.springboot.ExceptionReplayController",
-      "_dd.code_origin.type": "entry",
       "_dd.debug.error.0.snapshot_id": "<scrubbed>",
       "_dd.debug.error.exception_hash": "<scrubbed>",
       "_dd.debug.error.exception_id": "<scrubbed>",
diff --git a/utils/_context/_scenarios/__init__.py b/utils/_context/_scenarios/__init__.py
index f4f171146a3..71984064333 100644
--- a/utils/_context/_scenarios/__init__.py
+++ b/utils/_context/_scenarios/__init__.py
@@ -702,7 +702,7 @@ class _Scenarios:
         "DEBUGGER_EXCEPTION_REPLAY",
         weblog_env={
             "DD_EXCEPTION_DEBUGGING_ENABLED": "1",
-            "DD_CODE_ORIGIN_FOR_SPANS_ENABLED": "1",
+            "DD_CODE_ORIGIN_FOR_SPANS_ENABLED": "0",
             "DD_EXCEPTION_REPLAY_CAPTURE_MAX_FRAMES": "10",
         },
         doc="Check exception replay",