diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
index ae34b1995e7..6f3551f22ec 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
@@ -269,7 +269,7 @@ public void onTestFinish(
       if (outcome.lastExecution()) {
         test.setTag(Tags.TEST_FINAL_STATUS, outcome.finalStatus());
 
-        if (outcome.failedAllRetries()) {
+        if (retryReason != null && outcome.failedAllRetries()) {
           test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true);
         }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java
index b87d24f11e2..4ba92bbade1 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java
@@ -4,9 +4,13 @@
 import datadog.trace.api.civisibility.execution.TestStatus;
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason;
 import datadog.trace.civisibility.config.ExecutionsByDuration;
+import datadog.trace.civisibility.execution.exit.EarlyExitPolicy;
 import java.util.List;
 
-/** Runs a test case N times (N depends on test duration) regardless of success or failure. */
+/**
+ * Runs a test case N times (N depends on test duration) regardless of success or failure. The
+ * execution can also be terminated early if its ExitPolicy evaluates to {@code true}.
+ */
 public class RunNTimes implements TestExecutionPolicy {
 
   private final boolean suppressFailures;
@@ -14,19 +18,23 @@ public class RunNTimes implements TestExecutionPolicy {
   private int executions;
   private int maxExecutions;
   private int successfulExecutionsSeen;
+  private int failedExecutionsSeen;
   private final RetryReason retryReason;
   private TestStatus lastStatus;
+  private final EarlyExitPolicy exitPolicy;
 
   public RunNTimes(
       List<ExecutionsByDuration> executionsByDuration,
       boolean suppressFailures,
-      RetryReason retryReason) {
+      RetryReason retryReason,
+      EarlyExitPolicy exitPolicy) {
     this.suppressFailures = suppressFailures;
     this.executionsByDuration = executionsByDuration;
     this.executions = 0;
     this.maxExecutions = getExecutions(0);
     this.successfulExecutionsSeen = 0;
     this.retryReason = retryReason;
+    this.exitPolicy = exitPolicy;
   }
 
   @Override
@@ -35,6 +43,8 @@ public ExecutionOutcome registerExecution(TestStatus status, long durationMillis
     ++executions;
     if (status != TestStatus.fail) {
       ++successfulExecutionsSeen;
+    } else {
+      ++failedExecutionsSeen;
     }
     int maxExecutionsForGivenDuration = getExecutions(durationMillis);
     maxExecutions = Math.min(maxExecutions, maxExecutionsForGivenDuration);
@@ -42,13 +52,12 @@ public ExecutionOutcome registerExecution(TestStatus status, long durationMillis
     boolean lastExecution = !retriesLeft();
     boolean retry = executions > 1; // first execution is not a retry
     boolean failureSuppressed = status == TestStatus.fail && suppressFailures();
-    boolean succeededAllRetries = lastExecution && successfulExecutionsSeen == executions;
-
+    boolean succeededAllExecutions = successfulExecutionsSeen == executions;
     TestStatus finalStatus = null;
     if (lastExecution) {
       // final status will only be "pass" if all retries pass (or the failures were suppressed)
       // also, the `suppressFailures()` call works because its value cannot change between retries
-      if (succeededAllRetries || suppressFailures()) {
+      if (succeededAllExecutions || suppressFailures()) {
         finalStatus = TestStatus.pass;
       } else {
         finalStatus = TestStatus.fail;
@@ -58,15 +67,17 @@ public ExecutionOutcome registerExecution(TestStatus status, long durationMillis
     return new ExecutionOutcomeImpl(
         failureSuppressed,
         lastExecution,
-        lastExecution && successfulExecutionsSeen == 0,
-        succeededAllRetries,
+        lastExecution && failedExecutionsSeen == executions,
+        lastExecution && succeededAllExecutions,
         retry ? retryReason : null,
         finalStatus);
   }
 
   private boolean retriesLeft() {
     // skipped tests (either by the framework or DD) should not be retried
-    return lastStatus != TestStatus.skip && executions < maxExecutions;
+    return lastStatus != TestStatus.skip
+        && executions < maxExecutions
+        && !exitPolicy.evaluate(failedExecutionsSeen != 0, successfulExecutionsSeen != 0);
   }
 
   @Override
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/EarlyExitPolicy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/EarlyExitPolicy.java
new file mode 100644
index 00000000000..8b644a7465c
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/EarlyExitPolicy.java
@@ -0,0 +1,9 @@
+package datadog.trace.civisibility.execution.exit;
+
+public interface EarlyExitPolicy {
+
+  /**
+   * @return {@code true} if the policy indicates that the test should not be retried anymore.
+   */
+  boolean evaluate(boolean hasFailedExecutions, boolean hasPassedExecutions);
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/ExitOnFailure.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/ExitOnFailure.java
new file mode 100644
index 00000000000..689dfd5fe8f
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/ExitOnFailure.java
@@ -0,0 +1,13 @@
+package datadog.trace.civisibility.execution.exit;
+
+/** Policy to avoid retries once a test fails once. Used for Attempt to Fix. */
+public class ExitOnFailure implements EarlyExitPolicy {
+  public static final EarlyExitPolicy INSTANCE = new ExitOnFailure();
+
+  private ExitOnFailure() {}
+
+  @Override
+  public boolean evaluate(boolean hasFailedExecutions, boolean hasPassedExecutions) {
+    return hasFailedExecutions;
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/ExitOnFlake.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/ExitOnFlake.java
new file mode 100644
index 00000000000..9926c4ebcf4
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/ExitOnFlake.java
@@ -0,0 +1,16 @@
+package datadog.trace.civisibility.execution.exit;
+
+/**
+ * Policy to avoid retries once a test flakes (has at least one failed and passed execution). Used
+ * for Early Flake Detection.
+ */
+public class ExitOnFlake implements EarlyExitPolicy {
+  public static final EarlyExitPolicy INSTANCE = new ExitOnFlake();
+
+  private ExitOnFlake() {}
+
+  @Override
+  public boolean evaluate(boolean hasFailedExecutions, boolean hasPassedExecutions) {
+    return hasFailedExecutions && hasPassedExecutions;
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/NoExit.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/NoExit.java
new file mode 100644
index 00000000000..dcc37b9358b
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/exit/NoExit.java
@@ -0,0 +1,13 @@
+package datadog.trace.civisibility.execution.exit;
+
+/** Policy that ignores early exit on retries. Currently only used in testing. */
+public class NoExit implements EarlyExitPolicy {
+  public static final EarlyExitPolicy INSTANCE = new NoExit();
+
+  private NoExit() {}
+
+  @Override
+  public boolean evaluate(boolean hasFailedExecutions, boolean hasPassedExecutions) {
+    return false;
+  }
+}
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
index 7cdacf572fc..4f434e808b0 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java
@@ -16,6 +16,8 @@
 import datadog.trace.civisibility.execution.RetryUntilSuccessful;
 import datadog.trace.civisibility.execution.RunNTimes;
 import datadog.trace.civisibility.execution.RunOnceIgnoreOutcome;
+import datadog.trace.civisibility.execution.exit.ExitOnFailure;
+import datadog.trace.civisibility.execution.exit.ExitOnFlake;
 import datadog.trace.civisibility.source.LinesResolver;
 import datadog.trace.civisibility.source.SourcePathResolver;
 import java.lang.reflect.Method;
@@ -129,7 +131,8 @@ public TestExecutionPolicy executionPolicy(
       return new RunNTimes(
           executionSettings.getTestManagementSettings().getAttemptToFixExecutions(),
           isQuarantined(test) || isDisabled(test),
-          RetryReason.attemptToFix);
+          RetryReason.attemptToFix,
+          ExitOnFailure.INSTANCE);
     }
 
     if (isEFDApplicable(test, testSource, testTags)) {
@@ -139,7 +142,8 @@ public TestExecutionPolicy executionPolicy(
       return new RunNTimes(
           executionSettings.getEarlyFlakeDetectionSettings().getExecutionsByDuration(),
           isQuarantined(test),
-          RetryReason.efd);
+          RetryReason.efd,
+          ExitOnFlake.INSTANCE);
     }
 
     if (isAutoRetryApplicable(test)) {
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy
index a9d82747de0..f3fa0bfbaac 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy
@@ -3,13 +3,16 @@ package datadog.trace.civisibility.execution
 import datadog.trace.api.civisibility.execution.TestStatus
 import datadog.trace.api.civisibility.telemetry.tag.RetryReason
 import datadog.trace.civisibility.config.ExecutionsByDuration
+import datadog.trace.civisibility.execution.exit.ExitOnFailure
+import datadog.trace.civisibility.execution.exit.ExitOnFlake
+import datadog.trace.civisibility.execution.exit.NoExit
 import spock.lang.Specification
 
 class RunNTimesTest extends Specification {
 
   def "test run N times"() {
     setup:
-    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd)
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd, NoExit.INSTANCE)
 
     when:
     def outcome = executionPolicy.registerExecution(TestStatus.fail, 0)
@@ -47,7 +50,7 @@ class RunNTimesTest extends Specification {
 
   def "test failed all retries"() {
     setup:
-    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd)
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd, NoExit.INSTANCE)
 
     when:
     def outcome = executionPolicy.registerExecution(TestStatus.fail, 0)
@@ -85,7 +88,7 @@ class RunNTimesTest extends Specification {
 
   def "test succeeded all retries"() {
     setup:
-    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd)
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd, NoExit.INSTANCE)
 
     when:
     def outcome = executionPolicy.registerExecution(TestStatus.pass, 0)
@@ -123,7 +126,7 @@ class RunNTimesTest extends Specification {
 
   def "test suppress failures"() {
     setup:
-    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], true, RetryReason.attemptToFix)
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], true, RetryReason.attemptToFix, NoExit.INSTANCE)
 
     when:
     def outcome = executionPolicy.registerExecution(TestStatus.fail, 0)
@@ -159,9 +162,40 @@ class RunNTimesTest extends Specification {
     outcome3.finalStatus() == TestStatus.pass
   }
 
+  def "test exits on flake"(){
+    setup:
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd, ExitOnFlake.INSTANCE)
+
+    when:
+    def outcome = executionPolicy.registerExecution(TestStatus.fail, 0)
+
+    then:
+    !outcome.lastExecution()
+    outcome.finalStatus() == null
+
+    when:
+    def outcome2 = executionPolicy.registerExecution(TestStatus.pass, 0)
+
+    then:
+    outcome2.lastExecution()
+    outcome2.finalStatus() == TestStatus.fail
+  }
+
+  def "test exits on failure"() {
+    setup:
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.attemptToFix, ExitOnFailure.INSTANCE)
+
+    when:
+    def outcome = executionPolicy.registerExecution(TestStatus.fail, 0)
+
+    then:
+    outcome.lastExecution()
+    outcome.finalStatus() == TestStatus.fail
+  }
+
   def "test adaptive retry count"() {
     when:
-    def executionPolicy = new RunNTimes([new ExecutionsByDuration(100, 3), new ExecutionsByDuration(Long.MAX_VALUE, 1)], true, RetryReason.efd)
+    def executionPolicy = new RunNTimes([new ExecutionsByDuration(100, 3), new ExecutionsByDuration(Long.MAX_VALUE, 1)], true, RetryReason.efd, NoExit.INSTANCE)
 
     then:
     !executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution()
@@ -169,7 +203,7 @@ class RunNTimesTest extends Specification {
     executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution()
 
     when:
-    executionPolicy = new RunNTimes([new ExecutionsByDuration(100, 3), new ExecutionsByDuration(Long.MAX_VALUE, 1)], true, RetryReason.efd)
+    executionPolicy = new RunNTimes([new ExecutionsByDuration(100, 3), new ExecutionsByDuration(Long.MAX_VALUE, 1)], true, RetryReason.efd, NoExit.INSTANCE)
 
     then:
     !executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution()
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl
index aed9df93b31..e48f884bdbe 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl
@@ -5,32 +5,4 @@
   "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_2},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_3},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index b47081605e0..fefd51295f8 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -48,12 +48,14 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
       "test.name" : "Addition",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
@@ -82,213 +84,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -310,7 +105,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -318,14 +113,14 @@
     "name" : "cucumber.test_session",
     "resource" : "junit-4-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -343,15 +138,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "cucumber.test_module",
     "resource" : "junit-4-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl
index aed9df93b31..e48f884bdbe 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl
@@ -5,32 +5,4 @@
   "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_2},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_3},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl
index fcfd3fd5f5b..b1bb84d7578 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -47,12 +47,14 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
       "test.name" : "Addition",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
       "test.type" : "test",
@@ -80,205 +82,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.final_status" : "fail",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -300,7 +103,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -308,14 +111,14 @@
     "name" : "cucumber.test_session",
     "resource" : "junit-4-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -333,15 +136,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "cucumber.test_module",
     "resource" : "junit-4-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl
index aed9df93b31..e48f884bdbe 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl
@@ -5,32 +5,4 @@
   "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_2},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_3},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index f54a5800de3..c5c1f454b0b 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -48,12 +48,14 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
       "test.name" : "Addition",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
@@ -82,213 +84,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -310,7 +105,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -318,14 +113,14 @@
     "name" : "cucumber.test_session",
     "resource" : "junit-4-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -343,15 +138,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "cucumber.test_module",
     "resource" : "junit-4-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl
index 70e67b32d40..69704272594 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl
@@ -134,6 +134,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -270,6 +271,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -316,6 +318,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -360,6 +363,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -460,4 +464,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-empty-name-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-empty-name-latest/events.ftl
index 0a6960e3bad..699069e5b89 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-empty-name-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-empty-name-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -139,4 +140,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-multiple-features-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-multiple-features-latest/events.ftl
index 3cab9f03e16..f4ff7d104c1 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-multiple-features-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-multiple-features-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -122,6 +123,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -217,4 +219,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-retry-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-retry-scenario-outline-latest/events.ftl
index e073042f2e9..77815133cda 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-retry-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-retry-scenario-outline-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -87,6 +88,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -133,6 +135,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -176,6 +179,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -271,4 +275,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl
index d4805fb83c2..9a1285031ea 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -87,6 +88,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -130,6 +132,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -173,6 +176,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-cucumber-5.4",
@@ -268,4 +272,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 12240241684..6de570f51f5 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "munit",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-munit-0.7.28",
@@ -128,6 +129,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedMUnit",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.traits" : "{\"category\":[\"myTag\"]}",
@@ -153,219 +155,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 048820bfc42..4d4c4184e5a 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -120,6 +120,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "munit",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-munit-0.7.28",
@@ -127,6 +128,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedMUnit",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.traits" : "{\"category\":[\"myTag\"]}",
       "test.type" : "test",
@@ -151,211 +153,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.final_status" : "fail",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 8546eb2c82d..1244265f9d7 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "munit",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-munit-0.7.28",
@@ -128,6 +129,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedMUnit",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.traits" : "{\"category\":[\"myTag\"]}",
@@ -153,219 +155,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "munit",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "munit.ComparisonFailException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "munit",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4-munit-0.7.28",
-      "test.name" : "Calculator.add",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedMUnit",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"myTag\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "munit.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedMUnit.Calculator.add",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-failed-assumption-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-failed-assumption-latest/events.ftl
index 002f3931487..cce321c1ffe 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-failed-assumption-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/src/test/resources/test-failed-assumption-latest/events.ftl
@@ -115,6 +115,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "skip",
       "test.framework" : "munit",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4-munit-0.7.28",
@@ -145,4 +146,4 @@
   },
   "type" : "test",
   "version" : 2
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 2b285b21652..65f830064a7 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -120,6 +120,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4.10",
@@ -128,6 +129,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
@@ -154,223 +156,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 5828fd42e53..900caaa1210 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -119,6 +119,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "junit4",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4.10",
@@ -127,6 +128,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
@@ -152,215 +154,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.final_status" : "fail",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 47e77fc5af0..2b7d78a7268 100644
--- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -120,6 +120,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-4.10",
@@ -128,6 +129,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -154,223 +156,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit4",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "junit4",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-4.10",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl
index aed9df93b31..e48f884bdbe 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl
@@ -5,32 +5,4 @@
   "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_2},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_3},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index d2a02c6df41..1a10a1da28f 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -48,12 +48,14 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
       "test.name" : "Addition",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
@@ -82,213 +84,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -310,7 +105,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -318,14 +113,14 @@
     "name" : "cucumber.test_session",
     "resource" : "junit-5-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -343,15 +138,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "cucumber.test_module",
     "resource" : "junit-5-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl
index aed9df93b31..e48f884bdbe 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl
@@ -5,32 +5,4 @@
   "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_2},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_3},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 212271069e9..ecc6564500d 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -47,12 +47,14 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
       "test.name" : "Addition",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
       "test.type" : "test",
@@ -80,205 +82,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.final_status" : "fail",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -300,7 +103,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -308,14 +111,14 @@
     "name" : "cucumber.test_session",
     "resource" : "junit-5-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -333,15 +136,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "cucumber.test_module",
     "resource" : "junit-5-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl
index aed9df93b31..e48f884bdbe 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl
@@ -5,32 +5,4 @@
   "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_2},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_3},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_4},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
-  } ],
-  "span_id" : ${content_span_id_5},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 22cf6cba345..ee7f021299c 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -48,12 +48,14 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
       "test.name" : "Addition",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
@@ -82,213 +84,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "cucumber",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "cucumber",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-cucumber-5.4",
-      "test.name" : "Addition",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.traits" : "{\"category\":[\"foo\"]}",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "cucumber.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -310,7 +105,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -318,14 +113,14 @@
     "name" : "cucumber.test_session",
     "resource" : "junit-5-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -343,15 +138,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "cucumber.test_module",
     "resource" : "junit-5-cucumber-5.4",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl
index b7eca472954..1dfb03565ca 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -88,6 +89,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -222,6 +224,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -358,6 +361,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -460,4 +464,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl
index a43c1926272..af39020cc1a 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl
@@ -241,6 +241,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -290,6 +291,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -385,4 +387,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl
index fa97b2f2064..66c81429897 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-scenario-outline-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -87,6 +88,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -130,6 +132,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -173,6 +176,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -268,4 +272,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-skipped-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-skipped-scenario-outline-latest/events.ftl
index e9a3a9c3294..f525ee4128a 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-skipped-scenario-outline-latest/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/src/test/resources/test-skipped-scenario-outline-latest/events.ftl
@@ -44,6 +44,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -88,6 +89,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -132,6 +134,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -176,6 +179,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "cucumber",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-cucumber-5.4",
@@ -272,4 +276,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 36adc7f37d1..81becaaa477 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "spock",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-spock-2.0",
@@ -129,6 +130,7 @@
       "test.source.method" : "test failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedSpock",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
@@ -155,227 +157,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 76eda22aeab..cd7f9b296d0 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -120,6 +120,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "spock",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-spock-2.0",
@@ -128,6 +129,7 @@
       "test.source.method" : "test failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedSpock",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
@@ -153,219 +155,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.final_status" : "fail",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 81a0f6483d0..4725f2f6ef3 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "spock",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5-spock-2.0",
@@ -129,6 +130,7 @@
       "test.source.method" : "test failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedSpock",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -155,227 +157,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "spock",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.spockframework.runtime.SpockComparisonFailure",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "spock",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5-spock-2.0",
-      "test.name" : "test failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailedSpock",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "spock.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailedSpock.test failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 6705cad2dfc..7666178fa48 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -129,6 +130,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
@@ -155,227 +157,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 8933c4643bf..7681ce0bb7a 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -120,6 +120,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -128,6 +129,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
@@ -153,219 +155,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.final_status" : "fail",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 310a7d74a58..c62d53f6c70 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -129,6 +130,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -155,227 +157,4 @@
   },
   "type" : "test",
   "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_7},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_8},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "junit5",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.opentest4j.AssertionFailedError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "junit5",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "junit-5.3",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "junit5.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl
index a22c1e73dae..40b1b87bb65 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl
@@ -117,6 +117,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "skip",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl
index 031ef5d33ac..80526d70bcb 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl
@@ -117,6 +117,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -165,6 +166,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl
index 2ec0ce4c113..e133041f88b 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl
@@ -219,6 +219,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -370,6 +371,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl
index 4c97002d731..d5d856f9e8b 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl
@@ -122,6 +122,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -171,6 +172,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-parameterized-6/events.ftl
index c8d91088fea..bc9f3e7bd6b 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-parameterized-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-parameterized-6/events.ftl
@@ -115,6 +115,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -163,6 +164,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl
index dab5cc36583..2478870d599 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl
@@ -121,6 +121,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
@@ -174,6 +175,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "junit-5.3",
diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl
index 101386b5d2a..3449ab1f6fc 100644
--- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl
+++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl
@@ -332,6 +332,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -600,6 +601,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "junit5",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 21b87d31302..e312fa0a99f 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -30,15 +30,15 @@
       "component" : "karate",
       "env" : "none",
       "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
+      "step.name" : "* print 'first'"
     },
     "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
+      "step.endLine" : 4,
+      "step.startLine" : 4
     },
     "name" : "karate.step",
     "parent_id" : ${content_parent_id_2},
-    "resource" : "* assert false",
+    "resource" : "* print 'first'",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
     "span_id" : ${content_span_id_2},
     "start" : ${content_start_2},
@@ -50,102 +50,6 @@
   "content" : {
     "duration" : ${content_duration_3},
     "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_3},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_3},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_4},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_4},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_5},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_5},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* print 'first'"
-    },
-    "metrics" : {
-      "step.endLine" : 4,
-      "step.startLine" : 4
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_6},
-    "resource" : "* print 'first'",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_6},
-    "start" : ${content_start_6},
-    "trace_id" : ${content_trace_id_6}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid},
       "component" : "karate",
@@ -167,7 +71,7 @@
     "name" : "karate.test_suite",
     "resource" : "[org/example/test_failed] test failed",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id}
@@ -176,7 +80,7 @@
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.profiling.ctx" : "test",
@@ -205,109 +109,11 @@
       "process_id" : ${content_metrics_process_id}
     },
     "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
+    "parent_id" : ${content_parent_id_3},
     "resource" : "[org/example/test_failed] test failed.first scenario",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_6},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_6}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_9},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id},
