Skip to content

Commit

Permalink
merge from main and remove bedrock runtime related code patches.
Browse files Browse the repository at this point in the history
  • Loading branch information
zzhlogin committed Dec 11, 2024
2 parents 4dd58f0 + f3c87ee commit 6f9b021
Show file tree
Hide file tree
Showing 90 changed files with 11,039 additions and 1,219 deletions.
965 changes: 124 additions & 841 deletions .github/patches/opentelemetry-java-instrumentation.patch

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/workflows/owasp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 6f9b021

Please sign in to comment.