Skip to content

Commit a825c19

Browse files
yiyuan-heyiyuan-he
authored
Merge Release/v1.32.4 to main (#913)
Merging release/v1.32.4 into main as part of MCM: https://mcm.amazon.dev/cms/MCM-112315558/execution/step/9de5087f-2c46-42b8-b760-a9ce99b569df By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent dfeb444 commit a825c19

File tree

95 files changed

+6064
-427
lines changed

Some content is hidden

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

95 files changed

+6064
-427
lines changed

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

+2,468-40
Large diffs are not rendered by default.

‎.github/workflows/patch-release-build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ jobs:
110110

111111
- name: Set up Docker Buildx
112112
uses: docker/setup-buildx-action@v3
113+
with:
114+
driver-opts: image=moby/buildkit:v0.15.1
113115

114116
- name: Build image for testing
115117
uses: docker/build-push-action@v5

‎.github/workflows/release-build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ jobs:
7878

7979
- name: Set up Docker Buildx
8080
uses: docker/setup-buildx-action@v3
81+
with:
82+
driver-opts: image=moby/buildkit:v0.15.1
8183

8284
- name: Build image for testing
8385
uses: docker/build-push-action@v5

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "1.32.1-adot1"
30+
val otelVersion = "1.32.1-adot2"
3131
val otelSnapshotVersion = "1.33.0"
3232
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
3333
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

‎licenses/annotations-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/annotations-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/annotations-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/annotations-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/apache-client-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/apache-client-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/apache-client-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/apache-client-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/arns-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/arns-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/arns-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/arns-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/auth-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/auth-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/auth-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/auth-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/aws-cbor-protocol-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/aws-cbor-protocol-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/aws-cbor-protocol-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/aws-cbor-protocol-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/aws-core-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/aws-core-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/aws-core-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/aws-core-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/aws-json-protocol-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/aws-json-protocol-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/aws-json-protocol-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/aws-json-protocol-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/aws-query-protocol-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/aws-query-protocol-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/aws-query-protocol-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/aws-query-protocol-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/aws-xml-protocol-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/aws-xml-protocol-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/aws-xml-protocol-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/aws-xml-protocol-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/crt-core-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/bedrock-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/crt-core-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/bedrock-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/dynamodb-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/bedrockagent-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/dynamodb-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/bedrockagent-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/endpoints-spi-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/bedrockagentruntime-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/endpoints-spi-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/bedrockagentruntime-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/http-client-spi-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/bedrockruntime-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/http-client-spi-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/bedrockruntime-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/json-utils-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/checksums-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/json-utils-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/checksums-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/kinesis-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/checksums-spi-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/kinesis-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/checksums-spi-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/metrics-spi-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/crt-core-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/metrics-spi-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/crt-core-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/netty-nio-client-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/dynamodb-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/netty-nio-client-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/dynamodb-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/profiles-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/endpoints-spi-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/profiles-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/endpoints-spi-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/protocol-core-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/http-auth-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/protocol-core-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/http-auth-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/regions-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/http-auth-aws-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/regions-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/http-auth-aws-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/s3-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/http-auth-spi-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/s3-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/http-auth-spi-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/sdk-core-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/http-client-spi-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/sdk-core-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/http-client-spi-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/sqs-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/identity-spi-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/sqs-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/identity-spi-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/jackson-annotations-2.16.1.jar/META-INF/LICENSE renamed to ‎licenses/jackson-annotations-2.17.2.jar/META-INF/LICENSE

File renamed without changes.

‎licenses/jackson-annotations-2.16.1.jar/META-INF/NOTICE renamed to ‎licenses/jackson-annotations-2.17.2.jar/META-INF/NOTICE

File renamed without changes.

‎licenses/jackson-core-2.16.1.jar/META-INF/LICENSE renamed to ‎licenses/jackson-core-2.17.2.jar/META-INF/LICENSE

File renamed without changes.

‎licenses/jackson-core-2.16.1.jar/META-INF/NOTICE renamed to ‎licenses/jackson-core-2.17.2.jar/META-INF/NOTICE

File renamed without changes.

‎licenses/jackson-databind-2.16.1.jar/META-INF/LICENSE renamed to ‎licenses/jackson-databind-2.17.2.jar/META-INF/LICENSE

File renamed without changes.

‎licenses/jackson-databind-2.16.1.jar/META-INF/NOTICE renamed to ‎licenses/jackson-databind-2.17.2.jar/META-INF/NOTICE

File renamed without changes.

‎licenses/jackson-dataformat-cbor-2.17.2.jar/META-INF/LICENSE

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎licenses/third-party-jackson-core-2.20.102.jar/META-INF/NOTICE renamed to ‎licenses/jackson-dataformat-cbor-2.17.2.jar/META-INF/NOTICE

+7-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎licenses/third-party-jackson-core-2.20.102.jar/META-INF/LICENSE renamed to ‎licenses/joda-time-2.12.7.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/joda-time-2.12.7.jar/META-INF/NOTICE.txt

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎licenses/third-party-jackson-core-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/json-utils-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/third-party-jackson-core-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/json-utils-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/third-party-jackson-dataformat-cbor-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/kinesis-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/third-party-jackson-dataformat-cbor-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/kinesis-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/licenses.md

+536-383

‎licenses/utils-2.20.102.jar/META-INF/LICENSE.txt renamed to ‎licenses/metrics-spi-2.26.20.jar/META-INF/LICENSE.txt

File renamed without changes.

‎licenses/utils-2.20.102.jar/META-INF/NOTICE.txt renamed to ‎licenses/metrics-spi-2.26.20.jar/META-INF/NOTICE.txt

File renamed without changes.

‎licenses/netty-nio-client-2.26.20.jar/META-INF/LICENSE.txt

+206
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎licenses/netty-nio-client-2.26.20.jar/META-INF/NOTICE.txt

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)