-    "start" : ${content_start_9},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_10},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
     "span_id" : ${content_parent_id_2},
-    "start" : ${content_start_10},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
@@ -317,107 +123,7 @@
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_11},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_3},
-    "start" : ${content_start_11},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_12},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_4},
-    "start" : ${content_start_12},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_13},
+    "duration" : ${content_duration_5},
     "error" : 1,
     "meta" : {
       "_dd.profiling.ctx" : "test",
@@ -426,7 +132,7 @@
       "dummy_ci_tag" : "dummy_ci_tag_value",
       "env" : "none",
       "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
+      "error.stack" : ${content_meta_error_stack},
       "error.type" : "com.intuit.karate.KarateException",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
@@ -436,11 +142,8 @@
       "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
       "test.module" : "karate-1.0",
       "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "[org/example/test_failed] test failed",
       "test.test_management.attempt_to_fix_passed" : "false",
@@ -450,27 +153,27 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
     },
     "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
+    "parent_id" : ${content_parent_id_3},
     "resource" : "[org/example/test_failed] test failed.second scenario",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_5},
-    "start" : ${content_start_13},
+    "span_id" : ${content_parent_id},
+    "start" : ${content_start_5},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
+    "trace_id" : ${content_trace_id}
   },
   "type" : "test",
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_14},
+    "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -492,7 +195,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -500,14 +203,14 @@
     "name" : "karate.test_session",
     "resource" : "karate-1.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_14},
