Merge pull request #2644 from DataDog/aleksandr-gringauz/RUM-9510/rummanual-scenario-android-benchmarks-2

RUM-9510: RumManual scenario for android benchmark app

Author: aleksandr-gringauz

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

@@ -47,7 +47,7 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         isInitialized = true
 
         if (needToEnableRum(config)) {
-            enableRum()
+            enableRum(config)
         }
 
         if (needToEnableLogs(config)) {
@@ -95,61 +95,65 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         }
     }
 
-    private fun createRumConfiguration(): RumConfiguration {
-        return RumConfiguration.Builder(BuildConfig.BENCHMARK_RUM_APPLICATION_ID)
-            .useViewTrackingStrategy(
-                NavigationViewTrackingStrategy(
-                    R.id.nav_host_fragment,
-                    true,
-                    BenchmarkNavigationPredicate()
+    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()
+                    )
                 )
-            )
-            .setTelemetrySampleRate(SAMPLE_RATE_TELEMETRY)
-            .trackUserInteractions()
-            .trackLongTasks(THRESHOLD_LONG_TASK_INTERVAL)
-            .trackNonFatalAnrs(true)
-            .setViewEventMapper { event ->
+            } else {
+                useViewTrackingStrategy(null)
+            }
+            setTelemetrySampleRate(SAMPLE_RATE_TELEMETRY)
+            trackUserInteractions()
+            trackLongTasks(THRESHOLD_LONG_TASK_INTERVAL)
+            trackNonFatalAnrs(true)
+            setViewEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
                 event
             }
-            .setActionEventMapper { event ->
+            setActionEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
                 event
             }
-            .setResourceEventMapper { event ->
+            setResourceEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
                 event
             }
-            .setErrorEventMapper { event ->
+            setErrorEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
                 event
             }
-            .setLongTaskEventMapper { event ->
+            setLongTaskEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
                 event
             }
-            .enableComposeActionTracking()
-            .build()
+            enableComposeActionTracking()
+        }.build()
     }
 
