add workflow to run ec2 canary with different node versions

pxaws · pxaws · commit d7e47c2ad5e1 · 2024-10-23T10:05:54.000-07:00
diff --git a/.github/workflows/node-ec2-default-retry.yml b/.github/workflows/node-ec2-default-retry.yml
@@ -14,6 +14,17 @@ on:
       caller-workflow-name:
         required: true
         type: string
+      node-version:
+        description: "Currently support version 14, 16, 18, 20, 22"
+        required: false
+        type: string
+        # 'none' means to use the node version come with the OS
+        default: 'none'
+      cpu-architecture:
+        description: "Permitted values: x86_64 or arm64"
+        required: false
+        type: string
+        default: "x86_64"
 
 permissions:
   id-token: write
@@ -26,6 +37,8 @@ jobs:
     with:
       aws-region: ${{ inputs.aws-region }}
       caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      node-version: ${{ inputs.node-version }}
+      cpu-architecture: ${{ inputs.cpu-architecture }}
 
   node-ec2-default-attempt-2:
     needs: [ node-ec2-default-attempt-1 ]
@@ -35,6 +48,8 @@ jobs:
     with:
       aws-region: ${{ inputs.aws-region }}
       caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      node-version: ${{ inputs.node-version }}
+      cpu-architecture: ${{ inputs.cpu-architecture }}
 
   publish-metric-attempt-1:
     needs: [ node-ec2-default-attempt-1, node-ec2-default-attempt-2 ]
diff --git a/.github/workflows/node-ec2-default-test.yml b/.github/workflows/node-ec2-default-test.yml
@@ -14,6 +14,17 @@ on:
       caller-workflow-name:
         required: true
         type: string
+      node-version:
+        description: "Currently support version 14, 16, 18, 20, 22"
+        required: false
+        type: string
+        # 'none' means to use the node version come with the OS
+        default: 'none'
+      cpu-architecture:
+        description: "Permitted values: x86_64 or arm64"
+        required: false
+        type: string
+        default: "x86_64"
       staging-instrumentation-name:
         required: false
         default: '@aws/aws-distro-opentelemetry-node-autoinstrumentation'
@@ -31,6 +42,8 @@ permissions:
 env:
   E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
   CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
+  NODE_VERSION: ${{ inputs.node-version }}
+  CPU_ARCHITECTURE: ${{ inputs.cpu-architecture }}
   ADOT_INSTRUMENTATION_NAME: ${{ inputs.staging-instrumentation-name }}
   SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/node-sample-app.zip
   E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
@@ -52,7 +65,7 @@ jobs:
         run: echo "job-started=true" >> $GITHUB_OUTPUT
 
       - name: Generate testing id
-        run: echo TESTING_ID="${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV
+        run: echo TESTING_ID="${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}-${{ inputs.node-version }}" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
         with:
@@ -105,7 +118,11 @@ jobs:
           if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then
             echo GET_CW_AGENT_RPM_COMMAND="aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/binary/${{ github.sha }}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm ./cw-agent.rpm" >> $GITHUB_ENV
           else
-            echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.E2E_TEST_AWS_REGION }}.s3.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
+            architecture="amd64"
+            if [ "${{ inputs.cpu-architecture }}" = "arm64" ]; then
+              architecture="arm64" 
+            fi
+            echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.E2E_TEST_AWS_REGION }}.s3.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/amazon_linux/${architecture}/latest/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
           fi
 
       - name: Set up terraform
@@ -142,6 +159,8 @@ jobs:
               -var="sample_app_zip=${{ env.SAMPLE_APP_ZIP }}" \
               -var="get_cw_agent_rpm_command=${{ env.GET_CW_AGENT_RPM_COMMAND }}" \
               -var="get_adot_instrumentation_command=${{ env.GET_ADOT_INSTRUMENTATION_COMMAND }}" \
+              -var="language_version=${{ env.NODE_VERSION }}" \
+              -var="cpu_architecture=${{ env.CPU_ARCHITECTURE }}" \
             || deployment_failed=$?
 
             if [ $deployment_failed -eq 1 ]; then
