Skip to content

Instrumentation Patch Removal and SPI AWS SDK Test Addition #1120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 13, 2025
Merged

Instrumentation Patch Removal and SPI AWS SDK Test Addition #1120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fae29a
added tests and removed patch file
anahatAWS Jul 24, 2025
5a5d794
added documentation for tests
anahatAWS Jul 25, 2025
9c9926a
updated scripts to remove instrumentation patch
anahatAWS Jul 29, 2025
e51353a
updated lambda-layer patches
anahatAWS Jul 29, 2025
e233884
Merge branch 'main' into spi-final
anahatAWS Aug 1, 2025
ee20ca8
Merge branch 'main' into spi-final
anahatAWS Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lambda-layer/patches/aws-otel-java-instrumentation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ index 9493189..6090207 100644
--- 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"
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"

// This is the version of the upstream instrumentation BOM
-val otelVersion = "2.11.0-adot1"
-val otelVersion = "2.11.0"
+val otelVersion = "2.11.0-adot-lambda1"
val otelSnapshotVersion = "2.12.0"
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
4 changes: 2 additions & 2 deletions lambda-layer/patches/opentelemetry-java-instrumentation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ index 7900c9a4d9..80383d7c22 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -1,5 +1,5 @@
-val stableVersion = "2.11.0-adot1"
-val alphaVersion = "2.11.0-adot1-alpha"
-val stableVersion = "2.11.0"
-val alphaVersion = "2.11.0-alpha"
+val stableVersion = "2.11.0-adot-lambda1"
+val alphaVersion = "2.11.0-adot-lambda1-alpha"

Expand Down