-    private fun enableRum() {
-        val rumConfig = createRumConfiguration()
+    private fun enableRum(config: BenchmarkConfig) {
+        val rumConfig = createRumConfiguration(config)
         Rum.enable(rumConfig, sdkCore = sdkCore)
     }
 
     private fun isSessionReplayScenario(config: BenchmarkConfig) = when (config.scenario) {
         SyntheticsScenario.SessionReplayCompose,
         SyntheticsScenario.Upload,
         SyntheticsScenario.SessionReplay -> true
-        SyntheticsScenario.Rum,
+        SyntheticsScenario.RumManual,
         SyntheticsScenario.Trace,
         SyntheticsScenario.LogsCustom,
         SyntheticsScenario.LogsHeavyTraffic,
         null -> false
     }
 
     private fun isRumScenario(config: BenchmarkConfig) = when (config.scenario) {
-        SyntheticsScenario.Rum -> true
+        SyntheticsScenario.RumManual -> true
         SyntheticsScenario.SessionReplay,
         SyntheticsScenario.SessionReplayCompose,
         SyntheticsScenario.Trace,
@@ -164,7 +168,7 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         SyntheticsScenario.LogsHeavyTraffic -> true
         SyntheticsScenario.SessionReplay,
         SyntheticsScenario.SessionReplayCompose,
-        SyntheticsScenario.Rum,
+        SyntheticsScenario.RumManual,
         SyntheticsScenario.Trace,
         SyntheticsScenario.Upload,
         null -> false

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

@@ -27,8 +27,7 @@ internal class MainActivityViewModelFactory(
 
         val benchmarkActivityComponent = DaggerBenchmarkActivityComponent.factory().create(
             deps = application.benchmarkAppComponent,
-            config = config,
-            mainActivity = activity
+            config = config
         )
 
         return MainActivityViewModel(benchmarkActivityComponent) as T

sample/benchmark/src/main/java/com/datadog/benchmark/sample/config/SyntheticsScenario.kt

@@ -12,7 +12,7 @@ internal enum class SyntheticsScenario(val value: String) {
 
     SessionReplayCompose("sr_compose"),
 
-    Rum("rum"),
+    RumManual("rum_manual"),
 
     Trace("trace"),
 

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

@@ -4,6 +4,8 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
+@file:Suppress("MethodOverloading")
+
 package com.datadog.benchmark.sample.di.activity
 
 import com.datadog.android.api.SdkCore
@@ -13,6 +15,7 @@ import com.datadog.benchmark.sample.config.BenchmarkConfig
 import com.datadog.benchmark.sample.di.common.DispatchersModule
 import com.datadog.benchmark.sample.ui.logscustom.LogsFragment
 import com.datadog.benchmark.sample.ui.logsheavytraffic.di.LogsHeavyTrafficComponentDependencies
+import com.datadog.benchmark.sample.ui.rummanual.RumManualScenarioFragment
 import com.datadog.benchmark.sample.ui.sessionreplay.SessionReplayAppcompatFragment
 import com.datadog.benchmark.sample.ui.sessionreplay.SessionReplayMaterialFragment
 import com.datadog.benchmark.sample.ui.trace.TraceScenarioFragment
@@ -46,8 +49,7 @@ internal interface BenchmarkActivityComponent : LogsHeavyTrafficComponentDepende
     interface Factory {
         fun create(
             deps: BenchmarkActivityComponentDependencies,
-            @BindsInstance config: BenchmarkConfig,
-            @BindsInstance mainActivity: MainActivity
+            @BindsInstance config: BenchmarkConfig
         ): BenchmarkActivityComponent
     }
 
@@ -57,4 +59,5 @@ internal interface BenchmarkActivityComponent : LogsHeavyTrafficComponentDepende
     fun inject(sessionReplayMaterialFragment: SessionReplayMaterialFragment)
     fun inject(logsFragment: LogsFragment)
     fun inject(traceScenarioFragment: TraceScenarioFragment)
+    fun inject(rumManualScenarioFragment: RumManualScenarioFragment)
 }

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

@@ -8,6 +8,8 @@ package com.datadog.benchmark.sample.di.activity
 
 import com.datadog.android.api.SdkCore
 import com.datadog.android.log.Logger
+import com.datadog.android.rum.GlobalRumMonitor
+import com.datadog.android.rum.RumMonitor
 import com.datadog.benchmark.DatadogBaseMeter
 import com.datadog.benchmark.DatadogExporterConfiguration
 import com.datadog.benchmark.DatadogSdkMeter
@@ -48,6 +50,12 @@ internal interface DatadogActivityModule {
                 .setLogcatLogsEnabled(true)
                 .build()
         }
+
+        @Provides
+        @BenchmarkActivityScope
+        fun provideRumMonitor(sdkCore: SdkCore): RumMonitor {
+            return GlobalRumMonitor.get(sdkCore = sdkCore)
+        }
     }
 }
 

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

@@ -10,9 +10,11 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.datadog.android.log.Logger
+import com.datadog.android.rum.RumMonitor
 import com.datadog.benchmark.sample.di.common.CoroutineDispatcherQualifier
 import com.datadog.benchmark.sample.di.common.CoroutineDispatcherType
 import com.datadog.benchmark.sample.ui.logscustom.LogsScreenViewModel
+import com.datadog.benchmark.sample.ui.rummanual.RumManualScenarioViewModel
 import com.datadog.benchmark.sample.ui.trace.TraceScenarioViewModel
 import dagger.Module
 import dagger.Provides
@@ -56,5 +58,20 @@ internal interface ViewModelsModule {
                 )
             }
         }
+
+        @Provides
+        @ViewModelQualifier(RumManualScenarioViewModel::class)
+        fun provideRumManualScenarioViewModelFactory(
+            rumMonitor: RumMonitor,
+            @CoroutineDispatcherQualifier(CoroutineDispatcherType.Default)
+            defaultDispatcher: CoroutineDispatcher
+        ): ViewModelProvider.Factory = viewModelFactory {
+            initializer {
+                RumManualScenarioViewModel(
+                    rumMonitor = rumMonitor,
+                    defaultDispatcher = defaultDispatcher
+                )
+            }
+        }
     }
 }

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

