Skip to content

Commit c0ac4ce

Browse files
authored
feat(java): use new wrappers (#2209)
* feat(java): use new aws-lambda-events 3.11 wrappers in wrapper layer * upgrade java otel instrumentation libs patch version
1 parent 94a634c commit c0ac4ce

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

java/dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
data class DependencySet(val group: String, val version: String, val modules: List<String>)
1010

1111
val DEPENDENCY_BOMS = listOf(
12-
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.0-alpha",
12+
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha",
1313
"org.apache.logging.log4j:log4j-bom:2.25.3",
1414
"software.amazon.awssdk:bom:2.42.18"
1515
)
@@ -18,7 +18,7 @@ val DEPENDENCIES = listOf(
1818
"com.amazonaws:aws-lambda-java-core:1.4.0",
1919
"com.amazonaws:aws-lambda-java-events:3.16.1",
2020
"com.squareup.okhttp3:okhttp:5.3.2",
21-
"io.opentelemetry.javaagent:opentelemetry-javaagent:2.26.0",
21+
"io.opentelemetry.javaagent:opentelemetry-javaagent:2.26.1",
2222
"io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
2323
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.54.0-alpha",
2424
)

java/layer-wrapper/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
dependencies {
66
runtimeOnly(project(":awssdk-autoconfigure"))
77

8-
runtimeOnly("io.opentelemetry.instrumentation:opentelemetry-aws-lambda-events-2.2")
8+
runtimeOnly("io.opentelemetry.instrumentation:opentelemetry-aws-lambda-events-3.11")
99
runtimeOnly("io.opentelemetry:opentelemetry-exporter-logging")
1010
runtimeOnly("io.opentelemetry:opentelemetry-exporter-otlp")
1111
runtimeOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
@@ -37,6 +37,6 @@ tasks {
3737

3838
tasks.register("printOtelJavaInstrumentationVersion") {
3939
doLast {
40-
println(configurations.named("runtimeClasspath").get().resolvedConfiguration.resolvedArtifacts.find { it.name == "opentelemetry-aws-lambda-events-2.2" }?.moduleVersion?.id?.version)
40+
println(configurations.named("runtimeClasspath").get().resolvedConfiguration.resolvedArtifacts.find { it.name == "opentelemetry-aws-lambda-events-3.11" }?.moduleVersion?.id?.version)
4141
}
4242
}

java/layer-wrapper/scripts/otel-handler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -ef -o pipefail
44

55
export OTEL_INSTRUMENTATION_AWS_LAMBDA_HANDLER="$_HANDLER"
6-
export _HANDLER="io.opentelemetry.instrumentation.awslambdaevents.v2_2.TracingRequestWrapper"
6+
export _HANDLER="io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingRequestWrapper"
77

88
if [[ $OTEL_RESOURCE_ATTRIBUTES != *"service.name="* ]]; then
99
export OTEL_RESOURCE_ATTRIBUTES="service.name=${AWS_LAMBDA_FUNCTION_NAME},${OTEL_RESOURCE_ATTRIBUTES}"

java/layer-wrapper/scripts/otel-proxy-handler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -ef -o pipefail
44

55
export OTEL_INSTRUMENTATION_AWS_LAMBDA_HANDLER="$_HANDLER"
6-
export _HANDLER="io.opentelemetry.instrumentation.awslambdaevents.v2_2.TracingRequestApiGatewayWrapper"
6+
export _HANDLER="io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingRequestApiGatewayWrapper"
77

88
if [[ $OTEL_RESOURCE_ATTRIBUTES != *"service.name="* ]]; then
99
export OTEL_RESOURCE_ATTRIBUTES="service.name=${AWS_LAMBDA_FUNCTION_NAME},${OTEL_RESOURCE_ATTRIBUTES}"

java/layer-wrapper/scripts/otel-sqs-handler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -ef -o pipefail
44

55
export OTEL_INSTRUMENTATION_AWS_LAMBDA_HANDLER="$_HANDLER"
6-
export _HANDLER="io.opentelemetry.instrumentation.awslambdaevents.v2_2.TracingSqsEventWrapper"
6+
export _HANDLER="io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingSqsEventWrapper"
77

88
if [[ $OTEL_RESOURCE_ATTRIBUTES != *"service.name="* ]]; then
99
export OTEL_RESOURCE_ATTRIBUTES="service.name=${AWS_LAMBDA_FUNCTION_NAME},${OTEL_RESOURCE_ATTRIBUTES}"

0 commit comments

Comments
 (0)