RUM-9908 handle View attributes updates

Author: xgouchet

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

@@ -122,12 +122,16 @@ internal class RumApplicationScope(
 
     // endregion
 
+    // region RumViewChangedListener
+
     override fun onViewChanged(viewInfo: RumViewInfo) {
         if (viewInfo.isActive) {
             lastActiveViewInfo = viewInfo
         }
     }
 
+    // endregion
+
     // region Internal
 
     @WorkerThread

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

@@ -216,6 +216,8 @@ internal open class RumViewScope(
 
             is RumRawEvent.UpdatePerformanceMetric -> onUpdatePerformanceMetric(event)
             is RumRawEvent.AddViewLoadingTime -> onAddViewLoadingTime(event, writer)
+            is RumRawEvent.AddViewAttributes -> onAddViewAttributes(event)
+            is RumRawEvent.RemoveViewAttributes -> onRemoveViewAttributes(event)
 
             else -> delegateEventToChildren(event, writer)
         }
@@ -322,6 +324,18 @@ internal open class RumViewScope(
         sendViewUpdate(event, writer)
     }
 
+    @WorkerThread
+    private fun onAddViewAttributes(event: RumRawEvent.AddViewAttributes) {
+        viewAttributes.putAll(event.attributes)
+    }
+
+    @WorkerThread
+    private fun onRemoveViewAttributes(event: RumRawEvent.RemoveViewAttributes) {
+        event.attributes.forEach {
+            viewAttributes.remove(it)
+        }
+    }
+
     @WorkerThread
     private fun onStartView(
         event: RumRawEvent.StartView,

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

@@ -45,10 +45,13 @@ import com.datadog.tools.unit.extensions.TestConfigurationExtension
 import com.datadog.tools.unit.extensions.config.TestConfiguration
 import com.datadog.tools.unit.forge.exhaustiveAttributes
 import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.annotation.AdvancedForgery
 import fr.xgouchet.elmyr.annotation.BoolForgery
 import fr.xgouchet.elmyr.annotation.Forgery
 import fr.xgouchet.elmyr.annotation.LongForgery
+import fr.xgouchet.elmyr.annotation.MapForgery
 import fr.xgouchet.elmyr.annotation.StringForgery
+import fr.xgouchet.elmyr.annotation.StringForgeryType
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
 import fr.xgouchet.elmyr.junit5.ForgeExtension
 import org.assertj.core.api.Assertions.assertThat
@@ -314,6 +317,52 @@ internal class RumViewScopeAttributePropagationTest {
         }
     }
 
+    @Test
+    fun `M send event with added view attributes W handleEvent(AddViewAttributes+KeepAlive) on active view`() {
+        // Given
+        val expectedAttributes = mutableMapOf<String, Any?>()
+        expectedAttributes.putAll(fakeParentAttributes)
+        expectedAttributes.putAll(fakeViewAttributes)
+        testedScope = newRumViewScope(initialAttributes = emptyMap())
+
+        // When
+        testedScope.handleEvent(RumRawEvent.AddViewAttributes(fakeViewAttributes), mockWriter)
+        val result = testedScope.handleEvent(RumRawEvent.KeepAlive(), mockWriter)
+
+        // Then
+        argumentCaptor<ViewEvent> {
+            verify(mockWriter).write(eq(mockEventBatchWriter), capture(), eq(EventType.DEFAULT))
+            assertThat(lastValue)
+                .containsExactlyContextAttributes(expectedAttributes)
+        }
+        assertThat(result).isNotNull()
+    }
+
+    @Test
+    fun `M send event without removed view attributes W handleEvent(AddViewAttributes+KeepAlive) on active view`(
+        @MapForgery(
+            key = AdvancedForgery(string = [StringForgery(StringForgeryType.ALPHABETICAL)]),
+            value = AdvancedForgery(string = [StringForgery()])
+        ) fakeViewAttributes: Map<String, String>
+    ) {
+        // Given
+        val expectedAttributes = mutableMapOf<String, Any?>()
+        expectedAttributes.putAll(fakeParentAttributes)
+        testedScope = newRumViewScope(initialAttributes = fakeViewAttributes)
+
+        // When
+        testedScope.handleEvent(RumRawEvent.RemoveViewAttributes(fakeViewAttributes.keys), mockWriter)
+        val result = testedScope.handleEvent(RumRawEvent.KeepAlive(), mockWriter)
+
+        // Then
+        argumentCaptor<ViewEvent> {
+            verify(mockWriter).write(eq(mockEventBatchWriter), capture(), eq(EventType.DEFAULT))
+            assertThat(lastValue)
+                .containsExactlyContextAttributes(expectedAttributes)
+        }
+        assertThat(result).isNotNull()
+    }
+
     // endregion
 
     // region Propagate parent attributes in Error Event