Merge pull request #2959 from DataDog/aleksandr-gringauz/RUM-12046/fix-synthetics-rum-association-in-benchmark-app

RUM-12046: Pass synthetic ids to RUM earlier in benchmark app

Author: aleksandr-gringauz

features/dd-sdk-android-rum/api/apiSurface

@@ -167,6 +167,7 @@ class com.datadog.android.rum._RumInternalProxy
   fun setInternalViewAttribute(String, Any?)
   fun setSyntheticsAttribute(String?, String?)
   fun enableJankStatsTracking(android.app.Activity)
+  fun setSyntheticsAttributeFromIntent(android.content.Intent)
   companion object 
     fun setTelemetryConfigurationEventMapper(com.datadog.android.rum.RumConfiguration.Builder, com.datadog.android.event.EventMapper<com.datadog.android.telemetry.model.TelemetryConfigurationEvent>): com.datadog.android.rum.RumConfiguration.Builder
     fun setAdditionalConfiguration(com.datadog.android.rum.RumConfiguration.Builder, Map<String, Any>): com.datadog.android.rum.RumConfiguration.Builder

features/dd-sdk-android-rum/api/dd-sdk-android-rum.api

@@ -251,6 +251,7 @@ public final class com/datadog/android/rum/_RumInternalProxy {
 	public final fun enableJankStatsTracking (Landroid/app/Activity;)V
 	public final fun setInternalViewAttribute (Ljava/lang/String;Ljava/lang/Object;)V
 	public final fun setSyntheticsAttribute (Ljava/lang/String;Ljava/lang/String;)V
+	public final fun setSyntheticsAttributeFromIntent (Landroid/content/Intent;)V
 	public final fun updateExternalRefreshRate (D)V
 	public final fun updatePerformanceMetric (Lcom/datadog/android/rum/RumPerformanceMetric;D)V
 }

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/_RumInternalProxy.kt

@@ -76,7 +76,7 @@ class _RumInternalProxy internal constructor(private val rumMonitor: AdvancedRum
         rumMonitor.enableJankStatsTracking(activity)
     }
 
-    internal fun setSyntheticsAttributeFromIntent(intent: Intent) {
+    fun setSyntheticsAttributeFromIntent(intent: Intent) {
         @Suppress("TooGenericExceptionCaught")
         val extras = try { intent.extras } catch (_: Exception) { null }
         val testId = extras?.getString("_dd.synthetics.test_id")

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

@@ -6,12 +6,14 @@
 
 package com.datadog.benchmark.sample
 
+import android.content.Intent
 import com.datadog.android.api.SdkCore
 import com.datadog.android.compose.enableComposeActionTracking
 import com.datadog.android.log.Logs
 import com.datadog.android.log.LogsConfiguration
 import com.datadog.android.rum.Rum
 import com.datadog.android.rum.RumConfiguration
+import com.datadog.android.rum.RumMonitor
 import com.datadog.android.rum.tracking.NavigationViewTrackingStrategy
 import com.datadog.android.rum.tracking.ViewTrackingStrategy
 import com.datadog.android.sessionreplay.SessionReplay
@@ -39,11 +41,12 @@ import javax.inject.Singleton
 @Singleton
 @Suppress("TooManyFunctions")
 internal class DatadogFeaturesInitializer @Inject constructor(
-    private val sdkCore: Lazy<SdkCore>
+    private val sdkCore: Lazy<SdkCore>,
+    private val rumMonitor: Lazy<RumMonitor>
 ) {
     private var isInitialized = false
 
-    fun initialize(config: BenchmarkConfig) {
+    fun initialize(config: BenchmarkConfig, intent: Intent) {
         if (config.run == SyntheticsRun.Baseline) {
             return
         }
@@ -54,7 +57,7 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         isInitialized = true
 
         if (needToEnableRum(config)) {
-            enableRum(config)
+            enableRum(config = config, intent = intent)
         }
 
         if (needToEnableLogs(config)) {
@@ -149,9 +152,16 @@ internal class DatadogFeaturesInitializer @Inject constructor(
         }
     }
 
-    private fun enableRum(config: BenchmarkConfig) {
+    private fun enableRum(config: BenchmarkConfig, intent: Intent) {
         val rumConfig = createRumConfiguration(config)
         Rum.enable(rumConfig, sdkCore = sdkCore.get())
+
+        /**
+         * We set synthetic test attributes now instead of waiting for them to be automatically
+         * extracted by the sdk because the Activity for the test scenario will not have
+         * the necessary attributes in the intent.
+         */
+        rumMonitor.get()._getInternal()?.setSyntheticsAttributeFromIntent(intent)
     }
 
     private fun isSessionReplayScenario(config: BenchmarkConfig) = when (config.scenario) {

sample/benchmark/src/main/java/com/datadog/benchmark/sample/activities/LaunchActivity.kt

@@ -49,7 +49,7 @@ internal class LaunchActivity : AppCompatActivity() {
          * have [SyntheticsRun.Instrumented] or [SyntheticsRun.Baseline] only in [LaunchActivity.onCreate].
          * It is derived from intent extras.
          */
-        benchmarkFeaturesInitializer.initialize(config)
+        benchmarkFeaturesInitializer.initialize(config = config, intent = intent)
 
         initializeCoil()
 

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

@@ -9,6 +9,8 @@ package com.datadog.benchmark.sample.config
 import com.datadog.android.api.SdkCore
 import com.datadog.android.log.Logs
 import com.datadog.android.rum.Rum
+import com.datadog.android.rum.RumMonitor
+import com.datadog.android.rum._RumInternalProxy
 import com.datadog.android.sessionreplay.SessionReplay
 import com.datadog.benchmark.sample.DatadogFeaturesInitializer
 import fr.xgouchet.elmyr.junit5.ForgeExtension
@@ -18,11 +20,10 @@ import org.junit.jupiter.api.extension.Extensions
 import org.mockito.Mock
 import org.mockito.MockedStatic
 import org.mockito.Mockito
+import org.mockito.Mockito.mock
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.junit.jupiter.MockitoSettings
 import org.mockito.kotlin.any
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.quality.Strictness
 
 @Extensions(
@@ -102,9 +103,17 @@ class DatadogFeaturesInitializerTest {
             Mockito.mockStatic(Rum::class.java).use { rumStatic ->
                 Mockito.mockStatic(Logs::class.java).use { logsStatic ->
                     // When
+                    val mockMonitor = mock<RumMonitor>()
+                    class StubRumMonitor : RumMonitor by mockMonitor {
+                        override fun _getInternal(): _RumInternalProxy? {
+                            return null
+                        }
+                    }
+
                     DatadogFeaturesInitializer(
-                        sdkCore = { mockSdkCore }
-                    ).initialize(config)
+                        sdkCore = { mockSdkCore },
+                        rumMonitor = { StubRumMonitor() }
+                    ).initialize(config, mock())
 
                     // Then
                     thenBlock(MockedStatics(sessionReplayStatic, rumStatic, logsStatic))