Merge pull request #1107 from DataDog/sbarrio/v3/update-with-latest-from-v2

sbarrio · web-flow · commit 6efb940ac74a · 2026-01-19T16:24:11.000+01:00
[CHORE] Bring latest changes from v2.14.1 into V3 feature branch
diff --git a/NATIVE_SDK_VERSIONS.md b/NATIVE_SDK_VERSIONS.md
@@ -1,5 +1,6 @@
 | React Native | iOS Bridge / iOS SDK | Android Bridge / Android SDK |
 |-------------|---------------------|-----------------------------|
+| 2.14.1 | 2.30.2 | 2.26.2 |
 | 2.14.0 | 2.30.2 | 2.26.2 |
 | 2.13.2 | 2.30.2 | 2.26.2 |
 | 2.13.1 | 2.30.2 | 2.26.2 |
diff --git a/benchmarks/ios/Podfile.lock b/benchmarks/ios/Podfile.lock
@@ -10,7 +10,7 @@ PODS:
     - DatadogInternal (= 3.4.0)
   - DatadogRUM (3.4.0):
     - DatadogInternal (= 3.4.0)
-  - DatadogSDKReactNative (2.14.0):
+  - DatadogSDKReactNative (2.14.1):
     - DatadogCore (= 3.4.0)
     - DatadogCrashReporting (= 3.4.0)
     - DatadogLogs (= 3.4.0)
@@ -37,7 +37,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - DatadogSDKReactNativeSessionReplay (2.14.0):
+  - DatadogSDKReactNativeSessionReplay (2.14.1):
     - DatadogSDKReactNative
     - DatadogSessionReplay (= 3.4.0)
     - DoubleConversion
@@ -60,7 +60,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - DatadogSDKReactNativeWebView (2.14.0):
+  - DatadogSDKReactNativeWebView (2.14.1):
     - DatadogInternal (= 3.4.0)
     - DatadogSDKReactNative
     - DatadogWebViewTracking (= 3.4.0)
@@ -2075,9 +2075,9 @@ SPEC CHECKSUMS:
   DatadogInternal: b0372935ad8dde5ad06960fe8d88c39b2cc92bcc
   DatadogLogs: 484bb1bfe0c9a7cb2a7d9733f61614e8ea7b2f3a
   DatadogRUM: 00069b27918e0ce4a9223b87b4bfa7929d6a0a1f
-  DatadogSDKReactNative: 92d5aa9086ff036530cb78c5439aeee24de93e34
-  DatadogSDKReactNativeSessionReplay: ccfc4d275a97d516ebcb643d03f86210db2380a8
-  DatadogSDKReactNativeWebView: 4cccdf90e3bb877f5d79eb688a28aad7f74ff4cf
+  DatadogSDKReactNative: 09e2b0a4de201ebe1a6ceb54e98fa309c3fecad1
+  DatadogSDKReactNativeSessionReplay: bdbee9e397fd03b77280b6d95e398a8a589593b4
+  DatadogSDKReactNativeWebView: 0bc52c443edca92cdd9d426f280468bdc8076236
   DatadogSessionReplay: 462a3a2e39e9e2193528cf572c8d1acfd6cdace1
   DatadogTrace: 852cb80f9370eb1321eb30a73c82c8e3d9e4e980
   DatadogWebViewTracking: 32dfeaf7aad47a605a689ed12e0d21ee8eb56141
diff --git a/benchmarks/package.json b/benchmarks/package.json
@@ -40,7 +40,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/runtime": "^7.26.10",
-    "@datadog/datadog-ci": "3.12.0",
+    "@datadog/datadog-ci": "^4.4.0",
     "@react-native-community/cli": "15.0.1",
     "@react-native-community/cli-platform-android": "15.0.1",
     "@react-native-community/cli-platform-ios": "15.0.1",
diff --git a/example-new-architecture/ios/Podfile.lock b/example-new-architecture/ios/Podfile.lock
@@ -10,7 +10,7 @@ PODS:
     - DatadogInternal (= 3.4.0)
   - DatadogRUM (3.4.0):
     - DatadogInternal (= 3.4.0)
-  - DatadogSDKReactNative (2.14.0):
+  - DatadogSDKReactNative (2.14.1):
     - DatadogCore (= 3.4.0)
     - DatadogCrashReporting (= 3.4.0)
     - DatadogLogs (= 3.4.0)
@@ -37,7 +37,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - DatadogSDKReactNative/Tests (2.14.0):
+  - DatadogSDKReactNative/Tests (2.14.1):
     - DatadogCore (= 3.4.0)
     - DatadogCrashReporting (= 3.4.0)
     - DatadogLogs (= 3.4.0)
