RUM-9908 Propagate parent attributes to the ResourceScope

Author: xgouchet

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScope.kt

@@ -12,7 +12,6 @@ import com.datadog.android.api.storage.DataWriter
 import com.datadog.android.core.InternalSdkCore
 import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
 import com.datadog.android.internal.utils.loggableStackTrace
-import com.datadog.android.rum.GlobalRumMonitor
 import com.datadog.android.rum.RumAttributes
 import com.datadog.android.rum.RumErrorSource
 import com.datadog.android.rum.RumResourceKind
@@ -50,9 +49,8 @@ internal class RumResourceScope(
 ) : RumScope {
 
     internal val resourceId: String = UUID.randomUUID().toString()
-    internal val attributes: MutableMap<String, Any?> = initialAttributes.toMutableMap().apply {
-        putAll(GlobalRumMonitor.get(sdkCore).getAttributes())
-    }
+    internal val resourceAttributes: MutableMap<String, Any?> = initialAttributes.toMutableMap()
+
     private var timing: ResourceTiming? = null
     private val initialContext = parentScope.getRumContext()
 
@@ -95,6 +93,10 @@ internal class RumResourceScope(
         return initialContext
     }
 
+    override fun getCustomAttributes(): Map<String, Any?> {
+        return parentScope.getCustomAttributes() + resourceAttributes
+    }
+
     override fun isActive(): Boolean {
         return !stopped
     }
@@ -110,7 +112,7 @@ internal class RumResourceScope(
     ) {
         if (key != event.key) return
         stopped = true
-        attributes.putAll(event.attributes)
+        resourceAttributes.putAll(event.attributes)
         kind = event.kind
         statusCode = event.statusCode
         size = event.size
@@ -138,7 +140,7 @@ internal class RumResourceScope(
         writer: DataWriter<Any>
     ) {
         if (key != event.key) return
-        attributes.putAll(event.attributes)
+        resourceAttributes.putAll(event.attributes)
         sendError(
             event.message,
             event.source,
@@ -157,7 +159,7 @@ internal class RumResourceScope(
         writer: DataWriter<Any>
     ) {
         if (key != event.key) return
-        attributes.putAll(event.attributes)
+        resourceAttributes.putAll(event.attributes)
 
         val errorCategory =
             if (event.stackTrace.isNotEmpty()) ErrorEvent.Category.EXCEPTION else null
@@ -182,10 +184,9 @@ internal class RumResourceScope(
         eventTime: Time,
         writer: DataWriter<Any>
     ) {
-        attributes.putAll(GlobalRumMonitor.get(sdkCore).getAttributes())
-        val traceId = attributes.remove(RumAttributes.TRACE_ID)?.toString()
-        val spanId = attributes.remove(RumAttributes.SPAN_ID)?.toString()
-        val rulePsr = attributes.remove(RumAttributes.RULE_PSR) as? Number
+        val traceId = resourceAttributes.remove(RumAttributes.TRACE_ID)?.toString()
+        val spanId = resourceAttributes.remove(RumAttributes.SPAN_ID)?.toString()
+        val rulePsr = resourceAttributes.remove(RumAttributes.RULE_PSR) as? Number
 
         val rumContext = getRumContext()
         val syntheticsAttribute = if (
@@ -207,15 +208,14 @@ internal class RumResourceScope(
 
         @Suppress("UNCHECKED_CAST")
         val finalTiming = timing ?: extractResourceTiming(
-            attributes.remove(RumAttributes.RESOURCE_TIMINGS) as? Map<String, Any?>
+            resourceAttributes.remove(RumAttributes.RESOURCE_TIMINGS) as? Map<String, Any?>
         )
         val graphql = resolveGraphQLAttributes(
-            attributes.remove(RumAttributes.GRAPHQL_OPERATION_TYPE) as? String?,
-            attributes.remove(RumAttributes.GRAPHQL_OPERATION_NAME) as? String?,
-            attributes.remove(RumAttributes.GRAPHQL_PAYLOAD) as? String?,
-            attributes.remove(RumAttributes.GRAPHQL_VARIABLES) as? String?
+            resourceAttributes.remove(RumAttributes.GRAPHQL_OPERATION_TYPE) as? String?,
+            resourceAttributes.remove(RumAttributes.GRAPHQL_OPERATION_NAME) as? String?,
+            resourceAttributes.remove(RumAttributes.GRAPHQL_PAYLOAD) as? String?,
+            resourceAttributes.remove(RumAttributes.GRAPHQL_VARIABLES) as? String?
         )
-        val eventAttributes = attributes.toMutableMap()
         sdkCore.newRumEventWriteOperation(writer) { datadogContext ->
             val user = datadogContext.userInfo
             val hasReplay = featuresContextResolver.resolveViewHasReplay(
@@ -282,7 +282,7 @@ internal class RumResourceScope(
                     brand = datadogContext.deviceInfo.deviceBrand,
                     architecture = datadogContext.deviceInfo.architecture
                 ),
-                context = ResourceEvent.Context(additionalProperties = eventAttributes),
+                context = ResourceEvent.Context(additionalProperties = getCustomAttributes().toMutableMap()),
                 dd = ResourceEvent.Dd(
                     traceId = traceId,
                     spanId = spanId,
@@ -343,12 +343,9 @@ internal class RumResourceScope(
         writer: DataWriter<Any>,
         resourceStopTimestampInNanos: Long
     ) {
-        attributes.putAll(GlobalRumMonitor.get(sdkCore).getAttributes())
-        val errorFingerprint = attributes.remove(RumAttributes.ERROR_FINGERPRINT) as? String
-
+        val errorFingerprint = resourceAttributes.remove(RumAttributes.ERROR_FINGERPRINT) as? String
         val rumContext = getRumContext()
 
-        val eventAttributes = attributes.toMutableMap()
         val syntheticsAttribute = if (
             rumContext.syntheticsTestId.isNullOrBlank() ||
             rumContext.syntheticsResultId.isNullOrBlank()
@@ -431,7 +428,7 @@ internal class RumResourceScope(
                     brand = datadogContext.deviceInfo.deviceBrand,
                     architecture = datadogContext.deviceInfo.architecture
                 ),
-                context = ErrorEvent.Context(additionalProperties = eventAttributes),
+                context = ErrorEvent.Context(additionalProperties = getCustomAttributes().toMutableMap()),
                 dd = ErrorEvent.Dd(
                     session = ErrorEvent.DdSession(
                         sessionPrecondition = rumContext.sessionStartReason.toErrorSessionPrecondition()