From 6ab111d5c0cb87ddee6e11706b958260bb7f3569 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 11 Jun 2024 11:57:54 -0500
Subject: [PATCH] CLDR-17699 updated per code review

- ddenv to dd_env
- add comments explaining what dd is
---
 .github/workflows/maven.yml                             | 2 ++
 tools/scripts/ansible/hosts                             | 6 ++++--
 tools/scripts/ansible/monitoring-playbook.yml           | 2 +-
 tools/scripts/ansible/templates/bootstrap-properties.j2 | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 93985c09121..e8940d0622b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -91,6 +91,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: DataDog sourcemap upload
+        # only on push to main!
+        if: github.repository == 'unicode-org/cldr' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.event.inputs.git-ref == ''
         run: npx --package=@datadog/datadog-ci datadog-ci sourcemaps upload tools/cldr-apps/src/main/webapp/dist/ --minified-path-prefix=/cldr-apps/dist/ --release-version=r${{ github.event.inputs.git-ref }} --service=surveytool
         env:
           DATADOG_SITE: ${{ secrets.DATADOG_SITE }}
diff --git a/tools/scripts/ansible/hosts b/tools/scripts/ansible/hosts
index 68d8a08e626..4d71e99ad88 100644
--- a/tools/scripts/ansible/hosts
+++ b/tools/scripts/ansible/hosts
@@ -3,13 +3,15 @@ cldr-smoke.unicode.org
 cldr-staging.unicode.org
 
 [staging:vars]
-ddenv=staging
+# dd_env is the DataDog environment, staging vs prod
+dd_env=staging
 
 [prod]
 st.unicode.org
 
 [prod:vars]
-ddenv=prod
+# dd_env is the DataDog environment, staging vs prod
+dd_env=prod
 
 # CLDR Commit Checker web hosting here
 [ccc]
diff --git a/tools/scripts/ansible/monitoring-playbook.yml b/tools/scripts/ansible/monitoring-playbook.yml
index 35ad20a8909..66cafc36889 100644
--- a/tools/scripts/ansible/monitoring-playbook.yml
+++ b/tools/scripts/ansible/monitoring-playbook.yml
@@ -18,6 +18,6 @@
         block: |
           # enable apm and set the env
               enabled: true
-              env: {{ ddenv }}
+              env: {{ dd_env }}
         marker: '# {mark} ANSIBLE MANAGED BLOCK'
         insertafter: '^apm_config:'
diff --git a/tools/scripts/ansible/templates/bootstrap-properties.j2 b/tools/scripts/ansible/templates/bootstrap-properties.j2
index 0970e82eb0b..6a54c4a0c8c 100644
--- a/tools/scripts/ansible/templates/bootstrap-properties.j2
+++ b/tools/scripts/ansible/templates/bootstrap-properties.j2
@@ -9,7 +9,7 @@ org.unicode.cldr.util.CLDRConfigImpl.cldrHome="{{ cldr_path }}"
 # datadog things
 dd.dynamic.instrumentation.enabled=true
 dd.logs.injection=true
-dd.env={{ ddenv }}
+dd.env={{ dd_env }}
 
 # for DD: use json!
 com.ibm.ws.logging.message.format=json