Use java script

Author: cbeauchesne

.gitlab/TagInitializationErrors.java

@@ -0,0 +1,54 @@
+import org.w3c.dom.Element;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tags intermediate initializationError retries with dd_tags[test.final_status]=skip.
+ *
+ * <p>Gradle generates synthetic "initializationError" testcases in JUnit reports for setup methods.
+ * When a setup is retried and eventually succeeds, multiple testcases are created, with only the
+ * last one passing. All intermediate attempts are marked skip so Test Optimization is not misled.
+ *
+ * <p>Usage (JEP 330): java TagInitializationErrors.java <xml-file>
+ */
+class TagInitializationErrors {
+  public static void main(String[] args) throws Exception {
+    if (args.length == 0) {
+      System.err.println("Usage: java TagInitializationErrors.java <xml-file>");
+      System.exit(1);
+    }
+    var xmlFile = new File(args[0]);
+    if (!xmlFile.exists()) {
+      System.err.println("File not found: " + xmlFile);
+      System.exit(1);
+    }
+    var doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(xmlFile);
+    var testcases = doc.getElementsByTagName("testcase");
+    List<Element> initErrorCases = new ArrayList<>();
+    for (int i = 0; i < testcases.getLength(); i++) {
+      var e = (Element) testcases.item(i);
+      if ("initializationError".equals(e.getAttribute("name"))) {
+        initErrorCases.add(e);
+      }
+    }
+    if (initErrorCases.size() <= 1) return;
+    for (int i = 0; i < initErrorCases.size() - 1; i++) {
+      var testcase = initErrorCases.get(i);
+      var properties = doc.createElement("properties");
+      var property = doc.createElement("property");
+      property.setAttribute("name", "dd_tags[test.final_status]");
+      property.setAttribute("value", "skip");
+      properties.appendChild(property);
+      testcase.appendChild(properties);
+    }
+    var transformer = TransformerFactory.newInstance().newTransformer();
+    transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+    transformer.transform(new DOMSource(doc), new StreamResult(xmlFile));
+  }
+}

.gitlab/collect_results.sh

@@ -90,6 +90,9 @@ do
     echo " (non-stable test names detected)"
   fi
 
+  echo "Add dd_tags[test.final_status] property on retried synthetics testcase initializationErrors"
+  java "$(dirname "$0")/TagInitializationErrors.java" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+
   echo "Add dd_tags[test.final_status] property to each testcase on $TARGET_DIR/$AGGREGATED_FILE_NAME"
   xsl_file="$(dirname "$0")/add_final_status.xsl"
   tmp_file="$(mktemp)"

buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts

@@ -9,12 +9,6 @@ import org.gradle.kotlin.dsl.withType
 import org.gradle.testing.base.TestingExtension
 import java.time.Duration
 import java.time.temporal.ChronoUnit
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.transform.OutputKeys
-import javax.xml.transform.TransformerFactory
-import javax.xml.transform.dom.DOMSource
-import javax.xml.transform.stream.StreamResult
-import org.w3c.dom.Element
 
 // Need concrete implementation of BuildService in Kotlin
 abstract class ForkedTestLimit : BuildService<BuildServiceParameters.None>
@@ -120,52 +114,3 @@ tasks.withType<Test>().configureEach {
     }
   }
 }
-
-tasks.withType<Test>().configureEach {
-  
-  // Gradle generates synthetic test cases in JUnit reports for setup methods. When a setup is retried
-  // and eventually succeeds, multiple test cases are created, with only the last one passing. Since the
-  // retry succeeds, this does not fail the CI.
-  //
-  // However, all intermediate attempts are reported as failures in TestOptimization, which is misleading.
-  //
-  // To tackle this, we'll expose a final_status field:
-  // - "skip" for intermediate retries
-  // - nothing on last attempt, using the defaulting made by Test Optimization
-  //
-  // Charles de Beauchesne, March 2025
-
-  doLast("post-process-junit-xml-report") {
-    val dir = reports.junitXml.outputLocation.get().asFile
-    if (!dir.exists()) return@doLast
-    dir.walkTopDown()
-      .filter { it.isFile && it.extension == "xml" }
-      .forEach { xmlFile ->
-        try {
-          tagInitializationErrors(xmlFile)
-        } catch (e: Exception) {
-          logger.warn("Failed to remove initializationError testcases from {}: {}", xmlFile.name, e.message)
-        }
-      }
-  }
-}
-
-fun tagInitializationErrors(xmlFile: File) {
-  val doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(xmlFile)
-  val testcases = doc.getElementsByTagName("testcase")
-  val initErrorCases = (0 until testcases.length)
-    .map { testcases.item(it) as Element }
-    .filter { it.getAttribute("name") == "initializationError" }
-  if (initErrorCases.size <= 1) return
-  initErrorCases.dropLast(1).forEach { testcase ->
-    val properties = doc.createElement("properties")
-    val property = doc.createElement("property")
-    property.setAttribute("name", "dd_tags[test.final_status]")
-    property.setAttribute("value", "skip")
-    properties.appendChild(property)
-    testcase.appendChild(properties)
-  }
-  val transformer = TransformerFactory.newInstance().newTransformer()
-  transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8")
-  transformer.transform(DOMSource(doc), StreamResult(xmlFile))
-}