Skip to content

Commit 803a06d

Browse files
authored
Update java patch for otel-lambda repo (#1030)
1 parent 7f26d89 commit 803a06d

File tree

1 file changed

+31
-6
lines changed

1 file changed

+31
-6
lines changed

patches/opentelemetry-lambda_java.patch

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
2-
index 7693c66..e66bcba 100644
2+
index 7693c66..d3941ac 100644
33
--- a/java/build.gradle.kts
44
+++ b/java/build.gradle.kts
55
@@ -15,7 +15,7 @@ allprojects {
@@ -12,7 +12,7 @@ index 7693c66..e66bcba 100644
1212
}
1313

1414
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
15-
index 12f34ec..e76b1a4 100644
15+
index 12f34ec..9ad35ed 100644
1616
--- a/java/dependencyManagement/build.gradle.kts
1717
+++ b/java/dependencyManagement/build.gradle.kts
1818
@@ -9,7 +9,7 @@ plugins {
@@ -24,15 +24,40 @@ index 12f34ec..e76b1a4 100644
2424
"org.apache.logging.log4j:log4j-bom:2.24.3",
2525
"software.amazon.awssdk:bom:2.29.39"
2626
)
27-
@@ -18,9 +18,9 @@ val DEPENDENCIES = listOf(
27+
@@ -18,9 +18,7 @@ val DEPENDENCIES = listOf(
2828
"com.amazonaws:aws-lambda-java-core:1.2.3",
2929
"com.amazonaws:aws-lambda-java-events:3.14.0",
3030
"com.squareup.okhttp3:okhttp:4.12.0",
3131
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0",
32-
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1",
33-
"io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
32+
- "io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
3433
- "io.opentelemetry.contrib:opentelemetry-aws-resources:1.42.0-alpha",
35-
+ "io.opentelemetry.contrib:opentelemetry-aws-resources:1.32.0-alpha",
34+
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1",
3635
)
3736

3837
javaPlatform {
38+
diff --git a/java/layer-wrapper/build.gradle.kts b/java/layer-wrapper/build.gradle.kts
39+
index 232d096..0d7f190 100644
40+
--- a/java/layer-wrapper/build.gradle.kts
41+
+++ b/java/layer-wrapper/build.gradle.kts
42+
@@ -10,7 +10,7 @@ dependencies {
43+
runtimeOnly("io.opentelemetry:opentelemetry-exporter-otlp")
44+
runtimeOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
45+
runtimeOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
46+
- runtimeOnly("io.opentelemetry.contrib:opentelemetry-aws-resources")
47+
+ runtimeOnly("io.opentelemetry:opentelemetry-sdk-extension-aws")
48+
}
49+
50+
tasks {
51+
diff --git a/java/sample-apps/aws-sdk/deploy/wrapper/main.tf b/java/sample-apps/aws-sdk/deploy/wrapper/main.tf
52+
index 28b2b88..f4f91b3 100644
53+
--- a/java/sample-apps/aws-sdk/deploy/wrapper/main.tf
54+
+++ b/java/sample-apps/aws-sdk/deploy/wrapper/main.tf
55+
@@ -11,7 +11,7 @@ module "hello-lambda-function" {
56+
local_existing_package = "${path.module}/../../build/libs/aws-sdk-all.jar"
57+
58+
memory_size = 384
59+
- timeout = 20
60+
+ timeout = 30
61+
62+
layers = compact([
63+
var.collector_layer_arn,

0 commit comments

Comments
 (0)