Merge pull request #546 from DataDog/louiszawadzki/rum-1947/release-1.9.0

louiszawadzki · web-flow · commit 83bae8e19d5a · 2023-10-30T14:49:44.000+01:00
Release 1.9.0
diff --git a/example-new-architecture/ios/Podfile.lock b/example-new-architecture/ios/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
   - DatadogSDKCrashReporting (1.22.0):
     - DatadogSDK (= 1.22.0)
     - PLCrashReporter (~> 1.11.0)
-  - DatadogSDKReactNative (1.8.5):
+  - DatadogSDKReactNative (1.9.0):
     - DatadogSDK (~> 1.22.0)
     - DatadogSDKCrashReporting (~> 1.22.0)
     - RCT-Folly (= 2021.07.22.00)
@@ -942,7 +942,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DatadogSDK: 46e1a7363bc3130fae151ec4aedf11ea291517c5
   DatadogSDKCrashReporting: 24a0e6ec6db905cdeb174721962a7941b2f8a9d2
-  DatadogSDKReactNative: f5aebd969f859454689ca16326520c65a4eb3725
+  DatadogSDKReactNative: 28e1439d5a240608b84c1516b7770e231388cfcf
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: ddb55c55295ea51ed98aa7e2e08add2f826309d5
   FBReactNativeSpec: 33a87f65f1a467d5f63d11d0cc106a10d3b0639d
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -4,7 +4,7 @@ PODS:
   - DatadogSDKCrashReporting (1.22.0):
     - DatadogSDK (= 1.22.0)
     - PLCrashReporter (~> 1.11.0)
-  - DatadogSDKReactNative (1.8.5):
+  - DatadogSDKReactNative (1.9.0):
     - DatadogSDK (~> 1.22.0)
     - DatadogSDKCrashReporting (~> 1.22.0)
     - React-Core
@@ -530,7 +530,7 @@ SPEC CHECKSUMS:
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   DatadogSDK: 46e1a7363bc3130fae151ec4aedf11ea291517c5
   DatadogSDKCrashReporting: 24a0e6ec6db905cdeb174721962a7941b2f8a9d2
-  DatadogSDKReactNative: 1cd2c5ca0673e9fc83ad4b44b2c14f90cce9d53c
+  DatadogSDKReactNative: 92e7f7fb2e1231d35b22971e899efe863bd43d8d
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: ddb55c55295ea51ed98aa7e2e08add2f826309d5
   FBReactNativeSpec: 90fc1a90b4b7a171e0a7c20ea426c1bf6ce4399c
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "npmClient": "yarn",
-  "version": "1.8.5",
+  "version": "1.9.0",
   "packages": [
     "packages/*"
   ],
diff --git a/packages/codepush/package.json b/packages/codepush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/mobile-react-native-code-push",
-  "version": "1.8.5",
+  "version": "1.9.0",
   "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": "^1.8.5",