@@ -1855,7 +1855,7 @@ SPEC CHECKSUMS:
   DatadogInternal: b0372935ad8dde5ad06960fe8d88c39b2cc92bcc
   DatadogLogs: 484bb1bfe0c9a7cb2a7d9733f61614e8ea7b2f3a
   DatadogRUM: 00069b27918e0ce4a9223b87b4bfa7929d6a0a1f
-  DatadogSDKReactNative: 8bfd30eecba2ecc242140b7b4319d5f49be5a179
+  DatadogSDKReactNative: dc365391ece79c792de428048724e17b1905deb7
   DatadogTrace: 852cb80f9370eb1321eb30a73c82c8e3d9e4e980
   DatadogWebViewTracking: 32dfeaf7aad47a605a689ed12e0d21ee8eb56141
   DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -10,23 +10,23 @@ PODS:
     - DatadogInternal (= 3.4.0)
   - DatadogRUM (3.4.0):
     - DatadogInternal (= 3.4.0)
-  - DatadogSDKReactNative (2.14.0):
+  - DatadogSDKReactNative (2.14.1):
     - DatadogCore (= 3.4.0)
     - DatadogCrashReporting (= 3.4.0)
     - DatadogLogs (= 3.4.0)
     - DatadogRUM (= 3.4.0)
     - DatadogTrace (= 3.4.0)
     - DatadogWebViewTracking (= 3.4.0)
     - React-Core
-  - DatadogSDKReactNative/Tests (2.14.0):
+  - DatadogSDKReactNative/Tests (2.14.1):
     - DatadogCore (= 3.4.0)
     - DatadogCrashReporting (= 3.4.0)
     - DatadogLogs (= 3.4.0)
     - DatadogRUM (= 3.4.0)
     - DatadogTrace (= 3.4.0)
     - DatadogWebViewTracking (= 3.4.0)
     - React-Core
-  - DatadogSDKReactNativeSessionReplay (2.14.0):
+  - DatadogSDKReactNativeSessionReplay (2.14.1):
     - DatadogSDKReactNative
     - DatadogSessionReplay (= 3.4.0)
     - DoubleConversion
@@ -49,7 +49,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - DatadogSDKReactNativeSessionReplay/Tests (2.14.0):
+  - DatadogSDKReactNativeSessionReplay/Tests (2.14.1):
     - DatadogSDKReactNative
     - DatadogSessionReplay (= 3.4.0)
     - DoubleConversion
@@ -73,12 +73,12 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - DatadogSDKReactNativeWebView (2.14.0):
+  - DatadogSDKReactNativeWebView (2.14.1):
     - DatadogInternal (= 3.4.0)
     - DatadogSDKReactNative
     - DatadogWebViewTracking (= 3.4.0)
     - React-Core
-  - DatadogSDKReactNativeWebView/Tests (2.14.0):
+  - DatadogSDKReactNativeWebView/Tests (2.14.1):
     - DatadogInternal (= 3.4.0)
     - DatadogSDKReactNative
     - DatadogWebViewTracking (= 3.4.0)
@@ -1993,9 +1993,9 @@ SPEC CHECKSUMS:
   DatadogInternal: b0372935ad8dde5ad06960fe8d88c39b2cc92bcc
   DatadogLogs: 484bb1bfe0c9a7cb2a7d9733f61614e8ea7b2f3a
   DatadogRUM: 00069b27918e0ce4a9223b87b4bfa7929d6a0a1f
-  DatadogSDKReactNative: 177767e5521ac53b759baef08e74f218231f2d35
-  DatadogSDKReactNativeSessionReplay: 7f69610ddcd542ad0b1652cad3cf2a969b32335a
-  DatadogSDKReactNativeWebView: 87b2c59fc708a79c74a9b7730de4ea812f470e80
+  DatadogSDKReactNative: a518e82bafe915c80f6495bd17dfe8d54b9b7c8b
+  DatadogSDKReactNativeSessionReplay: b7ab52020b149e8cfc4a319ed9a947b5a4bae606
+  DatadogSDKReactNativeWebView: 0492d1d9144ec1c717970776398639dc4eaa30e4
   DatadogSessionReplay: 462a3a2e39e9e2193528cf572c8d1acfd6cdace1
   DatadogTrace: 852cb80f9370eb1321eb30a73c82c8e3d9e4e980
   DatadogWebViewTracking: 32dfeaf7aad47a605a689ed12e0d21ee8eb56141
diff --git a/example/package.json b/example/package.json
@@ -36,7 +36,7 @@
         "@babel/core": "^7.25.2",
         "@babel/preset-env": "^7.25.3",
         "@babel/runtime": "^7.26.10",
