Skip to content

Commit 6dc9432

Browse files
vasireddy99vasireddy99
committed
Update java version
1 parent 346830c commit 6dc9432

File tree

7 files changed

+19
-74
lines changed

7 files changed

+19
-74
lines changed

‎adot/collector/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.42.0
1+
v0.43.0

‎java/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ val javaagentDependency by configurations.creating {
2828
}
2929

3030
dependencies {
31-
compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.32.0"))
32-
compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha"))
31+
compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.42.0"))
32+
compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.42.0-alpha"))
3333
// Already included in wrapper so compileOnly
3434
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
35-
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws")
36-
javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.32.0-adot-lambda1")
35+
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0")
36+
javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:2.10.0")
3737
}
3838

3939
tasks.register<Copy>("download") {

‎java/build.sh‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,6 @@
22

33
SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
44

5-
6-
## revert https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7970
7-
OTEL_VERSION="1.32.0"
8-
ADOT_VERSION="1.32.0"
9-
10-
git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
11-
pushd opentelemetry-java-instrumentation
12-
git checkout v${OTEL_VERSION} -b tag-v${OTEL_VERSION}
13-
patch -p1 < "$SOURCEDIR"/../patches/opentelemetry-java-instrumentation.patch
14-
git add -A
15-
git commit -m "Create patch version"
16-
./gradlew publishToMavenLocal
17-
popd
18-
19-
rm -rf opentelemetry-java-instrumentation
20-
21-
22-
git clone https://github.com/aws-observability/aws-otel-java-instrumentation.git
23-
24-
pushd aws-otel-java-instrumentation
25-
26-
git checkout v${ADOT_VERSION} -b tag-v${ADOT_VERSION}
27-
patch -p1 < "${SOURCEDIR}"/../patches/aws-otel-java-instrumentation.patch
28-
git add -A
29-
git commit -a -m "Create patch version"
30-
CI=false ./gradlew publishToMavenLocal -Prelease.version=${ADOT_VERSION}-adot-lambda1
31-
popd
32-
33-
rm -rf aws-otel-java-instrumentation
34-
355
# Build collector
366

377
pushd ../opentelemetry-lambda/collector || exit

‎java/scripts/otel-handler‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
44

5-
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
5+
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:xray-lambda,tracecontext,b3,b3multi}"
66

77
# Temporarily set OTEL_SERVICE_NAME variable to work around but in javaagent not handling
88
# OTEL_RESOURCE_ATTRIBUTES as set in otel-handler-upstream. It doesn't hurt to apply this

‎java/scripts/otel-proxy-handler‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
44

5-
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
5+
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:xray-lambda,tracecontext,b3,b3multi}"
66

77
source /opt/otel-proxy-handler-upstream

‎java/scripts/otel-stream-handler‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
44

5-
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
5+
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:xray-lambda,tracecontext,b3,b3multi}"
66

77
source /opt/otel-stream-handler-upstream

‎patches/opentelemetry-lambda_java.patch‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,27 @@ index 7693c66..d3941ac 100644
1212
}
1313

1414
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
15-
index 12f34ec..9ad35ed 100644
15+
index 7b07f56..ab62739 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:2.10.0-alpha",
23-
+ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-adot-lambda1-alpha",
22+
- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha",
23+
+ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha",
2424
"org.apache.logging.log4j:log4j-bom:2.24.3",
25-
"software.amazon.awssdk:bom:2.29.39"
25+
"software.amazon.awssdk:bom:2.31.45"
2626
)
27-
@@ -18,9 +18,7 @@ val DEPENDENCIES = listOf(
27+
@@ -18,9 +18,9 @@ val DEPENDENCIES = listOf(
2828
"com.amazonaws:aws-lambda-java-core:1.2.3",
29-
"com.amazonaws:aws-lambda-java-events:3.14.0",
29+
"com.amazonaws:aws-lambda-java-events:3.15.0",
3030
"com.squareup.okhttp3:okhttp:4.12.0",
31-
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0",
32-
- "io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
33-
- "io.opentelemetry.contrib:opentelemetry-aws-resources:1.42.0-alpha",
34-
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1",
31+
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.16.0",
32+
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0",
33+
"io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
34+
- "io.opentelemetry.contrib:opentelemetry-aws-resources:1.46.0-alpha",
35+
+ "io.opentelemetry.contrib:opentelemetry-aws-resources:1.42.0-alpha",
3536
)
3637

3738
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)