Juan.naranjo/hybrid session replay flutter

detekt_custom_safe_calls_android.yml

@@ -131,6 +131,7 @@ datadog:
       - "android.view.View.hashCode()"
       - "android.view.View.onDraw(android.graphics.Canvas)"
       - "android.view.View.performClick()"
+      - "android.view.View.postInvalidateOnAnimation()"
       - "android.view.View.post(java.lang.Runnable?)"
       - "android.view.View.removeOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener?)"
       - "android.view.View.setOnClickListener(android.view.View.OnClickListener?)"

detekt_custom_safe_calls_third_party.yml

@@ -345,6 +345,7 @@ datadog:
       - "java.lang.ref.WeakReference.constructor(android.view.Window?)"
       - "java.lang.ref.WeakReference.constructor(com.datadog.android.api.SdkCore?)"
       - "java.lang.ref.WeakReference.constructor(com.datadog.android.rum.tracking.ViewTarget?)"
+      - "java.lang.ref.WeakReference.constructor(com.datadog.android.sessionreplay.internal.embedded.EmbeddedContentSlotRegistration?)"
       - "java.lang.ref.WeakReference.constructor(kotlin.Any?)"
       - "java.lang.ref.WeakReference.constructor(kotlin.Nothing?)"
       - "java.lang.ref.WeakReference.constructor(kotlin.String?)"
@@ -461,8 +462,11 @@ datadog:
       - "kotlin.collections.ArrayList(kotlin.collections.MutableCollection?)"
       - "kotlin.collections.buildMap(kotlin.Function1)"
       - "kotlin.collections.Collection.flatten()"
+      - "kotlin.collections.Collection.firstOrNull()"
       - "kotlin.collections.Collection.fold(kotlin.collections.MutableSet, kotlin.Function2)"
       - "kotlin.collections.Collection.forEach(kotlin.Function1)"
+      - "kotlin.collections.Collection.groupBy(kotlin.Function1)"
+      - "kotlin.collections.Collection.mapNotNull(kotlin.Function1)"
       - "kotlin.collections.Collection.isNotEmpty()"
       - "kotlin.collections.Collection.sumOf(kotlin.Function1)"
       - "kotlin.collections.Collection.toList()"
@@ -502,6 +506,7 @@ datadog:
       - "kotlin.collections.List.firstOrNull(kotlin.Function1)"
       - "kotlin.collections.List.firstNotNullOfOrNull(kotlin.Function1)"
       - "kotlin.collections.List.flatMap(kotlin.Function1)"
+      - "kotlin.collections.List.flatten()"
       - "kotlin.collections.List.fold(com.google.gson.JsonArray, kotlin.Function2)"
       - "kotlin.collections.List.fold(kotlin.Long, kotlin.Function2)"
       - "kotlin.collections.List.fold(kotlin.String?, kotlin.Function2)"
@@ -519,10 +524,12 @@ datadog:
       - "kotlin.collections.List.lastOrNull()"
       - "kotlin.collections.List.lastOrNull(kotlin.Function1)"
       - "kotlin.collections.List.map(kotlin.Function1)"
+      - "kotlin.collections.List.mapTo(kotlin.collections.MutableSet, kotlin.Function1)"
       - "kotlin.collections.List.mapIndexed(kotlin.Function2)"
       - "kotlin.collections.List.mapNotNull(kotlin.Function1)"
       - "kotlin.collections.List.maxByOrNull(kotlin.Function1)"
       - "kotlin.collections.List.maxOrNull()"
+      - "kotlin.collections.List.minOrNull()"
       - "kotlin.collections.List.orEmpty()"
       - "kotlin.collections.List.partition(kotlin.Function1)"
       - "kotlin.collections.List.reduceOrNull(kotlin.Function2)"
@@ -571,6 +578,7 @@ datadog:
       - "kotlin.collections.MutableCollection.flatMap(kotlin.Function1)"
       - "kotlin.collections.MutableCollection.forEach(kotlin.Function1)"
       - "kotlin.collections.MutableCollection.toList()"
+      - "kotlin.collections.MutableCollection.toSet()"
       - "kotlin.collections.MutableIterator.forEach(kotlin.Function1)"
       - "kotlin.collections.MutableIterator.hasNext()"
       - "kotlin.collections.MutableList.add(com.datadog.android.api.InternalLogger.Target)"
@@ -587,6 +595,7 @@ datadog:
       - "kotlin.collections.MutableList.add(com.datadog.android.rum.model.ActionEvent.Type)"
       - "kotlin.collections.MutableList.add(com.datadog.android.sessionreplay.compose.internal.data.Parameter)"
       - "kotlin.collections.MutableList.add(com.datadog.android.sessionreplay.compose.internal.utils.BackgroundInfo)"
