Merge pull request #852 from aws-observability/merge-v1.32.3

Merge relevant patch from v1.32.3 release
aws-observability · Jul 23, 2024 · 84e95c3 · 84e95c3
2 parents e5428dd + 08d06b1
commit 84e95c3
Show file tree

Hide file tree

Showing 82 changed files with 2,888 additions and 8,822 deletions.
diff --git a/.github/patches/opentelemetry-java-instrumentation.patch b/.github/patches/opentelemetry-java-instrumentation.patch
diff --git a/.github/patches/versions b/.github/patches/versions
@@ -0,0 +1 @@
+OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.1
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -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"
+val otelVersion = "1.32.1-adot1"
 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"

diff --git a/licenses/annotations-2.20.78.jar/META-INF/LICENSE.txt b/licenses/annotations-2.20.78.jar/META-INF/LICENSE.txt
diff --git a/licenses/annotations-2.20.78.jar/META-INF/NOTICE.txt b/licenses/annotations-2.20.78.jar/META-INF/NOTICE.txt