fix: update propagated error message

daniel-mohedano · daniel-mohedano · commit 4fd99ee3ec50 · 2026-04-15T14:13:17.000+02:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/EarlyFlakeDetection.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/EarlyFlakeDetection.java
@@ -73,7 +73,10 @@ public boolean suppressFailures() {
 
   @Override
   public boolean propagateFailure() {
-    // used to bypass TestNG's RetryAnalyzer marking `fail` + `pass` test executions as passed
+    // used to bypass TestNG's RetryAnalyzer, which made the framework session status depend on
+    // result order:
+    // pass + fail -> fail (correct)
+    // fail + pass -> pass (incorrect)
     return !suppressFailures && results == ExecutionAggregation.MIXED;
   }
 
diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGExecutionInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGExecutionInstrumentation.java
@@ -122,14 +122,11 @@ public static void modifyStatus(@Advice.Argument(0) final ITestResult result) {
         // "failed but within success percentage"
         result.setStatus(ITestResult.SUCCESS_PERCENTAGE_FAILURE);
       } else if (result.isSuccess() && ddRetryAnalyzer.shouldPropagateFailure()) {
-        // Aligns session status with DD's reported result on EFD. Without this,
-        // the session status would depend on the result order:
-        // - pass + fail -> fail (correct)
-        // - fail + pass -> pass (incorrect, EFD should fail on flaky)
+        // mark status as failed to propagate an earlier failure suppressed by TestNG
         result.setStatus(ITestResult.FAILURE);
         result.setThrowable(
             new AssertionError(
-                "Datadog Early Flake Detection: test has flaky results (mixed pass/fail)"));
+                "Datadog: propagating test failure based on aggregated execution results"));
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -122,14 +122,11 @@ public static void modifyStatus(@Advice.Argument(0) final ITestResult result) {`
`122`	`122`	`// "failed but within success percentage"`
`123`	`123`	`result.setStatus(ITestResult.SUCCESS_PERCENTAGE_FAILURE);`
`124`	`124`	`} else if (result.isSuccess() && ddRetryAnalyzer.shouldPropagateFailure()) {`
`125`		`- // Aligns session status with DD's reported result on EFD. Without this,`
`126`		`- // the session status would depend on the result order:`
`127`		`- // - pass + fail -> fail (correct)`
`128`		`- // - fail + pass -> pass (incorrect, EFD should fail on flaky)`
	`125`	`+ // mark status as failed to propagate an earlier failure suppressed by TestNG`
`129`	`126`	`result.setStatus(ITestResult.FAILURE);`
`130`	`127`	`result.setThrowable(`
`131`	`128`	`new AssertionError(`
`132`		`- "Datadog Early Flake Detection: test has flaky results (mixed pass/fail)"));`
	`129`	`+ "Datadog: propagating test failure based on aggregated execution results"));`
`133`	`130`	`}`
`134`	`131`	`}`
`135`	`132`	`}`