Skip to content

Commit

Permalink
Merge Release/v1.32.4 to main (#913)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
yiyuan-he authored Oct 18, 2024
1 parent dfeb444 commit a825c19
Show file tree
Hide file tree
Showing 95 changed files with 6,064 additions and 427 deletions.
2,508 changes: 2,468 additions & 40 deletions .github/patches/opentelemetry-java-instrumentation.patch

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .github/workflows/patch-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ jobs:

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

- name: Build image for testing
uses: docker/build-push-action@v5
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ jobs:

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

- name: Build image for testing
uses: docker/build-push-action@v5
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"

// This is the version of the upstream instrumentation BOM
val otelVersion = "1.32.1-adot1"
val otelVersion = "1.32.1-adot2"
val otelSnapshotVersion = "1.33.0"
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
Expand Down
8 changes: 8 additions & 0 deletions licenses/jackson-dataformat-cbor-2.17.2.jar/META-INF/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions licenses/joda-time-2.12.7.jar/META-INF/NOTICE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

919 changes: 536 additions & 383 deletions licenses/licenses.md

Large diffs are not rendered by default.

206 changes: 206 additions & 0 deletions licenses/netty-nio-client-2.26.20.jar/META-INF/LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions licenses/netty-nio-client-2.26.20.jar/META-INF/NOTICE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a825c19

Please sign in to comment.