From cc757ba082a82e327bdd9669b1bde7cc79ac4d8e Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@bstein.dev>
Date: Wed, 22 Apr 2026 13:28:35 -0300
Subject: [PATCH] ci(data-prepper): quote testcase metrics correctly

---
 services/logging/Jenkinsfile.data-prepper | 46 +++++++++++++++--------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/services/logging/Jenkinsfile.data-prepper b/services/logging/Jenkinsfile.data-prepper
index 476a0ca3..4d261c6a 100644
--- a/services/logging/Jenkinsfile.data-prepper
+++ b/services/logging/Jenkinsfile.data-prepper
@@ -214,15 +214,9 @@ EOF
             mkdir -p build
             failures=0
             cases=""
-            case_metrics=""
-
-            suite="${SUITE_NAME:-data_prepper}"
-            metric_branch_raw="${BRANCH_NAME:-${GIT_BRANCH:-unknown}}"
-            metric_branch_raw="${metric_branch_raw#origin/}"
-            metric_suite="${suite}"
-            metric_branch="${metric_branch_raw}"
-            metric_build_number="${BUILD_NUMBER:-unknown}"
-            metric_jenkins_job="${JOB_NAME:-data-prepper}"
+            dockerfile_present_status="skipped"
+            pipeline_config_present_status="skipped"
+            logging_kustomization_includes_data_prepper_status="skipped"
 
             add_case() {
               name="$1"
@@ -231,13 +225,15 @@ EOF
               if [ -n "${message}" ]; then
                 status="failed"
                 failures=$((failures + 1))
-                cases="${cases}<testcase classname=\"data_prepper.packaging\" name=\"${name}\"><failure message=\"${message}\" /></testcase>"
+                cases="${cases}"'<testcase classname="data_prepper.packaging" name="'"${name}"'"><failure message="'"${message}"'" /></testcase>'
               else
-                cases="${cases}<testcase classname=\"data_prepper.packaging\" name=\"${name}\" />"
+                cases="${cases}"'<testcase classname="data_prepper.packaging" name="'"${name}"'" />'
               fi
-              test_name="data_prepper.packaging::${name}"
-              case_metrics="${case_metrics}platform_quality_gate_test_case_result{suite=\"${metric_suite}\",branch=\"${metric_branch}\",build_number=\"${metric_build_number}\",jenkins_job=\"${metric_jenkins_job}\",test=\"${test_name}\",status=\"${status}\"} 1
-"
+              case "${name}" in
+                dockerfile_present) dockerfile_present_status="${status}" ;;
+                pipeline_config_present) pipeline_config_present_status="${status}" ;;
+                logging_kustomization_includes_data_prepper) logging_kustomization_includes_data_prepper_status="${status}" ;;
+              esac
             }
 
             if [ -s dockerfiles/Dockerfile.data-prepper ]; then
@@ -270,7 +266,11 @@ test_failed_count=${failures}
 test_error_count=0
 test_skipped_count=0
 EOF
-            printf '%s' "${case_metrics}" > build/testcase-metrics.prom
+            cat > build/testcase-status.env <<EOF
+dockerfile_present_status=${dockerfile_present_status}
+pipeline_config_present_status=${pipeline_config_present_status}
+logging_kustomization_includes_data_prepper_status=${logging_kustomization_includes_data_prepper_status}
+EOF
             if [ "${failures}" -ne 0 ]; then
               exit 1
             fi
@@ -450,15 +450,29 @@ EOF
           export METRIC_BRANCH_RAW="${metric_branch_raw}"
           export METRIC_BUILD_NUMBER_RAW="${BUILD_NUMBER:-unknown}"
           export METRIC_JENKINS_JOB_RAW="${JOB_NAME:-data-prepper}"
-          if [ ! -s build/test-counts.env ] || [ ! -s build/testcase-metrics.prom ]; then
+          if [ ! -s build/test-counts.env ] || [ ! -s build/testcase-status.env ]; then
             cat > build/test-counts.env <<EOF
 test_passed_count=0
 test_failed_count=0
 test_error_count=0
 test_skipped_count=1
 EOF
+            cat > build/testcase-status.env <<EOF
+dockerfile_present_status=skipped
+pipeline_config_present_status=skipped
+logging_kustomization_includes_data_prepper_status=skipped
+EOF
+          fi
+          . build/testcase-status.env
+          if [ "${dockerfile_present_status}" = "skipped" ] && [ "${pipeline_config_present_status}" = "skipped" ] && [ "${logging_kustomization_includes_data_prepper_status}" = "skipped" ]; then
             cat > build/testcase-metrics.prom <<METRICS
 platform_quality_gate_test_case_result{suite="${suite}",branch="${metric_branch}",build_number="${metric_build_number}",jenkins_job="${metric_jenkins_job}",test="__no_test_cases__",status="skipped"} 1
+METRICS
+          else
+            cat > build/testcase-metrics.prom <<METRICS
+platform_quality_gate_test_case_result{suite="${suite}",branch="${metric_branch}",build_number="${metric_build_number}",jenkins_job="${metric_jenkins_job}",test="data_prepper.packaging::dockerfile_present",status="${dockerfile_present_status}"} 1
+platform_quality_gate_test_case_result{suite="${suite}",branch="${metric_branch}",build_number="${metric_build_number}",jenkins_job="${metric_jenkins_job}",test="data_prepper.packaging::pipeline_config_present",status="${pipeline_config_present_status}"} 1
+platform_quality_gate_test_case_result{suite="${suite}",branch="${metric_branch}",build_number="${metric_build_number}",jenkins_job="${metric_jenkins_job}",test="data_prepper.packaging::logging_kustomization_includes_data_prepper",status="${logging_kustomization_includes_data_prepper_status}"} 1
 METRICS
           fi
           . build/test-counts.env