@datadog/mobile-react-native 2.6.4 → 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 (100) hide show
  1. package/DatadogSDKReactNative.podspec +6 -6
  2. package/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +17 -1
  3. package/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt +26 -1
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +5 -2
  5. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +7 -2
  6. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +38 -1
  7. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +7 -0
  8. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  9. package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +28 -0
  10. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +19 -0
  11. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +2 -0
  12. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +226 -4
  13. package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +6 -0
  14. package/android/src/test/resources/input/complete-configuration.json +2 -1
  15. package/datadog-configuration.schema.json +4 -0
  16. package/ios/Sources/DdSdk.mm +22 -0
  17. package/ios/Sources/DdSdkConfiguration.swift +5 -1
  18. package/ios/Sources/DdSdkImplementation.swift +29 -0
  19. package/ios/Sources/DdSdkNativeInitialization.swift +6 -0
  20. package/ios/Sources/RNDdSdkConfiguration.swift +7 -3
  21. package/ios/Sources/SdkVersion.swift +1 -1
  22. package/jest/mock.js +3 -0
  23. package/lib/commonjs/DdSdkReactNative.js +24 -4
  24. package/lib/commonjs/DdSdkReactNative.js.map +1 -1
  25. package/lib/commonjs/DdSdkReactNativeConfiguration.js +34 -0
  26. package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
  27. package/lib/commonjs/rum/DdRum.js +9 -16
  28. package/lib/commonjs/rum/DdRum.js.map +1 -1
  29. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -0
  30. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
  31. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +1 -1
  32. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  33. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +2 -2
  34. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  35. package/lib/commonjs/rum/sessionId/sessionIdHelper.js +67 -0
  36. package/lib/commonjs/rum/sessionId/sessionIdHelper.js.map +1 -0
  37. package/lib/commonjs/rum/types.js +5 -0
  38. package/lib/commonjs/rum/types.js.map +1 -1
  39. package/lib/commonjs/sdk/EventEmitter/EventEmitter.js +51 -0
  40. package/lib/commonjs/sdk/EventEmitter/EventEmitter.js.map +1 -0
  41. package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
  42. package/lib/commonjs/types.js +4 -2
  43. package/lib/commonjs/types.js.map +1 -1
  44. package/lib/commonjs/version.js +1 -1
  45. package/lib/module/DdSdkReactNative.js +24 -4
  46. package/lib/module/DdSdkReactNative.js.map +1 -1
  47. package/lib/module/DdSdkReactNativeConfiguration.js +34 -0
  48. package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
  49. package/lib/module/rum/DdRum.js +9 -16
  50. package/lib/module/rum/DdRum.js.map +1 -1
  51. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -0
  52. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
  53. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +1 -1
  54. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  55. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +2 -2
  56. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  57. package/lib/module/rum/sessionId/sessionIdHelper.js +56 -0
  58. package/lib/module/rum/sessionId/sessionIdHelper.js.map +1 -0
  59. package/lib/module/rum/types.js +5 -0
  60. package/lib/module/rum/types.js.map +1 -1
  61. package/lib/module/sdk/EventEmitter/EventEmitter.js +43 -0
  62. package/lib/module/sdk/EventEmitter/EventEmitter.js.map +1 -0
  63. package/lib/module/specs/NativeDdSdk.js.map +1 -1
  64. package/lib/module/types.js +4 -2
  65. package/lib/module/types.js.map +1 -1
  66. package/lib/module/version.js +1 -1
  67. package/lib/typescript/DdSdkReactNative.d.ts +17 -2
  68. package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
  69. package/lib/typescript/DdSdkReactNativeConfiguration.d.ts +8 -0
  70. package/lib/typescript/DdSdkReactNativeConfiguration.d.ts.map +1 -1
  71. package/lib/typescript/rum/DdRum.d.ts +0 -1
  72. package/lib/typescript/rum/DdRum.d.ts.map +1 -1
  73. package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts +26 -0
  74. package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts.map +1 -0
  75. package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts +12 -0
  76. package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts.map +1 -0
  77. package/lib/typescript/sdk/UserInfoSingleton/types.d.ts +3 -2
  78. package/lib/typescript/sdk/UserInfoSingleton/types.d.ts.map +1 -1
  79. package/lib/typescript/specs/NativeDdSdk.d.ts +11 -0
  80. package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
  81. package/lib/typescript/types.d.ts +22 -5
  82. package/lib/typescript/types.d.ts.map +1 -1
  83. package/lib/typescript/version.d.ts +1 -1
  84. package/package.json +2 -2
  85. package/src/DdSdkReactNative.tsx +40 -5
  86. package/src/DdSdkReactNativeConfiguration.tsx +9 -0
  87. package/src/__tests__/DdSdkReactNative.test.tsx +101 -12
  88. package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +3 -1
  89. package/src/rum/DdRum.ts +13 -21
  90. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.tsx +1 -1
  91. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +2 -2
  92. package/src/rum/sessionId/__tests__/sessionIdHelper.test.ts +162 -0
  93. package/src/rum/sessionId/sessionIdHelper.ts +59 -0
  94. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +1 -0
  95. package/src/sdk/EventEmitter/EventEmitter.ts +55 -0
  96. package/src/sdk/EventEmitter/__tests__/EventEmitter.test.ts +181 -0
  97. package/src/sdk/UserInfoSingleton/types.ts +5 -2
  98. package/src/specs/NativeDdSdk.ts +13 -0
  99. package/src/types.tsx +23 -5
  100. package/src/version.ts +1 -1
