rebase and update

signalfx · Apr 12, 2024 · 09dcf87 · 09dcf87
1 parent 396d68b
commit 09dcf87
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,23 @@
 [versions]
-opentelemetry-core = "1.36.0"
-opentelemetry-core-alpha = "1.36.0-alpha"
-opentelemetry-alpha = "1.33.1-alpha"
+opentelemetry-core = "1.37.0"
+opentelemetry-core-alpha = "1.37.0-alpha"
+opentelemetry-inst = "2.3.0"
+opentelemetry-inst-alpha = "2.3.0-alpha"
 opentelemetry-android = "0.4.0-alpha"
 mockito = "5.11.0"
 junit = "5.10.2"
 spotless = "6.25.0"
 
 [libraries]
-opentelemetry-instrumentation-bom = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetry-alpha" }
-opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "opentelemetry-core-alpha" }
+opentelemetry-instrumentation-bom = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetry-inst-alpha" }
+opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "opentelemetry-core" }
 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-api-incubator = { module = "io.opentelemetry:opentelemetry-api-incubator", 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-alpha" }
-opentelemetry-instrumenter-api-semconv = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv", version.ref = "opentelemetry-alpha" }
-opentelemetry-instrumentation-okhttp = { module = "io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0", version.ref = "opentelemetry-alpha" }
+opentelemetry-instrumenter-api = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api", version.ref = "opentelemetry-inst" }
+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" }
 opentelemetry-exporter-logging = { module = "io.opentelemetry:opentelemetry-exporter-logging", version.ref = "opentelemetry-core" }

diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
     implementation(libs.android.volley)
     implementation(libs.androidx.work)
     implementation(libs.opentelemetry.sdk)
-    implementation(libs.opentelemetry.api.events)
+    implementation(libs.opentelemetry.api.incubator)
     testImplementation(libs.bundles.junit)
     androidTestImplementation(libs.androidx.test.core)
     androidTestImplementation(libs.androidx.junit)

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)