@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.
- package/DatadogSDKReactNative.podspec +6 -6
- package/android/build.gradle +4 -4
- package/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +17 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt +26 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +12 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +5 -2
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +7 -2
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +39 -3
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +33 -5
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +28 -0
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +30 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +9 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +3 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +226 -4
- package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +6 -0
- package/android/src/test/resources/input/complete-configuration.json +2 -1
- package/datadog-configuration.schema.json +4 -0
- package/ios/Sources/DdRum.mm +11 -0
- package/ios/Sources/DdRumImplementation.swift +7 -0
- package/ios/Sources/DdSdk.h +5 -3
- package/ios/Sources/DdSdk.mm +27 -1
- package/ios/Sources/DdSdkConfiguration.swift +5 -1
- package/ios/Sources/DdSdkImplementation.swift +31 -2
- package/ios/Sources/DdSdkNativeInitialization.swift +17 -6
- package/ios/Sources/RNDdSdkConfiguration.swift +7 -3
- package/ios/Sources/SdkVersion.swift +1 -1
- package/jest/mock.js +6 -0
- package/lib/commonjs/DdSdkReactNative.js +24 -4
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/DdSdkReactNativeConfiguration.js +36 -1
- package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
- package/lib/commonjs/nativeModulesTypes.js +2 -1
- package/lib/commonjs/nativeModulesTypes.js.map +1 -1
- package/lib/commonjs/rum/DdRum.js +19 -3
- package/lib/commonjs/rum/DdRum.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +2 -2
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +2 -2
- package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +6 -4
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +31 -12
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +9 -8
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/sessionId/sessionIdHelper.js +67 -0
- package/lib/commonjs/rum/sessionId/sessionIdHelper.js.map +1 -0
- package/lib/commonjs/rum/types.js +5 -0
- package/lib/commonjs/rum/types.js.map +1 -1
- package/lib/commonjs/sdk/EventEmitter/EventEmitter.js +51 -0
- package/lib/commonjs/sdk/EventEmitter/EventEmitter.js.map +1 -0
- package/lib/commonjs/specs/NativeDdRum.js.map +1 -1
- package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
- package/lib/commonjs/types.js +4 -1
- package/lib/commonjs/types.js.map +1 -1
- package/lib/commonjs/utils/Timer.js +2 -2
- package/lib/commonjs/utils/Timer.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/DdSdkReactNative.js +24 -4
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/DdSdkReactNativeConfiguration.js +36 -1
- package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
- package/lib/module/nativeModulesTypes.js +2 -1
- package/lib/module/nativeModulesTypes.js.map +1 -1
- package/lib/module/rum/DdRum.js +19 -3
- package/lib/module/rum/DdRum.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -0
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +6 -4
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +30 -11
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +8 -6
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/rum/sessionId/sessionIdHelper.js +56 -0
- package/lib/module/rum/sessionId/sessionIdHelper.js.map +1 -0
- package/lib/module/rum/types.js +5 -0
- package/lib/module/rum/types.js.map +1 -1
- package/lib/module/sdk/EventEmitter/EventEmitter.js +43 -0
- package/lib/module/sdk/EventEmitter/EventEmitter.js.map +1 -0
- package/lib/module/specs/NativeDdRum.js.map +1 -1
- package/lib/module/specs/NativeDdSdk.js.map +1 -1
- package/lib/module/types.js +4 -1
- package/lib/module/types.js.map +1 -1
- package/lib/module/utils/Timer.js +1 -1
- package/lib/module/utils/Timer.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts +17 -2
- package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
- package/lib/typescript/DdSdkReactNativeConfiguration.d.ts +8 -0
- package/lib/typescript/DdSdkReactNativeConfiguration.d.ts.map +1 -1
- package/lib/typescript/rum/DdRum.d.ts +3 -0
- package/lib/typescript/rum/DdRum.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts +2 -2
- package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts +4 -2
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +3 -2
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
- package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts +26 -0
- package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts.map +1 -0
- package/lib/typescript/rum/types.d.ts +6 -0
- package/lib/typescript/rum/types.d.ts.map +1 -1
- package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts +12 -0
- package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/UserInfoSingleton/types.d.ts +3 -2
- package/lib/typescript/sdk/UserInfoSingleton/types.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdRum.d.ts +6 -0
- package/lib/typescript/specs/NativeDdRum.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdSdk.d.ts +17 -0
- package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
- package/lib/typescript/types.d.ts +22 -5
- package/lib/typescript/types.d.ts.map +1 -1
- package/lib/typescript/utils/Timer.d.ts +1 -1
- package/lib/typescript/utils/Timer.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/DdSdkReactNative.tsx +40 -5
- package/src/DdSdkReactNativeConfiguration.tsx +10 -1
- package/src/__tests__/DdSdkReactNative.test.tsx +101 -12
- package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +3 -1
- package/src/__tests__/mock.test.ts +2 -1
- package/src/nativeModulesTypes.ts +1 -1
- package/src/rum/DdRum.ts +39 -4
- package/src/rum/__mocks__/MockTimeProvider.ts +1 -1
- package/src/rum/__tests__/DdRum.test.ts +17 -0
- package/src/rum/__tests__/DdRumTimeProvider.test.ts +1 -1
- package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +1 -1
- package/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx +2 -2
- package/src/rum/instrumentation/interactionTracking/EventsInterceptor.tsx +1 -1
- package/src/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.tsx +2 -2
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.tsx +10 -4
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +42 -15
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +8 -6
- package/src/rum/sessionId/__tests__/sessionIdHelper.test.ts +162 -0
- package/src/rum/sessionId/sessionIdHelper.ts +59 -0
- package/src/rum/types.ts +7 -0
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +1 -0
- package/src/sdk/EventEmitter/EventEmitter.ts +55 -0
- package/src/sdk/EventEmitter/__tests__/EventEmitter.test.ts +181 -0
- package/src/sdk/UserInfoSingleton/types.ts +5 -2
- package/src/specs/NativeDdRum.ts +7 -0
- package/src/specs/NativeDdSdk.ts +20 -0
- package/src/types.tsx +23 -5
- package/src/utils/Timer.ts +1 -1
- package/src/utils/__tests__/TimeProvider.test.tsx +1 -1
- package/src/utils/__tests__/Timer.test.ts +1 -1
- package/src/version.ts +1 -1
|
@@ -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
|
|
11
|
+
readonly extraInfo?: Record<string, unknown>;
|
|
12
|
+
readonly [
|
|
13
|
+
key: string
|
|
14
|
+
]: unknown /** @deprecated To be removed alongside DdSdkReactnative.setUser */;
|
|
12
15
|
};
|
package/src/specs/NativeDdRum.ts
CHANGED
|
@@ -136,6 +136,13 @@ export interface Spec extends TurboModule {
|
|
|
136
136
|
*/
|
|
137
137
|
addTiming(name: string): Promise<void>;
|
|
138
138
|
|
|
139
|
+
/**
|
|
140
|
+
* Adds the loading time of the view to the active view.
|
|
141
|
+
* It is calculated as the difference between the current time and the start time of the view.
|
|
142
|
+
* @param overwrite: If true, overwrites the previously calculated view loading time.
|
|
143
|
+
*/
|
|
144
|
+
addViewLoadingTime(overwrite: boolean): Promise<void>;
|
|
145
|
+
|
|
139
146
|
/**
|
|
140
147
|
* Stops the current RUM Session.
|
|
141
148
|
*/
|
package/src/specs/NativeDdSdk.ts
CHANGED
|
@@ -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'.
|
|
@@ -62,6 +75,13 @@ export interface Spec extends TurboModule {
|
|
|
62
75
|
* Clears all data that has not already been sent to Datadog servers
|
|
63
76
|
*/
|
|
64
77
|
clearAllData(): Promise<void>;
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Required definitions, because of:
|
|
81
|
+
* https://github.com/react-native-community/RNNewArchitectureLibraries/tree/feat/swift-event-emitter?tab=readme-ov-file#codegen-update-codegen-specs)
|
|
82
|
+
*/
|
|
83
|
+
addListener: (eventType: string) => void;
|
|
84
|
+
removeListeners: (count: number) => void;
|
|
65
85
|
}
|
|
66
86
|
|
|
67
87
|
// eslint-disable-next-line import/no-default-export
|
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
|
|
64
|
+
readonly resourceTracingSamplingRate: number,
|
|
65
65
|
readonly trackWatchdogTerminations: boolean | undefined,
|
|
66
|
-
readonly batchProcessingLevel: BatchProcessingLevel
|
|
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
|
-
*
|
|
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
|
|
105
|
+
* @param extraUserInfo: The additional information. (To set the id, name or email please user setUserInfo).
|
|
95
106
|
*/
|
|
96
|
-
addUserExtraInfo(extraUserInfo:
|
|
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/utils/Timer.ts
CHANGED
|
@@ -14,7 +14,7 @@ const STOP_LABEL = '__stop';
|
|
|
14
14
|
* Simple timer which records time ticks. Shouldn't be re-used once stopped.
|
|
15
15
|
* All timestamps/durations returned are in milliseconds.
|
|
16
16
|
*/
|
|
17
|
-
export
|
|
17
|
+
export class Timer {
|
|
18
18
|
private timeProvider: TimeProvider;
|
|
19
19
|
private times: Record<string, Timestamp> = {};
|
|
20
20
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Copyright 2016-Present Datadog, Inc.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import MockTimeProvider from '../../rum/__mocks__/MockTimeProvider';
|
|
7
|
+
import { MockTimeProvider } from '../../rum/__mocks__/MockTimeProvider';
|
|
8
8
|
import { DefaultTimeProvider } from '../time-provider/DefaultTimeProvider';
|
|
9
9
|
|
|
10
10
|
function mockDateNow(value: number) {
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '2.6.
|
|
2
|
+
export const version = '2.6.5';
|