@@ -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
+ };
@@ -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,
@@ -0,0 +1,55 @@
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 { NativeEventEmitter, Platform } from 'react-native';
7
+ import type { NativeModule } from 'react-native';
8
+
9
+ const EMPTY_NATIVE_MODULE: NativeModule = {
10
+ addListener(_: string): void {
11
+ /* empty */
12
+ },
13
+ removeListeners(_: number): void {
14
+ /* empty */
15
+ }
16
+ };
17
+
18
+ const nativeEventEmitters = new Map<NativeModule, NativeEventEmitter>();
19
+
20
+ /**
21
+ * Default implementation for creating a NativeEventEmitter.
22
+ * @param nativeModule The NativeModule for which the NativeEventEmitter is created for.
23
+ * @returns The NativeEventEmitter.
24
+ */
25
+ const createDefaultNativeEventEmitter = (
26
+ nativeModule?: NativeModule
27
+ ): NativeEventEmitter => {
28
+ return new NativeEventEmitter(nativeModule);
29
+ };
30
+
31
+ /**
32
+ * [INTERNAL API]
33
+ * Creates a {@link NativeEventEmitter} from the given {@link NativeModule}.
34
+ * @param nativeModule The {@link NativeModule} to create the {@link NativeEventEmitter} for.
35
+ * @param createNativeEventEmitter Custom implementation for creating a {@link NativeEventEmitter}.
36
+ * Defaults to {@link createDefaultNativeEventEmitter} (USEFUL FOR TESTING)
37
+ * @returns The created {@link NativeEventEmitter}.
38
+ */
39
+ export const createNativeEventEmitterForModule = (
40
+ nativeModule: NativeModule,
41
+ createNativeEventEmitter: (
42
+ nativeEventModule?: NativeModule
43
+ ) => NativeEventEmitter = createDefaultNativeEventEmitter
44
+ ): NativeEventEmitter => {
45
+ const eventEmitter = nativeEventEmitters.get(nativeModule);
46
+ if (!eventEmitter) {
47
+ const newEventEmitter =
48
+ Platform.OS === 'android'
49
+ ? createNativeEventEmitter()
50
+ : createNativeEventEmitter(nativeModule ?? EMPTY_NATIVE_MODULE);
51
+ nativeEventEmitters.set(nativeModule, newEventEmitter);
52
+ return newEventEmitter;
53
+ }
54
+ return eventEmitter;
55
+ };
@@ -0,0 +1,181 @@
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 type { NativeModule } from 'react-native';
10
+ import { NativeModules, Platform } from 'react-native';
11
+
12
+ const mockPlatform = (platform: typeof Platform.OS) => {
13
+ Object.defineProperty(Platform, 'OS', {
14
+ value: platform
15
+ });
16
+ };
17
+
18
+ describe('EventEmitter', () => {
19
+ let defaultPlatform: typeof Platform.OS;
20
+ const createNativeEventEmitterMock = jest.fn();
21
+
22
+ beforeAll(() => {
23
+ createNativeEventEmitterMock.mockReturnValue({});
24
+ });
25
+
26
+ beforeEach(() => {
27
+ defaultPlatform = Platform.OS;
28
+ createNativeEventEmitterMock.mockClear();
29
+ jest.resetModules();
30
+ });
31
+
32
+ afterEach(() => {
33
+ mockPlatform(defaultPlatform);
34
+ });
35
+
36
+ it('M createNativeEventEmitterForModule returns valid event emitter W { platform = Android, NativeModules = undefined }', () => {
37
+ // GIVEN
38
+ mockPlatform('android');
39
+ const createNativeEventEmitterForModule = require('../EventEmitter')
40
+ .createNativeEventEmitterForModule;
41
+
42
+ // WHEN
43
+ const eventEmitter = createNativeEventEmitterForModule(
44
+ NativeModules.DdSdk,
45
+ createNativeEventEmitterMock
46
+ );
47
+
48
+ // THEN
49
+ expect(eventEmitter).toBeDefined();
50
+ expect(createNativeEventEmitterMock).toHaveBeenCalledWith();
51
+ });
52
+
53
+ it('M createNativeEventEmitterForModule returns valid event emitter W { platform = iOS, NativeModules = undefined }', () => {
54
+ // GIVEN
55
+ mockPlatform('ios');
56
+ const createNativeEventEmitterForModule = require('../EventEmitter')
57
+ .createNativeEventEmitterForModule;
58
+
59
+ // WHEN
60
+ const eventEmitter = createNativeEventEmitterForModule(
61
+ NativeModules.DdSdk,
62
+ createNativeEventEmitterMock
63
+ );
64
+
65
+ // THEN
66
+ expect(eventEmitter).toBeDefined();
67
+ expect(createNativeEventEmitterMock).toHaveBeenCalledWith(
68
+ // iOS expects an object of type NativeModule to be passed
69
+ expect.objectContaining({
70
+ addListener: expect.any(Function),
71
+ removeListeners: expect.any(Function)
72
+ } as NativeModule)
73
+ );
74
+ });
75
+
76
+ it('M createNativeEventEmitterForModule returns valid event emitter W { platform = Android, NativeModules != undefined }', () => {
77
+ // GIVEN
78
+ mockPlatform('android');
79
+ const createNativeEventEmitterForModule = require('../EventEmitter')
80
+ .createNativeEventEmitterForModule;
81
+
82
+ const nativeModuleMock = {
83
+ addListener: jest.fn(),
84
+ removeListeners: jest.fn()
85
+ };
86
+
87
+ // WHEN
88
+ const eventEmitter = createNativeEventEmitterForModule(
89
+ nativeModuleMock,
90
+ createNativeEventEmitterMock
91
+ );
92
+
93
+ // THEN
94
+ expect(eventEmitter).toBeDefined();
95
+ expect(createNativeEventEmitterMock).toHaveBeenCalledWith();
96
+ });
97
+
98
+ it('M createNativeEventEmitterForModule returns valid event emitter W { platform= iOS, NativeModules != undefined }', () => {
99
+ // GIVEN
100
+ mockPlatform('ios');
101
+ const createNativeEventEmitterForModule = require('../EventEmitter')
102
+ .createNativeEventEmitterForModule;
103
+
104
+ const nativeModuleMock = {
105
+ addListener: () => {
106
+ /* empty */
107
+ },
108
+ removeListeners: () => {
109
+ /* empty */
110
+ },
111
+ testFunction: () => {
112
+ /* empty */
113
+ }
114
+ };
115
+
116
+ // WHEN
117
+ const eventEmitter = createNativeEventEmitterForModule(
118
+ nativeModuleMock,
119
+ createNativeEventEmitterMock
120
+ );
121
+
122
+ // THEN
123
+ expect(eventEmitter).toBeDefined();
124
+ expect(createNativeEventEmitterMock).toHaveBeenCalledWith(
125
+ nativeModuleMock
126
+ );
127
+ });
128
+
129
+ it('M createNativeEventEmitterForModule initializes NativeEventEmitter only once W { platform = Android }', () => {
130
+ // GIVEN
131
+ mockPlatform('android');
132
+ const createNativeEventEmitterForModule = require('../EventEmitter')
133
+ .createNativeEventEmitterForModule;
134
+
135
+ // WHEN
136
+ const eventEmitter1 = createNativeEventEmitterForModule(
137
+ NativeModules.DdSdk,
138
+ createNativeEventEmitterMock
139
+ );
140
+ const eventEmitter2 = createNativeEventEmitterForModule(
141
+ NativeModules.DdSdk,
142
+ createNativeEventEmitterMock
143
+ );
144
+
145
+ // THEN
146
+ expect(eventEmitter1).toBeDefined();
147
+ expect(eventEmitter2).toBeDefined();
148
+ expect(eventEmitter1).toBe(eventEmitter2);
149
+ expect(createNativeEventEmitterMock).toHaveBeenCalledTimes(1);
150
+ expect(createNativeEventEmitterMock).toHaveBeenCalledWith();
151
+ });
152
+
153
+ it('M createNativeEventEmitterForModule initializes NativeEventEmitter only once W { platform = iOS }', () => {
154
+ // GIVEN
155
+ mockPlatform('ios');
156
+ const createNativeEventEmitterForModule = require('../EventEmitter')
157
+ .createNativeEventEmitterForModule;
158
+
159
+ // WHEN
160
+ const eventEmitter1 = createNativeEventEmitterForModule(
161
+ NativeModules.DdSdk,
162
+ createNativeEventEmitterMock
163
+ );
164
+ const eventEmitter2 = createNativeEventEmitterForModule(
165
+ NativeModules.DdSdk,
166
+ createNativeEventEmitterMock
167
+ );
168
+
169
+ // THEN
170
+ expect(eventEmitter1).toBeDefined();
171
+ expect(eventEmitter2).toBeDefined();
172
+ expect(eventEmitter1).toBe(eventEmitter2);
173
+ expect(createNativeEventEmitterMock).toHaveBeenCalledTimes(1);
174
+ expect(createNativeEventEmitterMock).toHaveBeenCalledWith(
175
+ expect.objectContaining({
176
+ addListener: expect.any(Function),
177
+ removeListeners: expect.any(Function)
178
+ })
179
+ );
180
+ });
181
+ });
@@ -5,8 +5,11 @@
5
5
  */
