Skip to content

Commit 0861b23

Browse files
authored
Merge pull request #2786 from DataDog/tvaleev/feature/RUM-9903
[RUM 9903] Updating opentelemetry version
2 parents 5a0abc0 + 9169ab2 commit 0861b23

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Dependencies List
22

33
androidx.annotation:annotation-jvm:1.9.1 : 59 Kb
4-
io.opentelemetry:opentelemetry-api:1.4.0 : 78 Kb
5-
io.opentelemetry:opentelemetry-context:1.4.0 : 42 Kb
4+
io.opentelemetry:opentelemetry-api:1.40.0 : 138 Kb
5+
io.opentelemetry:opentelemetry-context:1.40.0 : 46 Kb
66
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
77
org.jetbrains:annotations:13.0 : 17 Kb
88

9-
Total transitive dependencies size : 1904 Kb
9+
Total transitive dependencies size : 1967 Kb
1010

gradle/libs.versions.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ ktorServer = "3.0.0-rc-1"
9898

9999
# Otel
100100
jctools = "3.3.0"
101-
openTelemetry = "1.4.0"
102-
# Only for internal benchmark use
103-
openTelemetryBenchmark = "1.40.0"
101+
openTelemetry = "1.40.0"
104102
re2j = "1.7"
105103
material3Android = "1.1.2"
106104

@@ -269,8 +267,7 @@ ktorClientMock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
269267
# Otel
270268
jctools = { module = "org.jctools:jctools-core", version.ref = "jctools" }
271269
openTelemetryApi = { module = "io.opentelemetry:opentelemetry-api", version.ref = "openTelemetry" }
272-
openTelemetryApiBenchmark = { module = "io.opentelemetry:opentelemetry-api", version.ref = "openTelemetryBenchmark" }
273-
openTelemetrySdkBenchmark = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "openTelemetryBenchmark" }
270+
openTelemetrySdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "openTelemetry" }
274271
re2j = { module = "com.google.re2j:re2j", version.ref = "re2j" }
275272

276273
[bundles]

integrations/dd-sdk-android-okhttp-otel/transitiveDependencies

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Dependencies List
22

33
com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
44
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
5-
io.opentelemetry:opentelemetry-api:1.4.0 : 78 Kb
6-
io.opentelemetry:opentelemetry-context:1.4.0 : 42 Kb
5+
io.opentelemetry:opentelemetry-api:1.40.0 : 138 Kb
6+
io.opentelemetry:opentelemetry-context:1.40.0 : 46 Kb
77
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
88
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
99
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb

tools/benchmark/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ dependencies {
3737
implementation(project(":dd-sdk-android-internal"))
3838
implementation(libs.kotlin)
3939
implementation(libs.okHttp)
40-
implementation(libs.openTelemetryApiBenchmark)
41-
implementation(libs.openTelemetrySdkBenchmark)
40+
implementation(libs.openTelemetryApi)
41+
implementation(libs.openTelemetrySdk)
4242
implementation(libs.gson)
4343
testImplementation(project(":tools:unit")) {
4444
attributes {

0 commit comments

Comments
 (0)