testing pr changes

Author: Miqueasher

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

@@ -45,7 +45,7 @@ env:
   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
+  SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/node-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

.github/workflows/test.yml

@@ -0,0 +1,23 @@
+## 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:
+      - Node_Custom_metrics
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  node-ec2-default-test:
+    uses: ./.github/workflows/node-ec2-default-test.yml
+    secrets: inherit
+    with:
+      caller-workflow-name: 'test'
+      aws-region: 'us-east-1'

sample-apps/node/frontend-service/index.js

@@ -187,8 +187,6 @@ app.get('/client-call', (req, res) => {
   makeAsyncCall = true;
 });
 
-
-
 app.get('/mysql', (req, res) => {
   // Create a connection to the MySQL database
   const connection = mysql.createConnection({

sample-apps/node/frontend-service/package.json

@@ -22,6 +22,6 @@
     "@types/node": "^20.14.6",
     "bunyan": "^1.8.15",
     "express": "^4.21.2",
-    "mysql2": "^3.15.3"
+    "mysql2": "^3.11.0"
   }
 }

terraform/node/ec2/default/main.tf

@@ -141,8 +141,8 @@ resource "null_resource" "main_service_setup" {
       sudo /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:./amazon-cloudwatch-agent.json
 
       # Get and run the sample application with configuration
-      aws s3 cp ${var.sample_app_zip} ./node-sample-app.zip
-      unzip -o node-sample-app.zip
+      aws s3 cp ${var.sample_app_zip} ./node-sample-app-delete-me.zip
+      unzip -o node-sample-app-delete-me.zip
 
       # Enter appropriate service folder
       cd frontend-service
@@ -182,7 +182,7 @@ resource "null_resource" "main_service_setup" {
       tmux send-keys -t frontend 'export AWS_REGION="$${AWS_REGION}"' C-m
       tmux send-keys -t frontend 'export TESTING_ID="$${TESTING_ID}"' C-m
       tmux send-keys -t frontend 'export OTEL_NODE_DISABLED_INSTRUMENTATIONS=fs,dns,express' C-m
-      tmux send-keys -t frontend 'export OTEL_SERVICE_NAME=node-sample-application-${var.test_id}' C-m
+      tmux send-keys -t frontend 'export OTEL_SERVICE_NAME="$${SERVICE_NAME}"' C-m
       tmux send-keys -t frontend 'export OTEL_TRACES_SAMPLER=always_on' C-m
       tmux send-keys -t frontend 'node --require "@aws/aws-distro-opentelemetry-node-autoinstrumentation/register" index.js' C-m
 
@@ -272,8 +272,8 @@ resource "null_resource" "remote_service_setup" {
       sudo /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:./amazon-cloudwatch-agent.json
 
       # Get and run the sample application with configuration
-      aws s3 cp ${var.sample_app_zip} ./node-sample-app.zip
-      unzip -o node-sample-app.zip
+      aws s3 cp ${var.sample_app_zip} ./node-sample-app-delete-me.zip
+      unzip -o node-sample-app-delete-me.zip
 
       # Enter appropriate service folder
       cd remote-service