diff --git a/.github/workflows/node-ec2-release-test.yml b/.github/workflows/node-ec2-release-test.yml
@@ -0,0 +1,50 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+## This workflow aims to run the Application Signals end-to-end tests as a canary to
+## test the artifacts for App Signals enablement. It will deploy a sample app and remote
+## service on two EC2 instances, call the APIs, and validate the generated telemetry,
+## including logs, metrics, and traces.
+name: Node EC2 Enablement Release Testing
+on:
+  push:
+    branches:
+      - add-node-tests
+  # workflow_dispatch: # be able to run the workflow on demand
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  test-multiple-node-versions:
+    strategy:
+      fail-fast: false
+      matrix:
+        # aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1',
+        #              'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1',
+        #              'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1',
+        #              'us-east-1','us-east-2', 'us-west-1', 'us-west-2']
+        node-version: [ '14', '16', '18', '20', '22' ]
+    uses: ./.github/workflows/node-ec2-default-retry.yml
+    secrets: inherit
+    with:
+      aws-region: 'us-east-1'
+      node-version: ${{ matrix.node-version }}
+      cpu-architecture: 'x86_64'
+      caller-workflow-name: 'test-nodejs'
+
+  test-arm64-cpu-architecture:
+    uses: ./.github/workflows/node-ec2-default-retry.yml
+    secrets: inherit
+    with:
+      aws-region: 'us-east-1'
+      cpu-architecture: 'arm64'
+      caller-workflow-name: 'test-nodejs'
+
+  # to make sure existing tests are not affected by current changes
+  test-without-node-version-and-cpu-architecture:
+    uses: ./.github/workflows/node-ec2-default-retry.yml
+    secrets: inherit
+    with:
+      aws-region: 'us-east-1'
diff --git a/terraform/node/ec2/default/main.tf b/terraform/node/ec2/default/main.tf
@@ -79,7 +79,7 @@ data "aws_ami" "ami" {
 
 resource "aws_instance" "main_service_instance" {
   ami                                   = data.aws_ami.ami.id # Amazon Linux 2 (free tier)
-  instance_type                         = "t3.small"
+  instance_type                         = var.cpu_architecture == "arm64" ? "t4g.small" : "t3.small"
   key_name                              = local.ssh_key_name
   iam_instance_profile                  = "APP_SIGNALS_EC2_TEST_ROLE"
   vpc_security_group_ids                = [aws_default_vpc.default.default_security_group_id]
@@ -190,7 +190,7 @@ resource "null_resource" "main_service_setup" {
 
 resource "aws_instance" "remote_service_instance" {
   ami                                   = data.aws_ami.ami.id # Amazon Linux 2 (free tier)
-  instance_type                         = "t3.small"
+  instance_type                         = var.cpu_architecture == "arm64" ? "t4g.small" : "t3.small"
   key_name                              = local.ssh_key_name
   iam_instance_profile                  = "APP_SIGNALS_EC2_TEST_ROLE"
   vpc_security_group_ids                = [aws_default_vpc.default.default_security_group_id]
diff --git a/validator/src/main/resources/expected-data-template/node/ec2/default/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/node/ec2/default/aws-sdk-call-trace.mustache
@@ -19,7 +19,7 @@
       "EC2.InstanceId": "^{{instanceId}}$",
       "PlatformType": "^AWS::EC2$",
       "otel.resource.host.image.id": "^{{instanceAmi}}$",
-      "otel.resource.host.type": "^t3.small$",
+      "otel.resource.host.type": "^(t3.small|t4g.small)$",
       "aws.span.kind": "^LOCAL_ROOT$"
     }
   },
diff --git a/validator/src/main/resources/expected-data-template/node/ec2/default/client-call-trace.mustache b/validator/src/main/resources/expected-data-template/node/ec2/default/client-call-trace.mustache
@@ -8,7 +8,7 @@
   "metadata": {
     "default": {
       "otel.resource.host.image.id": "^{{instanceAmi}}$",
-      "otel.resource.host.type": "^t3.small$"
+      "otel.resource.host.type": "^(t3.small|t4g.small)$"
     }
   },
   "subsegments": [
diff --git a/validator/src/main/resources/expected-data-template/node/ec2/default/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/node/ec2/default/outgoing-http-call-trace.mustache
@@ -19,7 +19,7 @@
       "EC2.InstanceId": "^{{instanceId}}$",
       "PlatformType": "^AWS::EC2$",
       "otel.resource.host.image.id": "^{{instanceAmi}}$",
-      "otel.resource.host.type": "^t3.small$",
+      "otel.resource.host.type": "^(t3.small|t4g.small)$",
       "aws.span.kind": "^LOCAL_ROOT$"
     }
   },
diff --git a/validator/src/main/resources/expected-data-template/node/ec2/default/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/node/ec2/default/remote-service-trace.mustache
@@ -19,7 +19,7 @@
       "EC2.InstanceId": "^{{instanceId}}$",
       "PlatformType": "^AWS::EC2$",
       "otel.resource.host.image.id": "^{{instanceAmi}}$",
-      "otel.resource.host.type": "^t3.small$",
+      "otel.resource.host.type": "^(t3.small|t4g.small)$",
       "aws.span.kind": "^LOCAL_ROOT$"
     }
   },
@@ -71,7 +71,7 @@
       "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
       "PlatformType": "^AWS::EC2$",
       "otel.resource.host.image.id": "^{{instanceAmi}}$",
-      "otel.resource.host.type": "^t3.small$",
+      "otel.resource.host.type": "^(t3.small|t4g.small)$",
       "aws.span.kind": "^LOCAL_ROOT$"
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"EC2.InstanceId": "^{{instanceId}}$",`
`20`	`20`	`"PlatformType": "^AWS::EC2$",`
`21`	`21`	`"otel.resource.host.image.id": "^{{instanceAmi}}$",`
`22`		`- "otel.resource.host.type": "^t3.small$",`
	`22`	`+ "otel.resource.host.type": "^(t3.small\|t4g.small)$",`
`23`	`23`	`"aws.span.kind": "^LOCAL_ROOT$"`
`24`	`24`	`}`
`25`	`25`	`},`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"metadata": {`
`9`	`9`	`"default": {`
`10`	`10`	`"otel.resource.host.image.id": "^{{instanceAmi}}$",`
`11`		`- "otel.resource.host.type": "^t3.small$"`
	`11`	`+ "otel.resource.host.type": "^(t3.small\|t4g.small)$"`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"subsegments": [`