fix: add history on test start

daniel-mohedano · daniel-mohedano · commit 098b92930cb3 · 2025-09-08T12:36:27.000+02:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java
@@ -58,7 +58,8 @@ public void onTestStart(
       @Nullable String testParameters,
       @Nullable Collection<String> categories,
       @Nonnull TestSourceData testSourceData,
-      @Nullable Long startTime) {
+      @Nullable Long startTime,
+      @Nullable TestExecutionHistory testExecutionHistory) {
     // do nothing
   }
 
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java
@@ -85,7 +85,8 @@ public void testStarted(final Description description) {
             null,
             categories,
             TestSourceData.UNKNOWN,
-            null);
+            null,
+            executionHistories.get(description));
 
     recordFeatureFileCodeCoverage(description);
   }
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java
@@ -87,7 +87,8 @@ public void testStarted(final Description description) {
             null,
             categories,
             JUnit4Utils.toTestSourceData(description),
-            null);
+            null,
+            executionHistories.get(description));
   }
 
   @Override
@@ -173,6 +174,7 @@ public void testIgnored(final Description description) {
                 null,
                 categories,
                 JUnit4Utils.toTestSourceData(description),
+                null,
                 null);
       }
       TestEventsHandlerHolder.HANDLERS
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java
@@ -89,7 +89,8 @@ public void testStarted(final Description description) {
             testParameters,
             categories,
             testSourceData,
-            null);
+            null,
+            executionHistories.get(description));
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java
@@ -133,7 +133,8 @@ private void testResourceExecutionStarted(
             null,
             tags,
             TestSourceData.UNKNOWN,
-            null);
+            null,
+            TestEventsHandlerHolder.getExecutionHistory(testDescriptor));
 
     CoveragePerTestBridge.recordCoverage(classpathResourceName);
   }
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java
@@ -134,7 +134,8 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou
             testParameters,
             tags,
             testSourceData,
-            null);
+            null,
+            TestEventsHandlerHolder.getExecutionHistory(testDescriptor));
   }
 
   private void testCaseExecutionFinished(
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java
@@ -134,7 +134,8 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou
             testParameters,
             tags,
             testSourceData,
-            null);
+            null,
+            TestEventsHandlerHolder.getExecutionHistory(testDescriptor));
   }
 
   private void testCaseExecutionFinished(
diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java
@@ -147,7 +147,8 @@ public boolean beforeScenario(ScenarioRuntime sr) {
         parameters,
         categories,
         TestSourceData.UNKNOWN,
-        null);
+        null,
+        (TestExecutionHistory) sr.magicVariables.get(KarateUtils.EXECUTION_HISTORY_MAGICVARIABLE));
     return true;
   }
 
diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java
@@ -169,7 +169,8 @@ private static void onTestStart(TestStarting event) {
         testParameters,
         categories,
         new TestSourceData(testClass, null, null),
-        null);
+        null,
+        context.getExecutionHistory(testIdentifier));
   }
 
   private static void onTestSuccess(TestSucceeded event) {
diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java
@@ -92,7 +92,8 @@ public void onTestStart(final ITestResult result) {
         testParameters,
         groups,
         testSourceData,
-        null);
+        null,
+        executionHistory(result));
   }
 
   @Nullable
diff --git a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java
@@ -113,7 +113,8 @@ public static void onTestFinished(TestFinished event, TaskDef taskDef) {
         testParameters,
         categories,
         new TestSourceData(testClass, testMethod, testMethodName),
-        startMicros);
+        startMicros,
+        executionHistory);
 
     if (testOutcome.result() instanceof Result.Ignored) {
       Result.Ignored result = (Result.Ignored) testOutcome.result();
diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_failed_test_replay/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_failed_test_replay/events.ftl
@@ -370,6 +370,7 @@
       "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.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test",
@@ -440,6 +441,7 @@
       "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",
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java
@@ -64,7 +64,8 @@ void onTestStart(
       @Nullable String testParameters,
       @Nullable Collection<String> categories,
       @Nonnull TestSourceData testSourceData,
-      @Nullable Long startTime);
+      @Nullable Long startTime,
+      @Nullable TestExecutionHistory testExecutionHistory);
 
   void onTestSkip(TestKey descriptor, @Nullable String reason);
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ public void onTestStart(`
`58`	`58`	`@Nullable String testParameters,`
`59`	`59`	`@Nullable Collection<String> categories,`
`60`	`60`	`@Nonnull TestSourceData testSourceData,`
`61`		`- @Nullable Long startTime) {`
	`61`	`+ @Nullable Long startTime,`
	`62`	`+ @Nullable TestExecutionHistory testExecutionHistory) {`
`62`	`63`	`// do nothing`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ public void testStarted(final Description description) {`
`85`	`85`	`null,`
`86`	`86`	`categories,`
`87`	`87`	`TestSourceData.UNKNOWN,`
`88`		`- null);`
	`88`	`+ null,`
	`89`	`+ executionHistories.get(description));`
`89`	`90`
`90`	`91`	`recordFeatureFileCodeCoverage(description);`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ public void testStarted(final Description description) {`
`89`	`89`	`testParameters,`
`90`	`90`	`categories,`
`91`	`91`	`testSourceData,`
`92`		`- null);`
	`92`	`+ null,`
	`93`	`+ executionHistories.get(description));`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ private void testResourceExecutionStarted(`
`133`	`133`	`null,`
`134`	`134`	`tags,`
`135`	`135`	`TestSourceData.UNKNOWN,`
`136`		`- null);`
	`136`	`+ null,`
	`137`	`+ TestEventsHandlerHolder.getExecutionHistory(testDescriptor));`
`137`	`138`
`138`	`139`	`CoveragePerTestBridge.recordCoverage(classpathResourceName);`
`139`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou`
`134`	`134`	`testParameters,`
`135`	`135`	`tags,`
`136`	`136`	`testSourceData,`
`137`		`- null);`
	`137`	`+ null,`
	`138`	`+ TestEventsHandlerHolder.getExecutionHistory(testDescriptor));`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`private void testCaseExecutionFinished(`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ public boolean beforeScenario(ScenarioRuntime sr) {`
`147`	`147`	`parameters,`
`148`	`148`	`categories,`
`149`	`149`	`TestSourceData.UNKNOWN,`
`150`		`- null);`
	`150`	`+ null,`
	`151`	`+ (TestExecutionHistory) sr.magicVariables.get(KarateUtils.EXECUTION_HISTORY_MAGICVARIABLE));`
`151`	`152`	`return true;`
`152`	`153`	`}`
`153`	`154`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,8 @@ private static void onTestStart(TestStarting event) {`
`169`	`169`	`testParameters,`
`170`	`170`	`categories,`
`171`	`171`	`new TestSourceData(testClass, null, null),`
`172`		`- null);`
	`172`	`+ null,`
	`173`	`+ context.getExecutionHistory(testIdentifier));`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`private static void onTestSuccess(TestSucceeded event) {`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ public void onTestStart(final ITestResult result) {`
`92`	`92`	`testParameters,`
`93`	`93`	`groups,`
`94`	`94`	`testSourceData,`
`95`		`- null);`
	`95`	`+ null,`
	`96`	`+ executionHistory(result));`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`@Nullable`