+    "start" : ${content_start_6},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_15},
+    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -525,15 +228,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}
     },
     "name" : "karate.test_module",
     "resource" : "karate-1.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_15},
+    "start" : ${content_start_7},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 04cf07ce206..d2759e0f918 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -30,15 +30,15 @@
       "component" : "karate",
       "env" : "none",
       "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
+      "step.name" : "* print 'first'"
     },
     "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
+      "step.endLine" : 4,
+      "step.startLine" : 4
     },
     "name" : "karate.step",
     "parent_id" : ${content_parent_id_2},
-    "resource" : "* assert false",
+    "resource" : "* print 'first'",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
     "span_id" : ${content_span_id_2},
     "start" : ${content_start_2},
@@ -49,102 +49,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_3},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_3},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_4},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_4},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_5},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_5},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* print 'first'"
-    },
-    "metrics" : {
-      "step.endLine" : 4,
-      "step.startLine" : 4
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_6},
-    "resource" : "* print 'first'",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_6},
-    "start" : ${content_start_6},
-    "trace_id" : ${content_trace_id_6}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 1,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid},
@@ -170,7 +74,7 @@
     "name" : "karate.test_suite",
     "resource" : "[org/example/test_failed] test failed",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id}
@@ -179,7 +83,7 @@
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.profiling.ctx" : "test",
@@ -208,105 +112,11 @@
       "process_id" : ${content_metrics_process_id}
     },
     "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
