diff --git a/.gitignore b/.gitignore index 7c8f52bf9..eb9e2556b 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,6 @@ packages/**/*.tgz # Jest coverage + +# Auto-generated iOS Header +packages/react-native-session-replay/ios/Sources/RCTVersion.h diff --git a/example-new-architecture/ios/Podfile.lock b/example-new-architecture/ios/Podfile.lock index 70ab9d715..80e6d4261 100644 --- a/example-new-architecture/ios/Podfile.lock +++ b/example-new-architecture/ios/Podfile.lock @@ -10,7 +10,7 @@ PODS: - DatadogInternal (= 2.22.0) - DatadogRUM (2.22.0): - DatadogInternal (= 2.22.0) - - DatadogSDKReactNative (2.6.1): + - DatadogSDKReactNative (2.6.2): - DatadogCore (~> 2.22.0) - DatadogCrashReporting (~> 2.22.0) - DatadogLogs (~> 2.22.0) @@ -1760,7 +1760,7 @@ SPEC CHECKSUMS: DatadogInternal: 2c9770cd4bb66636f2c1578f4cfbc5984e032e2d DatadogLogs: 397a79884d4dff82cf3d1a35b3e61e9ab4b03cf4 DatadogRUM: 9f23460eb44e2bd2f2fe5e4db9d205dcdd0ef865 - DatadogSDKReactNative: 5b1047d12bcb2ad8bced39e9950ec9fb55d84760 + DatadogSDKReactNative: 4ae1ad4bc0a9369b9980ce20c5b765c76a5ab970 DatadogTrace: 637d592a8d98ece1794ee06ad27dbd43a4fe08d0 DatadogWebViewTracking: 2191682c6af12d86c093ceb3a20a886708bfeb4f DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index b1e08aed1..d7c400511 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -10,7 +10,7 @@ PODS: - DatadogInternal (= 2.22.0) - DatadogRUM (2.22.0): - DatadogInternal (= 2.22.0) - - DatadogSDKReactNative (2.6.1): + - DatadogSDKReactNative (2.6.2): - DatadogCore (~> 2.22.0) - DatadogCrashReporting (~> 2.22.0) - DatadogLogs (~> 2.22.0) @@ -18,7 +18,7 @@ PODS: - DatadogTrace (~> 2.22.0) - DatadogWebViewTracking (~> 2.22.0) - React-Core - - DatadogSDKReactNative/Tests (2.6.1): + - DatadogSDKReactNative/Tests (2.6.2): - DatadogCore (~> 2.22.0) - DatadogCrashReporting (~> 2.22.0) - DatadogLogs (~> 2.22.0) @@ -26,21 +26,21 @@ PODS: - DatadogTrace (~> 2.22.0) - DatadogWebViewTracking (~> 2.22.0) - React-Core - - DatadogSDKReactNativeSessionReplay (2.6.1): + - DatadogSDKReactNativeSessionReplay (2.6.2): - DatadogSDKReactNative - DatadogSessionReplay (~> 2.22.0) - React-Core - - DatadogSDKReactNativeSessionReplay/Tests (2.6.1): + - DatadogSDKReactNativeSessionReplay/Tests (2.6.2): - DatadogSDKReactNative - DatadogSessionReplay (~> 2.22.0) - React-Core - React-RCTText - - DatadogSDKReactNativeWebView (2.6.1): + - DatadogSDKReactNativeWebView (2.6.2): - DatadogInternal (~> 2.22.0) - DatadogSDKReactNative - DatadogWebViewTracking (~> 2.22.0) - React-Core - - DatadogSDKReactNativeWebView/Tests (2.6.1): + - DatadogSDKReactNativeWebView/Tests (2.6.2): - DatadogInternal (~> 2.22.0) - DatadogSDKReactNative - DatadogWebViewTracking (~> 2.22.0) @@ -1893,9 +1893,9 @@ SPEC CHECKSUMS: DatadogInternal: 2c9770cd4bb66636f2c1578f4cfbc5984e032e2d DatadogLogs: 397a79884d4dff82cf3d1a35b3e61e9ab4b03cf4 DatadogRUM: 9f23460eb44e2bd2f2fe5e4db9d205dcdd0ef865 - DatadogSDKReactNative: 262a791c94a78e6f97eb74cd70e65f15627ed4ed - DatadogSDKReactNativeSessionReplay: 8004fca16fb1cf50b1a0657b65d40b05c3a4ad8b - DatadogSDKReactNativeWebView: 1b177b783d922c9da33e0200dbf9870635cab2b5 + DatadogSDKReactNative: c1b1052fc981cf87285783d8dd48ca5830801ade + DatadogSDKReactNativeSessionReplay: c4c894a227194e3b75b59e19b70c7e56b2782383 + DatadogSDKReactNativeWebView: 99c8eef4dc80ce5133c7520aab9e65922d599223 DatadogSessionReplay: 837b6d028534b22b717ccc465707007be5ee8fdf DatadogTrace: 637d592a8d98ece1794ee06ad27dbd43a4fe08d0 DatadogWebViewTracking: 2191682c6af12d86c093ceb3a20a886708bfeb4f diff --git a/lerna.json b/lerna.json index a1a584f36..8c829de58 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "npmClient": "yarn", - "version": "2.6.1", + "version": "2.6.2", "packages": [ "packages/*" ], diff --git a/packages/codepush/package.json b/packages/codepush/package.json index 7a447d973..b0004f5b6 100644 --- a/packages/codepush/package.json +++ b/packages/codepush/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-code-push", - "version": "2.6.1", + "version": "2.6.2", "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": "^2.6.1", + "@datadog/mobile-react-native": "^2.6.2", "@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 index f86893809..b02fd3ead 100644 --- 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.6.1" +internal const val SDK_VERSION = "2.6.2" diff --git a/packages/core/ios/Sources/SdkVersion.swift b/packages/core/ios/Sources/SdkVersion.swift index 7aa9936bc..a10ee9b31 100644 --- 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.6.1" +let SdkVersion = "2.6.2" diff --git a/packages/core/package.json b/packages/core/package.json index dc3629755..4d6479c66 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native", - "version": "2.6.1", + "version": "2.6.2", "description": "A client-side React Native module to interact with Datadog", "keywords": [ "datadog", diff --git a/packages/core/release-content.txt b/packages/core/release-content.txt index 1be12eaf1..43bcbb9e3 100644 --- a/packages/core/release-content.txt +++ b/packages/core/release-content.txt @@ -138,6 +138,10 @@ package/lib/commonjs/rum/instrumentation/interactionTracking/getJsxRuntime.js package/lib/commonjs/rum/instrumentation/interactionTracking/getJsxRuntime.js.map package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.js +package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.js.map +package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.js +package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.js.map package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js @@ -272,6 +276,10 @@ package/lib/module/rum/instrumentation/interactionTracking/getJsxRuntime.js package/lib/module/rum/instrumentation/interactionTracking/getJsxRuntime.js.map package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.js +package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.js.map +package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.js +package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.js.map package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js @@ -406,6 +414,10 @@ package/lib/typescript/rum/instrumentation/interactionTracking/getJsxRuntime.d.t package/lib/typescript/rum/instrumentation/interactionTracking/getJsxRuntime.d.ts.map package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.d.ts +package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.d.ts.map +package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.d.ts +package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.d.ts.map package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts.map package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts @@ -521,6 +533,7 @@ package/src/rum/DdRum.ts package/src/rum/__mocks__/MockTimeProvider.ts package/src/rum/__tests__/DdRum.test.ts package/src/rum/__tests__/DdRumTimeProvider.test.ts +package/src/rum/__tests__/__utils__/TracingHeadersUtils.ts package/src/rum/eventMappers/actionEventMapper.ts package/src/rum/eventMappers/errorEventMapper.ts package/src/rum/eventMappers/resourceEventMapper.ts @@ -534,6 +547,8 @@ package/src/rum/instrumentation/interactionTracking/getJsxRuntime.ts package/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx package/src/rum/instrumentation/resourceTracking/__tests__/DdRumResourceTracking.test.ts package/src/rum/instrumentation/resourceTracking/__tests__/__utils__/XMLHttpRequestMock.ts +package/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.ts +package/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.ts package/src/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.tsx package/src/rum/instrumentation/resourceTracking/distributedTracing/__tests__/__utils__/TracingIdentifierUtils.ts package/src/rum/instrumentation/resourceTracking/distributedTracing/__tests__/distributedTracing.test.ts diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts index a11f179fe..012637442 100644 --- a/packages/core/src/version.ts +++ b/packages/core/src/version.ts @@ -1,2 +1,2 @@ // generated by genversion -export const version = '2.6.1'; +export const version = '2.6.2'; diff --git a/packages/internal-testing-tools/package.json b/packages/internal-testing-tools/package.json index e463ff6e3..98428b645 100644 --- 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.6.1", + "version": "2.6.2", "description": "Internal tools for testing the Datadog React Native SDK.", "keywords": [ "datadog", diff --git a/packages/react-native-apollo-client/package.json b/packages/react-native-apollo-client/package.json index a60efd64f..69df2db5d 100644 --- 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.6.1", + "version": "2.6.2", "description": "A client-side React Native module to interact with Apollo Client and Datadog", "keywords": [ "datadog", diff --git a/packages/react-native-navigation/package.json b/packages/react-native-navigation/package.json index 39670fe38..8bcbbe27d 100644 --- 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": "2.6.1", + "version": "2.6.2", "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": "^2.6.1", + "@datadog/mobile-react-native": "^2.6.2", "@testing-library/react-native": "7.0.2", "react-native-builder-bob": "0.26.0", "react-native-gesture-handler": "1.10.3", diff --git a/packages/react-native-navigation/release-content.txt b/packages/react-native-navigation/release-content.txt index 1a44ebdb6..69e013432 100644 --- a/packages/react-native-navigation/release-content.txt +++ b/packages/react-native-navigation/release-content.txt @@ -55,6 +55,10 @@ package/lib/typescript/core/src/rum/instrumentation/interactionTracking/getJsxRu package/lib/typescript/core/src/rum/instrumentation/interactionTracking/getJsxRuntime.d.ts.map package/lib/typescript/core/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts package/lib/typescript/core/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.d.ts +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.d.ts.map +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.d.ts +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.d.ts.map package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts.map package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts diff --git a/packages/react-native-session-replay/package.json b/packages/react-native-session-replay/package.json index a607fbe6a..03b70e17a 100644 --- a/packages/react-native-session-replay/package.json +++ b/packages/react-native-session-replay/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-session-replay", - "version": "2.6.1", + "version": "2.6.2", "description": "A client-side React Native module to enable session replay with Datadog", "keywords": [ "datadog", diff --git a/packages/react-native-webview/package.json b/packages/react-native-webview/package.json index 56d35170d..05515e05c 100644 --- 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": "2.6.1", + "version": "2.6.2", "description": "A client-side React Native module to interact with react-native-webview and Datadog", "keywords": [ "datadog", diff --git a/packages/react-navigation/package.json b/packages/react-navigation/package.json index 1882d30db..d67af9530 100644 --- a/packages/react-navigation/package.json +++ b/packages/react-navigation/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-navigation", - "version": "2.6.1", + "version": "2.6.2", "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": "^2.6.1", + "@datadog/mobile-react-native": "^2.6.2", "@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/packages/react-navigation/release-content.txt b/packages/react-navigation/release-content.txt index c2937654a..7aad876bf 100644 --- a/packages/react-navigation/release-content.txt +++ b/packages/react-navigation/release-content.txt @@ -59,6 +59,10 @@ package/lib/typescript/core/src/rum/instrumentation/interactionTracking/getJsxRu package/lib/typescript/core/src/rum/instrumentation/interactionTracking/getJsxRuntime.d.ts.map package/lib/typescript/core/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts package/lib/typescript/core/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.d.ts +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext.d.ts.map +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.d.ts +package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier.d.ts.map package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts.map package/lib/typescript/core/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts diff --git a/yarn.lock b/yarn.lock index 6859e1559..bb1a27320 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2919,7 +2919,7 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-native-code-push@workspace:packages/codepush" dependencies: - "@datadog/mobile-react-native": ^2.6.1 + "@datadog/mobile-react-native": ^2.6.2 "@testing-library/react-native": 7.0.2 react-native-builder-bob: 0.26.0 react-native-code-push: 7.1.0 @@ -2935,7 +2935,7 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-native-navigation@workspace:packages/react-native-navigation" dependencies: - "@datadog/mobile-react-native": ^2.6.1 + "@datadog/mobile-react-native": ^2.6.2 "@testing-library/react-native": 7.0.2 react-native-builder-bob: 0.26.0 react-native-gesture-handler: 1.10.3 @@ -2976,7 +2976,7 @@ __metadata: languageName: unknown linkType: soft -"@datadog/mobile-react-native@^2.6.1, @datadog/mobile-react-native@workspace:packages/core": +"@datadog/mobile-react-native@^2.6.2, @datadog/mobile-react-native@workspace:packages/core": version: 0.0.0-use.local resolution: "@datadog/mobile-react-native@workspace:packages/core" dependencies: @@ -2993,7 +2993,7 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-navigation@workspace:packages/react-navigation" dependencies: - "@datadog/mobile-react-native": ^2.6.1 + "@datadog/mobile-react-native": ^2.6.2 "@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"