+      - "kotlin.collections.MutableList.add(com.datadog.android.sessionreplay.internal.embedded.PendingBatch)"
       - "kotlin.collections.MutableList.add(com.datadog.android.sessionreplay.internal.prerequisite.SystemRequirementChecker)"
       - "kotlin.collections.MutableList.add(com.datadog.android.sessionreplay.internal.processor.MutationResolver.Entry)"
       - "kotlin.collections.MutableList.add(com.datadog.android.sessionreplay.model.MobileSegment.Add)"
@@ -606,6 +615,7 @@ datadog:
       - "kotlin.collections.MutableList.add(kotlin.Int, com.datadog.android.sessionreplay.model.MobileSegment.Wireframe)"
       - "kotlin.collections.MutableList.add(kotlin.Int, com.datadog.android.sessionreplay.model.MobileSegment.Wireframe.ShapeWireframe)"
       - "kotlin.collections.MutableList.add(kotlin.String)"
+      - "kotlin.collections.MutableList.add(kotlin.Function1)"
       - "kotlin.collections.MutableList.addAll(kotlin.collections.Collection)"
       - "kotlin.collections.MutableList.any(kotlin.Function1)"
       - "kotlin.collections.MutableList.clear()"
@@ -623,6 +633,7 @@ datadog:
       - "kotlin.collections.MutableList.iterator()"
       - "kotlin.collections.MutableList.joinToString(kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence, kotlin.Int, kotlin.CharSequence, kotlin.Function1?)"
       - "kotlin.collections.MutableList.map(kotlin.Function1)"
+      - "kotlin.collections.MutableList.mapNotNullTo(kotlin.collections.MutableSet, kotlin.Function1)"
       - "kotlin.collections.MutableList.partition(kotlin.Function1)"
       - "kotlin.collections.MutableList.remove(java.io.File)"
       - "kotlin.collections.MutableList.remove(java.lang.ref.WeakReference)"
@@ -699,7 +710,10 @@ datadog:
       - "kotlin.collections.MutableSet.contains(com.datadog.android.telemetry.internal.TelemetryEventId)"
       - "kotlin.collections.MutableSet.contains(kotlin.String)"
       - "kotlin.collections.MutableSet.contains(kotlin.String?)"
+      - "kotlin.collections.MutableSet.isEmpty()"
+      - "kotlin.collections.MutableSet.remove(kotlin.String)"
       - "kotlin.collections.MutableSet.filter(kotlin.Function1)"
+      - "kotlin.collections.MutableSet.firstOrNull()"
       - "kotlin.collections.MutableSet.firstOrNull(kotlin.Function1)"
       - "kotlin.collections.MutableSet.flatMap(kotlin.Function1)"
       - "kotlin.collections.MutableSet.forEach(kotlin.Function1)"
@@ -713,6 +727,7 @@ datadog:
       - "kotlin.collections.MutableSet.remove(java.io.File)"
       - "kotlin.collections.MutableSet.remove(kotlin.collections.MutableMap.Mutab(...)"
       - "kotlin.collections.MutableSet.removeAll(kotlin.collections.Collection)"
+      - "kotlin.collections.MutableSet.retainAll(kotlin.collections.Collection)"
       - "kotlin.collections.MutableSet.toList()"
       - "kotlin.collections.MutableSet.lastOrNull()"
       - "kotlin.collections.MutableSet.sortedByDescending(kotlin.Function1)"

features/dd-sdk-android-session-replay-compose/src/test/kotlin/com/datadog/android/sessionreplay/compose/internal/mappers/semantics/RootSemanticsNodeMapperTest.kt

@@ -400,16 +400,18 @@ class RootSemanticsNodeMapperTest {
     }
 
     @Test
