test

Author: liustve

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

@@ -40,18 +40,15 @@ 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="Root=1-${ID_1}-${ID_2};Parent=$(openssl rand -hex 8);Sampled=1"
-          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: ${TRACE_ID}"
-          echo "Generated Baggage: ${BAGGAGE}"
+          echo "Generated XRay Trace ID: ${XRAY_TRACE_ID}"
         
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -114,7 +111,6 @@ jobs:
           export DELAY_SECONDS="5"
           export TIMEOUT="30"
           export TRACE_ID="${{ env.XRAY_TRACE_ID }}"
-          export BAGGAGE="${{ env.BAGGAGE }}"
           ./generate_traffic.sh
 
       - name: Validate generated logs
@@ -147,8 +143,7 @@ jobs:
           --account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
           --service-name langchain-traceloop-app
           --instance-id ${{ env.INSTANCE_ID }}
-          --trace-id ${{ env.XRAY_TRACE_ID }}
-          --baggage ${{ env.BAGGAGE }}'
+          --trace-id ${{ env.XRAY_TRACE_ID }}'
 
       - name: Cleanup
         if: always()

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;