@datadog/mobile-react-native 2.6.3 → 2.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (162) hide show
  1. package/DatadogSDKReactNative.podspec +6 -6
  2. package/android/build.gradle +4 -4
  3. package/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +17 -1
  4. package/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt +26 -1
  5. package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +12 -0
  6. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +5 -2
  7. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +7 -2
  8. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +39 -3
  9. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +33 -5
  10. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  11. package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
  12. package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +28 -0
  13. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
  14. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +30 -0
  15. package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +9 -0
  16. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +3 -0
  17. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +226 -4
  18. package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +6 -0
  19. package/android/src/test/resources/input/complete-configuration.json +2 -1
  20. package/datadog-configuration.schema.json +4 -0
  21. package/ios/Sources/DdRum.mm +11 -0
  22. package/ios/Sources/DdRumImplementation.swift +7 -0
  23. package/ios/Sources/DdSdk.h +5 -3
  24. package/ios/Sources/DdSdk.mm +27 -1
  25. package/ios/Sources/DdSdkConfiguration.swift +5 -1
  26. package/ios/Sources/DdSdkImplementation.swift +31 -2
  27. package/ios/Sources/DdSdkNativeInitialization.swift +17 -6
  28. package/ios/Sources/RNDdSdkConfiguration.swift +7 -3
  29. package/ios/Sources/SdkVersion.swift +1 -1
  30. package/jest/mock.js +6 -0
  31. package/lib/commonjs/DdSdkReactNative.js +24 -4
  32. package/lib/commonjs/DdSdkReactNative.js.map +1 -1
  33. package/lib/commonjs/DdSdkReactNativeConfiguration.js +36 -1
  34. package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
  35. package/lib/commonjs/nativeModulesTypes.js +2 -1
  36. package/lib/commonjs/nativeModulesTypes.js.map +1 -1
  37. package/lib/commonjs/rum/DdRum.js +19 -3
  38. package/lib/commonjs/rum/DdRum.js.map +1 -1
  39. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +2 -2
  40. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  41. package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +2 -2
  42. package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
  43. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -0
  44. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
  45. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +6 -4
  46. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  47. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +31 -12
  48. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  49. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +9 -8
  50. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  51. package/lib/commonjs/rum/sessionId/sessionIdHelper.js +67 -0
  52. package/lib/commonjs/rum/sessionId/sessionIdHelper.js.map +1 -0
  53. package/lib/commonjs/rum/types.js +5 -0
  54. package/lib/commonjs/rum/types.js.map +1 -1
  55. package/lib/commonjs/sdk/EventEmitter/EventEmitter.js +51 -0
  56. package/lib/commonjs/sdk/EventEmitter/EventEmitter.js.map +1 -0
  57. package/lib/commonjs/specs/NativeDdRum.js.map +1 -1
  58. package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
  59. package/lib/commonjs/types.js +4 -1
  60. package/lib/commonjs/types.js.map +1 -1
  61. package/lib/commonjs/utils/Timer.js +2 -2
  62. package/lib/commonjs/utils/Timer.js.map +1 -1
  63. package/lib/commonjs/version.js +1 -1
  64. package/lib/module/DdSdkReactNative.js +24 -4
  65. package/lib/module/DdSdkReactNative.js.map +1 -1
  66. package/lib/module/DdSdkReactNativeConfiguration.js +36 -1
  67. package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
  68. package/lib/module/nativeModulesTypes.js +2 -1
  69. package/lib/module/nativeModulesTypes.js.map +1 -1
  70. package/lib/module/rum/DdRum.js +19 -3
  71. package/lib/module/rum/DdRum.js.map +1 -1
  72. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +1 -1
  73. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  74. package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +1 -1
  75. package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
  76. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -0
  77. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
  78. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +6 -4
  79. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  80. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +30 -11
  81. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  82. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +8 -6
  83. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  84. package/lib/module/rum/sessionId/sessionIdHelper.js +56 -0
  85. package/lib/module/rum/sessionId/sessionIdHelper.js.map +1 -0
  86. package/lib/module/rum/types.js +5 -0
  87. package/lib/module/rum/types.js.map +1 -1
  88. package/lib/module/sdk/EventEmitter/EventEmitter.js +43 -0
  89. package/lib/module/sdk/EventEmitter/EventEmitter.js.map +1 -0
  90. package/lib/module/specs/NativeDdRum.js.map +1 -1
  91. package/lib/module/specs/NativeDdSdk.js.map +1 -1
  92. package/lib/module/types.js +4 -1
  93. package/lib/module/types.js.map +1 -1
  94. package/lib/module/utils/Timer.js +1 -1
  95. package/lib/module/utils/Timer.js.map +1 -1
  96. package/lib/module/version.js +1 -1
  97. package/lib/typescript/DdSdkReactNative.d.ts +17 -2
  98. package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
  99. package/lib/typescript/DdSdkReactNativeConfiguration.d.ts +8 -0
  100. package/lib/typescript/DdSdkReactNativeConfiguration.d.ts.map +1 -1
  101. package/lib/typescript/rum/DdRum.d.ts +3 -0
  102. package/lib/typescript/rum/DdRum.d.ts.map +1 -1
  103. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +1 -1
  104. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
  105. package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts +1 -1
  106. package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts.map +1 -1
  107. package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts +2 -2
  108. package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts.map +1 -1
  109. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts +4 -2
  110. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts.map +1 -1
  111. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +3 -2
  112. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -1
  113. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
  114. package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts +26 -0
  115. package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts.map +1 -0
  116. package/lib/typescript/rum/types.d.ts +6 -0
  117. package/lib/typescript/rum/types.d.ts.map +1 -1
  118. package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts +12 -0
  119. package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts.map +1 -0
  120. package/lib/typescript/sdk/UserInfoSingleton/types.d.ts +3 -2
  121. package/lib/typescript/sdk/UserInfoSingleton/types.d.ts.map +1 -1
  122. package/lib/typescript/specs/NativeDdRum.d.ts +6 -0
  123. package/lib/typescript/specs/NativeDdRum.d.ts.map +1 -1
  124. package/lib/typescript/specs/NativeDdSdk.d.ts +17 -0
  125. package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
  126. package/lib/typescript/types.d.ts +22 -5
  127. package/lib/typescript/types.d.ts.map +1 -1
  128. package/lib/typescript/utils/Timer.d.ts +1 -1
  129. package/lib/typescript/utils/Timer.d.ts.map +1 -1
  130. package/lib/typescript/version.d.ts +1 -1
  131. package/package.json +2 -2
  132. package/src/DdSdkReactNative.tsx +40 -5
  133. package/src/DdSdkReactNativeConfiguration.tsx +10 -1
  134. package/src/__tests__/DdSdkReactNative.test.tsx +101 -12
  135. package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +3 -1
  136. package/src/__tests__/mock.test.ts +2 -1
  137. package/src/nativeModulesTypes.ts +1 -1
  138. package/src/rum/DdRum.ts +39 -4
  139. package/src/rum/__mocks__/MockTimeProvider.ts +1 -1
  140. package/src/rum/__tests__/DdRum.test.ts +17 -0
  141. package/src/rum/__tests__/DdRumTimeProvider.test.ts +1 -1
  142. package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +1 -1
  143. package/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx +2 -2
  144. package/src/rum/instrumentation/interactionTracking/EventsInterceptor.tsx +1 -1
  145. package/src/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.tsx +2 -2
  146. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.tsx +10 -4
  147. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +42 -15
  148. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +8 -6
  149. package/src/rum/sessionId/__tests__/sessionIdHelper.test.ts +162 -0
  150. package/src/rum/sessionId/sessionIdHelper.ts +59 -0
  151. package/src/rum/types.ts +7 -0
  152. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +1 -0
  153. package/src/sdk/EventEmitter/EventEmitter.ts +55 -0
  154. package/src/sdk/EventEmitter/__tests__/EventEmitter.test.ts +181 -0
  155. package/src/sdk/UserInfoSingleton/types.ts +5 -2
  156. package/src/specs/NativeDdRum.ts +7 -0
  157. package/src/specs/NativeDdSdk.ts +20 -0
  158. package/src/types.tsx +23 -5
  159. package/src/utils/Timer.ts +1 -1
  160. package/src/utils/__tests__/TimeProvider.test.tsx +1 -1
  161. package/src/utils/__tests__/Timer.test.ts +1 -1
  162. package/src/version.ts +1 -1