@@ -15,6 +15,7 @@ import com.datadog.benchmark.sample.config.BenchmarkConfig
 import com.datadog.benchmark.sample.config.SyntheticsScenario
 import com.datadog.benchmark.sample.ui.logscustom.LogsFragment
 import com.datadog.benchmark.sample.ui.logsheavytraffic.LogsHeavyTrafficHostFragment
+import com.datadog.benchmark.sample.ui.rummanual.RumManualScenarioFragment
 import com.datadog.benchmark.sample.ui.sessionreplay.SessionReplayAppcompatFragment
 import com.datadog.benchmark.sample.ui.sessionreplay.SessionReplayMaterialFragment
 import com.datadog.benchmark.sample.ui.trace.TraceScenarioFragment
@@ -55,7 +56,7 @@ private fun createStartDestination(scenario: SyntheticsScenario?): String {
         SyntheticsScenario.SessionReplayCompose -> error("Using fragments for SessionReplayCompose scenario")
         SyntheticsScenario.LogsCustom -> LOGS_FRAGMENT_KEY
         SyntheticsScenario.LogsHeavyTraffic -> LOGS_HEAVY_TRAFFIC_FRAGMENT_KEY
-        SyntheticsScenario.Rum -> SESSION_REPLAY_METERIAL_FRAGMENT_KEY // TODO RUM-9510
+        SyntheticsScenario.RumManual -> RUM_MANUAL_FRAGMENT_KEY
         SyntheticsScenario.Trace -> TRACE_SCENARIO_FRAGMENT_KEY
     }
 }
@@ -68,7 +69,7 @@ private fun NavGraphBuilder.navGraph(scenario: SyntheticsScenario?) {
         SyntheticsScenario.SessionReplayCompose -> error("Using fragments for SessionReplayCompose scenario")
         SyntheticsScenario.LogsCustom -> navGraphLogs()
         SyntheticsScenario.LogsHeavyTraffic -> navGraphLogsHeavyTraffic()
-        SyntheticsScenario.Rum -> navGraphSessionReplay() // TODO RUM-9510
+        SyntheticsScenario.RumManual -> navGraphRumManualScenario()
         SyntheticsScenario.Trace -> navGraphTraceScenario()
     }
 }
@@ -101,8 +102,15 @@ private fun NavGraphBuilder.navGraphTraceScenario() {
     }
 }
 
+private fun NavGraphBuilder.navGraphRumManualScenario() {
+    fragment<RumManualScenarioFragment>(route = RUM_MANUAL_FRAGMENT_KEY) {
+        label = "rum manual scenario"
+    }
+}
+
 private const val LOGS_FRAGMENT_KEY = "logs_fragment"
 private const val LOGS_HEAVY_TRAFFIC_FRAGMENT_KEY = "logs_heavy_traffic_fragment"
 private const val SESSION_REPLAY_METERIAL_FRAGMENT_KEY = "fragment_session_replay_material"
 private const val SESSION_REPLAY_APPCOMPAT_FRAGMENT_KEY = "fragment_session_replay_appcompat"
 private const val TRACE_SCENARIO_FRAGMENT_KEY = "fragment_trace_scenario"
+private const val RUM_MANUAL_FRAGMENT_KEY = "fragment_rum_manual_scenario"

sample/benchmark/src/main/java/com/datadog/benchmark/sample/ui/rummanual/RumManualScenarioFragment.kt

@@ -0,0 +1,48 @@
+/*
+ * 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.ui.rummanual
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.datadog.benchmark.sample.benchmarkActivityComponent
+import com.datadog.benchmark.sample.di.activity.ViewModelQualifier
+import javax.inject.Inject
+
+internal class RumManualScenarioFragment : Fragment() {
+
+    @Inject
+    @ViewModelQualifier(RumManualScenarioViewModel::class)
+    internal lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    private val viewModel: RumManualScenarioViewModel by viewModels { viewModelFactory }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        requireActivity().benchmarkActivityComponent.inject(this)
+
+        return ComposeView(requireActivity()).apply {
+            setContent {
+                val state by viewModel.rumManualScenarioState.collectAsStateWithLifecycle()
+
+                RumManualScenarioScreen(
+                    modifier = Modifier.fillMaxSize(),
+                    state = state,
+                    dispatch = viewModel::dispatch
+                )
+            }
+        }
+    }
+}