+    "parent_id" : ${content_parent_id_3},
     "resource" : "[org/example/test_failed] test failed.first scenario",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_6},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_6}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_9},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message_2},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id},
-    "start" : ${content_start_9},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_10},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message_2},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
     "span_id" : ${content_parent_id_2},
-    "start" : ${content_start_10},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
@@ -316,103 +126,7 @@
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_11},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message_2},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_3},
-    "start" : ${content_start_11},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_12},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message_2},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_4},
-    "start" : ${content_start_12},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_13},
+    "duration" : ${content_duration_5},
     "error" : 1,
     "meta" : {
       "_dd.profiling.ctx" : "test",
@@ -420,8 +134,8 @@
       "component" : "karate",
       "dummy_ci_tag" : "dummy_ci_tag_value",
       "env" : "none",
-      "error.message" : ${content_meta_error_message_2},
-      "error.stack" : ${content_meta_error_stack_6},
+      "error.message" : ${content_meta_error_message},
+      "error.stack" : ${content_meta_error_stack_2},
       "error.type" : "com.intuit.karate.KarateException",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
@@ -430,11 +144,8 @@
       "test.final_status" : "fail",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
       "test.module" : "karate-1.0",
       "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "[org/example/test_failed] test failed",
       "test.test_management.attempt_to_fix_passed" : "false",
@@ -443,27 +154,27 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
     },
     "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
+    "parent_id" : ${content_parent_id_3},
     "resource" : "[org/example/test_failed] test failed.second scenario",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_5},
-    "start" : ${content_start_13},
+    "span_id" : ${content_parent_id},
+    "start" : ${content_start_5},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
+    "trace_id" : ${content_trace_id}
   },
   "type" : "test",
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_14},
+    "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -485,7 +196,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -493,14 +204,14 @@
     "name" : "karate.test_session",
     "resource" : "karate-1.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_14},
+    "start" : ${content_start_6},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_15},
+    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -518,15 +229,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}
     },
     "name" : "karate.test_module",
     "resource" : "karate-1.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_15},
+    "start" : ${content_start_7},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 4860af79dec..85d59dcb988 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -30,15 +30,15 @@
       "component" : "karate",
       "env" : "none",
       "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
+      "step.name" : "* print 'first'"
     },
     "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
+      "step.endLine" : 4,
+      "step.startLine" : 4
     },
     "name" : "karate.step",
     "parent_id" : ${content_parent_id_2},
-    "resource" : "* assert false",
+    "resource" : "* print 'first'",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
     "span_id" : ${content_span_id_2},
     "start" : ${content_start_2},
