From 5ab1e088aae49f79665d8bb71b952f9a516b8489 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Thu, 14 May 2026 12:09:51 +0200 Subject: [PATCH] Bump Native SDKs --- benchmarks/android/app/build.gradle | 6 +- benchmarks/ios/Podfile.lock | 80 +++++++------- example-new-architecture/ios/Podfile.lock | 78 +++++++------- example/ios/Podfile.lock | 100 +++++++++--------- packages/core/DatadogSDKReactNative.podspec | 14 +-- packages/core/android/build.gradle | 14 +-- .../reactnative/DdSdkNativeInitialization.kt | 1 + .../com/datadog/reactnative/DdSdkTest.kt | 60 +++++++++++ .../com/datadog/tools/unit/MockRumMonitor.kt | 25 +++++ .../ios/Sources/RNDdSdkConfiguration.swift | 2 + packages/core/ios/Tests/DdSdkTests.swift | 10 ++ ...DatadogSDKReactNativeSessionReplay.podspec | 2 +- .../android/build.gradle | 4 +- .../DatadogSDKReactNativeWebView.podspec | 4 +- .../react-native-webview/android/build.gradle | 2 +- 15 files changed, 250 insertions(+), 152 deletions(-) diff --git a/benchmarks/android/app/build.gradle b/benchmarks/android/app/build.gradle index 9a67dd2b1..02519a4ca 100644 --- a/benchmarks/android/app/build.gradle +++ b/benchmarks/android/app/build.gradle @@ -128,8 +128,8 @@ dependencies { } // Benchmark tools from dd-sdk-android are used for vitals recording - // Remember to bump thid alongside the main dd-sdk-android dependencies - implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.8.0") + // Remember to bump this alongside the main dd-sdk-android dependencies + implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.10.0") // Required for compile-time access to Datadog.getInstance() required by BenchmarkVitalsModuleImpl - implementation("com.datadoghq:dd-sdk-android-core:3.8.0") + implementation("com.datadoghq:dd-sdk-android-core:3.10.0") } diff --git a/benchmarks/ios/Podfile.lock b/benchmarks/ios/Podfile.lock index 365ed3ed2..26d7bddea 100644 --- a/benchmarks/ios/Podfile.lock +++ b/benchmarks/ios/Podfile.lock @@ -1,26 +1,26 @@ PODS: - boost (1.84.0) - - DatadogCore (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogCrashReporting (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogCore (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogCrashReporting (3.11.0): + - DatadogInternal (= 3.11.0) - KSCrash/Filters (= 2.5.0) - KSCrash/Recording (= 2.5.0) - - DatadogFlags (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogInternal (3.10.0) - - DatadogLogs (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogRUM (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogFlags (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogInternal (3.11.0) + - DatadogLogs (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogRUM (3.11.0): + - DatadogInternal (= 3.11.0) - DatadogSDKReactNative (3.4.0): - - DatadogCore (= 3.10.0) - - DatadogCrashReporting (= 3.10.0) - - DatadogFlags (= 3.10.0) - - DatadogLogs (= 3.10.0) - - DatadogRUM (= 3.10.0) - - DatadogTrace (= 3.10.0) - - DatadogWebViewTracking (= 3.10.0) + - DatadogCore (= 3.11.0) + - DatadogCrashReporting (= 3.11.0) + - DatadogFlags (= 3.11.0) + - DatadogLogs (= 3.11.0) + - DatadogRUM (= 3.11.0) + - DatadogTrace (= 3.11.0) + - DatadogWebViewTracking (= 3.11.0) - DoubleConversion - glog - hermes-engine @@ -43,7 +43,7 @@ PODS: - Yoga - DatadogSDKReactNativeSessionReplay (3.4.0): - DatadogSDKReactNative - - DatadogSessionReplay (= 3.10.0) + - DatadogSessionReplay (= 3.11.0) - DoubleConversion - glog - hermes-engine @@ -65,9 +65,9 @@ PODS: - ReactCommon/turbomodule/core - Yoga - DatadogSDKReactNativeWebView (3.4.0): - - DatadogInternal (= 3.10.0) + - DatadogInternal (= 3.11.0) - DatadogSDKReactNative - - DatadogWebViewTracking (= 3.10.0) + - DatadogWebViewTracking (= 3.11.0) - DoubleConversion - glog - hermes-engine @@ -88,13 +88,13 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - DatadogSessionReplay (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogTrace (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogSessionReplay (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogTrace (3.11.0): + - DatadogInternal (= 3.11.0) - OpenTelemetry-Swift-Api (~> 2.3.0) - - DatadogWebViewTracking (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogWebViewTracking (3.11.0): + - DatadogInternal (= 3.11.0) - DoubleConversion (1.1.6) - fast_float (6.1.4) - FBLazyVector (0.78.2) @@ -2088,18 +2088,18 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90 - DatadogCore: be0f6c233bef27eda40acade29763943cb88935f - DatadogCrashReporting: 151f72523ee117000fed4b5e792de2349d38b331 - DatadogFlags: fbc1d17d2b83397c4f33817263a14b84a857ca1d - DatadogInternal: b81d08e4035de78140488b7422c239b17b89d251 - DatadogLogs: 20381f731050c500c85d36f4799cf0f28a56915e - DatadogRUM: 4f863c5330d85d6b54bb372d830929ad3b5006ab - DatadogSDKReactNative: 72113cd4f223791588af6853e03722e5bbfcae81 - DatadogSDKReactNativeSessionReplay: 349f90a23e72a0ca572e7fcb803ba7acb5d9f1e7 - DatadogSDKReactNativeWebView: 22a2b265c16e9ea7d450ce3b80192ac173d4b653 - DatadogSessionReplay: aef317ccd62a089691899bc7153177deec3c66d6 - DatadogTrace: c51a2bde28197cb1bab50031c83a82e3a1dbcf30 - DatadogWebViewTracking: 7775faa20f2044f2948c2eb246889ba5ceefbd6a + DatadogCore: 106d2aa8bef1a3dfb2a75723240f78cb5f8310fd + DatadogCrashReporting: eace5202ae63d92835718cf4a86489fdaef681a3 + DatadogFlags: 0587c5b5db34874ce22264abc5e03102b53d3656 + DatadogInternal: 00709affd9889ca9e8fd96e85e39ad865e651c32 + DatadogLogs: ef98708261f8f7ba82d15360f9951d43f578163b + DatadogRUM: 67d130164f4a7663e05a3d02803be9e9dd1abbb7 + DatadogSDKReactNative: 58bb5f7fa0f08a4f7248e0517e32f58b0319c841 + DatadogSDKReactNativeSessionReplay: 24aebdc3ee2989fe829cf42b01870a80c6bf8b9e + DatadogSDKReactNativeWebView: 5980f1be17d8477c9bb206af2593ed3bb8a1c1f0 + DatadogSessionReplay: 23107da4c61d0c84435efc6111929d562988045b + DatadogTrace: 17f50647107755fba79fc2298bf4cb282e0efb1f + DatadogWebViewTracking: 1290fce6010bf65b5e0e0ffa9048b448782e469c DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6 FBLazyVector: e32d34492c519a2194ec9d7f5e7a79d11b73f91c @@ -2109,7 +2109,7 @@ SPEC CHECKSUMS: KSCrash: 80e1e24eaefbe5134934ae11ca8d7746586bc2ed OpenTelemetry-Swift-Api: 3d77582ab6837a63b65bf7d2eacc57d8f2595edd OpenTelemetry-Swift-Sdk: 69d60f0242e830366e359481edd575d6776eb983 - RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809 + RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82 RCTDeprecation: be794de7dc6ed8f9f7fbf525f86e7651b8b68746 RCTRequired: a83787b092ec554c2eb6019ff3f5b8d125472b3b RCTTypeSafety: 48ad3c858926b1c46f46a81a58822b476e178e2c diff --git a/example-new-architecture/ios/Podfile.lock b/example-new-architecture/ios/Podfile.lock index 7c96f28e3..1daba6b6b 100644 --- a/example-new-architecture/ios/Podfile.lock +++ b/example-new-architecture/ios/Podfile.lock @@ -1,26 +1,26 @@ PODS: - boost (1.84.0) - - DatadogCore (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogCrashReporting (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogCore (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogCrashReporting (3.11.0): + - DatadogInternal (= 3.11.0) - KSCrash/Filters (= 2.5.0) - KSCrash/Recording (= 2.5.0) - - DatadogFlags (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogInternal (3.10.0) - - DatadogLogs (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogRUM (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogFlags (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogInternal (3.11.0) + - DatadogLogs (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogRUM (3.11.0): + - DatadogInternal (= 3.11.0) - DatadogSDKReactNative (3.4.0): - - DatadogCore (= 3.10.0) - - DatadogCrashReporting (= 3.10.0) - - DatadogFlags (= 3.10.0) - - DatadogLogs (= 3.10.0) - - DatadogRUM (= 3.10.0) - - DatadogTrace (= 3.10.0) - - DatadogWebViewTracking (= 3.10.0) + - DatadogCore (= 3.11.0) + - DatadogCrashReporting (= 3.11.0) + - DatadogFlags (= 3.11.0) + - DatadogLogs (= 3.11.0) + - DatadogRUM (= 3.11.0) + - DatadogTrace (= 3.11.0) + - DatadogWebViewTracking (= 3.11.0) - DoubleConversion - glog - hermes-engine @@ -42,13 +42,13 @@ PODS: - ReactCommon/turbomodule/core - Yoga - DatadogSDKReactNative/Tests (3.4.0): - - DatadogCore (= 3.10.0) - - DatadogCrashReporting (= 3.10.0) - - DatadogFlags (= 3.10.0) - - DatadogLogs (= 3.10.0) - - DatadogRUM (= 3.10.0) - - DatadogTrace (= 3.10.0) - - DatadogWebViewTracking (= 3.10.0) + - DatadogCore (= 3.11.0) + - DatadogCrashReporting (= 3.11.0) + - DatadogFlags (= 3.11.0) + - DatadogLogs (= 3.11.0) + - DatadogRUM (= 3.11.0) + - DatadogTrace (= 3.11.0) + - DatadogWebViewTracking (= 3.11.0) - DoubleConversion - glog - hermes-engine @@ -69,11 +69,11 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - DatadogTrace (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogTrace (3.11.0): + - DatadogInternal (= 3.11.0) - OpenTelemetry-Swift-Api (~> 2.3.0) - - DatadogWebViewTracking (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogWebViewTracking (3.11.0): + - DatadogInternal (= 3.11.0) - DoubleConversion (1.1.6) - fast_float (6.1.4) - FBLazyVector (0.76.9) @@ -1866,15 +1866,15 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 1dca942403ed9342f98334bf4c3621f011aa7946 - DatadogCore: be0f6c233bef27eda40acade29763943cb88935f - DatadogCrashReporting: 151f72523ee117000fed4b5e792de2349d38b331 - DatadogFlags: fbc1d17d2b83397c4f33817263a14b84a857ca1d - DatadogInternal: b81d08e4035de78140488b7422c239b17b89d251 - DatadogLogs: 20381f731050c500c85d36f4799cf0f28a56915e - DatadogRUM: 4f863c5330d85d6b54bb372d830929ad3b5006ab - DatadogSDKReactNative: 0871c12fc0fa3a6a78d9c8dd0f65f15bd9950b7e - DatadogTrace: c51a2bde28197cb1bab50031c83a82e3a1dbcf30 - DatadogWebViewTracking: 7775faa20f2044f2948c2eb246889ba5ceefbd6a + DatadogCore: 106d2aa8bef1a3dfb2a75723240f78cb5f8310fd + DatadogCrashReporting: eace5202ae63d92835718cf4a86489fdaef681a3 + DatadogFlags: 0587c5b5db34874ce22264abc5e03102b53d3656 + DatadogInternal: 00709affd9889ca9e8fd96e85e39ad865e651c32 + DatadogLogs: ef98708261f8f7ba82d15360f9951d43f578163b + DatadogRUM: 67d130164f4a7663e05a3d02803be9e9dd1abbb7 + DatadogSDKReactNative: d38fa020d47398ca682357e0837cdc54adf65669 + DatadogTrace: 17f50647107755fba79fc2298bf4cb282e0efb1f + DatadogWebViewTracking: 1290fce6010bf65b5e0e0ffa9048b448782e469c DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385 fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6 FBLazyVector: 7605ea4810e0e10ae4815292433c09bf4324ba45 @@ -1883,7 +1883,7 @@ SPEC CHECKSUMS: hermes-engine: 9e868dc7be781364296d6ee2f56d0c1a9ef0bb11 KSCrash: 80e1e24eaefbe5134934ae11ca8d7746586bc2ed OpenTelemetry-Swift-Api: 3d77582ab6837a63b65bf7d2eacc57d8f2595edd - RCT-Folly: 7b4f73a92ad9571b9dbdb05bb30fad927fa971e1 + RCT-Folly: ea9d9256ba7f9322ef911169a9f696e5857b9e17 RCTDeprecation: ebe712bb05077934b16c6bf25228bdec34b64f83 RCTRequired: ca91e5dd26b64f577b528044c962baf171c6b716 RCTTypeSafety: e7678bd60850ca5a41df9b8dc7154638cb66871f diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 793b1c77a..7efd05c9f 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,64 +1,64 @@ PODS: - boost (1.84.0) - - DatadogCore (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogCrashReporting (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogCore (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogCrashReporting (3.11.0): + - DatadogInternal (= 3.11.0) - KSCrash/Filters (= 2.5.0) - KSCrash/Recording (= 2.5.0) - - DatadogFlags (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogInternal (3.10.0) - - DatadogLogs (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogRUM (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogFlags (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogInternal (3.11.0) + - DatadogLogs (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogRUM (3.11.0): + - DatadogInternal (= 3.11.0) - DatadogSDKReactNative (3.4.0): - - DatadogCore (= 3.10.0) - - DatadogCrashReporting (= 3.10.0) - - DatadogFlags (= 3.10.0) - - DatadogLogs (= 3.10.0) - - DatadogRUM (= 3.10.0) - - DatadogTrace (= 3.10.0) - - DatadogWebViewTracking (= 3.10.0) + - DatadogCore (= 3.11.0) + - DatadogCrashReporting (= 3.11.0) + - DatadogFlags (= 3.11.0) + - DatadogLogs (= 3.11.0) + - DatadogRUM (= 3.11.0) + - DatadogTrace (= 3.11.0) + - DatadogWebViewTracking (= 3.11.0) - React-Core - DatadogSDKReactNative/Tests (3.4.0): - - DatadogCore (= 3.10.0) - - DatadogCrashReporting (= 3.10.0) - - DatadogFlags (= 3.10.0) - - DatadogLogs (= 3.10.0) - - DatadogRUM (= 3.10.0) - - DatadogTrace (= 3.10.0) - - DatadogWebViewTracking (= 3.10.0) + - DatadogCore (= 3.11.0) + - DatadogCrashReporting (= 3.11.0) + - DatadogFlags (= 3.11.0) + - DatadogLogs (= 3.11.0) + - DatadogRUM (= 3.11.0) + - DatadogTrace (= 3.11.0) + - DatadogWebViewTracking (= 3.11.0) - React-Core - DatadogSDKReactNativeSessionReplay (3.4.0): - DatadogSDKReactNative - - DatadogSessionReplay (= 3.10.0) + - DatadogSessionReplay (= 3.11.0) - React-Core - DatadogSDKReactNativeSessionReplay/Tests (3.4.0): - DatadogSDKReactNative - - DatadogSessionReplay (= 3.10.0) + - DatadogSessionReplay (= 3.11.0) - React-Core - React-RCTText - DatadogSDKReactNativeWebView (3.4.0): - - DatadogInternal (= 3.10.0) + - DatadogInternal (= 3.11.0) - DatadogSDKReactNative - - DatadogWebViewTracking (= 3.10.0) + - DatadogWebViewTracking (= 3.11.0) - React-Core - DatadogSDKReactNativeWebView/Tests (3.4.0): - - DatadogInternal (= 3.10.0) + - DatadogInternal (= 3.11.0) - DatadogSDKReactNative - - DatadogWebViewTracking (= 3.10.0) + - DatadogWebViewTracking (= 3.11.0) - React-Core - react-native-webview - React-RCTText - - DatadogSessionReplay (3.10.0): - - DatadogInternal (= 3.10.0) - - DatadogTrace (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogSessionReplay (3.11.0): + - DatadogInternal (= 3.11.0) + - DatadogTrace (3.11.0): + - DatadogInternal (= 3.11.0) - OpenTelemetry-Swift-Api (~> 2.3.0) - - DatadogWebViewTracking (3.10.0): - - DatadogInternal (= 3.10.0) + - DatadogWebViewTracking (3.11.0): + - DatadogInternal (= 3.11.0) - DoubleConversion (1.1.6) - fast_float (6.1.4) - FBLazyVector (0.76.9) @@ -1966,18 +1966,18 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 1dca942403ed9342f98334bf4c3621f011aa7946 - DatadogCore: be0f6c233bef27eda40acade29763943cb88935f - DatadogCrashReporting: 151f72523ee117000fed4b5e792de2349d38b331 - DatadogFlags: fbc1d17d2b83397c4f33817263a14b84a857ca1d - DatadogInternal: b81d08e4035de78140488b7422c239b17b89d251 - DatadogLogs: 20381f731050c500c85d36f4799cf0f28a56915e - DatadogRUM: 4f863c5330d85d6b54bb372d830929ad3b5006ab - DatadogSDKReactNative: c7d0a4d8ced869ce285d8e1f7c00726805290c6b - DatadogSDKReactNativeSessionReplay: 46872f6f1f8acaa636e942a32156829412d99041 - DatadogSDKReactNativeWebView: 848c6aca6181570e2d635b87b1e4ca2df0b7ece9 - DatadogSessionReplay: aef317ccd62a089691899bc7153177deec3c66d6 - DatadogTrace: c51a2bde28197cb1bab50031c83a82e3a1dbcf30 - DatadogWebViewTracking: 7775faa20f2044f2948c2eb246889ba5ceefbd6a + DatadogCore: 106d2aa8bef1a3dfb2a75723240f78cb5f8310fd + DatadogCrashReporting: eace5202ae63d92835718cf4a86489fdaef681a3 + DatadogFlags: 0587c5b5db34874ce22264abc5e03102b53d3656 + DatadogInternal: 00709affd9889ca9e8fd96e85e39ad865e651c32 + DatadogLogs: ef98708261f8f7ba82d15360f9951d43f578163b + DatadogRUM: 67d130164f4a7663e05a3d02803be9e9dd1abbb7 + DatadogSDKReactNative: 0b37fa67a3a4ee3d6dbc98ecb3aa6087892caef2 + DatadogSDKReactNativeSessionReplay: 4969cc7074e763dbb080b40748f03ba87e13b17c + DatadogSDKReactNativeWebView: 6a434b777165c45dbc9e43f1c84b260fe76404ac + DatadogSessionReplay: 23107da4c61d0c84435efc6111929d562988045b + DatadogTrace: 17f50647107755fba79fc2298bf4cb282e0efb1f + DatadogWebViewTracking: 1290fce6010bf65b5e0e0ffa9048b448782e469c DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385 fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6 FBLazyVector: 7605ea4810e0e10ae4815292433c09bf4324ba45 @@ -1987,7 +1987,7 @@ SPEC CHECKSUMS: HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 KSCrash: 80e1e24eaefbe5134934ae11ca8d7746586bc2ed OpenTelemetry-Swift-Api: 3d77582ab6837a63b65bf7d2eacc57d8f2595edd - RCT-Folly: 7b4f73a92ad9571b9dbdb05bb30fad927fa971e1 + RCT-Folly: ea9d9256ba7f9322ef911169a9f696e5857b9e17 RCTDeprecation: ebe712bb05077934b16c6bf25228bdec34b64f83 RCTRequired: ca91e5dd26b64f577b528044c962baf171c6b716 RCTTypeSafety: e7678bd60850ca5a41df9b8dc7154638cb66871f diff --git a/packages/core/DatadogSDKReactNative.podspec b/packages/core/DatadogSDKReactNative.podspec index 351ec31b5..9fa6f9b59 100644 --- a/packages/core/DatadogSDKReactNative.podspec +++ b/packages/core/DatadogSDKReactNative.podspec @@ -19,15 +19,15 @@ Pod::Spec.new do |s| s.dependency "React-Core" # /!\ Remember to keep the versions in sync with DatadogSDKReactNativeSessionReplay.podspec - s.dependency 'DatadogCore', '3.10.0' - s.dependency 'DatadogLogs', '3.10.0' - s.dependency 'DatadogTrace', '3.10.0' - s.dependency 'DatadogRUM', '3.10.0' - s.dependency 'DatadogCrashReporting', '3.10.0' - s.dependency 'DatadogFlags', '3.10.0' + s.dependency 'DatadogCore', '3.11.0' + s.dependency 'DatadogLogs', '3.11.0' + s.dependency 'DatadogTrace', '3.11.0' + s.dependency 'DatadogRUM', '3.11.0' + s.dependency 'DatadogCrashReporting', '3.11.0' + s.dependency 'DatadogFlags', '3.11.0' # DatadogWebViewTracking is not available for tvOS - s.ios.dependency 'DatadogWebViewTracking', '3.10.0' + s.ios.dependency 'DatadogWebViewTracking', '3.11.0' s.test_spec 'Tests' do |test_spec| test_spec.source_files = 'ios/Tests/**/*.{swift,json}' diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 9810cc9ba..6974c517a 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -200,7 +200,7 @@ dependencies { // This breaks builds if the React Native target is below 0.76.0. as it relies on Gradle 8.5.0. // To avoid this, we enforce 1.0.0-beta01 on RN < 0.76.0 if (reactNativeMinorVersion < 76) { - implementation("com.datadoghq:dd-sdk-android-rum:3.8.0") { + implementation("com.datadoghq:dd-sdk-android-rum:3.10.0") { exclude group: "androidx.metrics", module: "metrics-performance" } implementation "androidx.metrics:metrics-performance:1.0.0-beta01" @@ -220,13 +220,13 @@ dependencies { } } } else { - implementation "com.datadoghq:dd-sdk-android-rum:3.8.0" + implementation "com.datadoghq:dd-sdk-android-rum:3.10.0" } - implementation "com.datadoghq:dd-sdk-android-logs:3.8.0" - implementation "com.datadoghq:dd-sdk-android-trace:3.8.0" - implementation "com.datadoghq:dd-sdk-android-webview:3.8.0" - implementation "com.datadoghq:dd-sdk-android-ndk:3.8.0" - implementation "com.datadoghq:dd-sdk-android-flags:3.8.0" + implementation "com.datadoghq:dd-sdk-android-logs:3.10.0" + implementation "com.datadoghq:dd-sdk-android-trace:3.10.0" + implementation "com.datadoghq:dd-sdk-android-webview:3.10.0" + implementation "com.datadoghq:dd-sdk-android-ndk:3.10.0" + implementation "com.datadoghq:dd-sdk-android-flags:3.10.0" implementation "com.google.code.gson:gson:2.11.0" testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2" diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt index a6e3884e0..ae9ee7118 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt @@ -349,6 +349,7 @@ class DdSdkNativeInitialization internal constructor( "us3" -> DatadogSite.US3 "us5" -> DatadogSite.US5 "us1_fed", "gov" -> DatadogSite.US1_FED + "us2_fed" -> DatadogSite.US2_FED "ap1" -> DatadogSite.AP1 "ap2" -> DatadogSite.AP2 else -> DatadogSite.US1 diff --git a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt index 758856060..1b1343c51 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt @@ -937,6 +937,66 @@ internal class DdSdkTest { } } + @Test + fun `𝕄 initialize native SDK 𝕎 initialize() {site=us2_fed}`( + forge: Forge + ) { + // Given + val site = forge.randomizeCase("us2_fed") + val rumConfiguration = fakeConfiguration.rumConfiguration?.copy( + nativeCrashReportEnabled = true + ) + fakeConfiguration = fakeConfiguration.copy(site = site, rumConfiguration = rumConfiguration) + val sdkConfigCaptor = argumentCaptor() + val rumConfigCaptor = argumentCaptor() + val logsConfigCaptor = argumentCaptor() + val traceConfigCaptor = argumentCaptor() + + val rumMock = org.mockito.Mockito.mockStatic(Rum::class.java) + val traceMock = org.mockito.Mockito.mockStatic(Trace::class.java) + val logsMock = org.mockito.Mockito.mockStatic(Logs::class.java) + + try { + rumMock.`when` { Rum.enable(any(), any()) }.then { } + logsMock.`when` { Logs.enable(any(), any()) }.then { } + traceMock.`when` { Trace.enable(any(), any()) }.then { } + + // When + testedBridgeSdk.initialize(fakeConfiguration.toReadableJavaOnlyMap(), mockPromise) + + // Then + inOrder(mockDatadog) { + verify(mockDatadog).initialize( + same(mockContext), + sdkConfigCaptor.capture(), + any() + ) + rumMock.verify { Rum.enable(rumConfigCaptor.capture(), any()) } + traceMock.verify { Trace.enable(traceConfigCaptor.capture(), any()) } + logsMock.verify { Logs.enable(logsConfigCaptor.capture(), any()) } + } + assertThat(sdkConfigCaptor.firstValue) + .hasField("coreConfig") { + it.hasFieldEqualTo("needsClearTextHttp", false) + it.hasFieldEqualTo("firstPartyHostsWithHeaderTypes", emptyMap()) + it.hasFieldEqualTo("site", DatadogSite.US2_FED) + } + .hasFieldEqualTo("clientToken", fakeConfiguration.clientToken) + .hasFieldEqualTo("env", fakeConfiguration.env) + .hasFieldEqualTo("variant", "") + .hasFieldEqualTo( + "additionalConfig", + fakeConfiguration.additionalConfiguration?.filterValues { it != null }.orEmpty() + ) + assertThat(rumConfigCaptor.firstValue) + .hasFieldEqualTo("applicationId", fakeConfiguration.rumConfiguration?.applicationId) + } finally { + rumMock.close() + logsMock.close() + traceMock.close() + } + } + @Test fun `𝕄 initialize native SDK 𝕎 initialize() {site=eu1}`( forge: Forge diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MockRumMonitor.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MockRumMonitor.kt index 2ef718888..df0e8b5ad 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MockRumMonitor.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MockRumMonitor.kt @@ -14,6 +14,8 @@ import com.datadog.android.rum.RumResourceKind import com.datadog.android.rum.RumResourceMethod import com.datadog.android.rum._RumInternalProxy import com.datadog.android.rum.featureoperations.FailureReason +import com.datadog.android.rum.operations.FailureReason as OperationFailureReason +import com.datadog.android.rum.operations.OperationOptions class MockRumMonitor : RumMonitor { override var debug = false @@ -148,6 +150,29 @@ class MockRumMonitor : RumMonitor { attributes: Map ) {} + @ExperimentalRumApi + override fun startOperation( + name: String, + operationKey: String?, + options: OperationOptions, + attributes: Map + ) {} + + @ExperimentalRumApi + override fun succeedOperation( + name: String, + operationKey: String?, + attributes: Map + ) {} + + @ExperimentalRumApi + override fun failOperation( + name: String, + operationKey: String?, + failureReason: OperationFailureReason, + attributes: Map + ) {} + @ExperimentalRumApi override fun reportAppFullyDisplayed() {} } diff --git a/packages/core/ios/Sources/RNDdSdkConfiguration.swift b/packages/core/ios/Sources/RNDdSdkConfiguration.swift index 8c4cb8a5e..bd84625b3 100644 --- a/packages/core/ios/Sources/RNDdSdkConfiguration.swift +++ b/packages/core/ios/Sources/RNDdSdkConfiguration.swift @@ -515,6 +515,8 @@ extension NSString? { return .us5 case "us1_fed", "gov": return .us1_fed + case "us2_fed": + return .us2_fed case "ap1": return .ap1 case "ap2": diff --git a/packages/core/ios/Tests/DdSdkTests.swift b/packages/core/ios/Tests/DdSdkTests.swift index e79805e8c..bc13c4f98 100644 --- a/packages/core/ios/Tests/DdSdkTests.swift +++ b/packages/core/ios/Tests/DdSdkTests.swift @@ -381,6 +381,16 @@ class DdSdkTests: XCTestCase { XCTAssertEqual(ddConfig.site, .us1_fed) } + func testBuildConfigurationUS2FEDEndpoint() { + let configuration: DdSdkConfiguration = .mockAny(site: "US2_FED") + + let ddConfig = DdSdkNativeInitialization().buildSDKConfiguration( + configuration: configuration + ) + + XCTAssertEqual(ddConfig.site, .us2_fed) + } + func testBuildConfigurationGOVEndpoint() { let configuration: DdSdkConfiguration = .mockAny(site: "GOV") diff --git a/packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec b/packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec index 3ce5cbbef..e81101d9c 100644 --- a/packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec +++ b/packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.dependency "React-Core" # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec - s.dependency 'DatadogSessionReplay', '3.10.0' + s.dependency 'DatadogSessionReplay', '3.11.0' s.dependency 'DatadogSDKReactNative' s.test_spec 'Tests' do |test_spec| diff --git a/packages/react-native-session-replay/android/build.gradle b/packages/react-native-session-replay/android/build.gradle index 4d1ff5dc2..aafc08c07 100644 --- a/packages/react-native-session-replay/android/build.gradle +++ b/packages/react-native-session-replay/android/build.gradle @@ -216,8 +216,8 @@ dependencies { api "com.facebook.react:react-android:$reactNativeVersion" } implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "com.datadoghq:dd-sdk-android-session-replay:3.8.0" - implementation "com.datadoghq:dd-sdk-android-internal:3.8.0" + implementation "com.datadoghq:dd-sdk-android-session-replay:3.10.0" + implementation "com.datadoghq:dd-sdk-android-internal:3.10.0" implementation project(path: ':datadog_mobile-react-native') testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" diff --git a/packages/react-native-webview/DatadogSDKReactNativeWebView.podspec b/packages/react-native-webview/DatadogSDKReactNativeWebView.podspec index e854a6cfc..38bca4e66 100644 --- a/packages/react-native-webview/DatadogSDKReactNativeWebView.podspec +++ b/packages/react-native-webview/DatadogSDKReactNativeWebView.podspec @@ -23,8 +23,8 @@ Pod::Spec.new do |s| end # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec - s.dependency 'DatadogWebViewTracking', '3.10.0' - s.dependency 'DatadogInternal', '3.10.0' + s.dependency 'DatadogWebViewTracking', '3.11.0' + s.dependency 'DatadogInternal', '3.11.0' s.dependency 'DatadogSDKReactNative' s.test_spec 'Tests' do |test_spec| diff --git a/packages/react-native-webview/android/build.gradle b/packages/react-native-webview/android/build.gradle index 638ff80d3..0bb0abb82 100644 --- a/packages/react-native-webview/android/build.gradle +++ b/packages/react-native-webview/android/build.gradle @@ -196,7 +196,7 @@ dependencies { implementation "com.facebook.react:react-android:$reactNativeVersion" } - implementation "com.datadoghq:dd-sdk-android-webview:3.8.0" + implementation "com.datadoghq:dd-sdk-android-webview:3.10.0" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(path: ':datadog_mobile-react-native')