6
6
 
7
7
  export type UserInfo = {
8
- readonly id?: string;
8
+ readonly id?: string /** @deprecated To be made mandatory when removing DdSdkReactnative.setUser */;
9
9
  readonly name?: string;
10
10
  readonly email?: string;
11
- readonly [key: string]: unknown;
11
+ readonly extraInfo?: Record<string, unknown>;
12
+ readonly [
13
+ key: string
14
+ ]: unknown /** @deprecated To be removed alongside DdSdkReactnative.setUser */;
12
15
  };
@@ -28,10 +28,23 @@ export interface Spec extends TurboModule {
28
28
 
29
29
  /**
30
30
  * Set the user information.
31
+ * @deprecated: Use setUserInfo instead
31
32
  * @param user: The user object (use builtin attributes: 'id', 'email', 'name', and/or any custom attribute).
32
33
  */
33
34
  setUser(user: Object): Promise<Object>;
34
35
 
36
+ /**
37
+ * Set the user information.
38
+ * @param user: The user object (use builtin attributes: 'id', 'email', 'name', and any custom attribute under extraInfo).
39
+ */
40
+ setUserInfo(user: Object): Promise<Object>;
41
+
42
+ /**
43
+ * Add custom attributes to the current user information
44
+ * @param extraInfo: The extraInfo object containing additionall custom attributes
45
+ */
46
+ addUserExtraInfo(extraInfo: Object): Promise<Object>;
47
+
35
48
  /**
36
49
  * Set the tracking consent regarding the data collection.
37
50
  * @param trackingConsent: Consent, which can take one of the following values: 'pending', 'granted', 'not_granted'.
package/src/types.tsx CHANGED
@@ -61,9 +61,10 @@ export class DdSdkConfiguration {
61
61
  readonly bundleLogsWithTraces: boolean,
62
62
  readonly trackNonFatalAnrs: boolean | undefined,
63
63
  readonly appHangThreshold: number | undefined,
64
- readonly resourceTracingSamplingRate: number | undefined,
64
+ readonly resourceTracingSamplingRate: number,
65
65
  readonly trackWatchdogTerminations: boolean | undefined,
66
- readonly batchProcessingLevel: BatchProcessingLevel // eslint-disable-next-line no-empty-function
66
+ readonly batchProcessingLevel: BatchProcessingLevel, // eslint-disable-next-line no-empty-function
67
+ readonly initialResourceThreshold: number | undefined
67
68
  ) {}
68
69
  }
69
70
 
@@ -84,16 +85,26 @@ export type DdSdkType = {
84
85
  setAttributes(attributes: object): Promise<void>;
85
86
 
86
87
  /**
87
- * Set the user information.
88
+ * Sets the user information.
89
+ * @deprecated UserInfo id property is now mandatory (please user setUserInfo instead)
88
90
  * @param user: The user object (use builtin attributes: 'id', 'email', 'name', and/or any custom attribute).
89
91
  */
90
92
  setUser(user: object): Promise<void>;
91
93
 
94
+ /**
95
+ * Sets the user information.
96
+ * @param id: A unique user identifier (relevant to your business domain)
97
+ * @param name: The user name or alias.
98
+ * @param email: The user email.
99
+ * @param extraInfo: Additional information.
100
+ */
101
+ setUserInfo(userInfo: UserInfo): Promise<void>;
102
+
92
103
  /**
93
104
  * Add additional user information.
94
- * @param extraUserInfo: The extra info object (use builtin attributes: 'id', 'email', 'name', and/or any custom attribute).
105
+ * @param extraUserInfo: The additional information. (To set the id, name or email please user setUserInfo).
95
106
  */
96
- addUserExtraInfo(extraUserInfo: object): Promise<void>;
107
+ addUserExtraInfo(extraUserInfo: Record<string, unknown>): Promise<void>;
97
108
 
98
109
  /**
99
110
  * Set the tracking consent regarding the data collection.
@@ -102,6 +113,13 @@ export type DdSdkType = {
102
113
  setTrackingConsent(trackingConsent: string): Promise<void>;
103
114
  };
104
115
 
116
+ export type UserInfo = {
117
+ id: string;
118
+ name?: string;
119
+ email?: string;
120
+ extraInfo?: object;
121
+ };
122
+
105
123
  /**
106
124
  * The entry point to use Datadog's Trace feature.
107
125
  */
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // generated by genversion
2
- export const version = '2.6.4';
2
+ export const version = '2.6.5';