Skip to content

Commit 6f9b021

Browse files
committed
merge from main and remove bedrock runtime related code patches.
2 parents 4dd58f0 + f3c87ee commit 6f9b021

File tree

90 files changed

+11039
-1219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+11039
-1219
lines changed

.github/patches/opentelemetry-java-instrumentation.patch

Lines changed: 124 additions & 841 deletions
Large diffs are not rendered by default.

.github/workflows/owasp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ jobs:
7777
id: high_scan
7878
uses: ./.github/actions/image_scan
7979
with:
80-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
80+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.6"
8181
severity: 'CRITICAL,HIGH'
8282

8383
- name: Perform low image scan
8484
if: always()
8585
id: low_scan
8686
uses: ./.github/actions/image_scan
8787
with:
88-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.5"
88+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.32.6"
8989
severity: 'MEDIUM,LOW,UNKNOWN'
9090

9191
- name: Configure AWS Credentials for emitting metrics

0 commit comments

Comments
 (0)