From b529049788773ad53f7c804e83c04a08b3e63c97 Mon Sep 17 00:00:00 2001
From: Charles de Beauchesne <charles.debeauchesne@datadoghq.com>
Date: Thu, 2 Apr 2026 09:56:19 +0200
Subject: [PATCH] Revert "chore(ci): add final_status property on junit XML
 [APMSP-2610] (#1681)"

This reverts commit c37a7dd978b3e4b214dae50e0726d18df4f3eedd.
---
 .github/workflows/add_final_status.xsl | 50 --------------------------
 .github/workflows/test.yml             | 15 --------
 2 files changed, 65 deletions(-)
 delete mode 100644 .github/workflows/add_final_status.xsl

diff --git a/.github/workflows/add_final_status.xsl b/.github/workflows/add_final_status.xsl
deleted file mode 100644
index ea2958a85a..0000000000
--- a/.github/workflows/add_final_status.xsl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <!-- Identity transform: copy everything as-is by default -->
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- For testcase elements missing dd_tags[test.final_status] inside their properties block -->
-  <xsl:template match="testcase[not(properties/property[@name='dd_tags[test.final_status]'])]">
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:variable name="status">
-        <xsl:choose>
-          <xsl:when test="failure or error">fail</xsl:when>
-          <xsl:when test="skipped">skip</xsl:when>
-          <xsl:otherwise>pass</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="properties">
-          <!-- Inject into existing properties block, preserving child order -->
-          <xsl:for-each select="node()">
-            <xsl:choose>
-              <xsl:when test="self::properties">
-                <properties>
-                  <xsl:apply-templates select="@*|node()"/>
-                  <property name="dd_tags[test.final_status]" value="{$status}"/>
-                </properties>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="."/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- No properties block: create one before other children -->
-          <properties>
-            <property name="dd_tags[test.final_status]" value="{$status}"/>
-          </properties>
-          <xsl:apply-templates select="node()"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cf2940ff0d..3e2d3405a8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -93,21 +93,6 @@ jobs:
           report_paths: "target/nextest/ci/junit.xml"
           check_name: "[${{ matrix.platform }}:${{ matrix.rust_version }}] test report"
           include_passed: true
-      # We're using not-that-ideal XSLT here as this change, because it must be done over 17+ repos.
-      # It's a workaround until this gets integrated into a better place, such as datadog-ci or the backend.
-      #
-      # * ticket: https://datadoghq.atlassian.net/browse/APMSP-2610
-      # * RFC: https://docs.google.com/document/d/1OaX_h09fCXWmK_1ADrwvilt8Yt5h4WjC7UUAdS3Y3uw/edit?pli=1&tab=t.0#heading=h.tfy5viz7rz2
-      - name: Add final_status property
-        if: success() || failure()
-        shell: bash
-        run: |
-          which xsltproc || sudo apt-get install -y xsltproc
-          echo "Fixing target/nextest/ci/junit.xml"
-          tmp_file="$(mktemp)"
-          xsltproc --output "$tmp_file" ".github/workflows/add_final_status.xsl" "target/nextest/ci/junit.xml"
-          mv "$tmp_file" "target/nextest/ci/junit.xml"
-
       - name: Upload test results to Datadog
         if: success() || failure()
         shell: bash