Skip to content

Commit d0764a7

Browse files
Patch java versions to v1.32.0 (#862)
1 parent cb9f316 commit d0764a7

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

OTEL_Java_Version.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
2+
index 4d7087a..62dcbb7 100644
3+
--- a/java/dependencyManagement/build.gradle.kts
4+
+++ b/java/dependencyManagement/build.gradle.kts
5+
@@ -9,16 +9,16 @@ plugins {
6+
data class DependencySet(val group: String, val version: String, val modules: List<String>)
7+
8+
val DEPENDENCY_BOMS = listOf(
9+
- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.0.0-alpha",
10+
- "org.apache.logging.log4j:log4j-bom:2.22.1",
11+
- "software.amazon.awssdk:bom:2.23.7"
12+
+ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha",
13+
+ "org.apache.logging.log4j:log4j-bom:2.22.0",
14+
+ "software.amazon.awssdk:bom:2.21.42"
15+
)
16+
17+
val DEPENDENCIES = listOf(
18+
"com.amazonaws:aws-lambda-java-core:1.2.3",
19+
"com.amazonaws:aws-lambda-java-events:3.11.4",
20+
"com.squareup.okhttp3:okhttp:4.12.0",
21+
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.0.0"
22+
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0"
23+
)
24+
25+
javaPlatform {

patch-upstream.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ 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 ../..
30+
2231
# Move to the upstream OTel Lambda Collector folder where we will build a
2332
# collector used in each Lambda layer
2433
cd opentelemetry-lambda/collector
@@ -30,6 +39,8 @@ if [ -f $PATCH_OTEL_VERSION ]; then
3039
patch -p2 < $PATCH_OTEL_VERSION;
3140
fi
3241

42+
43+
3344
# patch collector startup to remove HTTP and S3 confmap providers
3445
# and set ADOT-specific BuildInfo
3546
patch -p2 < ../../collector.patch

0 commit comments

Comments
 (0)