Merge branch 'main' into add-checksum

Author: harrryr

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

@@ -1 +1 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.1
+OTEL_JAVA_INSTRUMENTATION_VERSION=v1.33.6

.github/patches/versions

@@ -194,7 +194,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: gradle/wrapper-validation-action@v1
 
@@ -219,7 +219,7 @@ jobs:
           key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
 
       - name: Pull base image of Contract Tests Sample Apps
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
+        run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
 
       - name: Build snapshot with Gradle
         uses: gradle/gradle-build-action@v3

.github/workflows/main-build.yml

@@ -120,7 +120,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: gradle/wrapper-validation-action@v1
 
@@ -136,7 +136,7 @@ jobs:
           registry: public.ecr.aws
 
       - name: Pull base image of Contract Tests Sample Apps
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
+        run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
 
       - name: Build snapshot with Gradle
         uses: gradle/gradle-build-action@v3

.github/workflows/nightly-upstream-snapshot-build.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

.github/workflows/owasp.yml

@@ -81,16 +81,28 @@ jobs:
         with:
           arguments: build integrationTests --stacktrace -PenableCoverage=true -PlocalDocker=true
 
+      - name: Set up Java version for tests
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
       - name: Pull base image of Contract Tests Sample Apps
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
+        run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
 
       - name: Run contract tests
         uses: gradle/gradle-build-action@v3
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           arguments: contractTests -PlocalDocker=true -i
 
+      - name: Set up Java version for image build
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
       - name: Get current version
         if: ${{ matrix.os == 'ubuntu-latest' }}
         shell: bash

.github/workflows/pr-build.yml

@@ -13,7 +13,7 @@
 # permissions and limitations under the License.
 
 # Stage 1: Build the cp-utility binary
-FROM public.ecr.aws/docker/library/rust:1.75 as builder
+FROM public.ecr.aws/docker/library/rust:1.82 as builder
 
 WORKDIR /usr/src/cp-utility
 COPY ./tools/cp-utility .

Dockerfile

@@ -29,7 +29,7 @@ This configuration includes being able to reconfigure the [IdsGenerator](https:/
 which we need to support X-Ray compatible trace IDs. Because the SDK uses SPI, it is sufficient for
 the custom implementation to be on the classpath to be recognized. The AWS distribution of the
 OpenTelemetry Java Agent repackages the upstream agent by simply adding our SPI implementation for
-reconfiguring the ID generator. In addition, it includes [AWS resource providers](https://github.com/open-telemetry/opentelemetry-java/tree/main/sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource) 
+reconfiguring the ID generator. In addition, it includes [AWS resource providers](https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource) 
 by default, and it sets a system property to configure the agent to use multiple trace ID propagators, 
 defaulting to maximum interoperability.