RUM-9508: pr fixes

Author: aleksandr-gringauz

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

@@ -28,3 +28,6 @@ internal class BenchmarkApplication : Application() {
         benchmarkAppComponent.inject(this)
     }
 }
+
+internal val Application.benchmarkAppComponent: BenchmarkAppComponent
+    get() = (this as BenchmarkApplication).benchmarkAppComponent

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

@@ -21,34 +21,44 @@ import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
 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 javax.inject.Inject
+import javax.inject.Singleton
 
-@BenchmarkActivityScope
+/**
+ * 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.
+ */
+@Singleton
 @Suppress("TooManyFunctions")
 internal class DatadogFeaturesInitializer @Inject constructor(
-    private val sdkCore: SdkCore,
-    private val config: BenchmarkConfig
+    private val sdkCore: SdkCore
 ) {
-    fun initialize() {
-        if (needToEnableRum()) {
+    private var isInitialized = false
+    fun initialize(config: BenchmarkConfig) {
+        if (isInitialized) {
+            return
+        }
+        isInitialized = true
+
+        if (needToEnableRum(config)) {
             enableRum()
         }
 
-        if (needToEnableLogs()) {
+        if (needToEnableLogs(config)) {
             enableLogs()
         }
 
-        if (needToEnableSessionReplay()) {
+        if (needToEnableSessionReplay(config)) {
             enableSessionReplay()
         }
     }
 
-    private fun needToEnableSessionReplay(): Boolean {
-        return isInstrumentedRun() && isSessionReplayScenario()
+    private fun needToEnableSessionReplay(config: BenchmarkConfig): Boolean {
+        return isInstrumentedRun(config) && isSessionReplayScenario(config)
     }
 
     @Suppress("DEPRECATION")
@@ -63,19 +73,19 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         SessionReplay.enable(sessionReplayConfig, sdkCore)
     }
 
-    private fun needToEnableLogs(): Boolean {
-        return isInstrumentedRun() && isLogsScenario()
+    private fun needToEnableLogs(config: BenchmarkConfig): Boolean {
+        return isInstrumentedRun(config) && isLogsScenario(config)
     }
 
     private fun enableLogs() {
         val logsConfig = LogsConfiguration.Builder().build()
         Logs.enable(logsConfig, sdkCore)
     }
 
-    private fun needToEnableRum(): Boolean {
-        return when (isInstrumentedRun()) {
-            true -> isSessionReplayScenario() || isRumScenario()
-            false -> isSessionReplayScenario()
+    private fun needToEnableRum(config: BenchmarkConfig): Boolean {
+        return when (isInstrumentedRun(config)) {
+            true -> isSessionReplayScenario(config) || isRumScenario(config)
+            false -> isSessionReplayScenario(config)
         }
     }
 
@@ -121,24 +131,40 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         Rum.enable(rumConfig, sdkCore = sdkCore)
     }
 
-    private fun isSessionReplayScenario() = when (config.scenario) {
+    private fun isSessionReplayScenario(config: BenchmarkConfig) = when (config.scenario) {
         SyntheticsScenario.SessionReplayCompose,
+        SyntheticsScenario.Upload,
         SyntheticsScenario.SessionReplay -> true
-        else -> false
+        SyntheticsScenario.Rum,
+        SyntheticsScenario.Trace,
+        SyntheticsScenario.LogsCustom,
+        SyntheticsScenario.LogsHeavyTraffic,
+        null -> false
     }
 
-    private fun isRumScenario() = when (config.scenario) {
+    private fun isRumScenario(config: BenchmarkConfig) = when (config.scenario) {
         SyntheticsScenario.Rum -> true
-        else -> false
+        SyntheticsScenario.SessionReplay,
+        SyntheticsScenario.SessionReplayCompose,
+        SyntheticsScenario.Trace,
+        SyntheticsScenario.LogsCustom,
+        SyntheticsScenario.LogsHeavyTraffic,
+        SyntheticsScenario.Upload,
+        null -> false
     }
 
-    private fun isLogsScenario() = when (config.scenario) {
+    private fun isLogsScenario(config: BenchmarkConfig) = when (config.scenario) {
         SyntheticsScenario.LogsCustom,
         SyntheticsScenario.LogsHeavyTraffic -> true
-        else -> false
+        SyntheticsScenario.SessionReplay,
+        SyntheticsScenario.SessionReplayCompose,
+        SyntheticsScenario.Rum,
+        SyntheticsScenario.Trace,
+        SyntheticsScenario.Upload,
+        null -> false
     }
 
-    private fun isInstrumentedRun() = config.run == SyntheticsRun.Instrumented
+    private fun isInstrumentedRun(config: BenchmarkConfig) = config.run == SyntheticsRun.Instrumented
 
     companion object {
         private const val SAMPLE_IN_ALL_SESSIONS = 100f

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

@@ -6,6 +6,7 @@
 
 package com.datadog.benchmark.sample
 
+import android.app.Activity
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
@@ -43,7 +44,7 @@ class MainActivity : AppCompatActivity() {
         config = BenchmarkConfig.resolveSyntheticsBundle(intent.extras)
 
         benchmarkActivityComponent = DaggerBenchmarkActivityComponent.factory().create(
-            deps = (application as BenchmarkApplication).benchmarkAppComponent,
+            deps = application.benchmarkAppComponent,
             config = config,
             mainActivity = this
         )
@@ -59,7 +60,7 @@ class MainActivity : AppCompatActivity() {
             setContentView(R.layout.activity_main)
         }
 
-        datadogFeaturesInitializer.initialize()
+        datadogFeaturesInitializer.initialize(config)
     }
 
     override fun onStart() {
@@ -79,3 +80,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 }
+
+internal val Activity.benchmarkActivityComponent: BenchmarkActivityComponent
+    get() = (this as MainActivity).benchmarkActivityComponent

sample/benchmark/src/main/java/com/datadog/benchmark/sample/di/activity/BenchmarkActivityComponent.kt

@@ -7,6 +7,7 @@
 package com.datadog.benchmark.sample.di.activity
 
 import com.datadog.android.api.SdkCore
+import com.datadog.benchmark.sample.DatadogFeaturesInitializer
 import com.datadog.benchmark.sample.MainActivity
 import com.datadog.benchmark.sample.config.BenchmarkConfig
 import com.datadog.benchmark.sample.ui.logscustom.LogsFragment
@@ -21,6 +22,7 @@ internal annotation class BenchmarkActivityScope
 
 internal interface BenchmarkActivityComponentDependencies {
     val sdkCore: SdkCore
+    val datadogFeaturesInitializer: DatadogFeaturesInitializer
 }
 
 @Component(

sample/benchmark/src/main/java/com/datadog/benchmark/sample/navigation/FragmentsNavigationManagerImpl.kt

@@ -47,25 +47,24 @@ private fun NavController.createNavGraph(scenario: SyntheticsScenario?): NavGrap
 
 private fun createStartDestination(scenario: SyntheticsScenario?): String {
     return when (scenario) {
-        SyntheticsScenario.SessionReplay -> SESSION_REPLAY_METERIAL_FRAGMENT_KEY
-        SyntheticsScenario.SessionReplayCompose -> TODO()
-        SyntheticsScenario.Rum -> TODO()
-        SyntheticsScenario.Trace -> TODO()
+        SyntheticsScenario.SessionReplay, SyntheticsScenario.Upload -> SESSION_REPLAY_METERIAL_FRAGMENT_KEY
+        SyntheticsScenario.SessionReplayCompose -> error("Using fragments for SessionReplayCompose scenario")
+        SyntheticsScenario.Rum -> TODO("RUM-9510")
+        SyntheticsScenario.Trace -> TODO("RUM-9509")
         null, SyntheticsScenario.LogsCustom -> LOGS_FRAGMENT_KEY
-        SyntheticsScenario.Upload -> TODO()
-        SyntheticsScenario.LogsHeavyTraffic -> TODO()
+        SyntheticsScenario.LogsHeavyTraffic -> TODO("RUM-9508")
     }
 }
 
 private fun NavGraphBuilder.navGraph(scenario: SyntheticsScenario?) {
     return when (scenario) {
-        SyntheticsScenario.SessionReplay -> navGraphSessionReplay()
+        SyntheticsScenario.SessionReplay,
+        SyntheticsScenario.Upload -> navGraphSessionReplay()
         SyntheticsScenario.SessionReplayCompose -> error("Using fragments for SessionReplayCompose scenario")
-        SyntheticsScenario.Rum -> TODO()
-        SyntheticsScenario.Trace -> TODO()
+        SyntheticsScenario.Rum -> TODO("RUM-9510")
+        SyntheticsScenario.Trace -> TODO("RUM-9509")
         null, SyntheticsScenario.LogsCustom -> navGraphLogs()
-        SyntheticsScenario.Upload -> TODO()
-        SyntheticsScenario.LogsHeavyTraffic -> TODO()
+        SyntheticsScenario.LogsHeavyTraffic -> TODO("RUM-9508")
     }
 }
 

sample/benchmark/src/main/java/com/datadog/benchmark/sample/ui/logscustom/LogPayloadUtils.kt

@@ -19,49 +19,49 @@ internal fun LogPayloadSize.createLogAttributes(): Map<String, Any?> {
 }
 
 private val MEDIUM_ATTRIBUTES_PAYLOAD = mapOf(
-    "user" to mapOf(
+    "benchmark_user" to mapOf(
         "id" to UUID.randomUUID().toString(),
         "name" to "John Doe",
         "email" to "[email protected]"
     ),
-    "device" to mapOf(
-        "type" to "iPhone",
-        "os" to "iOS 17.0"
+    "benchmark_device" to mapOf(
+        "type" to "Android Phone",
+        "os" to "Android 15"
     ),
-    "log_type" to "user_event"
+    "benchmark_log_type" to "user_event"
 )
 
 private val LARGE_ATTRIBUTES_PAYLOAD = mapOf(
-    "log_type" to "user_event",
-    "session" to mapOf(
+    "benchmark_log_type" to "user_event",
+    "benchmark_session" to mapOf(
         "id" to UUID.randomUUID().toString(),
         "startTime" to "2024-02-27T12:00:00Z",
         "duration" to "2450"
     ),
-    "user" to mapOf(
+    "benchmark_user" to mapOf(
         "id" to "a1b2c3d4-e5f6-7g8h-9i0j-k1l2m3n4o5p6",
         "name" to "John Doe",
         "email" to "[email protected]"
     ),
-    "location" to mapOf(
+    "benchmark_location" to mapOf(
         "city" to "San Francisco",
         "country" to "USA"
     ),
-    "device" to mapOf(
-        "model" to "iPhone 15 Pro",
-        "os" to "iOS 17.2",
+    "benchmark_device" to mapOf(
+        "model" to "Google Pixel 8",
+        "os" to "Android 15",
         "battery" to "80%"
     ),
-    "network" to mapOf(
+    "benchmark_network" to mapOf(
         "type" to "WiFi",
         "carrier" to "Verizon"
     ),
-    "errorStack" to mapOf(
+    "benchmark_errorStack" to mapOf(
         "stackTrace" to "Error at module XYZ -> function ABC",
         "crashType" to "NullPointerException"
     )
 )
 
 private val SMALL_ATTRIBUTES_PAYLOAD = mapOf(
-    "log_type" to "simple"
+    "benchmark_log_type" to "simple"
 )

sample/benchmark/src/main/java/com/datadog/benchmark/sample/ui/logscustom/LogsFragment.kt

@@ -18,7 +18,7 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
-import com.datadog.benchmark.sample.MainActivity
+import com.datadog.benchmark.sample.benchmarkActivityComponent
 import com.datadog.benchmark.sample.di.activity.ViewModel
 import javax.inject.Inject
 
@@ -29,7 +29,7 @@ internal class LogsFragment : Fragment() {
     internal lateinit var viewModelFactory: ViewModelProvider.Factory
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        (requireActivity() as MainActivity).benchmarkActivityComponent.inject(this)
+        requireActivity().benchmarkActivityComponent.inject(this)
 
         val viewModel by viewModels<LogsScreenViewModel> { viewModelFactory }
 

sample/benchmark/src/main/java/com/datadog/benchmark/sample/ui/sessionreplay/SessionReplayAppcompatFragment.kt

@@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
-import com.datadog.benchmark.sample.MainActivity
+import com.datadog.benchmark.sample.benchmarkActivityComponent
 import com.datadog.benchmark.sample.navigation.FragmentsNavigationManager
 import com.datadog.sample.benchmark.R
 import com.google.android.material.datepicker.MaterialDatePicker
@@ -41,7 +41,7 @@ internal class SessionReplayAppcompatFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        (requireActivity() as MainActivity).benchmarkActivityComponent.inject(this)
+        requireActivity().benchmarkActivityComponent.inject(this)
 
         return inflater.inflate(R.layout.fragment_session_replay_compat, container, false).apply {
             findViewById<CheckedTextView>(R.id.checked_text_view).apply {

sample/benchmark/src/main/java/com/datadog/benchmark/sample/ui/sessionreplay/SessionReplayMaterialFragment.kt

@@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
-import com.datadog.benchmark.sample.MainActivity
+import com.datadog.benchmark.sample.benchmarkActivityComponent
 import com.datadog.benchmark.sample.navigation.FragmentsNavigationManager
 import com.datadog.sample.benchmark.R
 import com.google.android.material.datepicker.MaterialDatePicker
@@ -40,7 +40,7 @@ internal class SessionReplayMaterialFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        (requireActivity() as MainActivity).benchmarkActivityComponent.inject(this)
+        requireActivity().benchmarkActivityComponent.inject(this)
 
         return inflater.inflate(R.layout.fragment_session_replay_material, container, false).apply {
             findViewById<CheckedTextView>(R.id.checked_text_view).apply {

sample/benchmark/src/test/java/com/datadog/benchmark/sample/config/DatadogFeaturesInitializerTest.kt

@@ -101,9 +101,8 @@ class DatadogFeaturesInitializerTest {
                 Mockito.mockStatic(Logs::class.java).use { logsStatic ->
                     // When
                     DatadogFeaturesInitializer(
-                        sdkCore = mockSdkCore,
-                        config = config
-                    ).initialize()
+                        sdkCore = mockSdkCore
+                    ).initialize(config)
 
                     // Then
                     thenBlock(MockedStatics(sessionReplayStatic, rumStatic, logsStatic))