diff --git a/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt b/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt index 513c27328..d66d03597 100644 --- a/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt +++ b/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt @@ -42,9 +42,9 @@ import com.datadog.android.sessionreplay.SessionReplay import com.datadog.android.sessionreplay.SessionReplayConfiguration import com.datadog.android.sessionreplay.compose.ComposeExtensionSupport import com.datadog.android.timber.DatadogTree -import com.datadog.android.trace.AndroidTracer import com.datadog.android.trace.Trace import com.datadog.android.trace.TraceConfiguration +import com.datadog.android.trace.opentelemetry.DatadogOpenTelemetry import com.geeksville.mesh.BuildConfig import com.geeksville.mesh.analytics.AnalyticsProvider import com.geeksville.mesh.analytics.FirebaseAnalytics @@ -59,7 +59,7 @@ import com.google.firebase.crashlytics.crashlytics import com.google.firebase.crashlytics.setCustomKeys import com.google.firebase.initialize import com.suddenh4x.ratingdialog.AppRating -import io.opentracing.util.GlobalTracer +import io.opentelemetry.api.GlobalOpenTelemetry import timber.log.Timber abstract class GeeksvilleApplication : @@ -218,8 +218,7 @@ abstract class GeeksvilleApplication : val traceConfig = TraceConfiguration.Builder().build() Trace.enable(traceConfig) - val tracer = AndroidTracer.Builder().build() - GlobalTracer.registerIfAbsent(tracer) + GlobalOpenTelemetry.set(DatadogOpenTelemetry(BuildConfig.APPLICATION_ID)) val sessionReplayConfig = SessionReplayConfiguration.Builder(sampleRate = 20.0f) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a648d96cc..f53839430 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ core-location-altitude = "1.0.0-alpha03" core-splashscreen = "1.0.1" crashlytics = "3.0.6" datastore = "1.1.7" -dd-sdk-android = "2.26.0" +dd-sdk-android = "3.0.0" dd-sdk-android-gradle-plugin = "1.19.0" detekt = "1.23.8" devtools-ksp = "2.2.10-2.0.2" @@ -94,6 +94,7 @@ dd-sdk-android-session-replay = { group = "com.datadoghq", name = "dd-sdk-androi dd-sdk-android-session-replay-compose = { group = "com.datadoghq", name = "dd-sdk-android-session-replay-compose", version.ref = "dd-sdk-android" } dd-sdk-android-timber = { group = "com.datadoghq", name = "dd-sdk-android-timber", version.ref = "dd-sdk-android" } dd-sdk-android-trace = { group = "com.datadoghq", name = "dd-sdk-android-trace", version.ref = "dd-sdk-android" } +dd-sdk-android-trace-otel = { group = "com.datadoghq", name = "dd-sdk-android-trace-otel", version.ref = "dd-sdk-android" } detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } emoji2-emojipicker = { group = "androidx.emoji2", name = "emoji2-emojipicker", version.ref = "emoji2" } espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } @@ -193,7 +194,7 @@ maps-compose = ["location-services", "maps-compose", "maps-compose-utils", "maps firebase = ["firebase-analytics", "firebase-crashlytics"] # Datadog -datadog = ["dd-sdk-android-compose", "dd-sdk-android-logs", "dd-sdk-android-okhttp", "dd-sdk-android-rum", "dd-sdk-android-session-replay", "dd-sdk-android-session-replay-compose", "dd-sdk-android-timber", "dd-sdk-android-trace"] +datadog = ["dd-sdk-android-compose", "dd-sdk-android-logs", "dd-sdk-android-okhttp", "dd-sdk-android-rum", "dd-sdk-android-session-replay", "dd-sdk-android-session-replay-compose", "dd-sdk-android-timber", "dd-sdk-android-trace", "dd-sdk-android-trace-otel"] # Protobuf protobuf = ["protobuf-kotlin"]