test

Author: liustve

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

@@ -86,11 +86,7 @@ npm install
 npm install express @langchain/community @langchain/core @traceloop/node-server-sdk pino
 
 # Download and install ADOT instrumentation
-echo "Installing ADOT instrumentation..."
 ${var.get_adot_wheel_command}
-echo "ADOT installation completed"
-echo "Checking installed packages:"
-npm list --depth=0
 
 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"
@@ -99,50 +95,28 @@ export AGENT_OBSERVABILITY_ENABLED="true"
 
 # Run the genai service from the genai-service directory
 cd /app/genai-service
-echo "Starting Node.js service..."
-echo "Current directory: $(pwd)"
-echo "Files in directory:"
-ls -la
-echo "Checking if ADOT module exists:"
-node -e "try { require('@aws/aws-distro-opentelemetry-node-autoinstrumentation/register'); console.log('ADOT module found'); } catch(e) { console.log('ADOT module not found:', e.message); }"
-echo "Starting service with ADOT instrumentation:"
 nohup node --require '@aws/aws-distro-opentelemetry-node-autoinstrumentation/register' --require ./customInstrumentation.js index.js > /var/log/langchain-service.log 2>&1 &
-echo "Service started with PID: $!"
 
 # Wait for service to be ready
-echo "Waiting for service to be ready..."
-for i in {1..10}; do
+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..."
-  echo "Checking service logs:"
-  tail -5 /var/log/langchain-service.log
   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 &
-
-# 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
-
+' > /dev/null 2>&1 &
 EOF
   )
 

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}}"
 }]