fix: Fix broken datadog metrics (#686)

department-of-veterans-affairs · Aug 27, 2024 · fc920b5 · fc920b5
1 parent c2f1e8c
commit fc920b5
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/.github/workflows/content-release.yml b/.github/workflows/content-release.yml
@@ -197,8 +197,8 @@ jobs:
         retry_on: error
         timeout_minutes: 70
         command: |
-          cd main && BUILD_OPTION=static yarn export --DRUPAL_CLIENT_ID ${{ secrets.PROD_DRUPAL_CLIENT_ID }} --DRUPAL_CLIENT_SECRET ${{ secrets.PROD_DRUPAL_CLIENT_SECRET }} --no-USE_REDIS | tee -a yarnoutput
-          echo YARN_OUTPUT=$(<yarnoutput)
+          cd main && BUILD_OPTION=static yarn export --DRUPAL_CLIENT_ID ${{ secrets.PROD_DRUPAL_CLIENT_ID }} --DRUPAL_CLIENT_SECRET ${{ secrets.PROD_DRUPAL_CLIENT_SECRET }} --no-USE_REDIS | tee yarnoutput
+          echo YARN_OUTPUT=$(<yarnoutput) >> $GITHUB_OUTPUT
           ls
           ls out
           if [[ $? -ne 0 ]]; then
@@ -208,10 +208,7 @@ jobs:
             cd out
             ls -l
           fi
-          
-        #command: cd main && yarn export --NEXT_PUBLIC_DRUPAL_BASE_URL https://content-build-medc0xjkxm4jmpzxl3tfbcs7qcddsivh.ci.cms.va.gov --NEXT_IMAGE_DOMAIN https://content-build-medc0xjkxm4jmpzxl3tfbcs7qcddsivh.ci.cms.va.gov --SITE_URL https://www.va.gov --DRUPAL_CLIENT_ID  ${{ secrets.PROD_DRUPAL_CLIENT_ID }} --DRUPAL_CLIENT_SECRET ${{ secrets.PROD_DRUPAL_CLIENT_SECRET }} --no-USE_REDIS
-
-
+                  
     - name: Build sitemap
       run: cd main && yarn build:sitemap
 
@@ -261,7 +258,11 @@ jobs:
       env:
         SRC: ./out/
         DEST: s3://next-content.www.va.gov
-
+
+    - name: Export deploy end time
+      id: export-deploy-end-time
+      run: echo DEPLOY_END_TIME=$(date +"%s") >> $GITHUB_OUTPUT
+
   notify-success:
     name: Notify Success
     needs: [validate-build-status, build]
@@ -391,15 +392,16 @@ jobs:
             echo "DEPLOY_ENV=${{ inputs.build_type || 'prod' }}" >> $GITHUB_ENV
             echo "BUILD_TRIGGER=cms" >> $GITHUB_ENV
 
+          # Calculate all of our metrics that we send to data dog
         - name: Calculate durations
           run: |
             echo "SETUP_DURATION=$(expr ${{needs.build.outputs.SETUP_END_TIME}} - ${{needs.build.outputs.SETUP_START_TIME}})" >> $GITHUB_ENV
             echo "BUILD_DURATION=$(expr ${{needs.build.outputs.BUILD_END_TIME}} - ${{needs.build.outputs.BUILD_START_TIME}})" >> $GITHUB_ENV
             echo "NEXT_BUILD_DURATION=$(expr ${{needs.build.outputs.BUILD_END_TIME}} - ${{needs.build.outputs.BUILD_START_TIME}})" >> $GITHUB_ENV
             echo "OVERALL_DURATION=$(expr ${{needs.build.outputs.DEPLOY_END_TIME}} - ${{needs.validate-build-status.outputs.APPROX_WORKFLOW_START_TIME}})" >> $GITHUB_ENV
             echo "DEPLOY_DURATION=$(expr ${{needs.build.outputs.DEPLOY_END_TIME}} - ${{needs.build.outputs.DEPLOY_START_TIME}})" >> $GITHUB_ENV
-            echo "${{needs.build.outputs.YARN_OUTPUT}}" >> yarn.out
-            echo "BUILT_PAGES=$(grep -oE "*\/([0-9]{4,})" ./yarn.out | head -1 | sed 's/\///g')" >> $GITHUB_ENV
+            echo "${{needs.build.outputs.YARN_OUTPUT}}" >> yarnoutput
+            echo "BUILT_PAGES=$(grep -oE "*\/([0-9]{4,})" ./yarnoutput| head -1 | sed 's/\///g')" >> $GITHUB_ENV
 
         - name: Build JSON object
           run: |