test

Author: liustve

.github/workflows/python-ec2-genesis-test.yml

@@ -41,19 +41,16 @@ jobs:
       - name: Generate testing id
         run: echo TESTING_ID="${{ github.run_id }}-${{ github.run_number }}-${RANDOM}" >> $GITHUB_ENV
 
-      - name: Generate XRay and W3C trace ID and baggage
+      - name: Generate XRay and W3C trace ID
         run: |
           ID_1="$(printf '%08x' $(date +%s))"
           ID_2="$(openssl rand -hex 12)"
           W3C_TRACE_ID="${ID_1}${ID_2}"
           XRAY_TRACE_ID="1-${ID_1}-${ID_2}"
-          BAGGAGE="test_session_$(openssl rand -hex 4)"
           echo "XRAY_TRACE_ID=${XRAY_TRACE_ID}" >> $GITHUB_ENV
           echo "W3C_TRACE_ID=${W3C_TRACE_ID}" >> $GITHUB_ENV
-          echo "BAGGAGE=${BAGGAGE}" >> $GITHUB_ENV
           echo "Generated XRay Trace ID: ${XRAY_TRACE_ID}"
           echo "Generated W3C Trace ID: ${W3C_TRACE_ID}"
-          echo "Generated Baggage: ${BAGGAGE}"
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -116,7 +113,6 @@ jobs:
           export DELAY_SECONDS="5"
           export TIMEOUT="30"
           export TRACE_ID="Root=${XRAY_TRACE_ID};Parent=$(openssl rand -hex 8);Sampled=1"
-          export BAGGAGE="${{ env.BAGGAGE }}"
           ./generate_traffic.sh
 
       - name: Validate generated logs

sample-apps/traffic-generator/langchain/generate_traffic.sh

@@ -42,16 +42,13 @@ send_request() {
     echo "Message: \"$message\""
 
     # Use environment variables or defaults for headers
-    local baggage_header="${BAGGAGE:-session.id=test_session}"
     local trace_id_header="${TRACE_ID:-Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1}"
 
-    echo "Using Baggage: $baggage_header"
     echo "Using Trace ID: $trace_id_header"
 
     # Send request with timeout
     response=$(curl -s -X POST "$ENDPOINT" \
         -H "Content-Type: application/json" \
-        -H "baggage: $baggage_header" \
         -H "X-Amzn-Trace-Id: $trace_id_header" \
         -d "{\"message\": \"$message\"}" \
         -m "$TIMEOUT" \

validator/src/main/java/com/amazon/aoc/App.java

@@ -160,9 +160,6 @@ public class App implements Callable<Integer> {
   @CommandLine.Option(names = {"--trace-id"})
   private String traceId;
 
-  @CommandLine.Option(names = {"--baggage"})
-  private String baggage;
-
   private static final String TEST_CASE_DIM_KEY = "testcase";
   private static final String CANARY_NAMESPACE = "Otel/Canary";
   private static final String CANARY_METRIC_NAME = "Success";
@@ -203,7 +200,6 @@ public Integer call() throws Exception {
     context.setInstanceId(this.instanceId);
     context.setPrivateDnsName(this.privateDnsName);
     context.setTraceId(this.traceId);
-    context.setBaggage(this.baggage);
 
     log.info(context);
 

validator/src/main/java/com/amazon/aoc/models/Context.java

@@ -69,8 +69,6 @@ public class Context {
 
   private String traceId;
 
-  private String baggage;
-
   private ECSContext ecsContext;
 
   private CloudWatchContext cloudWatchContext;

validator/src/main/java/com/amazon/aoc/validators/TraceValidator.java

@@ -147,6 +147,12 @@ private Map<String, Object> getTrace() throws Exception {
               validationConfig.getHttpMethod().toUpperCase(),
               validationConfig.getHttpPath()));
     }
+
+    if (validationConfig.getHttpPath().contains("chat")) {
+      if (context.getTraceId() != null) {
+        traceFilter += String.format(" AND id = \"%s\"", context.getTraceId());
+      }
+    }
     log.info("Trace Filter: {}", traceFilter);
     List<TraceSummary> retrieveTraceLists = xrayService.searchTraces(traceFilter);
     List<String> traceIdLists = Collections.singletonList(retrieveTraceLists.get(0).getId());

validator/src/main/resources/expected-data-template/python/ec2/adot-genai/genai-trace.mustache

@@ -1,13 +1,22 @@
 [{
-  "resource": {
-    "attributes": {
-      "aws.local.service": "{{serviceName}}",
-      "aws.service.type": "gen_ai_agent",
-      "service.name": "{{serviceName}}"
+  "name": "^{{serviceName}}$",
+  "trace_id": "^{{traceId}}$",
+  "http": {
+    "request": {
+      "url": "^.*/chat$",
+      "method": "^POST$"
     }
   },
-  "attributes": {
-    "session.id": "{{baggage}}"
+  "aws": {
+    "service.type": "^gen_ai_agent$"
   },
-  "traceId": "{{traceId}}"
+  "annotations": {
+    "aws.local.service": "^{{serviceName}}$",
+    "aws.local.operation": "^POST /chat$"
+  },
+  "metadata": {
+    "default": {
+      "service.name": "^{{serviceName}}$"
+    }
+  }
 }]