@@ -50,102 +50,6 @@
   "content" : {
     "duration" : ${content_duration_3},
     "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_3},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_3},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_4},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_4},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* assert false"
-    },
-    "metrics" : {
-      "step.endLine" : 7,
-      "step.startLine" : 7
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_5},
-    "resource" : "* assert false",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_5},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 0,
-    "meta" : {
-      "component" : "karate",
-      "env" : "none",
-      "library_version" : ${content_meta_library_version},
-      "step.name" : "* print 'first'"
-    },
-    "metrics" : {
-      "step.endLine" : 4,
-      "step.startLine" : 4
-    },
-    "name" : "karate.step",
-    "parent_id" : ${content_parent_id_6},
-    "resource" : "* print 'first'",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_6},
-    "start" : ${content_start_6},
-    "trace_id" : ${content_trace_id_6}
-  },
-  "type" : "span",
-  "version" : 1
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
-    "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid},
       "component" : "karate",
@@ -167,7 +71,7 @@
     "name" : "karate.test_suite",
     "resource" : "[org/example/test_failed] test failed",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id}
@@ -176,7 +80,7 @@
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.profiling.ctx" : "test",
@@ -205,109 +109,11 @@
       "process_id" : ${content_metrics_process_id}
     },
     "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
+    "parent_id" : ${content_parent_id_3},
     "resource" : "[org/example/test_failed] test failed.first scenario",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_6},
-    "start" : ${content_start_8},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_6}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_9},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id},
-    "start" : ${content_start_9},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_10},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
     "span_id" : ${content_parent_id_2},
-    "start" : ${content_start_10},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
@@ -317,107 +123,7 @@
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_11},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_3},
-    "start" : ${content_start_11},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_12},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "karate",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "com.intuit.karate.KarateException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "karate",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "karate-1.0",
-      "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.status" : "fail",
-      "test.suite" : "[org/example/test_failed] test failed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
-    "resource" : "[org/example/test_failed] test failed.second scenario",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_4},
-    "start" : ${content_start_12},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_13},
+    "duration" : ${content_duration_5},
     "error" : 1,
     "meta" : {
       "_dd.profiling.ctx" : "test",
@@ -426,7 +132,7 @@
       "dummy_ci_tag" : "dummy_ci_tag_value",
       "env" : "none",
       "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
+      "error.stack" : ${content_meta_error_stack},
       "error.type" : "com.intuit.karate.KarateException",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
@@ -436,11 +142,8 @@
       "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
       "test.module" : "karate-1.0",
       "test.name" : "second scenario",
-      "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "[org/example/test_failed] test failed",
       "test.test_management.attempt_to_fix_passed" : "false",
@@ -450,27 +153,27 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
     },
     "name" : "karate.test",
-    "parent_id" : ${content_parent_id_7},
+    "parent_id" : ${content_parent_id_3},
     "resource" : "[org/example/test_failed] test failed.second scenario",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_parent_id_5},
-    "start" : ${content_start_13},
+    "span_id" : ${content_parent_id},
+    "start" : ${content_start_5},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
+    "trace_id" : ${content_trace_id}
   },
   "type" : "test",
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_14},
+    "duration" : ${content_duration_6},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -492,7 +195,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -500,14 +203,14 @@
     "name" : "karate.test_session",
     "resource" : "karate-1.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_14},
+    "start" : ${content_start_6},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_15},
+    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -525,15 +228,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}
     },
     "name" : "karate.test_module",
     "resource" : "karate-1.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_15},
+    "start" : ${content_start_7},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-disabled-failed/events.ftl
index c3d804776ba..85e425ae784 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-disabled-failed/events.ftl
@@ -68,6 +68,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -110,6 +111,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -208,4 +210,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl
index 2ef5fe150bf..b66e8fc1c27 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping-parameterized/events.ftl
@@ -117,6 +117,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -163,6 +164,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -266,4 +268,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl
index e31ef566757..d75ad145a05 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-skipping/events.ftl
@@ -70,6 +70,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -116,6 +117,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -219,4 +221,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl
index 1ff0128a678..07388ca3db8 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-itr-unskippable/events.ftl
@@ -94,6 +94,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.itr.forced_run" : "true",
@@ -140,6 +141,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -241,4 +243,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-with-setup/events.ftl b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-with-setup/events.ftl
index 87e3e437eba..65cc9c41f96 100644
--- a/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-with-setup/events.ftl
+++ b/dd-java-agent/instrumentation/karate-1.0/src/test/resources/test-with-setup/events.ftl
@@ -92,6 +92,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -136,6 +137,7 @@
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "karate",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "karate-1.0",
@@ -232,4 +234,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 98f0a92d478..260b31a5c36 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -53,6 +53,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "scalatest",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "scalatest-3.0.8",
@@ -60,6 +61,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
@@ -87,217 +89,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -319,7 +110,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -327,14 +118,14 @@
     "name" : "scalatest.test_session",
     "resource" : "scalatest-3.0.8",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -352,15 +143,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "scalatest.test_module",
     "resource" : "scalatest-3.0.8",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-failed/events.ftl
index df78aa99e04..ceda119e528 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -52,6 +52,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "scalatest",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "scalatest-3.0.8",
@@ -59,6 +60,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
@@ -85,209 +87,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.final_status" : "fail",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -309,7 +108,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -317,14 +116,14 @@
     "name" : "scalatest.test_session",
     "resource" : "scalatest-3.0.8",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -342,15 +141,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "scalatest.test_module",
     "resource" : "scalatest-3.0.8",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index da571833f6d..c1634de2bf3 100644
--- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -53,6 +53,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "scalatest",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "scalatest-3.0.8",
@@ -60,6 +61,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -87,217 +89,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "scalatest",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "org.scalatest.exceptions.TestFailedException",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "scalatest",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "scalatest-3.0.8",
-      "test.name" : "Example.add adds two numbers",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id}
-    },
-    "name" : "scalatest.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.Example.add adds two numbers",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -319,7 +110,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -327,14 +118,14 @@
     "name" : "scalatest.test_session",
     "resource" : "scalatest-3.0.8",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -352,15 +143,15 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "scalatest.test_module",
     "resource" : "scalatest-3.0.8",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
\ No newline at end of file
+} ]
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 05c149c3e03..2a5de8dc466 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -53,6 +53,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -61,6 +62,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
@@ -90,228 +92,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_test_disabled" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -333,7 +113,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -341,14 +121,14 @@
     "name" : "testng.test_session",
     "resource" : "testng-7.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -366,12 +146,12 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "testng.test_module",
     "resource" : "testng-7.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl
