Merge branch 'main' into bedrock-contract-test

Author: zzhlogin

.github/workflows/application-signals-e2e-test.yml

@@ -43,7 +43,7 @@ jobs:
 
   python-ec2-default-e2e-test:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-e2e-test.yml@consolidate-release
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-e2e-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -52,15 +52,15 @@ jobs:
 
   python-ec2-asg-e2e-test:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-e2e-test.yml@consolidate-release
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-e2e-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
       staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
       caller-workflow-name: 'main-build'
 
   python-eks-e2e-test:
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-e2e-test.yml@consolidate-release
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-e2e-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -69,7 +69,7 @@ jobs:
       caller-workflow-name: 'main-build'
 
   python-k8s-e2e-test:
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-e2e-test.yml@consolidate-release
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-e2e-test.yml@main
     secrets: inherit
     with:
       aws-region: us-east-1

.github/workflows/daily_scan.yml

@@ -82,15 +82,15 @@ jobs:
         id: high_scan
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.2.0"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.3.0"
           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-python:v0.2.0"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.3.0"
           severity: 'MEDIUM,LOW,UNKNOWN'
 
       - name: Configure AWS Credentials for emitting metrics

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/version.py

@@ -1,4 +1,4 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "0.2.0.dev0"
+__version__ = "0.3.0.dev0"

contract-tests/images/applications/django/requirements.txt

@@ -1,4 +1,4 @@
 opentelemetry-distro==0.46b0
 opentelemetry-exporter-otlp-proto-grpc==1.25.0
 typing-extensions==4.9.0
-django==5.0.3
+django==5.0.7