RUM-9508: more pr fixes

Author: aleksandr-gringauz

gradle/libs.versions.toml

@@ -20,6 +20,7 @@ androidXConstraintLayout = "2.0.4"
 androidXCore = "1.3.1"
 androidXFragment = "1.2.4"
 androidXLeanback = "1.0.0"
+androidXLifecycleRuntimeCompose = "2.8.7"
 androidXMetrics = "1.0.0-beta02"
 androidXMultidex = "2.0.1"
 androidXNavigation = "2.7.7"
@@ -145,6 +146,7 @@ androidXNavigationFragment = { module = "androidx.navigation:navigation-fragment
 androidXNavigationRuntime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidXNavigation" }
 androidXRecyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "androidXRecyclerView" }
 androidXWorkManager = { module = "androidx.work:work-runtime", version.ref = "androidXWorkManager" }
+androidXLifecycleCompose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidXLifecycleRuntimeCompose" }
 daggerLib = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 daggerCompiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 googleAccompanistAppCompatTheme = { module = "com.google.accompanist:accompanist-appcompat-theme", version.ref = "googleAccompanist" }

sample/benchmark/build.gradle.kts

@@ -87,6 +87,7 @@ dependencies {
     implementation(libs.bundles.androidXNavigation)
     implementation(libs.androidXAppCompat)
     implementation(libs.androidXConstraintLayout)
+    implementation(libs.androidXLifecycleCompose)
     implementation(libs.googleMaterial)
     implementation(libs.glideCore)
     implementation(libs.material3Android)

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

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

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

@@ -11,13 +11,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.collectAsState
 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.ViewModel
 import javax.inject.Inject
@@ -35,7 +35,7 @@ internal class LogsFragment : Fragment() {
 
         return ComposeView(requireContext()).apply {
             setContent {
-                val states by viewModel.states().collectAsState()
+                val states by viewModel.logsScreenState.collectAsStateWithLifecycle()
 
                 LogsScreen(
                     modifier = Modifier.fillMaxSize(),

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

@@ -84,20 +84,18 @@ internal class LogsScreenViewModel(
 
     private val actions: Channel<LogsScreenAction> = Channel(capacity = UNLIMITED)
 
-    private val statesPipeline: StateFlow<LogsScreenState> = actions
+    private val _logsScreenState: StateFlow<LogsScreenState> = actions
         .receiveAsFlow()
         .scan(LogsScreenState.INITIAL, ::processAction)
         .flowOn(defaultDispatcher)
         .stateIn(scope = viewModelScope, started = SharingStarted.Lazily, initialValue = LogsScreenState.INITIAL)
 
+    val logsScreenState: StateFlow<LogsScreenState> = _logsScreenState
+
     fun dispatch(action: LogsScreenAction) {
         actions.trySend(action)
     }
 
-    fun states(): StateFlow<LogsScreenState> {
-        return statesPipeline
-    }
-
     private fun processAction(prev: LogsScreenState, action: LogsScreenAction): LogsScreenState {
         return when (action) {
             is LogsScreenAction.ChangeLogMessage -> prev.modifyConfig { copy(logMessage = action.newLogMessage) }