From 61f55a2a064659bf7ac33a4b40c647aaaae2b1bb Mon Sep 17 00:00:00 2001 From: Jeel Mehta Date: Fri, 9 May 2025 15:36:57 -0700 Subject: [PATCH 1/3] Test --- .github/workflows/node-ec2-adot-sigv4-test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node-ec2-adot-sigv4-test.yml b/.github/workflows/node-ec2-adot-sigv4-test.yml index ea212c9d7..870c4b896 100644 --- a/.github/workflows/node-ec2-adot-sigv4-test.yml +++ b/.github/workflows/node-ec2-adot-sigv4-test.yml @@ -6,6 +6,9 @@ # Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview name: Node EC2 ADOT SigV4 Use Case on: + push: + branches: + - Node_SigV4_test workflow_call: inputs: caller-workflow-name: @@ -34,9 +37,9 @@ permissions: env: E2E_TEST_AWS_REGION: 'us-west-2' CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }} - NODE_VERSION: ${{ inputs.node-version }} - CPU_ARCHITECTURE: ${{ inputs.cpu-architecture }} - ADOT_INSTRUMENTATION_NAME: ${{ inputs.staging-instrumentation-name }} + NODE_VERSION: ${{ inputs.node-version || 'none' }} + CPU_ARCHITECTURE: ${{ inputs.cpu-architecture || 'x86_64' }} + ADOT_INSTRUMENTATION_NAME: ${{ inputs.staging-instrumentation-name || '@aws/aws-distro-opentelemetry-node-autoinstrumentation' }} 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 From d97c8a3347494f8814875029f2a9d6b90da69b2b Mon Sep 17 00:00:00 2001 From: Jeel Mehta Date: Fri, 9 May 2025 15:56:36 -0700 Subject: [PATCH 2/3] Changing the values of dimensions of different metrics and alsovalue associated to arg remote-service-deployment-name in validate metrics --- .github/workflows/node-ec2-adot-sigv4-test.yml | 2 +- .../node/ec2/adot-sigv4/aws-sdk-call-metric.mustache | 6 +++--- .../node/ec2/adot-sigv4/outgoing-http-call-metric.mustache | 6 +++--- .../node/ec2/adot-sigv4/remote-service-metric.mustache | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/node-ec2-adot-sigv4-test.yml b/.github/workflows/node-ec2-adot-sigv4-test.yml index 870c4b896..81ed2bf42 100644 --- a/.github/workflows/node-ec2-adot-sigv4-test.yml +++ b/.github/workflows/node-ec2-adot-sigv4-test.yml @@ -195,7 +195,7 @@ jobs: run: ./gradlew validator:run --args='-c node/ec2/adot-sigv4/metric-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }} - --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001 + --remote-service-deployment-name node-sample-remote-application-${{ env.TESTING_ID }} --region ${{ env.E2E_TEST_AWS_REGION }} --account-id ${{ env.E2E_TEST_ACCOUNT_ID }} --metric-namespace ${{ env.METRIC_NAMESPACE }} diff --git a/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/aws-sdk-call-metric.mustache index 3c6f6e117..3e9383227 100644 --- a/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/aws-sdk-call-metric.mustache @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /aws-sdk-call - name: Service value: {{serviceName}} @@ -94,7 +94,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /aws-sdk-call - name: Service value: {{serviceName}} @@ -170,7 +170,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/outgoing-http-call-metric.mustache index db02e6f01..3cfd98efc 100644 --- a/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/outgoing-http-call-metric.mustache @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /outgoing-http-call - name: Service value: {{serviceName}} @@ -94,7 +94,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /outgoing-http-call - name: Service value: {{serviceName}} @@ -170,7 +170,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/remote-service-metric.mustache index 69f1f649e..4b1f0ad9c 100644 --- a/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/node/ec2/adot-sigv4/remote-service-metric.mustache @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /remote-service - name: Service value: {{serviceName}} @@ -127,7 +127,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /remote-service - name: Service value: {{serviceName}} @@ -236,7 +236,7 @@ dimensions: - name: Operation - value: UnmappedOperation + value: GET /remote-service - name: Service value: {{serviceName}} From 92ab5c98adfabd4c1d2f116efd78e50ed27aae14 Mon Sep 17 00:00:00 2001 From: Jeel Mehta Date: Fri, 9 May 2025 16:04:50 -0700 Subject: [PATCH 3/3] Reverting changes made to run the workflow --- .github/workflows/node-ec2-adot-sigv4-test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/node-ec2-adot-sigv4-test.yml b/.github/workflows/node-ec2-adot-sigv4-test.yml index 81ed2bf42..20b2b09a3 100644 --- a/.github/workflows/node-ec2-adot-sigv4-test.yml +++ b/.github/workflows/node-ec2-adot-sigv4-test.yml @@ -6,9 +6,6 @@ # Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview name: Node EC2 ADOT SigV4 Use Case on: - push: - branches: - - Node_SigV4_test workflow_call: inputs: caller-workflow-name: @@ -37,9 +34,9 @@ permissions: env: E2E_TEST_AWS_REGION: 'us-west-2' CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }} - NODE_VERSION: ${{ inputs.node-version || 'none' }} - CPU_ARCHITECTURE: ${{ inputs.cpu-architecture || 'x86_64' }} - ADOT_INSTRUMENTATION_NAME: ${{ inputs.staging-instrumentation-name || '@aws/aws-distro-opentelemetry-node-autoinstrumentation' }} + NODE_VERSION: ${{ inputs.node-version }} + CPU_ARCHITECTURE: ${{ inputs.cpu-architecture }} + ADOT_INSTRUMENTATION_NAME: ${{ inputs.staging-instrumentation-name }} 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