Skip to content

Commit da09503

Browse files
aws-application-signals-botgithub-actionsthpierceezhang6811srprash
authored
Nightly dependency update: OpenTelemetry 2.25.0/1.54.0 (#1305)
Automated update of OpenTelemetry dependencies. **Build Status:** ❌ [failure](https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/21698259849) **Updated versions:** - [OpenTelemetry Java Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.25.0): 2.25.0 - [OpenTelemetry Java Contrib](https://github.com/open-telemetry/opentelemetry-java-contrib/releases/tag/v1.54.0): 1.54.0 **Upstream releases with breaking changes:** Note: the mechanism to detect upstream breaking changes is not perfect. Be sure to check all new releases and understand if any additional changes need to be addressed. **opentelemetry-java-instrumentation:** - [Version 2.24.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.25.0) --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Thomas Pierce <thp@amazon.com> Co-authored-by: Eric Zhang <eric.zhang6811@gmail.com> Co-authored-by: Prashant Srivastava <50466688+srprash@users.noreply.github.com> Co-authored-by: Prashant Srivastava <srprash@amazon.com>
1 parent c3888a2 commit da09503

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/patches/opentelemetry-java-contrib.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,10 @@ index 74967704..d08094f7 100644
430430
--- a/version.gradle.kts
431431
+++ b/version.gradle.kts
432432
@@ -1,5 +1,5 @@
433-
-val stableVersion = "1.52.0"
434-
-val alphaVersion = "1.52.0-alpha"
435-
+val stableVersion = "1.52.0-adot1"
436-
+val alphaVersion = "1.52.0-alpha-adot1"
433+
-val stableVersion = "1.54.0"
434+
-val alphaVersion = "1.54.0-alpha"
435+
+val stableVersion = "1.54.0-adot1"
436+
+val alphaVersion = "1.54.0-alpha-adot1"
437437
val tagVersion by extra { "v$stableVersion" }
438438

439439
allprojects {

.github/patches/versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.23.0
2-
OTEL_JAVA_CONTRIB_VERSION=v1.52.0
1+
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.25.0
2+
OTEL_JAVA_CONTRIB_VERSION=v1.54.0

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/ScopeBasedPeriodicMetricReaderBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static io.opentelemetry.api.internal.Utils.checkArgument;
1919
import static java.util.Objects.requireNonNull;
2020

21-
import io.opentelemetry.sdk.internal.DaemonThreadFactory;
21+
import io.opentelemetry.sdk.common.internal.DaemonThreadFactory;
2222
import io.opentelemetry.sdk.metrics.export.MetricExporter;
2323
import java.time.Duration;
2424
import java.util.Set;

dependencyManagement/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "2.23.0"
31-
val otelSnapshotVersion = "2.24.0"
30+
val otelVersion = "2.25.0"
31+
val otelSnapshotVersion = "2.26.0"
3232
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
3333
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
3434
// All versions below are only used in testing and do not affect the released artifact.
@@ -77,8 +77,8 @@ val dependencyLists = listOf(
7777
"commons-logging:commons-logging:1.2",
7878
"com.sparkjava:spark-core:2.9.4",
7979
"com.squareup.okhttp3:okhttp:4.12.0",
80-
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.52.0-adot1",
81-
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.52.0-alpha",
80+
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.54.0-adot1",
81+
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.54.0-alpha",
8282
"io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
8383
"io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
8484
"io.opentelemetry:opentelemetry-extension-aws:1.20.1",

lambda-layer/patches/aws-otel-java-instrumentation.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ index 6ca4ff5..97e211a 100644
66
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
77

88
// This is the version of the upstream instrumentation BOM
9-
-val otelVersion = "2.23.0"
10-
+val otelVersion = "2.23.0-adot-lambda1"
11-
val otelSnapshotVersion = "2.24.0"
9+
-val otelVersion = "2.25.0"
10+
+val otelVersion = "2.25.0-adot-lambda1"
11+
val otelSnapshotVersion = "2.26.0"
1212
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
1313
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

lambda-layer/patches/opentelemetry-java-instrumentation.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,10 @@ index a46c2d24de..71a2264042 100644
678678
--- a/version.gradle.kts
679679
+++ b/version.gradle.kts
680680
@@ -1,5 +1,5 @@
681-
-val stableVersion = "2.23.0"
682-
-val alphaVersion = "2.23.0-alpha"
683-
+val stableVersion = "2.23.0-adot-lambda1"
684-
+val alphaVersion = "2.23.0-adot-lambda1-alpha"
681+
-val stableVersion = "2.25.0"
682+
-val alphaVersion = "2.25.0-alpha"
683+
+val stableVersion = "2.25.0-adot-lambda1"
684+
+val alphaVersion = "2.25.0-adot-lambda1-alpha"
685685

686686
allprojects {
687687
if (findProperty("otel.stable") != "true") {

0 commit comments

Comments
 (0)