TEST

Author: liustve

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

@@ -18,7 +18,6 @@ env:
   E2E_TEST_ACCOUNT_ID: 571600841604
   E2E_TEST_ROLE_NAME: github
   METRIC_NAMESPACE: genesis
-  SPANS_LOG_GROUP: aws/spans
   LOG_GROUP_NAME: test/genesis
   TEST_RESOURCES_FOLDER: ${GITHUB_WORKSPACE}
   SAMPLE_APP_ZIP: s3://sigv4perfresults/langchain-service.zip
@@ -30,6 +29,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # - name: Set Get ADOT Wheel command environment variable
+      #   run: |
+      #     if [ "${{ github.event.repository.name }}" = "aws-otel-python-instrumentation" ]; then
+      #       # Reusing the adot-main-build-staging-jar bucket to store the python wheel file
+      #       echo GET_ADOT_WHEEL_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/${{ env.ADOT_WHEEL_NAME }} ./${{ env.ADOT_WHEEL_NAME }} && sudo python${{ env.PYTHON_VERSION }} -m pip install ${{ env.ADOT_WHEEL_NAME }}" >> $GITHUB_ENV
+      #     elif [ "${{ env.OTEL_SOURCE }}" == "pypi" ]; then
+      #       echo GET_ADOT_WHEEL_COMMAND="sudo python${{ env.PYTHON_VERSION }} -m pip install ${{ env.ADOT_WHEEL_NAME }}" >> $GITHUB_ENV
+      #     else
+      #       latest_release_version=$(curl -sL https://github.com/aws-observability/aws-otel-python-instrumentation/releases/latest | grep -oP '/releases/tag/v\K[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
+      #       echo "The latest version is $latest_release_version"
+      #       echo GET_ADOT_WHEEL_COMMAND="wget -O ${{ env.ADOT_WHEEL_NAME }} https://github.com/aws-observability/aws-otel-python-instrumentation/releases/latest/download/aws_opentelemetry_distro-$latest_release_version-py3-none-any.whl \
+      #       && sudo python${{ env.PYTHON_VERSION }} -m pip install ${{ env.ADOT_WHEEL_NAME }}" >> $GITHUB_ENV
+      #     fi
+
       - name: Initiate Gradlew Daemon
         uses: ./.github/workflows/actions/execute_and_retry
         continue-on-error: true
@@ -134,7 +147,6 @@ jobs:
           --endpoint http://${{ env.INSTANCE_IP }}:8000
           --region ${{ env.E2E_TEST_AWS_REGION }}
           --metric-namespace ${{ env.METRIC_NAMESPACE }}
-          --log-group ${{ env.SPANS_LOG_GROUP }}
           --service-name langchain-traceloop-app
           --instance-id ${{ env.INSTANCE_ID }}
           --trace-id ${{ env.XRAY_TRACE_ID }}'

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

@@ -171,9 +171,12 @@ private JsonifyArrayList<Map<String, Object>> getExpectedAttributes() throws Exc
 
   private boolean isAwsOtlpLog(Map<String, Object> expectedAttributes) {
     // OTLP SigV4 logs have 'body' as a top-level attribute
-    return expectedAttributes.containsKey("body") &&
-           expectedAttributes.containsKey("severityNumber") &&
-           expectedAttributes.containsKey("severityText");
+    boolean hasBodyKey = expectedAttributes.keySet().stream()
+        .anyMatch(key -> key.startsWith("body"));
+
+    return expectedAttributes.containsKey("severityNumber") && 
+           expectedAttributes.containsKey("severityText") &&
+           hasBodyKey;
   }
 
   private Map<String, Object> getActualLog(