rebase and update

signalfx · Aug 12, 2024 · f93ecdd · f93ecdd
1 parent 4f58bf5
commit f93ecdd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 opentelemetry-core = "1.41.0"
 opentelemetry-core-alpha = "1.41.0-alpha"
-opentelemetry-inst = "1.33.5"
-opentelemetry-inst-alpha = "1.33.5-alpha"
-opentelemetry-android = "0.4.0-alpha"
+opentelemetry-inst = "2.6.0"
+opentelemetry-inst-alpha = "2.6.0-alpha"
+opentelemetry-android = "0.7.0-alpha"
 mockito = "5.12.0"
 junit = "5.10.3"
 spotless = "6.25.0"
-kotlin = "2.0.0"
+kotlin = "2.0.10"
 lifecycle-runtime-ktx = "2.8.4"
 activity-compose = "1.9.1"
 compose-bom = "2024.06.00"
@@ -16,12 +16,12 @@ navigationCompose = "2.7.7"
 [libraries]
 opentelemetry-instrumentation-bom = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom", version.ref = "opentelemetry-inst" }
 opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "opentelemetry-core" }
-opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk" }
-opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api" }
-opentelemetry-api-incubator = { module = "io.opentelemetry:opentelemetry-api-incubator", version.ref = "opentelemetry-core-alpha" }
+opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry-core" }
+opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry-core" }
+opentelemetry-api-events = { module = "io.opentelemetry:opentelemetry-api-events", version.ref = "opentelemetry-core-alpha" }
 opentelemetry-android = { module = "io.opentelemetry.android:instrumentation", version.ref = "opentelemetry-android" }
 opentelemetry-instrumenter-api = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api", version.ref = "opentelemetry-inst" }
-opentelemetry-instrumenter-api-semconv = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv", version.ref = "opentelemetry-inst-alpha" }
+opentelemetry-instrumenter-api-incubator = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator", version.ref = "opentelemetry-inst-alpha" }
 opentelemetry-instrumentation-okhttp = { module = "io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0", version.ref = "opentelemetry-inst-alpha" }
 opentelemetry-exporter-zipkin = { module = "io.opentelemetry:opentelemetry-exporter-zipkin", version.ref = "opentelemetry-core" }
 opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version.ref = "opentelemetry-core" }

diff --git a/splunk-otel-android-volley/build.gradle.kts b/splunk-otel-android-volley/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
     api(platform(libs.opentelemetry.bom))
     compileOnly(libs.opentelemetry.api)
     implementation(libs.opentelemetry.instrumenter.api)
-    implementation(libs.opentelemetry.instrumenter.api.semconv)
+    implementation(libs.opentelemetry.instrumenter.api.incubator)
     compileOnly(libs.android.volley)
     implementation(libs.androidx.core)
     testImplementation(libs.mockwebserver)