Skip to content

Commit 0ebbb23

Browse files
[chore] fix otel java patch (#864)
* Remove top level otel java patch * Update otel java patch
1 parent 89031de commit 0ebbb23

File tree

3 files changed

+5
-35
lines changed

3 files changed

+5
-35
lines changed

OTEL_Java_Version.patch

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

patch-upstream.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ cp -rf adot/* opentelemetry-lambda/
1919
# Get current repo path
2020
CURRENT_DIR=$PWD
2121

22-
cd opentelemetry-lambda/java
23-
# patch otel version on collector/go.mod
24-
PATCH_JAVA_VERSION="../../OTEL_Java_Version.patch"
25-
26-
if [ -f $PATCH_JAVA_VERSION ]; then
27-
patch -p2 < $PATCH_JAVA_VERSION;
28-
fi
29-
cd ../..
3022

3123
# Move to the upstream OTel Lambda Collector folder where we will build a
3224
# collector used in each Lambda layer

patches/opentelemetry-lambda_java.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ index 3e862e7..d3941ac 100644
1212
}
1313

1414
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
15-
index abb6c06..b20f093 100644
15+
index 2d5f860..cceb485 100644
1616
--- a/java/dependencyManagement/build.gradle.kts
1717
+++ b/java/dependencyManagement/build.gradle.kts
1818
@@ -9,7 +9,7 @@ plugins {
1919
data class DependencySet(val group: String, val version: String, val modules: List<String>)
2020

2121
val DEPENDENCY_BOMS = listOf(
22-
- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha",
22+
- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.0.0-alpha",
2323
+ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-adot-lambda1-alpha",
24-
"org.apache.logging.log4j:log4j-bom:2.22.0",
25-
"software.amazon.awssdk:bom:2.21.42"
24+
"org.apache.logging.log4j:log4j-bom:2.22.1",
25+
"software.amazon.awssdk:bom:2.24.2"
2626
)
2727
@@ -18,7 +18,7 @@ val DEPENDENCIES = listOf(
2828
"com.amazonaws:aws-lambda-java-core:1.2.3",
2929
"com.amazonaws:aws-lambda-java-events:3.11.4",
3030
"com.squareup.okhttp3:okhttp:4.12.0",
31-
- "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0"
31+
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.0.0"
3232
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1"
3333
)
3434

0 commit comments

Comments
 (0)