add JS genesis release test

Author: liustve

.github/workflows/node-ec2-adot-genesis-test.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch: # be able to run the workflow on demand
   push:
     branches:
-      - genesis-release-test
+      - genesis-js-release-test
   workflow_call:
     inputs:
       caller-workflow-name:
@@ -32,7 +32,7 @@ env:
   SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-us-east-1/node-sample-app.zip
 
 jobs:
-  python-ec2-adot-genai:
+  node-ec2-adot-genesis:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -93,22 +93,22 @@ jobs:
       - name: Initiate Terraform
         uses: ./.github/workflows/actions/execute_and_retry
         with:
-          command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/python/ec2/adot-genai && terraform init && terraform validate"
+          command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/node/ec2/adot-genai && terraform init && terraform validate"
           cleanup: "rm -rf .terraform && rm -rf .terraform.lock.hcl"
           max_retry: 6
 
       - name: Deploy service via terraform
-        working-directory: terraform/python/ec2/adot-genai
+        working-directory: terraform/node/ec2/adot-genai
         run: |
           terraform apply -auto-approve \
             -var="aws_region=${{ env.E2E_TEST_AWS_REGION }}" \
             -var="test_id=${{ env.TESTING_ID }}" \
             -var="service_zip_url=${{ env.SAMPLE_APP_ZIP }}" \
             -var="trace_id=${{ env.TRACE_ID_HEADER }}" \
-            -var="get_adot_wheel_command=${{ env.GET_ADOT_WHEEL_COMMAND }}" \
+            -var="get_adot_wheel_command=${{ env.GET_ADOT_INSTRUMENTATION_COMMAND }}" \
 
       - name: Get deployment info
-        working-directory: terraform/python/ec2/adot-genai
+        working-directory: terraform/node/ec2/adot-genai
         run: |
           echo "INSTANCE_IP=$(terraform output langchain_service_public_ip)" >> $GITHUB_ENV
           echo "INSTANCE_ID=$(terraform output langchain_service_instance_id)" >> $GITHUB_ENV
@@ -117,7 +117,7 @@ jobs:
         run: sleep 300
 
       - name: Validate generated logs
-        run: ./gradlew validator:run --args='-c python/ec2/adot-genai/log-validation.yml
+        run: ./gradlew validator:run --args='-c node/ec2/adot-genai/log-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.INSTANCE_IP }}:8000
           --region ${{ env.E2E_TEST_AWS_REGION }}
@@ -129,7 +129,7 @@ jobs:
 
       - name: Validate generated traces
         if: (success() || failure()) && !cancelled()
-        run: ./gradlew validator:run --args='-c python/ec2/adot-genai/trace-validation.yml
+        run: ./gradlew validator:run --args='-c node/ec2/adot-genai/trace-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.INSTANCE_IP }}:8000
           --region ${{ env.E2E_TEST_AWS_REGION }}
@@ -140,7 +140,7 @@ jobs:
 
       - name: Validate generated metrics
         if: (success() || failure()) && !cancelled()
-        run: ./gradlew validator:run --args='-c python/ec2/adot-genai/metric-validation.yml
+        run: ./gradlew validator:run --args='-c node/ec2/adot-genai/metric-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.INSTANCE_IP }}:8000
           --region ${{ env.E2E_TEST_AWS_REGION }}
@@ -152,7 +152,7 @@ jobs:
       - name: Cleanup
         if: always()
         continue-on-error: true
-        working-directory: terraform/python/ec2/adot-genai
+        working-directory: terraform/node/ec2/adot-genai
         run: |
           terraform destroy -auto-approve \
             -var="aws_region=${{ env.E2E_TEST_AWS_REGION }}" \

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

@@ -11,10 +11,6 @@ const PORT = parseInt(process.env.SAMPLE_APP_PORT || '8000', 10);
 const llm = new BedrockChat({
     model: "anthropic.claude-3-sonnet-20240229-v1:0",
     region: "us-east-1",
-    credentials: {
-        accessKeyId: process.env.BEDROCK_AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.BEDROCK_AWS_SECRET_ACCESS_KEY,
-    },
     temperature: 0.7,
 });
 

terraform/node/ec2/adot-genai/main.tf

@@ -83,6 +83,10 @@ unzip genai-service.zip
 # Navigate to genai-service directory and install dependencies
 cd genai-service
 npm install
+npm install express @langchain/community @langchain/core @traceloop/node-server-sdk pino
+
+# Download and install ADOT instrumentation
+${var.get_adot_wheel_command}
 
 export AWS_REGION=${var.aws_region}
 export OTEL_EXPORTER_OTLP_LOGS_HEADERS="x-aws-log-group=test/genesis,x-aws-log-stream=default,x-aws-metric-namespace=genesis"
@@ -93,38 +97,26 @@ export AGENT_OBSERVABILITY_ENABLED="true"
 cd /app/genai-service
 nohup node --require '@aws/aws-distro-opentelemetry-node-autoinstrumentation/register' --require ./customInstrumentation.js index.js > /var/log/langchain-service.log 2>&1 &
 
-# Upload cloud-init logs to S3
-aws s3 cp /var/log/cloud-init.log s3://adot-genai-js-test/cloud-init-logs/${var.test_id}/cloud-init.log
-aws s3 cp /var/log/cloud-init-output.log s3://adot-genai-js-test/cloud-init-logs/${var.test_id}/cloud-init-output.log
-
 # Wait for service to be ready
-echo "Waiting for service to be ready..."
 for i in {1..60}; do
   if curl -s http://localhost:8000/health > /dev/null 2>&1; then
-    echo "Service is ready!"
     break
   fi
-  echo "Attempt $i: Service not ready, waiting 5 seconds..."
   sleep 5
 done
 
 # Generate traffic directly
-echo "Starting traffic generator..."
 nohup bash -c '
 for i in {1..5}; do
     message="What is the weather like today?"
-    echo "[$(date)] Request $i: $message"
     curl -s -X POST http://localhost:8000/ai-chat \
         -H "Content-Type: application/json" \
         -H "X-Amzn-Trace-Id: ${var.trace_id}" \
         -d "{\"message\": \"$message\"}" \
-        -m 30 \
-    echo "Request $i completed"
+        -m 30 > /dev/null 2>&1
     sleep 10
 done
-echo "Traffic generator completed"
-' > /var/log/traffic-generator.log 2>&1 &
-
+' > /dev/null 2>&1 &
 EOF
   )
 

terraform/node/ec2/adot-genai/variables.tf

@@ -39,6 +39,6 @@ variable "trace_id" {
 }
 
 variable "get_adot_wheel_command" {
-  description = "Command to get and install ADOT wheel"
-  default = "python3.12 -m pip install aws-opentelemetry-distro"
+  description = "Command to get and install ADOT instrumentation"
+  default = "npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation"
 }

validator/src/main/resources/expected-data-template/node/ec2/adot-genai/genai-log.mustache

@@ -1,13 +1,12 @@
 [{
   "resource": {
     "attributes": {
-      "aws.local.service": "{{serviceName}}",
       "aws.service.type": "gen_ai_agent",
       "service.name": "{{serviceName}}"
     }
   },
   "scope": {
-    "name": "openinference.instrumentation.langchain"
+    "name": "@traceloop/instrumentation-langchain"
   },
   "severityNumber": "^[0-9]+$",
   "severityText": ".*",
@@ -30,7 +29,7 @@
     }
   },
   "attributes": {
-    "event.name": "openinference.instrumentation.langchain"
+    "event.name": "@traceloop/instrumentation-langchain"
   },
   "traceId": "{{traceId}}"
 }]