index 73daddba09c..332027b8a11 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl
@@ -251,6 +251,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_retry" : "true",
@@ -356,4 +357,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 2f6c081eae6..8e4c4169d62 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -52,6 +52,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -60,6 +61,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
@@ -88,220 +90,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -323,7 +111,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -331,14 +119,14 @@
     "name" : "testng.test_session",
     "resource" : "testng-7.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -356,12 +144,12 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "testng.test_module",
     "resource" : "testng-7.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index e10d98f129e..dcfe6131af4 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -53,6 +53,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -61,6 +62,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -90,228 +92,6 @@
 }, {
   "content" : {
     "duration" : ${content_duration_3},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_2},
-    "start" : ${content_start_3},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_4},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_3},
-    "start" : ${content_start_4},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_5},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_4},
-    "start" : ${content_start_5},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_6},
-    "error" : 1,
-    "meta" : {
-      "_dd.profiling.ctx" : "test",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "component" : "testng",
-      "dummy_ci_tag" : "dummy_ci_tag_value",
-      "env" : "none",
-      "error.message" : ${content_meta_error_message},
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "runtime-id" : ${content_meta_runtime_id},
-      "span.kind" : "test",
-      "test.codeowners" : "[\"owner1\",\"owner2\"]",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "testng",
-      "test.framework_version" : ${content_meta_test_framework_version},
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "testng-7.0",
-      "test.name" : "test_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "dummy_source_path",
-      "test.source.method" : "test_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "org.example.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "session-name"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id},
-      "test.source.end" : 18,
-      "test.source.start" : 12
-    },
-    "name" : "testng.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "org.example.TestFailed.test_failed",
-    "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "span_id" : ${content_span_id_5},
-    "start" : ${content_start_6},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_7},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_2},
@@ -333,7 +113,7 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id}
@@ -341,14 +121,14 @@
     "name" : "testng.test_session",
     "resource" : "testng-7.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_7},
+    "start" : ${content_start_3},
     "test_session_id" : ${content_test_session_id}
   },
   "type" : "test_session_end",
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_8},
+    "duration" : ${content_duration_4},
     "error" : 0,
     "meta" : {
       "_dd.p.tid" : ${content_meta__dd_p_tid_3},
@@ -366,12 +146,12 @@
       "test_session.name" : "session-name"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8}
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
     },
     "name" : "testng.test_module",
     "resource" : "testng-7.0",
     "service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
-    "start" : ${content_start_8},
+    "start" : ${content_start_4},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id}
   },
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl
index 2101079d4ed..fd9d1251296 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl
@@ -251,6 +251,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_retry" : "true",
@@ -356,4 +357,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-succeeded/events.ftl
index 750c3a97d2e..4177e22662a 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-succeeded/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-attempt-to-fix-succeeded/events.ftl
@@ -247,6 +247,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_retry" : "true",
@@ -351,4 +352,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-faulty-session-threshold/events.ftl
index 73da86035cc..7f52c0686d5 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-faulty-session-threshold/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-faulty-session-threshold/events.ftl
@@ -147,6 +147,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -304,6 +305,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -355,6 +357,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -458,4 +461,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-parameterized-test/events.ftl
index 6cb13042c03..834a7585b65 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-parameterized-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-parameterized-test/events.ftl
@@ -49,6 +49,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -97,6 +98,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -198,4 +200,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-test/events.ftl
index 217e5ec135c..96fbde4a2cf 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-test/events.ftl
@@ -49,6 +49,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -149,4 +150,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-tests-and-new-test/events.ftl
index cedc63c44fe..04474eca77b 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-tests-and-new-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-known-tests-and-new-test/events.ftl
@@ -147,6 +147,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -200,6 +201,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -247,6 +249,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -347,4 +350,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-parameterized-test/events.ftl
index d0995542163..3f09f2c2555 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-parameterized-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-parameterized-test/events.ftl
@@ -149,6 +149,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -300,6 +301,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -406,4 +408,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-slow-test/events.ftl
index 71ee405b2be..c1c038707ec 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-slow-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-slow-test/events.ftl
@@ -97,6 +97,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -200,4 +201,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-test/events.ftl
index 5e699b5f9e4..5d63050d9f7 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-test/events.ftl
@@ -147,6 +147,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -250,4 +251,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-very-slow-test/events.ftl
index 9e823985988..b5726e133ea 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-very-slow-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-new-very-slow-test/events.ftl
@@ -49,6 +49,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -150,4 +151,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-skip-new-test/events.ftl
index 16413cd4f80..dd252c6e513 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-skip-new-test/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-efd-skip-new-test/events.ftl
@@ -49,6 +49,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_new" : "true",
@@ -151,4 +152,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-failed-then-succeed/events.ftl
index b37f422fc33..7523c82cee6 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-failed-then-succeed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-failed-then-succeed/events.ftl
@@ -153,6 +153,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.is_retry" : "true",
@@ -253,4 +254,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-atr/events.ftl
index 0491d0dbc25..6eab9b61080 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-atr/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-atr/events.ftl
@@ -267,6 +267,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -371,4 +372,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-efd/events.ftl
index 6e1c25a999b..0f806e96817 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-efd/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-efd/events.ftl
@@ -161,6 +161,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -268,4 +269,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-known/events.ftl
index 6377985b8a0..56d689b4c45 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-known/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-known/events.ftl
@@ -53,6 +53,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -156,4 +157,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-parameterized/events.ftl
index 8030fc617bd..b704c5b604e 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-parameterized/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed-parameterized/events.ftl
@@ -49,6 +49,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -101,6 +102,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -203,4 +205,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed/events.ftl
index 38ca5c9a737..b9a3f2ddbd2 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-quarantined-failed/events.ftl
@@ -53,6 +53,7 @@
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -154,4 +155,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-error/events.ftl
index 29726eda0f3..d226f27f206 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-error/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-error/events.ftl
@@ -262,6 +262,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -363,4 +364,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-failed/events.ftl
index b67ade520e5..435ebb3666d 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-failed/events.ftl
@@ -262,6 +262,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -363,4 +364,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-parameterized/events.ftl
index 9d50e95bc24..87390f742cb 100644
--- a/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-parameterized/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/test/resources/test-retry-parameterized/events.ftl
@@ -49,6 +49,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "pass",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.module" : "testng-7.0",
@@ -309,6 +310,7 @@
       "runtime-id" : ${content_meta_runtime_id},
       "span.kind" : "test",
       "test.codeowners" : "[\"owner1\",\"owner2\"]",
+      "test.final_status" : "fail",
       "test.framework" : "testng",
       "test.framework_version" : ${content_meta_test_framework_version},
       "test.has_failed_all_retries" : "true",
@@ -411,4 +413,4 @@
   },
   "type" : "test_module_end",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
index 0713df1b0ea..44173ccbb90 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
@@ -214,6 +214,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "fail",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.module" : ":test",
@@ -385,4 +386,4 @@
   },
   "type" : "span",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
index 221936b548f..6c09f1adda7 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
@@ -210,6 +210,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.module" : ":test",
@@ -272,6 +273,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "skip",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.module" : ":test",
@@ -443,4 +445,4 @@
   },
   "type" : "span",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
index 14c6a95353d..68c0e93f4d0 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
@@ -210,6 +210,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
       "test.module" : ":test",
@@ -321,6 +322,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "junit5",
       "test.framework_version" : "5.9.3",
       "test.module" : ":test",
@@ -489,4 +491,4 @@
   },
   "type" : "span",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