package/src/rum/DdRum.ts CHANGED
@@ -3,7 +3,6 @@
3
3
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
-
7
6
  import type { GestureResponderEvent } from 'react-native';
8
7
 
9
8
  import { InternalLog } from '../InternalLog';
@@ -30,6 +29,10 @@ import {
30
29
  getTracingContext,
31
30
  getTracingContextForPropagators
32
31
  } from './instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders';
32
+ import {
33
+ getCachedRumSessionId,
34
+ setCachedRumSessionId
35
+ } from './sessionId/sessionIdHelper';
33
36
  import type {
34
37
  ErrorSource,
35
38
  DdRumType,
@@ -51,6 +54,13 @@ class DdRumWrapper implements DdRumType {
51
54
  private actionEventMapper = generateActionEventMapper(undefined);
52
55
  private timeProvider: TimeProvider = new DefaultTimeProvider();
53
56
 
57
+ constructor() {
58
+ // Fetch the current session if any (because we might have missed the first RumSessionStarted event)
59
+ this.getCurrentSessionId().then(value => {
60
+ setCachedRumSessionId(value ?? null);
61
+ });
62
+ }
63
+
54
64
  startView = (
55
65
  key: string,
56
66
  name: string,
@@ -277,6 +287,18 @@ class DdRumWrapper implements DdRumType {
277
287
  return bufferVoidNativeCall(() => this.nativeRum.addTiming(name));
278
288
  };
279
289
 
290
+ addViewLoadingTime = (overwrite: boolean): Promise<void> => {
291
+ InternalLog.log(
292
+ overwrite
293
+ ? 'Adding and overwriting view loading to RUM View'
294
+ : 'Adding view loading to RUM View',
295
+ SdkVerbosity.DEBUG
296
+ );
297
+ return bufferVoidNativeCall(() =>
298
+ this.nativeRum.addViewLoadingTime(overwrite)
299
+ );
300
+ };
301
+
280
302
  stopSession = (): Promise<void> => {
281
303
  InternalLog.log('Stopping RUM Session', SdkVerbosity.DEBUG);
282
304
  return bufferVoidNativeCall(() => this.nativeRum.stopSession());
@@ -301,7 +323,14 @@ class DdRumWrapper implements DdRumType {
301
323
  if (!GlobalState.instance.isInitialized) {
302
324
  return undefined;
303
325
  }
304
- return this.nativeRum.getCurrentSessionId();
326
+ const sessionId = await this.nativeRum.getCurrentSessionId();
327
+ setCachedRumSessionId(sessionId ?? null);
328
+
329
+ return sessionId;
330
+ }
331
+
332
+ getCachedSessionId(): string | null {
333
+ return getCachedRumSessionId();
305
334
  }
306
335
 
307
336
  getTracingContext = (
@@ -309,7 +338,12 @@ class DdRumWrapper implements DdRumType {
309
338
  tracingSamplingRate: number,
310
339
  firstPartyHosts: FirstPartyHost[]
311
340
  ): DatadogTracingContext => {
312
- return getTracingContext(url, tracingSamplingRate, firstPartyHosts);
341
+ return getTracingContext(
342
+ url,
343
+ tracingSamplingRate,
344
+ firstPartyHosts,
345
+ getCachedRumSessionId()
346
+ );
313
347
  };
314
348
 
315
349
  getTracingContextForPropagators = (
@@ -318,7 +352,8 @@ class DdRumWrapper implements DdRumType {
318
352
  ): DatadogTracingContext => {
319
353
  return getTracingContextForPropagators(
320
354
  propagators,
321
- tracingSamplingRate
355
+ tracingSamplingRate,
356
+ getCachedRumSessionId()
322
357
  );
323
358
  };
324
359
 
@@ -7,7 +7,7 @@
7
7
  import type { Timestamp } from '../../utils/time-provider/TimeProvider';
8
8
  import { TimeProvider } from '../../utils/time-provider/TimeProvider';
9
9
 
10
- export default class MockTimeProvider extends TimeProvider {
10
+ export class MockTimeProvider extends TimeProvider {
11
11
  unixMockedTime: number;
12
12
  reactNativeMockedTime: number | null;
13
13
 
@@ -1622,6 +1622,23 @@ describe('DdRum', () => {
1622
1622
  });
1623
1623
  });
1624
1624
 
1625
+ describe('DdRum.addViewLoadingTime', () => {
1626
+ it('calls the native API', async () => {
1627
+ await DdRum.addViewLoadingTime(true);
1628
+ await DdRum.addViewLoadingTime(false);
1629
+
1630
+ expect(
1631
+ NativeModules.DdRum.addViewLoadingTime
1632
+ ).toHaveBeenNthCalledWith(1, true);
1633
+ expect(
1634
+ NativeModules.DdRum.addViewLoadingTime
1635
+ ).toHaveBeenNthCalledWith(2, false);
1636
+ expect(
1637
+ NativeModules.DdRum.addViewLoadingTime
1638
+ ).toHaveBeenCalledTimes(2);
1639
+ });
1640
+ });
1641
+
1625
1642
  describe('PropagatorTypes', () => {
1626
1643
  it('matches with the native name of propagators', () => {
1627
1644
  /**
@@ -5,7 +5,7 @@
5
5
  */
6
6
 
7
7
  import { DdRum } from '../DdRum';
8
- import MockTimeProvider from '../__mocks__/MockTimeProvider';
8
+ import { MockTimeProvider } from '../__mocks__/MockTimeProvider';
9
9
 
10
10
  jest.unmock('../../utils/time-provider/TimeProvider');
11
11
 
@@ -11,7 +11,7 @@ import { SdkVerbosity } from '../../../SdkVerbosity';
11
11
  import { DdRum } from '../../DdRum';
12
12
  import { RumActionType } from '../../types';
13
13
 
14
- import type EventsInterceptor from './EventsInterceptor';
14
+ import type { EventsInterceptor } from './EventsInterceptor';
15
15
 
16
16
  export const UNKNOWN_TARGET_NAME = 'unknown_target';
17
17
  const DEBOUNCE_EVENT_THRESHOLD_IN_MS = 10;
@@ -13,8 +13,8 @@ import { getErrorMessage } from '../../../utils/errorUtils';
13
13
 
14
14
  import { DdEventsInterceptor } from './DdEventsInterceptor';
15
15
  import type { DdEventsInterceptorOptions } from './DdEventsInterceptor';
16
- import type EventsInterceptor from './EventsInterceptor';
17
- import NoOpEventsInterceptor from './NoOpEventsInterceptor';
16
+ import type { EventsInterceptor } from './EventsInterceptor';
17
+ import { NoOpEventsInterceptor } from './NoOpEventsInterceptor';
18
18
  import { areObjectShallowEqual } from './ShallowObjectEqualityChecker';
19
19
  import { getJsxRuntimes } from './getJsxRuntime';
20
20
 
@@ -4,6 +4,6 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
- export default interface EventsInterceptor {
7
+ export interface EventsInterceptor {
8
8
  interceptOnPress(...args: any[]): void;
9
9
  }
@@ -4,9 +4,9 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
- import type EventsInterceptor from './EventsInterceptor';
7
+ import type { EventsInterceptor } from './EventsInterceptor';
8
8
 
9
- export default class NoOpEventsInterceptor implements EventsInterceptor {
9
+ export class NoOpEventsInterceptor implements EventsInterceptor {
10
10
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
11
11
  interceptOnPress(..._args: any[]): void {
12
12
  // NoOp
@@ -25,6 +25,7 @@ export type DdRumResourceTracingAttributes =
25
25
  samplingPriorityHeader: '1' | '0';
26
26
  rulePsr: number;
27
27
  propagatorTypes: PropagatorType[];
28
+ rumSessionId: string | null;
28
29
  }
29
30
  | {
30
31
  tracingStrategy: 'DISCARD';
@@ -41,11 +42,13 @@ const DISCARDED_TRACE_ATTRIBUTES: DdRumResourceTracingAttributes = {
41
42
  export const getTracingAttributes = ({
42
43
  hostname,
43
44
  firstPartyHostsRegexMap,
44
- tracingSamplingRate
45
+ tracingSamplingRate,
46
+ rumSessionId
45
47
  }: {
46
48
  hostname: Hostname | null;
47
49
  firstPartyHostsRegexMap: RegexMap;
48
50
  tracingSamplingRate: number;
51
+ rumSessionId: string | null;
49
52
  }): DdRumResourceTracingAttributes => {
50
53
  if (hostname === null) {
51
54
  return DISCARDED_TRACE_ATTRIBUTES;
@@ -57,7 +60,8 @@ export const getTracingAttributes = ({
57
60
  if (propagatorsForHost) {
58
61
  return generateTracingAttributesWithSampling(
59
62
  tracingSamplingRate,
60
- propagatorsForHost
63
+ propagatorsForHost,
64
+ rumSessionId
61
65
  );
62
66
  }
63
67
  return DISCARDED_TRACE_ATTRIBUTES;
@@ -65,7 +69,8 @@ export const getTracingAttributes = ({
65
69
 
66
70
  export const generateTracingAttributesWithSampling = (
67
71
  tracingSamplingRate: number,
68
- propagatorTypes: PropagatorType[]
72
+ propagatorTypes: PropagatorType[],
73
+ rumSessionId: string | null
69
74
  ): DdRumResourceTracingAttributes => {
70
75
  if (!propagatorTypes || propagatorTypes.length === 0) {
71
76
  return DISCARDED_TRACE_ATTRIBUTES;
@@ -82,7 +87,8 @@ export const generateTracingAttributesWithSampling = (
82
87
  samplingPriorityHeader: isSampled ? '1' : '0',
83
88
  tracingStrategy: 'KEEP',
84
89
  rulePsr: tracingSamplingRate / 100,
85
- propagatorTypes
90
+ propagatorTypes,
91
+ rumSessionId
86
92
  };
87
93
 
88
94
  return tracingAttributes;
@@ -28,6 +28,7 @@ export const TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
28
28
  export const PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
29
29
  export const TAGS_HEADER_KEY = 'x-datadog-tags';
30
30
  export const DD_TRACE_ID_TAG = '_dd.p.tid';
31
+ export const DD_RUM_SESSION_ID_TAG = '_dd.p.rsid';
31
32
 
32
33
  /**
33
34
  * OTel headers
@@ -69,17 +70,30 @@ export const getTracingHeadersFromAttributes = (
69
70
  value: tracingAttributes.spanId.toString(
70
71
  TracingIdFormat.decimal
71
72
  )
72
- },
73
- {
73
+ }
74
+ );
75
+ if (tracingAttributes.rumSessionId) {
76
+ headers.push({
77
+ header: TAGS_HEADER_KEY,
78
+ value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(
79
+ TracingIdFormat.paddedHighHex
80
+ )},${DD_RUM_SESSION_ID_TAG}=${
81
+ tracingAttributes.rumSessionId
82
+ }`
83
+ });
84
+ } else {
85
+ headers.push({
74
86
  header: TAGS_HEADER_KEY,
75
87
  value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(
76
88
  TracingIdFormat.paddedHighHex
77
89
  )}`
78
- }
79
- );
90
+ });
91
+ }
80
92
  break;
81
93
  }
82
94
  case PropagatorType.TRACECONTEXT: {
95
+ const isSampled =
96
+ tracingAttributes.samplingPriorityHeader === '1';
83
97
  headers.push(
84
98
  {
85
99
  header: TRACECONTEXT_HEADER_KEY,
@@ -87,16 +101,15 @@ export const getTracingHeadersFromAttributes = (
87
101
  version: '00',
88
102
  traceId: tracingAttributes.traceId,
89
103
  parentId: tracingAttributes.spanId,
90
- isSampled:
91
- tracingAttributes.samplingPriorityHeader === '1'
104
+ isSampled
92
105
  })
93
106
  },
94
107
  {
95
108
  header: TRACESTATE_HEADER_KEY,
96
109
  value: generateTraceStateHeader({
97
110
  parentId: tracingAttributes.spanId,
98
- isSampled:
99
- tracingAttributes.samplingPriorityHeader === '1'
111
+ isSampled,
112
+ rumSessionId: tracingAttributes.rumSessionId
100
113
  })
101
114
  }
102
115
  );
@@ -143,7 +156,8 @@ export const getTracingHeadersFromAttributes = (
143
156
  export const getTracingContext = (
144
157
  url: string,
145
158
  tracingSamplingRate: number,
146
- firstPartyHosts: FirstPartyHost[]
159
+ firstPartyHosts: FirstPartyHost[],
160
+ rumSessionId: string | null
147
161
  ): DatadogTracingContext => {
148
162
  const hostname = URLHostParser(url);
149
163
  const firstPartyHostsRegexMap = firstPartyHostsRegexMapBuilder(
@@ -152,7 +166,8 @@ export const getTracingContext = (
152
166
  const tracingAttributes = getTracingAttributes({
153
167
  hostname,
154
168
  firstPartyHostsRegexMap,
155
- tracingSamplingRate
169
+ tracingSamplingRate,
170
+ rumSessionId
156
171
  });
157
172
 
158
173
  return getTracingContextForAttributes(
@@ -163,10 +178,15 @@ export const getTracingContext = (
163
178
 
164
179
  export const getTracingContextForPropagators = (
165
180
  propagators: PropagatorType[],
166
- tracingSamplingRate: number
181
+ tracingSamplingRate: number,
182
+ rumSessionId: string | null
167
183
  ): DatadogTracingContext => {
168
184
  return getTracingContextForAttributes(
169
- generateTracingAttributesWithSampling(tracingSamplingRate, propagators),
185
+ generateTracingAttributesWithSampling(
186
+ tracingSamplingRate,
187
+ propagators,
188
+ rumSessionId
189
+ ),
170
190
  tracingSamplingRate
171
191
  );
172
192
  };
@@ -221,16 +241,23 @@ const generateTraceContextHeader = ({
221
241
 
222
242
  const generateTraceStateHeader = ({
223
243
  parentId,
224
- isSampled
244
+ isSampled,
245
+ rumSessionId
225
246
  }: {
226
247
  parentId: SpanId;
227
248
  isSampled: boolean;
249
+ rumSessionId: string | null;
228
250
  }) => {
229
251
  const sampled = `s:${isSampled ? '1' : '0'}`;
230
252
  const origin = 'o:rum';
231
253
  const parent = `p:${parentId.toString(TracingIdFormat.paddedHex)}`;
232
-
233
- return `dd=${sampled};${origin};${parent}`;
254
+ const baseHeaderValue = `dd=${sampled};${origin};${parent}`;
255
+ if (rumSessionId) {
256
+ const session = `t.rsid:${rumSessionId}`;
257
+ return `${baseHeaderValue};${session}`;
258
+ } else {
259
+ return baseHeaderValue;
260
+ }
234
261
  };
235
262
 
236
263
  const generateB3Header = ({
@@ -4,7 +4,8 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
- import Timer from '../../../../../utils/Timer';
7
+ import { Timer } from '../../../../../utils/Timer';
8
+ import { DdRum } from '../../../../DdRum';
8
9
  import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
9
10
  import type { DdRumResourceTracingAttributes } from '../../distributedTracing/distributedTracing';
10
11
  import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
@@ -91,7 +92,7 @@ const proxyOpen = (
91
92
  const firstPartyHostsRegexMap = context.firstPartyHostsRegexMap;
92
93
  const tracingSamplingRate = context.tracingSamplingRate;
93
94
 
94
- xhrType.prototype.open = function (
95
+ xhrType.prototype.open = function open(
95
96
  this: DdRumXhr,
96
97
  method: string,
97
98
  url: string
@@ -108,7 +109,8 @@ const proxyOpen = (
108
109
  tracingAttributes: getTracingAttributes({
109
110
  hostname,
110
111
  firstPartyHostsRegexMap,
111
- tracingSamplingRate
112
+ tracingSamplingRate,
113
+ rumSessionId: DdRum.getCachedSessionId()
112
114
  })
113
115
  };
114
116
  // eslint-disable-next-line prefer-rest-params
@@ -120,7 +122,7 @@ const proxySend = (providers: XHRProxyProviders): void => {
120
122
  const xhrType = providers.xhrType;
121
123
  const originalXhrSend = xhrType.prototype.send;
122
124
 
123
- xhrType.prototype.send = function (this: DdRumXhr) {
125
+ xhrType.prototype.send = function send(this: DdRumXhr) {
124
126
  if (this._datadog_xhr) {
125
127
  // keep track of start time
126
128
  this._datadog_xhr.timer.start();
@@ -147,7 +149,7 @@ const proxyOnReadyStateChange = (
147
149
  const xhrType = providers.xhrType;
148
150
  const originalOnreadystatechange = xhrProxy.onreadystatechange;
149
151
 
150
- xhrProxy.onreadystatechange = function () {
152
+ xhrProxy.onreadystatechange = function onreadystatechange() {
151
153
  if (xhrProxy.readyState === xhrType.DONE) {
152
154
  if (!xhrProxy._datadog_xhr.reported) {
153
155
  reportXhr(xhrProxy, providers.resourceReporter);
@@ -204,7 +206,7 @@ const proxySetRequestHeader = (providers: XHRProxyProviders): void => {
204
206
  const xhrType = providers.xhrType;
205
207
  const originalXhrSetRequestHeader = xhrType.prototype.setRequestHeader;
206
208
 
207
- xhrType.prototype.setRequestHeader = function (
209
+ xhrType.prototype.setRequestHeader = function sendRequestHeader(
208
210
  this: DdRumXhr,
209
211
  header: string,
210
212
  value: string
@@ -0,0 +1,162 @@
1
+ /*
2
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
+ * Copyright 2016-Present Datadog, Inc.
5
+ */
6
+
7
+ /* eslint-disable @typescript-eslint/no-var-requires */
8
+ /* eslint-disable global-require */
9
+ import { createNativeEventEmitterForModule } from '../../../sdk/EventEmitter/EventEmitter';
10
+
11
+ describe('sessionIdHelper', () => {
12
+ beforeEach(() => {
13
+ jest.resetModules();
14
+ });
15
+
16
+ it('M registerRumSessionIdListener correctly registers a listener for RumSessionStarted', () => {
17
+ // GIVEN
18
+ const { registerRumSessionIdListener } = require('../sessionIdHelper');
19
+ const nativeModuleMock = {
20
+ addListener: jest.fn(),
21
+ removeListeners: jest.fn()
22
+ };
23
+
24
+ const eventEmitter = createNativeEventEmitterForModule(
25
+ nativeModuleMock
26
+ );
27
+
28
+ // WHEN
29
+ registerRumSessionIdListener();
30
+
31
+ // THEN
32
+ expect(eventEmitter.listenerCount('RumSessionStarted')).toBe(1);
33
+ });
34
+
35
+ it('M registerRumSessionIdListener does not register more than one listener for RumSessionStarted', () => {
36
+ // GIVEN
37
+ const { registerRumSessionIdListener } = require('../sessionIdHelper');
38
+
39
+ const nativeModuleMock = {
40
+ addListener: jest.fn(),
41
+ removeListeners: jest.fn()
42
+ };
43
+
44
+ const eventEmitter = createNativeEventEmitterForModule(
45
+ nativeModuleMock
46
+ );
47
+
48
+ // WHEN
49
+ registerRumSessionIdListener();
50
+ registerRumSessionIdListener();
51
+ registerRumSessionIdListener();
52
+
53
+ // THEN
54
+ expect(eventEmitter.listenerCount('RumSessionStarted')).toBe(1);
55
+ });
56
+
57
+ it('M removeRumSessionIdListeners should remove RumSessionStarted listener', () => {
58
+ // GIVEN
59
+ const {
60
+ registerRumSessionIdListener,
61
+ removeRumSessionIdListeners
62
+ } = require('../sessionIdHelper');
63
+
64
+ const nativeModuleMock = {
65
+ addListener: jest.fn(),
66
+ removeListeners: jest.fn()
67
+ };
68
+ const eventEmitter = createNativeEventEmitterForModule(
69
+ nativeModuleMock
70
+ );
71
+
72
+ registerRumSessionIdListener();
73
+ expect(eventEmitter.listenerCount('RumSessionStarted')).toBe(1);
74
+
75
+ // WHEN
76
+ removeRumSessionIdListeners();
77
+
78
+ // THEN
79
+ expect(eventEmitter.listenerCount('RumSessionStarted')).toBe(0);
80
+ });
81
+
82
+ it('M getCachedRumSessionId should return null W { cachedRumSessionId has not been set }', () => {
83
+ // GIVEN
84
+ const { getCachedRumSessionId } = require('../sessionIdHelper');
85
+
86
+ // WHEN
87
+ const sessionId = getCachedRumSessionId();
88
+
89
+ // THEN
90
+ expect(sessionId).toBeNull();
91
+ });
92
+
93
+ it('M getCachedRumSessionId should return cached RUM Session ID W { cachedRumSessionId has been set }', () => {
94
+ // GIVEN
95
+ const {
96
+ setCachedRumSessionId,
97
+ getCachedRumSessionId
98
+ } = require('../sessionIdHelper');
99
+
100
+ setCachedRumSessionId('TEST_SESSION_ID');
101
+
102
+ // WHEN
103
+ const sessionId = getCachedRumSessionId();
104
+
105
+ // THEN
106
+ expect(sessionId).toBe('TEST_SESSION_ID');
107
+ });
108
+
109
+ it('M getCachedRumSessionId should return sessionID W { registered listener is called }', () => {
110
+ // GIVEN
111
+ const {
112
+ registerRumSessionIdListener,
113
+ getCachedRumSessionId
114
+ } = require('../sessionIdHelper');
115
+
116
+ const nativeModuleMock = {
117
+ addListener: jest.fn(),
118
+ removeListeners: jest.fn()
119
+ };
120
+ const eventEmitter = createNativeEventEmitterForModule(
121
+ nativeModuleMock
122
+ );
123
+
124
+ registerRumSessionIdListener();
125
+
126
+ // WHEN
127
+ const event = {
128
+ sessionId: 'LISTENER_TEST_SESSION_ID'
129
+ };
130
+ eventEmitter.emit('RumSessionStarted', event);
131
+
132
+ // THEN
133
+ expect(getCachedRumSessionId()).toBe('LISTENER_TEST_SESSION_ID');
134
+ });
135
+
136
+ it('M getCachedRumSessionId should be null W { registered listener is called with undefined value }', () => {
137
+ // GIVEN
138
+ const {
139
+ registerRumSessionIdListener,
140
+ getCachedRumSessionId
141
+ } = require('../sessionIdHelper');
142
+
143
+ const nativeModuleMock = {
144
+ addListener: jest.fn(),
145
+ removeListeners: jest.fn()
146
+ };
147
+ const eventEmitter = createNativeEventEmitterForModule(
148
+ nativeModuleMock
149
+ );
150
+
151
+ registerRumSessionIdListener();
152
+
153
+ // WHEN
154
+ const event = {
155
+ sessionId: undefined
156
+ };
157
+ eventEmitter.emit('RumSessionStarted', event);
158
+
159
+ // THEN
160
+ expect(getCachedRumSessionId()).toBeNull();
161
+ });
162
+ });
@@ -0,0 +1,59 @@
1
+ /*
2
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
+ * Copyright 2016-Present Datadog, Inc.
5
+ */
6
+ import { NativeModules } from 'react-native';
7
+
8
+ import { createNativeEventEmitterForModule } from '../../sdk/EventEmitter/EventEmitter';
9
+
10
+ const RUM_SESSION_STARTED_EVENT_KEY = 'RumSessionStarted';
11
+
12
+ let cachedRumSessionId: string | null;
13
+
14
+ /**
15
+ * [INTERNAL API]
16
+ * Registers a listener for the native 'RumSessionStarted' event, to update
17
+ * the cached Session ID.
18
+ */
19
+ export const registerRumSessionIdListener = () => {
20
+ const eventEmitter = createNativeEventEmitterForModule(NativeModules.DdSdk);
21
+ if (eventEmitter.listenerCount(RUM_SESSION_STARTED_EVENT_KEY) > 0) {
22
+ return;
23
+ }
24
+
25
+ eventEmitter.addListener(RUM_SESSION_STARTED_EVENT_KEY, (event: any) => {
26
+ const field = 'sessionId';
27
+ const sessionId = event[field] as string | null;
28
+ cachedRumSessionId = sessionId;
29
+ });
30
+ };
31
+
32
+ /**
33
+ * [INTERNAL API]
34
+ * Removes all listeners for the native 'RumSessionStarted' event (USEFUL FOR TESTING).
35
+ */
36
+ export const removeRumSessionIdListeners = () => {
37
+ const eventEmitter = createNativeEventEmitterForModule(NativeModules.DdSdk);
38
+ eventEmitter.removeAllListeners(RUM_SESSION_STARTED_EVENT_KEY);
39
+ };
40
+
41
+ /**
42
+ * [INTERNAL API]
43
+ * Returns the cached RUM Session ID, updated either by:
44
+ * - `RUMSessionStarted` events from the native layer
45
+ * - Calls to `DdRum.getCurrentSessionId()` public API
46
+ * @returns The cached RUM Session ID.
47
+ */
48
+ export const getCachedRumSessionId = (): string | null => {
49
+ return cachedRumSessionId ?? null;
50
+ };
51
+
52
+ /**
53
+ * [INTERNAL API]
54
+ * Manually overrides the cached RUM Session ID.
55
+ * @param sessionId The RUM Session ID to set (or null).
56
+ */
57
+ export const setCachedRumSessionId = (sessionId: string | null) => {
58
+ cachedRumSessionId = sessionId;
59
+ };
package/src/rum/types.ts CHANGED
@@ -146,6 +146,13 @@ export type DdRumType = {
146
146
  */
147
147
  addTiming(name: string): Promise<void>;
148
148
 
149
+ /**
150
+ * Adds the loading time of the view to the active view.
151
+ * It is calculated as the difference between the current time and the start time of the view.
152
+ * @param overwrite: If true, overwrites the previously calculated view loading time.
153
+ */
154
+ addViewLoadingTime(overwrite: boolean): Promise<void>;
155
+
149
156
  /**
150
157
  * Stops the current RUM Session.
151
158
  */
@@ -86,6 +86,7 @@ describe('DatadogProvider', () => {
86
86
  "customEndpoints": {},
87
87
  "env": "fakeEnv",
88
88
  "firstPartyHosts": [],
89
+ "initialResourceThreshold": undefined,
89
90
  "longTaskThresholdMs": 0,
90
91
  "nativeCrashReportEnabled": false,
91
92
  "nativeInteractionTracking": false,