-        "@datadog/datadog-ci": "^2.39.0",
+        "@datadog/datadog-ci": "^4.4.0",
         "@react-native/babel-preset": "0.76.9",
         "@react-native/eslint-config": "0.76.9",
         "@react-native/metro-config": "0.76.9",
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "npmClient": "yarn",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "packages": [
     "packages/*"
   ],
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
         "eslint-plugin-react-native": "3.10.0",
         "genversion": "3.0.2",
         "jest": "^29.7.0",
-        "lerna": "9.0.0",
+        "lerna": "9.0.3",
         "metro": "^0.83.1",
         "pod-install": "0.1.14",
         "prettier": "2.2.0",
@@ -83,6 +83,13 @@
     },
     "packageManager": "yarn@3.4.1",
     "resolutions": {
+        "@istanbuljs/load-nyc-config/js-yaml": "3.14.2",
+        "@yarnpkg/parsers/js-yaml": "3.14.2",
+        "cosmiconfig@npm:5.2.1/js-yaml": "3.14.2",
+        "front-matter@npm:4.0.2/js-yaml": "3.14.2",
+        "node-forge": "^1.3.1",
+        "cacache/glob": "^10.5.0",
+        "@npmcli/arborist": "^9.1.8",
         "ejs": "3.1.10",
         "shell-quote": "^1.7.3",
         "cross-spawn": "7.0.5",
diff --git a/packages/codepush/package.json b/packages/codepush/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-code-push",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "description": "A client-side React Native module to interact with Appcenter Codepush and Datadog",
     "keywords": [
         "datadog",
@@ -38,7 +38,7 @@
         "prepare": "rm -rf lib && yarn bob build"
     },
     "devDependencies": {
-        "@datadog/mobile-react-native": "workspace:2.14.0",
+        "@datadog/mobile-react-native": "workspace:2.14.1",
         "@testing-library/react-native": "7.0.2",
         "react-native-builder-bob": "0.26.0",
         "react-native-code-push": "7.1.0"
diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt
@@ -7,4 +7,4 @@
 package com.datadog.reactnative
 
 // This is automatically updated by the update-version.sh script
-internal const val SDK_VERSION = "2.14.0"
+internal const val SDK_VERSION = "2.14.1"
diff --git a/packages/core/datadog-sourcemaps.gradle b/packages/core/datadog-sourcemaps.gradle
@@ -309,7 +309,8 @@ private def getReactConfig(File buildDir, variant) {
         def targetPath = variant.name
         reactConfig['bundleTaskName'] = "createBundle${targetName}JsAndAssets"
         reactConfig['bundleFileResolver'] = getBundleFileResolver([
-            "$buildDir/generated/assets/react/${targetName.toLowerCase()}", // RN 0.82+
+            "$buildDir/generated/assets/react/${targetPath}", // RN 0.82+ - for case sensitive OS's
+            "$buildDir/generated/assets/react/${targetName.toLowerCase()}", // RN 0.82+ - for case insensitive OS's
             "$buildDir/ASSETS/createBundle${targetName}JsAndAssets", // Android Gradle Plugin 7.3
             "$buildDir/generated/assets/createBundle${targetName}JsAndAssets" // Android Gradle Plugin 7.4 and up
         ] as String[], bundleAssetName)
diff --git a/packages/core/ios/Sources/DdLogsImplementation.swift b/packages/core/ios/Sources/DdLogsImplementation.swift
@@ -94,4 +94,4 @@ internal extension DatadogLogs.Logger.Configuration {
             consoleLogFormat: .short
         )
     }
-}
+}
diff --git a/packages/core/ios/Sources/DdSdkNativeInitialization.swift b/packages/core/ios/Sources/DdSdkNativeInitialization.swift
@@ -257,4 +257,4 @@ public class DdSdkNativeInitialization: NSObject {
             Datadog.verbosityLevel = nil
         }
     }
-}
+}
diff --git a/packages/core/ios/Sources/RNDdSdkConfiguration.swift b/packages/core/ios/Sources/RNDdSdkConfiguration.swift
@@ -179,7 +179,7 @@ extension NSDictionary {
             reactNativeVersion: reactNativeVersion
         )
     }
