Merge remote-tracking branch 'origin' into jmoskovich/rum-2575/update-to-0.73

Author: marco-saia-datadog

package.json

@@ -58,6 +58,7 @@
         "react": "18.2.0",
         "react-native": "0.73.6",
         "react-native-builder-bob": "0.17.1",
+        "react-native-gradle-plugin": "^0.71.19",
         "react-native-webview": "11.26.1",
         "react-test-renderer": "18.1.0",
         "typescript": "5.0.4"

packages/core/android/build.gradle

@@ -18,6 +18,8 @@ buildscript {
     classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1"
     classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.0"
     classpath 'com.github.bjoernq:unmockplugin:0.7.9'
+// Uncomment here and in settings.gradle for getting rid of IDE errors for new architecture:
+//    classpath "com.facebook.react:react-native-gradle-plugin"
   }
 }
 

packages/core/android/settings.gradle

@@ -0,0 +1,2 @@
+// Uncomment here and in build.gradle for getting rid of IDE errors for new architecture:
+//includeBuild('../../../node_modules/react-native-gradle-plugin')

packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkBridgeExt.kt

@@ -7,6 +7,7 @@
 package com.datadog.reactnative
 
 import android.util.Log
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
@@ -186,8 +187,18 @@ internal fun ReadableArray.toList(): List<*> {
                 ReadableType.Boolean -> list.add(getBoolean(i))
                 ReadableType.Number -> list.add(getDouble(i))
                 ReadableType.String -> list.add(getString(i))
-                ReadableType.Map -> list.add(getMap(i).toMap())
-                ReadableType.Array -> list.add(getArray(i).toList())
+                ReadableType.Map -> {
+                    // getMap() return type is nullable in previous RN versions
+                    @Suppress("USELESS_ELVIS")
+                    val readableMap = getMap(i) ?: Arguments.createMap()
+                    list.add(readableMap.toMap())
+                }
+                ReadableType.Array -> {
+                    // getArray() return type is nullable in previous RN versions
+                    @Suppress("USELESS_ELVIS")
+                    val readableArray = getArray(i) ?: Arguments.createArray()
+                    list.add(readableArray.toList())
+                }
                 else -> Log.e(
                     javaClass.simpleName,
                     "toList(): Unhandled ReadableType: ${type.name}."

packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt

@@ -15,10 +15,11 @@ import com.facebook.react.bridge.ReadableMap
  * The entry point to use Datadog's Logs feature.
  */
 class DdLogs(
-    reactContext: ReactApplicationContext
+    reactContext: ReactApplicationContext,
+    datadogWrapper: DatadogWrapper = DatadogSDKWrapper()
 ) : NativeDdLogsSpec(reactContext) {
 
-    private val implementation = DdLogsImplementation()
+    private val implementation = DdLogsImplementation(datadog = datadogWrapper)
 
     override fun getName(): String = DdLogsImplementation.NAME
 

packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt

@@ -15,9 +15,12 @@ import com.facebook.react.bridge.ReadableMap
  * The entry point to use Datadog's RUM feature.
  */
 @Suppress("TooManyFunctions")
-class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContext) {
+class DdRum(
+    reactContext: ReactApplicationContext,
+    datadogWrapper: DatadogWrapper = DatadogSDKWrapper()
+) : NativeDdRumSpec(reactContext) {
 
-    private val implementation = DdRumImplementation()
+    private val implementation = DdRumImplementation(datadog = datadogWrapper)
 
     override fun getName(): String = DdRumImplementation.NAME
 
@@ -26,7 +29,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param key The view unique key identifier.
      * @param name The view name.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the view started (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the view started (in milliseconds). If not provided,
+     * current timestamp will be used.
      */
     @ReactMethod
     override fun startView(
@@ -43,7 +47,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * Stop tracking a RUM View.
      * @param key The view unique key identifier.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the view stopped (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the view stopped (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     override fun stopView(key: String, context: ReadableMap, timestampMs: Double, promise: Promise) {
@@ -55,7 +60,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param type The action type (tap, scroll, swipe, click, custom).
      * @param name The action name.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the action started (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the action started (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     override fun startAction(
@@ -73,7 +79,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param type The action type (tap, scroll, swipe, click, custom).
      * @param name The action name.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the action stopped (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the action stopped (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     override fun stopAction(
@@ -91,7 +98,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param type The action type (tap, scroll, swipe, click, custom).
      * @param name The action name.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the action occurred (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the action occurred (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     override fun addAction(
@@ -110,7 +118,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param method The resource method (GET, POST, …).
      * @param url The resource url.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the resource started (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the resource started (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @Suppress("LongParameterList")
     @ReactMethod
@@ -132,7 +141,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param kind The resource's kind (xhr, document, image, css, font, …).
      * @param size The resource size in bytes.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the resource stopped (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the resource stopped (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @Suppress("LongParameterList")
     @ReactMethod
@@ -154,7 +164,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
      * @param source The error source (network, source, console, logger, …).
      * @param stacktrace The error stacktrace.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the error occurred (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the error occurred (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @Suppress("LongParameterList")
     @ReactMethod
@@ -170,8 +181,11 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
     }
 
     /**
-     * Adds a specific timing in the active View. The timing duration will be computed as the difference between the time the View was started and the time this function was called.
-     * @param name The name of the new custom timing attribute. Timings can be nested up to 8 levels deep. Names using more than 8 levels will be sanitized by SDK.
+     * Adds a specific timing in the active View. The timing duration will be computed as the
+     * difference between the time the View was started and the time this function was called.
+     * @param name The name of the new custom timing attribute.
+     * Timings can be nested up to 8 levels deep.
+     * Names using more than 8 levels will be sanitized by SDK.
      */
     @ReactMethod
     override fun addTiming(name: String, promise: Promise) {
@@ -188,7 +202,8 @@ class DdRum(reactContext: ReactApplicationContext) : NativeDdRumSpec(reactContex
 
     /**
      * Adds result of evaluating a feature flag to the view.
-     * Feature flag evaluations are local to the active view and are cleared when the view is stopped.
+     * Feature flag evaluations are local to the active view and are cleared when the view
+     * is stopped.
      * @param name The name of the feature flag
      * @param value The value the feature flag evaluated to, encapsulated in a Map
      */

packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt

@@ -13,10 +13,11 @@ import com.facebook.react.bridge.ReadableMap
 
 /** The entry point to initialize Datadog's features. */
 class DdSdk(
-    reactContext: ReactApplicationContext
+    reactContext: ReactApplicationContext,
+    datadogWrapper: DatadogWrapper = DatadogSDKWrapper()
 ) : NativeDdSdkSpec(reactContext) {
 
-    private val implementation = DdSdkImplementation(reactContext)
+    private val implementation = DdSdkImplementation(reactContext, datadog = datadogWrapper)
 
     override fun getName(): String = DdSdkImplementation.NAME
 

packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdTrace.kt

@@ -26,7 +26,8 @@ class DdTrace(
      * Start a span, and returns a unique identifier for the span.
      * @param operation The operation name of the span.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the operation started (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the operation started (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     override fun startSpan(operation: String, context: ReadableMap, timestampMs: Double, promise: Promise) {
@@ -37,7 +38,8 @@ class DdTrace(
      * Finish a started span.
      * @param spanId The unique identifier of the span.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the operation stopped (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the operation stopped (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     override fun finishSpan(spanId: String, context: ReadableMap, timestampMs: Double, promise: Promise) {

packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt

@@ -17,7 +17,7 @@ import com.facebook.react.bridge.ReadableMap
  */
 class DdLogs(
     reactContext: ReactApplicationContext,
-    datadogWrapper: DatadogWrapper
+    datadogWrapper: DatadogWrapper = DatadogSDKWrapper()
 ) : ReactContextBaseJavaModule(reactContext) {
 
     private val implementation = DdLogsImplementation(datadog = datadogWrapper)

packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdRum.kt

@@ -18,7 +18,7 @@ import com.facebook.react.bridge.ReadableMap
 @Suppress("TooManyFunctions")
 class DdRum(
     reactContext: ReactApplicationContext,
-    datadogWrapper: DatadogWrapper
+    datadogWrapper: DatadogWrapper = DatadogSDKWrapper()
 ) : ReactContextBaseJavaModule(reactContext) {
 
     private val implementation = DdRumImplementation(datadog = datadogWrapper)
@@ -30,7 +30,8 @@ class DdRum(
      * @param key The view unique key identifier.
      * @param name The view name.
      * @param context The additional context to send.
-     * @param timestampMs The timestamp when the view started (in milliseconds). If not provided, current timestamp will be used.
+     * @param timestampMs The timestamp when the view started (in milliseconds).
+     * If not provided, current timestamp will be used.
      */
     @ReactMethod
     fun startView(