Merge pull request #2689 from DataDog/aleksandr-gringauz/RUM-9511/rum-auto-scenario-benchmark-move-to-app-save

RUM-9511: RumAuto scenario for android benchmark app

Author: aleksandr-gringauz

build.gradle.kts

@@ -34,6 +34,7 @@ buildscript {
         classpath(libs.unmockGradlePlugin)
         classpath(libs.sqlDelightGradlePlugin)
         classpath(libs.binaryCompatibilityGradlePlugin)
+        classpath(libs.kotlinxSerializationPlugin)
     }
 }
 

gradle/libs.versions.toml

@@ -5,8 +5,10 @@ kotlinSP = "1.9.24-1.0.20"
 gson = "2.10.1"
 okHttp = "4.12.0"
 kronosNTP = "0.0.1-alpha11"
+kotlinxSerialization = "1.6.3"
 
 # Android
+adapterDelegates = "4.3.2"
 androidDesugaringSdk = "2.0.4"
 androidToolsPlugin = "8.9.1"
 androidXAnnotations = "1.9.1"
@@ -90,7 +92,7 @@ timber = "5.0.1"
 coroutines = "1.4.2"
 
 # Local Server
-ktor = "1.6.8"
+ktor = "2.3.13"
 ktorServer = "3.0.0-rc-1"
 
 # Otel
@@ -115,6 +117,7 @@ sqlDelightGradlePlugin = { module = "com.squareup.sqldelight:gradle-plugin", ver
 binaryCompatibilityGradlePlugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "binaryCompatibility" }
 dependencyLicenseGradlePlugin = { module = "com.datadoghq:dependency-license", version.ref = "dependencyLicense" }
 versionsGradlePlugin = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsGradlePlugin" }
+kotlinxSerializationPlugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin"}
 
 # Annotation processors
 glideCompiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
@@ -123,13 +126,15 @@ roomCompiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 # Common
 
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlinxSerializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 
 okHttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 kronosNTP = { module = "com.lyft.kronos:kronos-android", version.ref = "kronosNTP" }
 assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
 
 # Android libs
+adapterDelegatesViewBinding = { module = "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding", version.ref = "adapterDelegates" }
 androidDesugaringSdk = { module = "com.android.tools:desugar_jdk_libs", version.ref = "androidDesugaringSdk" }
 androidXAnnotation = { module = "androidx.annotation:annotation", version.ref = "androidXAnnotations" }
 androidXAppCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidXAppCompat" }
@@ -239,11 +244,18 @@ coroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ver
 
 # Local Server
 ktorCore = { module = "io.ktor:ktor", version.ref = "ktor" }
-ktorGson = { module = "io.ktor:ktor-gson", version.ref = "ktor" }
+ktorGson = { module = "io.ktor:ktor-serialization-gson", version.ref = "ktor" }
 ktorServerCore = { module = "io.ktor:ktor-server-core", version.ref = "ktorServer" }
 ktorServerNetty = { module = "io.ktor:ktor-server-netty", version.ref = "ktorServer" }
 ktorServerSSE = { module = "io.ktor:ktor-server-sse", version.ref = "ktorServer" }
 
+# ktor client
+ktorClientCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktorClientOkHttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktorContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
+ktorSerializationKotlinxJson = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
+ktorClientMock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
+
 # Otel
 jctools = { module = "org.jctools:jctools-core", version.ref = "jctools" }
 openTelemetryApi = { module = "io.opentelemetry:opentelemetry-api", version.ref = "openTelemetry" }
@@ -329,6 +341,12 @@ ktorServer = [
     "ktorServerNetty",
     "ktorServerSSE"
 ]