index 93d9bd86b60..0f4ffc2c3c7 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
@@ -216,6 +216,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.module" : ":submodule-a:test",
@@ -278,6 +279,7 @@
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.10",
       "test.module" : ":submodule-b:test",
@@ -707,4 +709,4 @@
   },
   "type" : "span",
   "version" : 1
-} ]
+} ]
\ No newline at end of file
diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
index ace7a496873..c426478b3ac 100644
--- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
+++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
@@ -140,7 +140,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
     def exitCode = whenRunningMavenBuild([:], [], [:])
     assert exitCode == 0
 
-    verifyEventsAndCoverages(projectName, "maven", mavenVersion, mockBackend.waitForEvents(15), mockBackend.waitForCoverages(6))
+    verifyEventsAndCoverages(projectName, "maven", mavenVersion, mockBackend.waitForEvents(11), mockBackend.waitForCoverages(3))
 
     where:
     projectName                                 | mavenVersion
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/coverages.ftl
index ae584f1dbb7..cba00bf9fbf 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/coverages.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/coverages.ftl
@@ -4,7 +4,7 @@
   }, {
     "filename" : "src/test/java/datadog/smoke/TestSucceeded.java"
   } ],
-  "span_id" : ${content_span_id_11},
+  "span_id" : ${content_span_id_7},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id_2}
 }, {
@@ -25,40 +25,4 @@
   "span_id" : ${content_span_id_6},
   "test_session_id" : ${content_test_session_id},
   "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  }, {
-    "filename" : "src/test/java/datadog/smoke/TestFailed.java"
-  } ],
-  "span_id" : ${content_span_id_7},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  }, {
-    "filename" : "src/test/java/datadog/smoke/TestFailed.java"
-  } ],
-  "span_id" : ${content_span_id_8},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  }, {
-    "filename" : "src/test/java/datadog/smoke/TestFailed.java"
-  } ],
-  "span_id" : ${content_span_id_9},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
-}, {
-  "files" : [ {
-    "filename" : "src/main/java/datadog/smoke/Calculator.java"
-  }, {
-    "filename" : "src/test/java/datadog/smoke/TestFailed.java"
-  } ],
-  "span_id" : ${content_span_id_10},
-  "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
 } ]
\ No newline at end of file
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
index 120d6770b21..7346c70b7d8 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
@@ -302,6 +302,7 @@
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
       "test.failure_suppressed" : "true",
+      "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
       "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
@@ -310,6 +311,7 @@
       "test.source.method" : "test_another_failed()V",
       "test.status" : "fail",
       "test.suite" : "datadog.smoke.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -370,289 +372,6 @@
       "runtime.version" : ${content_meta_runtime_version},
       "span.kind" : "test",
       "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : "4.13.2",
