Merge from main.

aws-observability · Dec 11, 2024 · bb3555c · bb3555c
2 parents 0668992 + 448d680
commit bb3555c
Show file tree

Hide file tree

Showing 93 changed files with 10,975 additions and 438 deletions.
diff --git a/.github/patches/opentelemetry-java-instrumentation.patch b/.github/patches/opentelemetry-java-instrumentation.patch
diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml
@@ -77,15 +77,15 @@ jobs:
         id: high_scan
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.6"
           severity: 'CRITICAL,HIGH'
 
       - name: Perform low image scan
         if: always()
         id: low_scan
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.6"
           severity: 'MEDIUM,LOW,UNKNOWN'
 
       - name: Configure AWS Credentials for emitting metrics