+    "@datadog/mobile-react-native": "^1.9.0",
     "@testing-library/react-native": "7.0.2",
     "react-native-builder-bob": "0.17.1",
     "react-native-code-push": "7.0.5"
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -84,6 +84,16 @@ def getExtOrIntegerDefault(name) {
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+    namespace = "com.datadog.reactnative"
+  }
+  if (agpVersion.tokenize('.')[0].toInteger() >= 8) {
+    buildFeatures {
+      buildConfig = true
+    }
+  }
+
   defaultConfig {
     minSdkVersion 21
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
diff --git a/packages/core/ios/Sources/DdTraceImplementation.swift b/packages/core/ios/Sources/DdTraceImplementation.swift
@@ -44,14 +44,13 @@ public class DdTraceImplementation: NSObject {
     public func finishSpan(spanId: NSString, context: NSDictionary, timestampMs: Double, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
         objc_sync_enter(self)
         let optionalSpan = spanDictionary.removeValue(forKey: spanId)
-        objc_sync_exit(self)
-
         if let span = optionalSpan {
             set(tags: castAttributesToSwift(context).mergeWithGlobalAttributes(), to: span)
             let timeIntervalSince1970: TimeInterval = timestampMs / 1_000
             span.finish(at: Date(timeIntervalSince1970: timeIntervalSince1970))
         }
-        
+        objc_sync_exit(self)
+
         resolve(nil)
     }
 
diff --git a/packages/core/ios/Tests/DdTraceTests.swift b/packages/core/ios/Tests/DdTraceTests.swift
@@ -139,6 +139,10 @@ internal class DdTraceTests: XCTestCase {
     }
 
     func testTracingConcurrently() {
+        // It is possible and acceptable that a concurrent finishSpan resolve is called on a different thread before we get the lastResolveValue.
+        // This would override lastResolveValue to be `nil`. To avoid this, we use a different resolve.
+        func mockFinishResolve(args: Any?) {}
+
         let iterationCount = 30
         DispatchQueue.concurrentPerform(iterations: iterationCount) { iteration in
             tracer.startSpan(
@@ -149,7 +153,7 @@ internal class DdTraceTests: XCTestCase {
                 reject: mockReject
             )
             let spanID = lastResolveValue as! NSString
-            tracer.finishSpan(spanId: spanID, context: testTags, timestampMs: 100, resolve: mockResolve, reject: mockReject)
+            tracer.finishSpan(spanId: spanID, context: testTags, timestampMs: 100, resolve: mockFinishResolve, reject: mockReject)
         }
 
         XCTAssertEqual(mockNativeTracer.startedSpans.count, iterationCount, "\(mockNativeTracer.startedSpans)")
diff --git a/packages/core/jest/mock.js b/packages/core/jest/mock.js
@@ -18,6 +18,7 @@ const actualDatadog = jest.requireActual('@datadog/mobile-react-native');
 const DatadogProviderMock = ({ children }) => {
     return <>{children}</>;
 };
+DatadogProviderMock.initialize = jest.fn().mockResolvedValue();
 
 module.exports = {
     ...actualDatadog,
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native",
-    "version": "1.8.5",
+    "version": "1.9.0",
     "description": "A client-side React Native module to interact with Datadog",
     "keywords": [
         "datadog",
diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '1.8.5';
+export const version = '1.9.0';
diff --git a/packages/react-native-navigation/package.json b/packages/react-native-navigation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/mobile-react-native-navigation",
-  "version": "1.8.5",
+  "version": "1.9.0",
   "description": "A client-side React Native module to interact with Datadog",
   "keywords": [
     "datadog",
@@ -36,7 +36,7 @@
     "prepare": "rm -rf lib && yarn bob build"
   },
   "devDependencies": {
-    "@datadog/mobile-react-native": "^1.8.5",
+    "@datadog/mobile-react-native": "^1.9.0",
     "@testing-library/react-native": "7.0.2",
     "react-native-builder-bob": "0.17.1",
     "react-native-gesture-handler": "1.10.3",
diff --git a/packages/react-native-webview/package.json b/packages/react-native-webview/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-webview",
-    "version": "1.8.5",
+    "version": "1.9.0",
     "description": "A client-side React Native module to interact with react-native-webview and Datadog",
     "keywords": [
         "datadog",
diff --git a/packages/react-native-webview/src/NativeDdSdk.ts b/packages/react-native-webview/src/NativeDdSdk.ts
@@ -0,0 +1,20 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+/**
+ * We have to redefine the spec for the Native SDK here to be able to use the new architecture.
+ * We don't declare it in a spec file so we don't end up with a duplicate definition of the native module.
+ */
+interface PartialNativeDdSdkSpec extends TurboModule {
+    consumeWebviewEvent(message: string): Promise<void>;
+    telemetryError(message: string, stack: string, kind: string): Promise<void>;
+}
+export const NativeDdSdk = TurboModuleRegistry.get<PartialNativeDdSdkSpec>(
+    'DdSdk'
+);
diff --git a/packages/react-native-webview/src/__utils__/formatAllowedHosts.ts b/packages/react-native-webview/src/__utils__/formatAllowedHosts.ts
@@ -3,14 +3,14 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2016-Present Datadog, Inc.
  */
-import { NativeModules } from 'react-native';
+import { NativeDdSdk } from '../NativeDdSdk';
 
 export function formatAllowedHosts(allowedHosts?: string[]): string {
     try {
         return `'${JSON.stringify(allowedHosts)}'`;
     } catch (e: any) {
-        if (NativeModules.DdSdk && NativeModules.DdSdk.telemetryError) {
-            NativeModules.DdSdk.telemetryError(
+        if (NativeDdSdk) {
+            NativeDdSdk.telemetryError(
                 getErrorMessage(e),
                 getErrorStackTrace(e),
                 'AllowedHostsError'
diff --git a/packages/react-native-webview/src/index.tsx b/packages/react-native-webview/src/index.tsx
@@ -5,10 +5,9 @@
  */
 import type { WebViewMessageEvent, WebViewProps } from 'react-native-webview';
 import { WebView as RNWebView } from 'react-native-webview';
-import type { TurboModule } from 'react-native';
-import { TurboModuleRegistry } from 'react-native';
 import React, { forwardRef, useCallback } from 'react';
 
+import { NativeDdSdk } from './NativeDdSdk';
 import {
     DATADOG_MESSAGE_PREFIX,
     getInjectedJavaScriptBeforeContentLoaded
@@ -50,12 +49,3 @@ const WebViewComponent = (props: Props, ref: React.Ref<RNWebView<Props>>) => {
 export const WebView = forwardRef(WebViewComponent);
 
 export default WebView;
-
-/**
- * We have to redefine the spec for the Native SDK here to be able to use the new architecture.
- * We don't declare it in a separate file so we don't end up with a duplicate definition of the native module.
- */
-interface PartialNativeDdSdkSpec extends TurboModule {
-    consumeWebviewEvent(message: string): Promise<void>;
-}
-const NativeDdSdk = TurboModuleRegistry.get<PartialNativeDdSdkSpec>('DdSdk');
diff --git a/packages/react-navigation/package.json b/packages/react-navigation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/mobile-react-navigation",
-  "version": "1.8.5",
+  "version": "1.9.0",
   "description": "A client-side React Native module to interact with Datadog",
   "keywords": [
     "datadog",
@@ -36,7 +36,7 @@
     "prepare": "rm -rf lib && yarn bob build"
   },
   "devDependencies": {
-    "@datadog/mobile-react-native": "^1.8.5",
+    "@datadog/mobile-react-native": "^1.9.0",
     "@react-navigation/native-v5": "npm:@react-navigation/native@5.9.8",
     "@react-navigation/native-v6": "npm:@react-navigation/native@6.1.2",
     "@react-navigation/stack-v5": "npm:@react-navigation/stack@5.14.2",
diff --git a/yarn.lock b/yarn.lock
@@ -3510,7 +3510,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@datadog/mobile-react-native-code-push@workspace:packages/codepush"
   dependencies:
-    "@datadog/mobile-react-native": ^1.8.5
+    "@datadog/mobile-react-native": ^1.9.0
     "@testing-library/react-native": 7.0.2
     react-native-builder-bob: 0.17.1
     react-native-code-push: 7.0.5
@@ -3526,7 +3526,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@datadog/mobile-react-native-navigation@workspace:packages/react-native-navigation"
   dependencies:
-    "@datadog/mobile-react-native": ^1.8.5
+    "@datadog/mobile-react-native": ^1.9.0
     "@testing-library/react-native": 7.0.2
     react-native-builder-bob: 0.17.1
     react-native-gesture-handler: 1.10.3
@@ -3554,7 +3554,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@datadog/mobile-react-native@^1.8.5, @datadog/mobile-react-native@workspace:packages/core":
+"@datadog/mobile-react-native@^1.9.0, @datadog/mobile-react-native@workspace:packages/core":
   version: 0.0.0-use.local
   resolution: "@datadog/mobile-react-native@workspace:packages/core"
   dependencies:
@@ -3570,7 +3570,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@datadog/mobile-react-navigation@workspace:packages/react-navigation"
   dependencies:
-    "@datadog/mobile-react-native": ^1.8.5
+    "@datadog/mobile-react-native": ^1.9.0
     "@react-navigation/native-v5": "npm:@react-navigation/native@5.9.8"
     "@react-navigation/native-v6": "npm:@react-navigation/native@6.1.2"
     "@react-navigation/stack-v5": "npm:@react-navigation/stack@5.14.2"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"npmClient": "yarn",`
`3`		`- "version": "1.8.5",`
	`3`	`+ "version": "1.9.0",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,10 @@ internal class DdTraceTests: XCTestCase {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`func testTracingConcurrently() {`
	`142`	`+ // It is possible and acceptable that a concurrent finishSpan resolve is called on a different thread before we get the lastResolveValue.`
	`143`	+ // This would override lastResolveValue to be `nil`. To avoid this, we use a different resolve.
	`144`	`+ func mockFinishResolve(args: Any?) {}`
	`145`	`+`
`142`	`146`	`let iterationCount = 30`
`143`	`147`	`DispatchQueue.concurrentPerform(iterations: iterationCount) { iteration in`
`144`	`148`	`tracer.startSpan(`
`@@ -149,7 +153,7 @@ internal class DdTraceTests: XCTestCase {`
`149`	`153`	`reject: mockReject`
`150`	`154`	`)`
`151`	`155`	`let spanID = lastResolveValue as! NSString`
`152`		`- tracer.finishSpan(spanId: spanID, context: testTags, timestampMs: 100, resolve: mockResolve, reject: mockReject)`
	`156`	`+ tracer.finishSpan(spanId: spanID, context: testTags, timestampMs: 100, resolve: mockFinishResolve, reject: mockReject)`
`153`	`157`	`}`
`154`	`158`
`155`	`159`	`XCTAssertEqual(mockNativeTracer.startedSpans.count, iterationCount, "\(mockNativeTracer.startedSpans)")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@datadog/mobile-react-native",`
`3`		`- "version": "1.8.5",`
	`3`	`+ "version": "1.9.0",`
`4`	`4`	`"description": "A client-side React Native module to interact with Datadog",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"datadog",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`// generated by genversion`
`2`		`-export const version = '1.8.5';`
	`2`	`+export const version = '1.9.0';`