fix(ci): fix test optimization upload broken by datadog-ci v5.13.0 requiring Node >= 20 (#3802)

* fix(ci): require Node >= 20 for datadog-ci npx, surface errors in silent wrapper

@datadog/datadog-ci@5.13.0 bumped its minimum Node.js requirement to >=20.
CI runners have Node 18, causing a ReferenceError: File is not defined crash
and silently failing all test optimization uploads.

Fix: raise the npx node version check from >=16 to >=20 so Node 18 runners
fall back to the standalone binary instead.

Also improve silent-upload-junit-to-datadog.sh to surface Warning/Error lines
even when the upload script exits 0, so future failures are visible in CI logs.

* revert silent-upload grep to original

* fix(ci): exit 1 on datadog-ci upload failure so silent wrapper shows output

Author: Leiyks

.gitlab/generate-appsec.php

@@ -131,7 +131,7 @@
   after_script:
     - mkdir -p "${CI_PROJECT_DIR}/artifacts"
     - find appsec/tests/integration/build/test-results -name "*.xml" -exec cp --parents '{}' "${CI_PROJECT_DIR}/artifacts/" \;
-    - .gitlab/upload-junit-to-datadog.sh "test.source.file:appsec/"
+    - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:appsec/"
   artifacts:
     reports:
       junit: "artifacts/**/test-results/**/TEST-*.xml"

.gitlab/silent-upload-junit-to-datadog.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 OUTFILE=/tmp/datadog-junit-upload.txt
 "$(dirname -- "${BASH_SOURCE[0]}")"/upload-junit-to-datadog.sh "$@" >$OUTFILE 2>&1
-if [[ $? -ne 0 ]]; then
+rc=$?
+if [[ $rc -ne 0 ]]; then
   cat $OUTFILE
 else
   grep -E '^\* ' $OUTFILE
 fi
+exit $rc

.gitlab/upload-junit-to-datadog.sh

@@ -142,9 +142,9 @@ export DATADOG_API_KEY
 # Determine which datadog-ci method to use
 datadog_ci_cmd=""
 
-# Prefer npm/npx if available and node version is recent enough (>=16)
+# Prefer npm/npx if available and node version is recent enough (>=20, required by @datadog/datadog-ci >= 5.13.0)
 node_version="$(node --version 2>/dev/null | sed 's/^v//' | cut -d. -f1)"
-if [ -n "$node_version" ] && [ "$node_version" -ge 16 ] 2>/dev/null && { command -v npx &> /dev/null || command -v npm &> /dev/null; }; then
+if [ -n "$node_version" ] && [ "$node_version" -ge 20 ] 2>/dev/null && { command -v npx &> /dev/null || command -v npm &> /dev/null; }; then
   echo "Using npx to run datadog-ci (node v${node_version})"
   datadog_ci_cmd="npx --yes @datadog/datadog-ci"
 else
@@ -215,8 +215,8 @@ echo "Current directory: $(pwd)"
 echo "Running command: ${datadog_ci_cmd} junit upload --service \"${DD_SERVICE}\" --max-concurrency 20 --verbose --tags git.repository_url:https://github.com/DataDog/dd-trace-php ${tags_args} ${xpath_tags_args} ${files_array[*]}"
 
 if ! ${datadog_ci_cmd} junit upload --service "${DD_SERVICE}" --max-concurrency 20 --verbose --tags "git.repository_url:https://github.com/DataDog/dd-trace-php" ${tags_args} ${xpath_tags_args} "${files_array[@]}"; then
-  echo "Warning: Failed to upload JUnit files" >&2
-  exit 0
+  echo "Error: Failed to upload JUnit files" >&2
+  exit 1
 fi
 
 echo "=== JUnit upload completed ==="