+ktorClient = [
+    "ktorClientCore",
+    "ktorClientOkHttp",
+    "ktorContentNegotiation",
+    "ktorSerializationKotlinxJson"
+]
 
 traceCore = [
     "jctools",

sample/benchmark/build.gradle.kts

@@ -10,7 +10,10 @@ plugins {
     id("com.android.application")
     kotlin("android")
     kotlin("kapt")
+    kotlin("plugin.serialization")
+    id("kotlin-parcelize")
     alias(libs.plugins.datadogGradlePlugin)
+    id("transitiveDependencies")
 }
 
 @Suppress("StringLiteralDuplication")
@@ -38,6 +41,7 @@ android {
 
     buildFeatures {
         compose = true
+        viewBinding = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.androidXComposeRuntime.get()
@@ -83,21 +87,25 @@ dependencies {
     implementation(libs.kotlin)
 
     // Android dependencies
+    implementation(libs.adapterDelegatesViewBinding)
     implementation(libs.androidXMultidex)
     implementation(libs.bundles.androidXNavigation)
     implementation(libs.androidXAppCompat)
     implementation(libs.androidXConstraintLayout)
     implementation(libs.androidXLifecycleCompose)
     implementation(libs.googleMaterial)
-    implementation(libs.glideCore)
-    implementation(libs.material3Android)
+    implementation(libs.bundles.glide)
     implementation(libs.timber)
     implementation(platform(libs.androidXComposeBom))
+    implementation(libs.material3Android)
     implementation(libs.bundles.androidXCompose)
     implementation(libs.coilCompose)
     implementation(libs.daggerLib)
     kapt(libs.daggerCompiler)
+    kapt(libs.glideCompiler)
     implementation(libs.coroutinesCore)
+    implementation(libs.bundles.ktorClient)
+    implementation(libs.kotlinxSerializationJson)
     implementation(project(":features:dd-sdk-android-logs"))
     implementation(project(":features:dd-sdk-android-rum"))
     implementation(project(":features:dd-sdk-android-trace"))
@@ -108,11 +116,14 @@ dependencies {
     implementation(project(":features:dd-sdk-android-session-replay-material"))
     implementation(project(":features:dd-sdk-android-session-replay-compose"))
     implementation(project(":integrations:dd-sdk-android-compose"))
+    implementation(project(":integrations:dd-sdk-android-glide"))
+    implementation(project(":integrations:dd-sdk-android-okhttp"))
     implementation(project(":tools:benchmark"))
 
     testImplementation(libs.bundles.jUnit5)
     testImplementation(libs.bundles.testTools)
     testImplementation(libs.systemStubsJupiter)
+    testImplementation(libs.ktorClientMock)
 }
 
 kotlinConfig()

sample/benchmark/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application
         android:name="com.datadog.benchmark.sample.BenchmarkApplication"
         android:allowBackup="true"
@@ -12,10 +13,37 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.BenchmarkApp">
         <activity
-            android:name="com.datadog.benchmark.sample.MainActivity"
+            android:name="com.datadog.benchmark.sample.activities.scenarios.DefaultScenarioActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.BenchmarkApp">
+
+        </activity>
+
+        <activity
+            android:name="com.datadog.benchmark.sample.activities.scenarios.RumAutoScenarioActivity"
+            android:exported="true"
+            android:theme="@style/Theme.BenchmarkApp">
+
+        </activity>
+
+        <activity
+            android:name="com.datadog.benchmark.sample.activities.scenarios.SessionReplayComposeScenarioActivity"
+            android:exported="true"
+            android:theme="@style/Theme.BenchmarkApp">
+
+        </activity>
+
+        <activity
+            android:name="com.datadog.benchmark.sample.activities.scenarios.SessionReplayScenarioActivity"
+            android:exported="true"
+            android:theme="@style/Theme.BenchmarkApp">
+
+        </activity>
+
+        <activity
+            android:name="com.datadog.benchmark.sample.activities.LaunchActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkApplication.kt

@@ -7,6 +7,7 @@
 package com.datadog.benchmark.sample
 
 import android.app.Application
+import android.content.Context
 import com.datadog.benchmark.sample.di.app.BenchmarkAppComponent
 import com.datadog.benchmark.sample.di.app.DaggerBenchmarkAppComponent
 
@@ -22,5 +23,5 @@ internal class BenchmarkApplication : Application() {
     }
 }
 
-internal val Application.benchmarkAppComponent: BenchmarkAppComponent
-    get() = (this as BenchmarkApplication).benchmarkAppComponent
+internal val Context.benchmarkAppComponent: BenchmarkAppComponent
+    get() = (applicationContext as BenchmarkApplication).benchmarkAppComponent

sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkConfigHolder.kt

@@ -0,0 +1,16 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.datadog.benchmark.sample
+
+import com.datadog.benchmark.sample.config.BenchmarkConfig
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+internal class BenchmarkConfigHolder @Inject constructor() {
+    lateinit var config: BenchmarkConfig
+}

sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkGlideModule.kt

@@ -0,0 +1,34 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.datadog.benchmark.sample
+
+import android.content.Context
+import com.bumptech.glide.Glide
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
+import com.datadog.android.glide.DatadogGlideModule
+import com.datadog.benchmark.sample.di.app.DATADOG_SDK_INSTANCE_NAME
+import okhttp3.OkHttpClient
+import javax.inject.Inject
+
+@GlideModule
+internal class BenchmarkGlideModule : DatadogGlideModule(
+    sdkInstanceName = DATADOG_SDK_INSTANCE_NAME
+) {
+    @Inject
+    lateinit var okHttpClient: OkHttpClient
+
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+        context.benchmarkAppComponent.inject(this)
+
+        super.registerComponents(context, glide, registry)
+    }
+
+    override fun getClientBuilder(): OkHttpClient.Builder {
+        return okHttpClient.newBuilder()
+    }
+}

sample/benchmark/src/main/java/com/datadog/benchmark/sample/DatadogFeaturesInitializer.kt

@@ -13,6 +13,7 @@ import com.datadog.android.log.LogsConfiguration
 import com.datadog.android.rum.Rum
 import com.datadog.android.rum.RumConfiguration
 import com.datadog.android.rum.tracking.NavigationViewTrackingStrategy
+import com.datadog.android.rum.tracking.ViewTrackingStrategy
 import com.datadog.android.sessionreplay.SessionReplay
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 import com.datadog.android.sessionreplay.SessionReplayPrivacy
@@ -23,19 +24,19 @@ import com.datadog.android.trace.TraceConfiguration
 import com.datadog.benchmark.sample.config.BenchmarkConfig
 import com.datadog.benchmark.sample.config.SyntheticsRun
 import com.datadog.benchmark.sample.config.SyntheticsScenario
-import com.datadog.benchmark.sample.di.activity.BenchmarkActivityScope
 import com.datadog.benchmark.sample.navigation.BenchmarkNavigationPredicate
 import com.datadog.sample.benchmark.BuildConfig
 import com.datadog.sample.benchmark.R
 import dagger.Lazy
 import javax.inject.Inject
+import javax.inject.Singleton
 
 /**
  * The general recommendation is to initialize all the components at the Application.onCreate
  * to have all the observability as early as possible. However in the Benchmark app we know what features
  * we need only in [MainActivity.onCreate], it depends on the [SyntheticsScenario] which is derived from intent extras.
  */
-@BenchmarkActivityScope
+@Singleton
 @Suppress("TooManyFunctions")
 internal class DatadogFeaturesInitializer @Inject constructor(
     private val sdkCore: Lazy<SdkCore>
@@ -104,17 +105,7 @@ internal class DatadogFeaturesInitializer @Inject constructor(
 
     private fun createRumConfiguration(config: BenchmarkConfig): RumConfiguration {
         return RumConfiguration.Builder(BuildConfig.BENCHMARK_RUM_APPLICATION_ID).apply {
-            if (config.scenario != SyntheticsScenario.RumManual) {
-                useViewTrackingStrategy(
-                    NavigationViewTrackingStrategy(
-                        R.id.nav_host_fragment,
-                        true,
-                        BenchmarkNavigationPredicate()
-                    )
-                )
-            } else {
-                useViewTrackingStrategy(null)
-            }
+            useViewTrackingStrategy(rumViewTrackingStrategy(config))
             setTelemetrySampleRate(SAMPLE_RATE_TELEMETRY)
             trackUserInteractions()
             trackLongTasks(THRESHOLD_LONG_TASK_INTERVAL)
@@ -143,6 +134,17 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         }.build()
     }
 
+    private fun rumViewTrackingStrategy(config: BenchmarkConfig): ViewTrackingStrategy? {
+        return when (config.scenario) {
+            SyntheticsScenario.RumManual -> null
+            else -> NavigationViewTrackingStrategy(
+                R.id.nav_host_fragment,
+                true,
+                BenchmarkNavigationPredicate()
+            )
+        }
+    }
+
     private fun enableRum(config: BenchmarkConfig) {
         val rumConfig = createRumConfiguration(config)
         Rum.enable(rumConfig, sdkCore = sdkCore.get())
@@ -156,10 +158,12 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         SyntheticsScenario.Trace,
         SyntheticsScenario.LogsCustom,
         SyntheticsScenario.LogsHeavyTraffic,
+        SyntheticsScenario.RumAuto,
         null -> false
     }
 
     private fun isRumScenario(config: BenchmarkConfig) = when (config.scenario) {
+        SyntheticsScenario.RumAuto,
         SyntheticsScenario.RumManual -> true
         SyntheticsScenario.SessionReplay,
         SyntheticsScenario.SessionReplayCompose,
@@ -178,6 +182,7 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         SyntheticsScenario.RumManual,
         SyntheticsScenario.Trace,
         SyntheticsScenario.Upload,
+        SyntheticsScenario.RumAuto,
         null -> false
     }