Merge pull request #753 from DataDog/marcosaia/RUM-7799/new-arch-support

[RUM-7799] Android: new architecture fixes
DataDog · Dec 18, 2024 · 6011682 · 6011682
2 parents 87c6136 + a505c2e
commit 6011682
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt b/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative
 
+import com.facebook.fbreact.specs.NativeDdLogsSpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod

diff --git a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt b/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative
 
+import com.facebook.fbreact.specs.NativeDdRumSpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod

diff --git a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt b/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt
@@ -7,6 +7,7 @@
 package com.datadog.reactnative
 
 import android.app.Activity
+import com.facebook.fbreact.specs.NativeDdSdkSpec
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext

diff --git a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdTrace.kt b/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdTrace.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative
 
+import com.facebook.fbreact.specs.NativeDdTraceSpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod

diff --git a/...s/android/src/newarch/kotlin/com/datadog/reactnative/internaltesting/DdInternalTesting.kt b/...s/android/src/newarch/kotlin/com/datadog/reactnative/internaltesting/DdInternalTesting.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative.internaltesting
 
+import com.facebook.fbreact.specs.NativeDdInternalTestingSpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod

diff --git a/...c/main/kotlin/com/datadog/reactnative/sessionreplay/mappers/ReactNativeImageViewMapper.kt b/...c/main/kotlin/com/datadog/reactnative/sessionreplay/mappers/ReactNativeImageViewMapper.kt
@@ -89,10 +89,9 @@ internal class ReactNativeImageViewMapper: BaseAsyncBackgroundWireframeMapper<Re
     }
 
     private fun generateUUID(reactImageView: ReactImageView): String {
-        val source = reactImageView.imageSource?.source ?:
-        System.identityHashCode(reactImageView).toString()
+        val hashCode = System.identityHashCode(reactImageView).toString()
         val drawableType = reactImageView.drawable.current::class.java.name
-        return "${drawableType}-${source}"
+        return "${drawableType}-${hashCode}"
     }
 
     private fun Rect.toWireframeClip(): MobileSegment.WireframeClip {

diff --git a/...eplay/android/src/newarch/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplay.kt b/...eplay/android/src/newarch/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplay.kt
@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative.sessionreplay
 
+import com.facebook.fbreact.specs.NativeDdSessionReplaySpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
@@ -20,15 +21,15 @@ class DdSessionReplay(
     private val implementation = DdSessionReplayImplementation(reactContext)
 
     override fun getName(): String = DdSessionReplayImplementation.NAME
-    
+
     /**
      * Enable session replay and start recording session.
      * @param replaySampleRate The sample rate applied for session replay.
-     * @param defaultPrivacyLevel The privacy level used for replay.
      * @param customEndpoint Custom server url for sending replay data.
      * @param imagePrivacyLevel Defines the way images should be masked.
      * @param touchPrivacyLevel Defines the way user touches should be masked.
      * @param textAndInputPrivacyLevel Defines the way text and input should be masked.
+     * @param startRecordingImmediately Whether the recording should start immediately when the feature is enabled.
      */
     @ReactMethod
     override fun enable(
@@ -37,6 +38,7 @@ class DdSessionReplay(
         imagePrivacyLevel: String,
         touchPrivacyLevel: String,
         textAndInputPrivacyLevel: String,
+        startRecordingImmediately: Boolean,
         promise: Promise
     ) {
         implementation.enable(
@@ -47,7 +49,16 @@ class DdSessionReplay(
                 touchPrivacyLevel = touchPrivacyLevel,
                 textAndInputPrivacyLevel = textAndInputPrivacyLevel
             ),
+            startRecordingImmediately,
             promise
         )
     }
+
+    override fun startRecording(promise: Promise) {
+        implementation.startRecording(promise)
+    }
+
+    override fun stopRecording(promise: Promise) {
+        implementation.stopRecording(promise)
+    }
 }