RUM-9511: Refactor navigation and empty RumAuto scenario fragment

f

Author: aleksandr-gringauz

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() {
+    var config: BenchmarkConfig? = null
+}

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
     }
 

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

@@ -9,7 +9,6 @@ package com.datadog.benchmark.sample
 import android.app.Application
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.datadog.benchmark.sample.config.BenchmarkConfig
 import com.datadog.benchmark.sample.di.activity.BenchmarkActivityComponent
 import com.datadog.benchmark.sample.di.activity.DaggerBenchmarkActivityComponent
 
@@ -18,16 +17,12 @@ internal class MainActivityViewModel(
 ) : ViewModel()
 
 internal class MainActivityViewModelFactory(
-    private val application: Application,
-    private val activity: MainActivity
+    private val application: Application
 ) : ViewModelProvider.Factory {
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        val config = BenchmarkConfig.resolveSyntheticsBundle(activity.intent.extras)
-
         val benchmarkActivityComponent = DaggerBenchmarkActivityComponent.factory().create(
-            deps = application.benchmarkAppComponent,
-            config = config
+            deps = application.benchmarkAppComponent
         )
 
         return MainActivityViewModel(benchmarkActivityComponent) as T

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

@@ -0,0 +1,76 @@
+/*
+ * 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.activities
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import coil.Coil
+import coil.ImageLoader
+import com.datadog.benchmark.sample.BenchmarkConfigHolder
+import com.datadog.benchmark.sample.DatadogFeaturesInitializer
+import com.datadog.benchmark.sample.activities.scenarios.DefaultScenarioActivity
+import com.datadog.benchmark.sample.activities.scenarios.RumAutoScenarioActivity
+import com.datadog.benchmark.sample.activities.scenarios.SessionReplayComposeScenarioActivity
+import com.datadog.benchmark.sample.activities.scenarios.SessionReplayScenarioActivity
+import com.datadog.benchmark.sample.benchmarkAppComponent
+import com.datadog.benchmark.sample.config.BenchmarkConfig
+import com.datadog.benchmark.sample.config.SyntheticsScenario
+import okhttp3.OkHttpClient
+import javax.inject.Inject
+
+@SuppressLint("CustomSplashScreen")
+internal class LaunchActivity : AppCompatActivity() {
+    @Inject
+    internal lateinit var benchmarkConfigHolder: BenchmarkConfigHolder
+
+    @Inject
+    internal lateinit var benchmarkFeaturesInitializer: DatadogFeaturesInitializer
+
+    @Inject
+    internal lateinit var okHttpClient: dagger.Lazy<OkHttpClient>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        application.benchmarkAppComponent.inject(this)
+
+        val config = BenchmarkConfig.resolveSyntheticsBundle(intent.extras)
+        benchmarkConfigHolder.config = config
+
+        /**
+         * The general recommendation is to initialize Datadog SDK at the Application.onCreate
+         * to have all the observability as early as possible. However in the Benchmark app we know what kind of run we
+         * have [SyntheticsRun.Instrumented] or [SyntheticsRun.Baseline] only in [LaunchActivity.onCreate].
+         * It is derived from intent extras.
+         */
+        benchmarkFeaturesInitializer.initialize(config)
+
+        initializeCoil()
+
+        openScenarioActivity(config)
+
+        finish()
+    }
+
+    private fun initializeCoil() {
+        Coil.setImageLoader(ImageLoader(applicationContext).newBuilder().okHttpClient(okHttpClient.get()).build())
+    }
+
+    private fun openScenarioActivity(config: BenchmarkConfig) {
+        val activity = when (config.scenario) {
+            SyntheticsScenario.RumAuto -> RumAutoScenarioActivity::class.java
+            SyntheticsScenario.SessionReplayCompose -> SessionReplayComposeScenarioActivity::class.java
+            SyntheticsScenario.SessionReplay -> SessionReplayScenarioActivity::class.java
+            else -> DefaultScenarioActivity::class.java
+        }
+
+        val intent = Intent(this, activity)
+        startActivity(intent)
+    }
+}