-
+    
     func asProxyConfiguration() -> [AnyHashable: Any]? {
         guard let address = object(forKey: "address") as? String else {
             return nil
diff --git a/packages/core/ios/Sources/SdkVersion.swift b/packages/core/ios/Sources/SdkVersion.swift
@@ -7,4 +7,4 @@
 import Foundation
 
 // This is automatically updated by the update-version.sh script
-let SdkVersion = "2.14.0"
+let SdkVersion = "2.14.1"
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "description": "A client-side React Native module to interact with Datadog",
     "keywords": [
         "datadog",
diff --git a/packages/core/src/metro/plugin/metroSerializer.ts b/packages/core/src/metro/plugin/metroSerializer.ts
@@ -46,7 +46,7 @@ export const createDatadogMetroSerializer = (
     const serializer = customSerializer || createDefaultMetroSerializer();
     return async (entryPoint, preModules, graph, options) => {
         // Skip for hot reload mode
-        if (graph.transformOptions.hot) {
+        if ((graph.transformOptions as any).hot) {
             return serializer(entryPoint, preModules, graph, options);
         }
 
@@ -109,7 +109,7 @@ export const createDefaultMetroSerializer = (): MetroSerializer => {
         // Modify the bundle through the datadogBundleCallback, if we are not in hot-reload mode
         if (
             (options as any).datadogBundleCallback &&
-            !graph.transformOptions.hot
+            !(graph.transformOptions as any).hot
         ) {
             bundle = (options as any).datadogBundleCallback(bundle);
         }
@@ -119,7 +119,7 @@ export const createDefaultMetroSerializer = (): MetroSerializer => {
         const { code } = bundleToString(bundle);
 
         // If we are in hot-reload mode, we skip sourcemaps generation, and only return the code.
-        if (graph.transformOptions.hot) {
+        if ((graph.transformOptions as any).hot) {
             return code;
         }
 
diff --git a/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts b/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts
@@ -122,8 +122,6 @@ class BabelInteractionTracking {
         targetObject: TargetObject
     ): (...args: any[]) => any {
         return (...args: any[]) => {
-            const result = func(...args);
-
             if (!this.telemetrySent) {
                 DdSdk?.sendTelemetryLog(
                     BABEL_PLUGIN_TELEMETRY,
@@ -157,7 +155,7 @@ class BabelInteractionTracking {
                     });
             }
 
-            return result;
+            return func(...args);
         };
     }
 }
diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '2.14.0';
+export const version = '2.14.1';
diff --git a/packages/internal-testing-tools/package.json b/packages/internal-testing-tools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/react-native-internal-testing-tools",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "description": "Internal tools for testing the Datadog React Native SDK.",
     "keywords": [
         "datadog",
diff --git a/packages/internal-testing-tools/src/assertions/assertionError.ts b/packages/internal-testing-tools/src/assertions/assertionError.ts
@@ -4,7 +4,7 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
-import type { Wireframe } from 'rum-events-format';
+import type { RumEvent, Wireframe } from 'rum-events-format';
 
 import type { DDEvent } from '../types/events';
 
@@ -13,7 +13,7 @@ export class AssertionError extends Error {
         message: string,
         expected: string,
         actual: string | undefined,
-        events: DDEvent[] | Wireframe | Wireframe[]
+        events: DDEvent[] | Wireframe | Wireframe[] | RumEvent[]
     ) {
         if (actual !== undefined) {
             super(
diff --git a/packages/react-native-apollo-client/package.json b/packages/react-native-apollo-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-apollo-client",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "description": "A client-side React Native module to interact with Apollo Client and Datadog",
     "keywords": [
         "datadog",
diff --git a/packages/react-native-babel-plugin/README.md b/packages/react-native-babel-plugin/README.md
@@ -49,7 +49,7 @@ You can configure the plugin to adjust how it processes your code, giving you co
 
 | Option          | Type    | Default | Description |
 |-----------------|---------|---------|-------------|
-| `svgTracking`    | boolean | true   | Whether to track SVG assets in the context of Session Replay. |
+| `svgTracking`    | boolean | false   | Whether to track SVG assets in the context of Session Replay. |
 
 ---
 
diff --git a/packages/react-native-babel-plugin/package.json b/packages/react-native-babel-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-babel-plugin",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "description": "A Babel plugin that enhances Datadog's React Native SDK by automatically enriching React components with contextual metadata.",
     "keywords": [
         "babel",
diff --git a/packages/react-native-babel-plugin/src/actions/rum/index.ts b/packages/react-native-babel-plugin/src/actions/rum/index.ts
diff --git a/packages/react-native-babel-plugin/test/plugin.test.ts b/packages/react-native-babel-plugin/test/plugin.test.ts
diff --git a/packages/react-native-navigation/package.json b/packages/react-native-navigation/package.json
diff --git a/packages/react-native-session-replay/README.md b/packages/react-native-session-replay/README.md
diff --git a/packages/react-native-session-replay/package.json b/packages/react-native-session-replay/package.json
diff --git a/packages/react-native-webview/package.json b/packages/react-native-webview/package.json
diff --git a/packages/react-navigation/package.json b/packages/react-navigation/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"npmClient": "yarn",`
`3`		`- "version": "2.14.0",`
	`3`	`+ "version": "2.14.1",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*"`
`6`	`6`	`],`