-    fun `M call interop callback W semantics node has interop view`(forge: Forge) {
+    fun `M preserve embedded wireframe W semantics node has interop view`(forge: Forge) {
         // Given
         val mockSemanticsNode = mockSemanticsNode(null)
         val mockView = mock<View>()
-        val fakeInteropWireframe = MobileSegment.Wireframe.ShapeWireframe(
+        val fakeInteropWireframe = MobileSegment.Wireframe.EmbeddedContentWireframe(
             id = forge.aLong(),
             x = forge.aLong(min = 0, max = 500),
             y = forge.aLong(min = 0, max = 500),
             width = forge.aLong(min = 1, max = 500),
-            height = forge.aLong(min = 1, max = 500)
+            height = forge.aLong(min = 1, max = 500),
+            slotId = forge.anAlphabeticalString(),
+            isVisible = true
         )
         whenever(mockSemanticsUtils.getInteropView(mockSemanticsNode)) doReturn mockView
         whenever(fakeMappingContext.interopViewCallback.map(mockView, fakeMappingContext))

features/dd-sdk-android-session-replay/api/apiSurface

@@ -24,6 +24,7 @@ const val WIREFRAME_TYPE_TEXT: String
 const val WIREFRAME_TYPE_IMAGE: String
 const val WIREFRAME_TYPE_PLACEHOLDER: String
 const val WIREFRAME_TYPE_WEBVIEW: String
+const val WIREFRAME_TYPE_EMBEDDED_CONTENT: String
 const val IMAGE_DIMEN_CONSIDERED_PII_IN_DP: Int
 interface com.datadog.android.sessionreplay.PrivacyLevel
 fun android.view.View.setSessionReplayHidden(Boolean)
@@ -77,6 +78,10 @@ enum com.datadog.android.sessionreplay.TouchPrivacy : PrivacyLevel
 class com.datadog.android.sessionreplay._SessionReplayInternalProxy
   constructor(SessionReplayConfiguration.Builder)
   fun setInternalCallback(SessionReplayInternalCallback): SessionReplayConfiguration.Builder
+  companion object 
+    fun setEmbeddedContentSlotId(android.view.View, String?)
+    fun addEmbeddedContentRecords(List<Map<String, Any?>>, String, String, com.datadog.android.api.SdkCore = Datadog.getInstance())
+    fun addEmbeddedContentResource(String, ByteArray, String, com.datadog.android.api.SdkCore = Datadog.getInstance())
 class com.datadog.android.sessionreplay.internal.TouchPrivacyManager
   constructor(com.datadog.android.sessionreplay.TouchPrivacy)
   fun addTouchOverrideArea(android.graphics.Rect, com.datadog.android.sessionreplay.TouchPrivacy)
@@ -192,14 +197,14 @@ data class com.datadog.android.sessionreplay.model.MobileSegment
   sealed class MobileRecord
     abstract fun toJson(): com.google.gson.JsonElement
     data class MobileFullSnapshotRecord : MobileRecord
-      constructor(kotlin.Long, Data)
+      constructor(kotlin.Long, Data, kotlin.String? = null)
       val type: kotlin.Long
       override fun toJson(): com.google.gson.JsonElement
       companion object 
         fun fromJson(kotlin.String): MobileFullSnapshotRecord
         fun fromJsonObject(com.google.gson.JsonObject): MobileFullSnapshotRecord
     data class MobileIncrementalSnapshotRecord : MobileRecord
-      constructor(kotlin.Long, MobileIncrementalData)
+      constructor(kotlin.Long, MobileIncrementalData, kotlin.String? = null)
       val type: kotlin.Long
       override fun toJson(): com.google.gson.JsonElement
       companion object 
@@ -330,6 +335,13 @@ data class com.datadog.android.sessionreplay.model.MobileSegment
       companion object 
         fun fromJson(kotlin.String): WebviewWireframe
         fun fromJsonObject(com.google.gson.JsonObject): WebviewWireframe
+    data class EmbeddedContentWireframe : Wireframe
+      constructor(kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, kotlin.Long, WireframeClip? = null, ShapeStyle? = null, ShapeBorder? = null, kotlin.String, kotlin.Boolean? = null, kotlin.String? = null)
+      val type: kotlin.String
+      override fun toJson(): com.google.gson.JsonElement
+      companion object 
+        fun fromJson(kotlin.String): EmbeddedContentWireframe
+        fun fromJsonObject(com.google.gson.JsonObject): EmbeddedContentWireframe
     companion object 
       fun fromJson(kotlin.String): Wireframe
       fun fromJsonElement(com.google.gson.JsonElement): Wireframe
@@ -382,6 +394,13 @@ data class com.datadog.android.sessionreplay.model.MobileSegment
       companion object 
         fun fromJson(kotlin.String): WebviewWireframeUpdate
         fun fromJsonObject(com.google.gson.JsonObject): WebviewWireframeUpdate
+    data class EmbeddedContentWireframeUpdate : WireframeUpdateMutation
+      constructor(kotlin.Long, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, kotlin.Long? = null, WireframeClip? = null, ShapeStyle? = null, ShapeBorder? = null, kotlin.String, kotlin.Boolean? = null)
+      val type: kotlin.String
+      override fun toJson(): com.google.gson.JsonElement
+      companion object 
+        fun fromJson(kotlin.String): EmbeddedContentWireframeUpdate
+        fun fromJsonObject(com.google.gson.JsonObject): EmbeddedContentWireframeUpdate
     companion object 
       fun fromJson(kotlin.String): WireframeUpdateMutation
       fun fromJsonElement(com.google.gson.JsonElement): WireframeUpdateMutation