Skip to content

Commit 84e95c3

Browse files
thpiercethpierce
authored
Merge pull request #852 from aws-observability/merge-v1.32.3
Merge relevant patch from v1.32.3 release
2 parents e5428dd + 08d06b1 commit 84e95c3

File tree

82 files changed

+2888
-8822
lines changed

Some content is hidden

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

82 files changed

+2888
-8822
lines changed

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

Lines changed: 756 additions & 0 deletions
Large diffs are not rendered by default.

‎.github/patches/versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.1

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
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"
30+
val otelVersion = "1.32.1-adot1"
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.78.jar/META-INF/LICENSE.txt

Lines changed: 0 additions & 206 deletions
This file was deleted.

‎licenses/annotations-2.20.78.jar/META-INF/NOTICE.txt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)