-      "test.is_retry" : "true",
-      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
-      "test.name" : "test_another_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
-      "test.source.method" : "test_another_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "datadog.smoke.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "mvn -B test"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id_2},
-      "test.source.end" : 17,
-      "test.source.start" : 14
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "datadog.smoke.TestFailed.test_another_failed",
-    "service" : "test-maven-service",
-    "span_id" : ${content_span_id_6},
-    "start" : ${content_start_9},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_2}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_10},
-    "error" : 1,
-    "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "1",
-      "_dd.library_capabilities.coverage_report_upload" : "1",
-      "_dd.library_capabilities.early_flake_detection" : "1",
-      "_dd.library_capabilities.fail_fast_test_order" : "1",
-      "_dd.library_capabilities.failed_test_replay" : "1",
-      "_dd.library_capabilities.impacted_tests" : "1",
-      "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "5",
-      "_dd.library_capabilities.test_management.disable" : "1",
-      "_dd.library_capabilities.test_management.quarantine" : "1",
-      "_dd.p.tid" : ${content_meta__dd_p_tid_10},
-      "_dd.test.is_user_provided_service" : "true",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "ci.workspace_path" : ${content_meta_ci_workspace_path},
-      "component" : "junit4",
-      "env" : "integration-test",
-      "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "os.architecture" : ${content_meta_os_architecture},
-      "os.platform" : ${content_meta_os_platform},
-      "os.version" : ${content_meta_os_version},
-      "runtime-id" : ${content_meta_runtime_id_2},
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
-      "runtime.version" : ${content_meta_runtime_version},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : "4.13.2",
-      "test.is_retry" : "true",
-      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
-      "test.name" : "test_another_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
-      "test.source.method" : "test_another_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "datadog.smoke.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "mvn -B test"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id_2},
-      "test.source.end" : 17,
-      "test.source.start" : 14
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "datadog.smoke.TestFailed.test_another_failed",
-    "service" : "test-maven-service",
-    "span_id" : ${content_span_id_7},
-    "start" : ${content_start_10},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_3}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_11},
-    "error" : 1,
-    "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "1",
-      "_dd.library_capabilities.coverage_report_upload" : "1",
-      "_dd.library_capabilities.early_flake_detection" : "1",
-      "_dd.library_capabilities.fail_fast_test_order" : "1",
-      "_dd.library_capabilities.failed_test_replay" : "1",
-      "_dd.library_capabilities.impacted_tests" : "1",
-      "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "5",
-      "_dd.library_capabilities.test_management.disable" : "1",
-      "_dd.library_capabilities.test_management.quarantine" : "1",
-      "_dd.p.tid" : ${content_meta__dd_p_tid_11},
-      "_dd.test.is_user_provided_service" : "true",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "ci.workspace_path" : ${content_meta_ci_workspace_path},
-      "component" : "junit4",
-      "env" : "integration-test",
-      "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "os.architecture" : ${content_meta_os_architecture},
-      "os.platform" : ${content_meta_os_platform},
-      "os.version" : ${content_meta_os_version},
-      "runtime-id" : ${content_meta_runtime_id_2},
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
-      "runtime.version" : ${content_meta_runtime_version},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.framework" : "junit4",
-      "test.framework_version" : "4.13.2",
-      "test.is_retry" : "true",
-      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
-      "test.name" : "test_another_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
-      "test.source.method" : "test_another_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "datadog.smoke.TestFailed",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "mvn -B test"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id_2},
-      "test.source.end" : 17,
-      "test.source.start" : 14
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "datadog.smoke.TestFailed.test_another_failed",
-    "service" : "test-maven-service",
-    "span_id" : ${content_span_id_8},
-    "start" : ${content_start_11},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_4}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_12},
-    "error" : 1,
-    "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "1",
-      "_dd.library_capabilities.coverage_report_upload" : "1",
-      "_dd.library_capabilities.early_flake_detection" : "1",
-      "_dd.library_capabilities.fail_fast_test_order" : "1",
-      "_dd.library_capabilities.failed_test_replay" : "1",
-      "_dd.library_capabilities.impacted_tests" : "1",
-      "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "5",
-      "_dd.library_capabilities.test_management.disable" : "1",
-      "_dd.library_capabilities.test_management.quarantine" : "1",
-      "_dd.p.tid" : ${content_meta__dd_p_tid_12},
-      "_dd.test.is_user_provided_service" : "true",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "ci.workspace_path" : ${content_meta_ci_workspace_path},
-      "component" : "junit4",
-      "env" : "integration-test",
-      "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "os.architecture" : ${content_meta_os_architecture},
-      "os.platform" : ${content_meta_os_platform},
-      "os.version" : ${content_meta_os_version},
-      "runtime-id" : ${content_meta_runtime_id_2},
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
-      "runtime.version" : ${content_meta_runtime_version},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
-      "test.final_status" : "pass",
-      "test.framework" : "junit4",
-      "test.framework_version" : "4.13.2",
-      "test.has_failed_all_retries" : "true",
-      "test.is_retry" : "true",
-      "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
-      "test.name" : "test_another_failed",
-      "test.retry_reason" : "attempt_to_fix",
-      "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
-      "test.source.method" : "test_another_failed()V",
-      "test.status" : "fail",
-      "test.suite" : "datadog.smoke.TestFailed",
-      "test.test_management.attempt_to_fix_passed" : "false",
-      "test.test_management.is_attempt_to_fix" : "true",
-      "test.test_management.is_quarantined" : "true",
-      "test.type" : "test",
-      "test_session.name" : "mvn -B test"
-    },
-    "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8},
-      "_dd.profiling.enabled" : 0,
-      "_dd.trace_span_attribute_schema" : 0,
-      "process_id" : ${content_metrics_process_id_2},
-      "test.source.end" : 17,
-      "test.source.start" : 14
-    },
-    "name" : "junit4.test",
-    "parent_id" : ${content_parent_id},
-    "resource" : "datadog.smoke.TestFailed.test_another_failed",
-    "service" : "test-maven-service",
-    "span_id" : ${content_span_id_9},
-    "start" : ${content_start_12},
-    "test_module_id" : ${content_test_module_id},
-    "test_session_id" : ${content_test_session_id},
-    "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_5}
-  },
-  "type" : "test",
-  "version" : 2
-}, {
-  "content" : {
-    "duration" : ${content_duration_13},
-    "error" : 1,
-    "meta" : {
-      "_dd.library_capabilities.auto_test_retries" : "1",
-      "_dd.library_capabilities.coverage_report_upload" : "1",
-      "_dd.library_capabilities.early_flake_detection" : "1",
-      "_dd.library_capabilities.fail_fast_test_order" : "1",
-      "_dd.library_capabilities.failed_test_replay" : "1",
-      "_dd.library_capabilities.impacted_tests" : "1",
-      "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "5",
-      "_dd.library_capabilities.test_management.disable" : "1",
-      "_dd.library_capabilities.test_management.quarantine" : "1",
-      "_dd.p.tid" : ${content_meta__dd_p_tid_13},
-      "_dd.test.is_user_provided_service" : "true",
-      "_dd.tracer_host" : ${content_meta__dd_tracer_host},
-      "ci.workspace_path" : ${content_meta_ci_workspace_path},
-      "component" : "junit4",
-      "env" : "integration-test",
-      "error.stack" : ${content_meta_error_stack_6},
-      "error.type" : "java.lang.AssertionError",
-      "language" : "jvm",
-      "library_version" : ${content_meta_library_version},
-      "os.architecture" : ${content_meta_os_architecture},
-      "os.platform" : ${content_meta_os_platform},
-      "os.version" : ${content_meta_os_version},
-      "runtime-id" : ${content_meta_runtime_id_2},
-      "runtime.name" : ${content_meta_runtime_name},
-      "runtime.vendor" : ${content_meta_runtime_vendor},
-      "runtime.version" : ${content_meta_runtime_version},
-      "span.kind" : "test",
-      "test.failure_suppressed" : "true",
       "test.final_status" : "pass",
       "test.framework" : "junit4",
       "test.framework_version" : "4.13.2",
@@ -667,7 +386,7 @@
       "test_session.name" : "mvn -B test"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id_2},
@@ -678,21 +397,21 @@
     "parent_id" : ${content_parent_id},
     "resource" : "datadog.smoke.TestFailed.test_failed",
     "service" : "test-maven-service",
-    "span_id" : ${content_span_id_10},
-    "start" : ${content_start_13},
+    "span_id" : ${content_span_id_6},
+    "start" : ${content_start_9},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id},
-    "trace_id" : ${content_trace_id_6}
+    "trace_id" : ${content_trace_id_2}
   },
   "type" : "test",
   "version" : 2
 }, {
   "content" : {
-    "duration" : ${content_duration_14},
+    "duration" : ${content_duration_10},
     "error" : 0,
     "meta" : {
-      "_dd.p.tid" : ${content_meta__dd_p_tid_14},
+      "_dd.p.tid" : ${content_meta__dd_p_tid_10},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
       "ci.workspace_path" : ${content_meta_ci_workspace_path},
@@ -718,7 +437,7 @@
       "test_session.name" : "mvn -B test"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_10},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id_2},
@@ -728,7 +447,7 @@
     "name" : "junit4.test_suite",
     "resource" : "datadog.smoke.TestSucceeded",
     "service" : "test-maven-service",
-    "start" : ${content_start_14},
+    "start" : ${content_start_10},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id_2}
@@ -737,7 +456,7 @@
   "version" : 1
 }, {
   "content" : {
-    "duration" : ${content_duration_15},
+    "duration" : ${content_duration_11},
     "error" : 0,
     "meta" : {
       "_dd.library_capabilities.auto_test_retries" : "1",
@@ -750,7 +469,7 @@
       "_dd.library_capabilities.test_management.attempt_to_fix" : "5",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
-      "_dd.p.tid" : ${content_meta__dd_p_tid_15},
+      "_dd.p.tid" : ${content_meta__dd_p_tid_11},
       "_dd.test.is_user_provided_service" : "true",
       "_dd.tracer_host" : ${content_meta__dd_tracer_host},
       "ci.workspace_path" : ${content_meta_ci_workspace_path},
@@ -779,7 +498,7 @@
       "test_session.name" : "mvn -B test"
     },
     "metrics" : {
-      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11},
+      "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7},
       "_dd.profiling.enabled" : 0,
       "_dd.trace_span_attribute_schema" : 0,
       "process_id" : ${content_metrics_process_id_2},
@@ -790,13 +509,13 @@
     "parent_id" : ${content_parent_id},
     "resource" : "datadog.smoke.TestSucceeded.test_succeeded",
     "service" : "test-maven-service",
-    "span_id" : ${content_span_id_11},
-    "start" : ${content_start_15},
+    "span_id" : ${content_span_id_7},
+    "start" : ${content_start_11},
     "test_module_id" : ${content_test_module_id},
     "test_session_id" : ${content_test_session_id},
     "test_suite_id" : ${content_test_suite_id_2},
-    "trace_id" : ${content_trace_id_7}
+    "trace_id" : ${content_trace_id_3}
   },
   "type" : "test",
   "version" : 2
-} ]
\ No newline at end of file
+} ]