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

This reverts commit 2bbc991095302c69f66688d99fb4ec7036082f10.
---
 .github/workflows/add_final_status.xsl | 50 --------------------------
 .github/workflows/dev.yml              | 27 +-------------
 2 files changed, 1 insertion(+), 76 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 c515dfed..00000000
--- 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>
\ No newline at end of file
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index ab20b162..c6139ee4 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -66,17 +66,7 @@ jobs:
         run: cd ${BUILD_DIR} && test/tests -r junit -o report.xml
         env:
           ASAN_OPTIONS: alloc_dealloc_mismatch=0
-      - name: Add final_status property
-        if: success() || failure()
-        run: |
-          which xsltproc || (apt-get update && apt-get install -y xsltproc)
-          xml_file=".build/report.xml"
-          echo "Fixing $xml_file"
-          tmp_file="$(mktemp)"
-          xsltproc --output "$tmp_file" ".github/workflows/add_final_status.xsl" "$xml_file"
-          mv "$tmp_file" "$xml_file"
       - name: Upload test report to Datadog
-        if: success() || failure()
         run: |
           curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-${{ matrix.arch }}" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
           datadog-ci junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp .build/report.xml
@@ -165,25 +155,10 @@ jobs:
         run: |
           & 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
           .\build\test\tests.exe -r junit -o report.xml
-      - name: Add final_status property
-        if: success() || failure()
-        run: |
-          $xmlFile = "report.xml"
-          $xslFile = ".github/workflows/add_final_status.xsl"
-          $tmpFile = [System.IO.Path]::GetTempFileName()
-          
-          echo "Fixing $xmlFile"
-
-          $transform = New-Object System.Xml.Xsl.XslCompiledTransform
-          $transform.Load($xslFile)
-          $transform.Transform($xmlFile, $tmpFile)
-
-          Move-Item -Force $tmpFile $xmlFile
       - name: Upload test report to Datadog
-        if: success() || failure()
         run: |
           Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "datadog-ci.exe"
-          ./datadog-ci.exe junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp report.xml
+          ./datadog-ci.exe junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp  report.xml
 
   coverage:
     needs: build-linux-cmake 

From 98eec8146a24d01156f5db825b8d1e93bd471ebb Mon Sep 17 00:00:00 2001
From: Charles de Beauchesne <charles.de.beauchesne@gmail.com>
Date: Thu, 2 Apr 2026 11:20:55 +0200
Subject: [PATCH 2/2] Put back if condition

---
 .github/workflows/dev.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index c6139ee4..c9a809d8 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -67,6 +67,7 @@ jobs:
         env:
           ASAN_OPTIONS: alloc_dealloc_mismatch=0
       - name: Upload test report to Datadog
+        if: success() || failure()
         run: |
           curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-${{ matrix.arch }}" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
           datadog-ci junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp .build/report.xml
@@ -156,9 +157,10 @@ jobs:
           & 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
           .\build\test\tests.exe -r junit -o report.xml
       - name: Upload test report to Datadog
+        if: success() || failure()
         run: |
           Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "datadog-ci.exe"
-          ./datadog-ci.exe junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp  report.xml
+          ./datadog-ci.exe junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp report.xml
 
   coverage:
     needs: build-linux-cmake