Skip to content

Commit 916a2f0

Browse files
Update upstream OpenTelemetry agent dependencies to 2.14.0 (#580)
* chore: Update upstream OpenTelemetry agent version and related depend... ... encies Made with ❤️️ by updatecli * fix semconv incubating alpha version * update update shell script --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <[email protected]>
1 parent 2886d58 commit 916a2f0

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ opentelemetryProto = "1.3.2-alpha"
1010

1111
# otel agent, we rely on the '*-alpha' and get the non-alpha dependencies transitively
1212
# updated from upstream agent with .ci/update-upstream.sh
13-
opentelemetryJavaagentAlpha = "2.13.3-alpha"
13+
opentelemetryJavaagentAlpha = "2.14.0-alpha"
1414

1515
# otel contrib
1616
# updated from upstream agent with .ci/update-upstream.sh
@@ -20,7 +20,8 @@ opentelemetryContribAlpha = "1.44.0-alpha"
2020
# updated from upstream agent with .ci/update-upstream.sh
2121
# While the semconv stable artifact is provided transitively by the agent, we still have to explicitly
2222
# reference the "incubating" version explicitly
23-
opentelemetrySemconv = "1.30.0-rc.1"
23+
opentelemetrySemconv = "1.30.0"
24+
opentelemetrySemconvAlpha = "1.30.0-alpha"
2425

2526
[libraries]
2627

@@ -36,7 +37,7 @@ contribSpanStacktrace = { group = "io.opentelemetry.contrib", name = "openteleme
3637
contribInferredSpans = { group = "io.opentelemetry.contrib", name = "opentelemetry-inferred-spans", version.ref = "opentelemetryContribAlpha" }
3738

3839
opentelemetrySemconv = { group = "io.opentelemetry.semconv", name = "opentelemetry-semconv", version.ref = "opentelemetrySemconv" }
39-
opentelemetrySemconvIncubating = { group = "io.opentelemetry.semconv", name = "opentelemetry-semconv-incubating", version.ref = "opentelemetrySemconv" }
40+
opentelemetrySemconvIncubating = { group = "io.opentelemetry.semconv", name = "opentelemetry-semconv-incubating", version.ref = "opentelemetrySemconvAlpha" }
4041

4142
autoservice-processor = { group = "com.google.auto.service", name = "auto-service", version.ref = "autoservice" }
4243
autoservice-annotations = { group = "com.google.auto.service", name = "auto-service-annotations", version.ref = "autoservice" }

gradle/update-upstream.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ upstreamSemconvVersion="$(upstream_version 'dependencyManagement/build.gradle.kt
2525
sed -i -e "s/^opentelemetryJavaagentAlpha = \".*/opentelemetryJavaagentAlpha = \"${upstreamAgentAlphaVersion}\"/" "${folder}/libs.versions.toml"
2626
sed -i -e "s/^opentelemetryContribAlpha = \".*/opentelemetryContribAlpha = \"${upstreamContribVersion}\"/" "${folder}/libs.versions.toml"
2727
sed -i -e "s/^opentelemetrySemconv = \".*/opentelemetrySemconv = \"${upstreamSemconvVersion}\"/" "${folder}/libs.versions.toml"
28+
sed -i -e "s/^opentelemetrySemconvAlpha = \".*/opentelemetrySemconvAlpha = \"${upstreamSemconvVersion}-alpha\"/" "${folder}/libs.versions.toml"
2829

smoke-tests/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ dependencies {
2929

3030
testImplementation(catalog.assertj.core)
3131

32-
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
33-
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
32+
testImplementation(catalog.bundles.semconv)
3433

3534
testImplementation(catalog.mockserver.client)
3635

universal-profiling-integration/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ description = "OpenTelemetry SDK extension to enable correlation of traces with
1616
dependencies {
1717
implementation(project(":jvmti-access"))
1818
api(project(":common"))
19-
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
19+
implementation(libs.opentelemetrySemconv)
2020
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
2121
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
2222
implementation(libs.lmax.disruptor)
@@ -28,5 +28,5 @@ dependencies {
2828
testImplementation("io.opentelemetry:opentelemetry-sdk")
2929
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
3030
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
31-
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
31+
testImplementation(libs.bundles.semconv)
3232
}

0 commit comments

Comments
 (0)