testing pr changes

Author: Miqueasher

.github/workflows/python-ec2-default-test.yml

@@ -49,7 +49,7 @@ env:
   CPU_ARCHITECTURE: ${{ inputs.cpu-architecture }}
   ADOT_WHEEL_NAME: ${{ inputs.staging-wheel-name }}
   OTEL_SOURCE: ${{ inputs.otel-source }}
-  SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/python-sample-app.zip
+  SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/python-sample-app-delete-me.zip
   E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
   E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
   METRIC_NAMESPACE: ApplicationSignals
@@ -171,7 +171,7 @@ jobs:
               -var="get_adot_wheel_command=${{ env.GET_ADOT_WHEEL_COMMAND }}" \
               -var="language_version=${{ env.PYTHON_VERSION }}" \
               -var="cpu_architecture=${{ env.CPU_ARCHITECTURE }}" \
-              || deployment_failed=$?
+            || deployment_failed=$?
             if [ $deployment_failed -eq 1 ]; then
               echo "Terraform deployment was unsuccessful. Will attempt to retry deployment."
             fi
@@ -253,7 +253,7 @@ jobs:
 
       - name: Validate CWAgent metrics
         id: cwagent-metric-validation
-        if: (success() || steps.log-validation.outcome == 'failure') && !cancelled()
+        if: (success() || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled()
         run: ./gradlew validator:run --args='-c python/ec2/default/custom-metric-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}

.github/workflows/python-sample-app-s3-deploy.yml

@@ -48,11 +48,11 @@ jobs:
 
       - name: Build Sample App Zip
         working-directory: sample-apps/python
-        run: zip -r python-sample-app.zip .
+        run: zip -r python-sample-app-delete-me.zip .
 
       - name: Upload to S3
         working-directory: sample-apps/python
-        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app.zip --key python-sample-app.zip
+        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app-delete-me.zip --key python-sample-app-delete-me.zip
 
       - name: Build Gen AI Sample App Zip
         working-directory: sample-apps/python/genai_service

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+# This is a reusable workflow for running the Enablement test for App Signals.
+# It is meant to be called from another workflow.
+# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview
+name: Test
+on:
+  push:
+    branches:
+      - otel-custom-metrics-test
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  java-ec2-default:
+    uses: ./.github/workflows/python-ec2-default-test.yml
+    secrets: inherit
+    with:
+      caller-workflow-name: 'test'
+      aws-region: 'us-east-1'
+
+  custom-metrics:
+    uses: ./.github/workflows/python-ec2-default-test.yml
+    secrets: inherit
+    with:
+      caller-workflow-name: 'test'
+      aws-region: 'us-east-1'

terraform/python/ec2/default/main.tf

@@ -161,8 +161,8 @@ resource "null_resource" "main_service_setup" {
       ${var.get_adot_wheel_command}
 
       # Get and run the sample application with configuration
-      aws s3 cp ${var.sample_app_zip} ./python-sample-app.zip
-      unzip -o python-sample-app.zip
+      aws s3 cp ${var.sample_app_zip} ./python-sample-app-delete-me.zip
+      unzip -o python-sample-app-delete-me.zip
 
       # Export environment variables for instrumentation
       cd ./django_frontend_service
@@ -294,8 +294,8 @@ resource "null_resource" "remote_service_setup" {
       ${var.get_adot_wheel_command}
 
       # Get and run the sample application with configuration
-      aws s3 cp ${var.sample_app_zip} ./python-sample-app.zip
-      unzip -o python-sample-app.zip
+      aws s3 cp ${var.sample_app_zip} ./python-sample-app-delete-me.zip
+      unzip -o python-sample-app-delete-me.zip
 
       # Export environment variables for instrumentation
       cd ./django_remote_service

validator/src/main/resources/expected-data-template/python/ec2/default/aws-otel-custom-metrics.mustache

@@ -2,7 +2,7 @@
 # ANY_VALUE defines a string to = 'ANY_VALUE' to pass validation testing
 -
   metricName: custom_export_counter
-  namespace: CWAgent
+  namespace: {{metricNamespace}}
   dimensions:
     -
       name: deployment.environment.name
@@ -54,7 +54,7 @@
       value: aws_ec2
 -
   metricName: test_histogram
-  namespace: CWAgent
+  namespace: {{metricNamespace}}
   dimensions:
     -
       name: deployment.environment.name