@datadog/mobile-react-native 2.8.0 → 2.8.1
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/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +1 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +15 -25
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt +1 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkSessionStartedListener.kt +124 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +26 -14
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +14 -4
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +0 -1
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkSessionStartedListenerTest.kt +140 -0
- package/ios/Sources/DdSdk.h +6 -4
- package/ios/Sources/DdSdk.mm +81 -31
- package/ios/Sources/DdSdkImplementation.swift +2 -2
- package/ios/Sources/DdSdkNativeInitialization.swift +14 -23
- package/ios/Sources/DdSdkSessionStartedListener.swift +105 -0
- package/ios/Sources/SdkVersion.swift +1 -1
- package/jest/mock.js +6 -2
- package/lib/commonjs/DdSdkReactNative.js +9 -7
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/index.js +4 -4
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/rum/DdRum.js +5 -12
- package/lib/commonjs/rum/DdRum.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/sessionId/sessionIdHelper.js +8 -60
- package/lib/commonjs/rum/sessionId/sessionIdHelper.js.map +1 -1
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js +48 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +41 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogEventEmitter.js +2 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js +43 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js +61 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js.map +1 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js +29 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js.map +1 -0
- package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js +5 -2
- package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -1
- package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/DdSdkReactNative.js +9 -7
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/index.js +4 -8
- package/lib/module/index.js.map +1 -1
- package/lib/module/rum/DdRum.js +6 -13
- package/lib/module/rum/DdRum.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -2
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/rum/sessionId/sessionIdHelper.js +5 -54
- package/lib/module/rum/sessionId/sessionIdHelper.js.map +1 -1
- package/lib/module/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js +41 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +33 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogEventEmitter.js +2 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js +35 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js +51 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js.map +1 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js +21 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js.map +1 -0
- package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js +5 -2
- package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -1
- package/lib/module/specs/NativeDdSdk.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts +3 -2
- package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
- package/lib/typescript/index.d.ts +7 -6
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/rum/DdRum.d.ts +0 -2
- package/lib/typescript/rum/DdRum.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts +3 -3
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +2 -2
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -1
- package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts +2 -25
- package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts.map +1 -1
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.d.ts +11 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.d.ts +10 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogEventEmitter.d.ts +7 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.d.ts +12 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.d.ts +14 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.d.ts +6 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.d.ts.map +1 -0
- package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts +2 -0
- package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/DdSdkReactNative.tsx +16 -10
- package/src/__tests__/DdSdkReactNative.test.tsx +1 -37
- package/src/__tests__/mock.test.ts +3 -0
- package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +1 -1
- package/src/__tests__/rum/instrumentation/DdRumUserInteractionTracking.test.tsx +1 -1
- package/src/index.tsx +10 -13
- package/src/rum/DdRum.ts +7 -17
- package/src/rum/__tests__/DdRum.test.ts +3 -3
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.tsx +3 -3
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +2 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +2 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +82 -1
- package/src/rum/sessionId/sessionIdHelper.ts +5 -63
- package/src/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.tsx +65 -0
- package/src/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.tsx +46 -0
- package/src/sdk/DatadogEventEmitter/DatadogEventEmitter.tsx +12 -0
- package/src/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.tsx +60 -0
- package/src/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.tsx +83 -0
- package/src/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.tsx +36 -0
- package/src/sdk/DatadogInternalBridge/__tests__/DdSdkNativeBridge.test.tsx +159 -0
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +2 -2
- package/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts +8 -2
- package/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts +6 -3
- package/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json +6 -1
- package/src/specs/NativeDdSdk.ts +0 -1
- package/src/version.ts +1 -1
- package/lib/commonjs/sdk/EventEmitter/EventEmitter.js +0 -51
- package/lib/commonjs/sdk/EventEmitter/EventEmitter.js.map +0 -1
- package/lib/module/sdk/EventEmitter/EventEmitter.js +0 -43
- package/lib/module/sdk/EventEmitter/EventEmitter.js.map +0 -1
- package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts +0 -12
- package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts.map +0 -1
- package/src/rum/sessionId/__tests__/sessionIdHelper.test.ts +0 -162
- package/src/sdk/EventEmitter/EventEmitter.ts +0 -55
- package/src/sdk/EventEmitter/__tests__/EventEmitter.test.ts +0 -181
package/src/index.tsx
CHANGED
|
@@ -3,8 +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
|
-
/* eslint-disable arca/import-ordering */
|
|
7
|
-
|
|
8
6
|
import {
|
|
9
7
|
DatadogProviderConfiguration,
|
|
10
8
|
DdSdkReactNativeConfiguration,
|
|
@@ -14,35 +12,34 @@ import {
|
|
|
14
12
|
BatchSize,
|
|
15
13
|
BatchProcessingLevel
|
|
16
14
|
} from './DdSdkReactNativeConfiguration';
|
|
15
|
+
import type { AutoInstrumentationConfiguration } from './DdSdkReactNativeConfiguration';
|
|
17
16
|
import { DdSdkReactNative } from './DdSdkReactNative';
|
|
18
|
-
import { DdSdk } from './sdk/DdSdk';
|
|
19
17
|
import { InternalLog } from './InternalLog';
|
|
20
18
|
import { ProxyConfiguration, ProxyType } from './ProxyConfiguration';
|
|
21
19
|
import { SdkVerbosity } from './SdkVerbosity';
|
|
22
20
|
import { TrackingConsent } from './TrackingConsent';
|
|
23
21
|
import { DdLogs } from './logs/DdLogs';
|
|
24
22
|
import { DdRum } from './rum/DdRum';
|
|
23
|
+
import { DatadogTracingContext } from './rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext';
|
|
24
|
+
import { DatadogTracingIdentifier } from './rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier';
|
|
25
|
+
import {
|
|
26
|
+
TracingIdType,
|
|
27
|
+
TracingIdFormat
|
|
28
|
+
} from './rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier';
|
|
25
29
|
import {
|
|
26
30
|
DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER,
|
|
27
31
|
DATADOG_GRAPH_QL_OPERATION_NAME_HEADER,
|
|
28
32
|
DATADOG_GRAPH_QL_VARIABLES_HEADER
|
|
29
33
|
} from './rum/instrumentation/resourceTracking/graphql/graphqlHeaders';
|
|
30
34
|
import { RumActionType, ErrorSource, PropagatorType } from './rum/types';
|
|
35
|
+
import type { FirstPartyHost } from './rum/types';
|
|
31
36
|
import { DatadogProvider } from './sdk/DatadogProvider/DatadogProvider';
|
|
37
|
+
import { DdSdk } from './sdk/DdSdk';
|
|
32
38
|
import { FileBasedConfiguration } from './sdk/FileBasedConfiguration/FileBasedConfiguration';
|
|
33
39
|
import { DdTrace } from './trace/DdTrace';
|
|
34
40
|
import { DefaultTimeProvider } from './utils/time-provider/DefaultTimeProvider';
|
|
35
41
|
import { TimeProvider } from './utils/time-provider/TimeProvider';
|
|
36
42
|
import type { Timestamp } from './utils/time-provider/TimeProvider';
|
|
37
|
-
import {
|
|
38
|
-
TracingIdType,
|
|
39
|
-
TracingIdFormat
|
|
40
|
-
} from './rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier';
|
|
41
|
-
import { DatadogTracingIdentifier } from './rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier';
|
|
42
|
-
import { DatadogTracingContext } from './rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext';
|
|
43
|
-
import type { FirstPartyHost } from './rum/types';
|
|
44
|
-
|
|
45
|
-
/* eslint-enable arca/import-ordering */
|
|
46
43
|
|
|
47
44
|
export {
|
|
48
45
|
DatadogProvider,
|
|
@@ -78,4 +75,4 @@ export {
|
|
|
78
75
|
DatadogTracingContext
|
|
79
76
|
};
|
|
80
77
|
|
|
81
|
-
export type { Timestamp, FirstPartyHost };
|
|
78
|
+
export type { Timestamp, FirstPartyHost, AutoInstrumentationConfiguration };
|
package/src/rum/DdRum.ts
CHANGED
|
@@ -30,8 +30,8 @@ import {
|
|
|
30
30
|
getTracingContextForPropagators
|
|
31
31
|
} from './instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders';
|
|
32
32
|
import {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
getCachedSessionId,
|
|
34
|
+
setCachedSessionId
|
|
35
35
|
} from './sessionId/sessionIdHelper';
|
|
36
36
|
import type {
|
|
37
37
|
ErrorSource,
|
|
@@ -54,13 +54,6 @@ class DdRumWrapper implements DdRumType {
|
|
|
54
54
|
private actionEventMapper = generateActionEventMapper(undefined);
|
|
55
55
|
private timeProvider: TimeProvider = new DefaultTimeProvider();
|
|
56
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
|
-
|
|
64
57
|
startView = (
|
|
65
58
|
key: string,
|
|
66
59
|
name: string,
|
|
@@ -324,15 +317,12 @@ class DdRumWrapper implements DdRumType {
|
|
|
324
317
|
return undefined;
|
|
325
318
|
}
|
|
326
319
|
const sessionId = await this.nativeRum.getCurrentSessionId();
|
|
327
|
-
|
|
328
|
-
|
|
320
|
+
if (sessionId) {
|
|
321
|
+
setCachedSessionId(sessionId);
|
|
322
|
+
}
|
|
329
323
|
return sessionId;
|
|
330
324
|
}
|
|
331
325
|
|
|
332
|
-
getCachedSessionId(): string | null {
|
|
333
|
-
return getCachedRumSessionId();
|
|
334
|
-
}
|
|
335
|
-
|
|
336
326
|
getTracingContext = (
|
|
337
327
|
url: string,
|
|
338
328
|
tracingSamplingRate: number,
|
|
@@ -342,7 +332,7 @@ class DdRumWrapper implements DdRumType {
|
|
|
342
332
|
url,
|
|
343
333
|
tracingSamplingRate,
|
|
344
334
|
firstPartyHosts,
|
|
345
|
-
|
|
335
|
+
getCachedSessionId()
|
|
346
336
|
);
|
|
347
337
|
};
|
|
348
338
|
|
|
@@ -353,7 +343,7 @@ class DdRumWrapper implements DdRumType {
|
|
|
353
343
|
return getTracingContextForPropagators(
|
|
354
344
|
propagators,
|
|
355
345
|
tracingSamplingRate,
|
|
356
|
-
|
|
346
|
+
getCachedSessionId()
|
|
357
347
|
);
|
|
358
348
|
};
|
|
359
349
|
|
|
@@ -20,7 +20,7 @@ import { DatadogTracingContext } from '../instrumentation/resourceTracking/distr
|
|
|
20
20
|
import { DatadogTracingIdentifier } from '../instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier';
|
|
21
21
|
import { TracingIdFormat } from '../instrumentation/resourceTracking/distributedTracing/TracingIdentifier';
|
|
22
22
|
import { TracingIdentifierUtils } from '../instrumentation/resourceTracking/distributedTracing/__tests__/__utils__/TracingIdentifierUtils';
|
|
23
|
-
import {
|
|
23
|
+
import { setCachedSessionId } from '../sessionId/sessionIdHelper';
|
|
24
24
|
import type { FirstPartyHost } from '../types';
|
|
25
25
|
import { ErrorSource, PropagatorType, RumActionType } from '../types';
|
|
26
26
|
|
|
@@ -47,7 +47,7 @@ describe('DdRum', () => {
|
|
|
47
47
|
beforeEach(() => {
|
|
48
48
|
jest.clearAllMocks();
|
|
49
49
|
BufferSingleton.onInitialization();
|
|
50
|
-
|
|
50
|
+
setCachedSessionId(undefined as any);
|
|
51
51
|
});
|
|
52
52
|
|
|
53
53
|
describe('Context validation', () => {
|
|
@@ -985,8 +985,8 @@ describe('DdRum', () => {
|
|
|
985
985
|
it('tracing context contains RUM session ID in baggage when RUM Session ID is cached', () => {
|
|
986
986
|
for (let i = 0; i < 100; i++) {
|
|
987
987
|
const randomSessionId = `test-${Math.random()}`;
|
|
988
|
-
setCachedRumSessionId(randomSessionId);
|
|
989
988
|
|
|
989
|
+
setCachedSessionId(randomSessionId);
|
|
990
990
|
const tracingContext = DdRum.getTracingContextForPropagators(
|
|
991
991
|
[
|
|
992
992
|
PropagatorType.DATADOG,
|
|
@@ -25,7 +25,7 @@ export type DdRumResourceTracingAttributes =
|
|
|
25
25
|
samplingPriorityHeader: '1' | '0';
|
|
26
26
|
rulePsr: number;
|
|
27
27
|
propagatorTypes: PropagatorType[];
|
|
28
|
-
rumSessionId
|
|
28
|
+
rumSessionId?: string;
|
|
29
29
|
}
|
|
30
30
|
| {
|
|
31
31
|
tracingStrategy: 'DISCARD';
|
|
@@ -48,7 +48,7 @@ export const getTracingAttributes = ({
|
|
|
48
48
|
hostname: Hostname | null;
|
|
49
49
|
firstPartyHostsRegexMap: RegexMap;
|
|
50
50
|
tracingSamplingRate: number;
|
|
51
|
-
rumSessionId
|
|
51
|
+
rumSessionId?: string;
|
|
52
52
|
}): DdRumResourceTracingAttributes => {
|
|
53
53
|
if (hostname === null) {
|
|
54
54
|
return DISCARDED_TRACE_ATTRIBUTES;
|
|
@@ -70,7 +70,7 @@ export const getTracingAttributes = ({
|
|
|
70
70
|
export const generateTracingAttributesWithSampling = (
|
|
71
71
|
tracingSamplingRate: number,
|
|
72
72
|
propagatorTypes: PropagatorType[],
|
|
73
|
-
rumSessionId
|
|
73
|
+
rumSessionId?: string
|
|
74
74
|
): DdRumResourceTracingAttributes => {
|
|
75
75
|
if (!propagatorTypes || propagatorTypes.length === 0) {
|
|
76
76
|
return DISCARDED_TRACE_ATTRIBUTES;
|
package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts
CHANGED
|
@@ -152,7 +152,7 @@ export const getTracingContext = (
|
|
|
152
152
|
url: string,
|
|
153
153
|
tracingSamplingRate: number,
|
|
154
154
|
firstPartyHosts: FirstPartyHost[],
|
|
155
|
-
rumSessionId
|
|
155
|
+
rumSessionId?: string
|
|
156
156
|
): DatadogTracingContext => {
|
|
157
157
|
const hostname = URLHostParser(url);
|
|
158
158
|
const firstPartyHostsRegexMap = firstPartyHostsRegexMapBuilder(
|
|
@@ -174,7 +174,7 @@ export const getTracingContext = (
|
|
|
174
174
|
export const getTracingContextForPropagators = (
|
|
175
175
|
propagators: PropagatorType[],
|
|
176
176
|
tracingSamplingRate: number,
|
|
177
|
-
rumSessionId
|
|
177
|
+
rumSessionId?: string
|
|
178
178
|
): DatadogTracingContext => {
|
|
179
179
|
return getTracingContextForAttributes(
|
|
180
180
|
generateTracingAttributesWithSampling(
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { Timer } from '../../../../../utils/Timer';
|
|
8
|
-
import {
|
|
8
|
+
import { getCachedSessionId } from '../../../../sessionId/sessionIdHelper';
|
|
9
9
|
import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
|
|
10
10
|
import type { DdRumResourceTracingAttributes } from '../../distributedTracing/distributedTracing';
|
|
11
11
|
import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
|
|
@@ -110,7 +110,7 @@ const proxyOpen = (
|
|
|
110
110
|
hostname,
|
|
111
111
|
firstPartyHostsRegexMap,
|
|
112
112
|
tracingSamplingRate,
|
|
113
|
-
rumSessionId:
|
|
113
|
+
rumSessionId: getCachedSessionId()
|
|
114
114
|
})
|
|
115
115
|
};
|
|
116
116
|
// eslint-disable-next-line prefer-rest-params
|
package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts
CHANGED
|
@@ -11,6 +11,7 @@ import { InternalLog } from '../../../../../../InternalLog';
|
|
|
11
11
|
import { SdkVerbosity } from '../../../../../../SdkVerbosity';
|
|
12
12
|
import { BufferSingleton } from '../../../../../../sdk/DatadogProvider/Buffer/BufferSingleton';
|
|
13
13
|
import { DdRum } from '../../../../../DdRum';
|
|
14
|
+
import { setCachedSessionId } from '../../../../../sessionId/sessionIdHelper';
|
|
14
15
|
import { PropagatorType } from '../../../../../types';
|
|
15
16
|
import { XMLHttpRequestMock } from '../../../__tests__/__utils__/XMLHttpRequestMock';
|
|
16
17
|
import { TracingIdentifierUtils } from '../../../distributedTracing/__tests__/__utils__/TracingIdentifierUtils';
|
|
@@ -26,7 +27,8 @@ import {
|
|
|
26
27
|
ORIGIN_RUM,
|
|
27
28
|
ORIGIN_HEADER_KEY,
|
|
28
29
|
TRACESTATE_HEADER_KEY,
|
|
29
|
-
TAGS_HEADER_KEY
|
|
30
|
+
TAGS_HEADER_KEY,
|
|
31
|
+
BAGGAGE_HEADER_KEY
|
|
30
32
|
} from '../../../distributedTracing/distributedTracingHeaders';
|
|
31
33
|
import { firstPartyHostsRegexMapBuilder } from '../../../distributedTracing/firstPartyHosts';
|
|
32
34
|
import {
|
|
@@ -758,6 +760,85 @@ describe('XHRProxy', () => {
|
|
|
758
760
|
expect(xhr.requestHeaders[SAMPLING_PRIORITY_HEADER_KEY]).toBe('1');
|
|
759
761
|
expect(xhr.requestHeaders[ORIGIN_HEADER_KEY]).toBe(ORIGIN_RUM);
|
|
760
762
|
});
|
|
763
|
+
|
|
764
|
+
it('adds rum session id to baggage headers when available', async () => {
|
|
765
|
+
// GIVEN
|
|
766
|
+
const method = 'GET';
|
|
767
|
+
const url = 'https://api.example.com:443/v2/user';
|
|
768
|
+
xhrProxy.onTrackingStart({
|
|
769
|
+
tracingSamplingRate: 100,
|
|
770
|
+
firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([
|
|
771
|
+
{
|
|
772
|
+
match: 'api.example.com',
|
|
773
|
+
propagatorTypes: [
|
|
774
|
+
PropagatorType.DATADOG,
|
|
775
|
+
PropagatorType.TRACECONTEXT
|
|
776
|
+
]
|
|
777
|
+
},
|
|
778
|
+
{
|
|
779
|
+
match: 'example.com',
|
|
780
|
+
propagatorTypes: [
|
|
781
|
+
PropagatorType.B3,
|
|
782
|
+
PropagatorType.B3MULTI
|
|
783
|
+
]
|
|
784
|
+
}
|
|
785
|
+
])
|
|
786
|
+
});
|
|
787
|
+
|
|
788
|
+
setCachedSessionId('TEST-SESSION-ID');
|
|
789
|
+
|
|
790
|
+
// WHEN
|
|
791
|
+
const xhr = new XMLHttpRequestMock();
|
|
792
|
+
xhr.open(method, url);
|
|
793
|
+
xhr.send();
|
|
794
|
+
xhr.notifyResponseArrived();
|
|
795
|
+
xhr.complete(200, 'ok');
|
|
796
|
+
await flushPromises();
|
|
797
|
+
|
|
798
|
+
// THEN
|
|
799
|
+
expect(xhr.requestHeaders[BAGGAGE_HEADER_KEY]).not.toBeUndefined();
|
|
800
|
+
expect(xhr.requestHeaders[BAGGAGE_HEADER_KEY]).toBe(
|
|
801
|
+
'session.id=TEST-SESSION-ID'
|
|
802
|
+
);
|
|
803
|
+
});
|
|
804
|
+
|
|
805
|
+
it('does not add rum session id to baggage headers when session id not cached', async () => {
|
|
806
|
+
// GIVEN
|
|
807
|
+
const method = 'GET';
|
|
808
|
+
const url = 'https://api.example.com:443/v2/user';
|
|
809
|
+
xhrProxy.onTrackingStart({
|
|
810
|
+
tracingSamplingRate: 100,
|
|
811
|
+
firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([
|
|
812
|
+
{
|
|
813
|
+
match: 'api.example.com',
|
|
814
|
+
propagatorTypes: [
|
|
815
|
+
PropagatorType.DATADOG,
|
|
816
|
+
PropagatorType.TRACECONTEXT
|
|
817
|
+
]
|
|
818
|
+
},
|
|
819
|
+
{
|
|
820
|
+
match: 'example.com',
|
|
821
|
+
propagatorTypes: [
|
|
822
|
+
PropagatorType.B3,
|
|
823
|
+
PropagatorType.B3MULTI
|
|
824
|
+
]
|
|
825
|
+
}
|
|
826
|
+
])
|
|
827
|
+
});
|
|
828
|
+
|
|
829
|
+
setCachedSessionId(undefined as any);
|
|
830
|
+
|
|
831
|
+
// WHEN
|
|
832
|
+
const xhr = new XMLHttpRequestMock();
|
|
833
|
+
xhr.open(method, url);
|
|
834
|
+
xhr.send();
|
|
835
|
+
xhr.notifyResponseArrived();
|
|
836
|
+
xhr.complete(200, 'ok');
|
|
837
|
+
await flushPromises();
|
|
838
|
+
|
|
839
|
+
// THEN
|
|
840
|
+
expect(xhr.requestHeaders[BAGGAGE_HEADER_KEY]).toBeUndefined();
|
|
841
|
+
});
|
|
761
842
|
});
|
|
762
843
|
|
|
763
844
|
describe('DdRum.startResource calls', () => {
|
|
@@ -3,70 +3,12 @@
|
|
|
3
3
|
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
4
4
|
* Copyright 2016-Present Datadog, Inc.
|
|
5
5
|
*/
|
|
6
|
-
|
|
7
|
-
/* eslint-disable global-require */
|
|
8
|
-
import { NativeModules } from 'react-native';
|
|
6
|
+
let _cachedSessionId: string | undefined;
|
|
9
7
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const RUM_SESSION_STARTED_EVENT_KEY = 'RumSessionStarted';
|
|
14
|
-
|
|
15
|
-
let cachedRumSessionId: string | null;
|
|
16
|
-
|
|
17
|
-
/**
|
|
18
|
-
* [INTERNAL API]
|
|
19
|
-
* Registers a listener for the native 'RumSessionStarted' event, to update
|
|
20
|
-
* the cached Session ID.
|
|
21
|
-
*/
|
|
22
|
-
export const registerRumSessionIdListener = () => {
|
|
23
|
-
const DdSdkModule =
|
|
24
|
-
NativeModules.DdSdk || require('../../specs/NativeDdSdk').default;
|
|
25
|
-
const eventEmitter = createNativeEventEmitterForModule(DdSdkModule);
|
|
26
|
-
const listenerCount = eventEmitter.listenerCount(
|
|
27
|
-
RUM_SESSION_STARTED_EVENT_KEY
|
|
28
|
-
);
|
|
29
|
-
|
|
30
|
-
// Always remove old listeners to avoid potential issues with invalid bridge references
|
|
31
|
-
if (listenerCount > 0) {
|
|
32
|
-
removeRumSessionIdListeners();
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
eventEmitter.addListener(
|
|
36
|
-
RUM_SESSION_STARTED_EVENT_KEY,
|
|
37
|
-
(event: RumSessionStartedEvent) => {
|
|
38
|
-
const field: keyof RumSessionStartedEvent = 'sessionId';
|
|
39
|
-
const sessionId = event[field];
|
|
40
|
-
cachedRumSessionId = sessionId;
|
|
41
|
-
}
|
|
42
|
-
);
|
|
8
|
+
export const getCachedSessionId = () => {
|
|
9
|
+
return _cachedSessionId;
|
|
43
10
|
};
|
|
44
11
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
* Removes all listeners for the native 'RumSessionStarted' event (USEFUL FOR TESTING).
|
|
48
|
-
*/
|
|
49
|
-
export const removeRumSessionIdListeners = () => {
|
|
50
|
-
const eventEmitter = createNativeEventEmitterForModule(NativeModules.DdSdk);
|
|
51
|
-
eventEmitter.removeAllListeners(RUM_SESSION_STARTED_EVENT_KEY);
|
|
52
|
-
};
|
|
53
|
-
|
|
54
|
-
/**
|
|
55
|
-
* [INTERNAL API]
|
|
56
|
-
* Returns the cached RUM Session ID, updated either by:
|
|
57
|
-
* - `RUMSessionStarted` events from the native layer
|
|
58
|
-
* - Calls to `DdRum.getCurrentSessionId()` public API
|
|
59
|
-
* @returns The cached RUM Session ID.
|
|
60
|
-
*/
|
|
61
|
-
export const getCachedRumSessionId = (): string | null => {
|
|
62
|
-
return cachedRumSessionId ?? null;
|
|
63
|
-
};
|
|
64
|
-
|
|
65
|
-
/**
|
|
66
|
-
* [INTERNAL API]
|
|
67
|
-
* Manually overrides the cached RUM Session ID.
|
|
68
|
-
* @param sessionId The RUM Session ID to set (or null).
|
|
69
|
-
*/
|
|
70
|
-
export const setCachedRumSessionId = (sessionId: string | null) => {
|
|
71
|
-
cachedRumSessionId = sessionId;
|
|
12
|
+
export const setCachedSessionId = (sessionId: string) => {
|
|
13
|
+
_cachedSessionId = sessionId;
|
|
72
14
|
};
|
|
@@ -0,0 +1,65 @@
|
|
|
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
|
+
import type {
|
|
8
|
+
DatadogEventEmitterCallback,
|
|
9
|
+
DatadogEventEmitter
|
|
10
|
+
} from './DatadogEventEmitter';
|
|
11
|
+
|
|
12
|
+
export class DatadogBatchedBridgeEventEmitter implements DatadogEventEmitter {
|
|
13
|
+
private listeners: Record<string, DatadogEventEmitterCallback>;
|
|
14
|
+
private errorHandler: (err: any) => void;
|
|
15
|
+
|
|
16
|
+
constructor(errorHandler: (err: any) => void) {
|
|
17
|
+
this.errorHandler = errorHandler;
|
|
18
|
+
this.listeners = {};
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
initialize(): boolean {
|
|
22
|
+
try {
|
|
23
|
+
// eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
|
|
24
|
+
const BatchedBridge = require('react-native/Libraries/BatchedBridge/BatchedBridge');
|
|
25
|
+
const batchedBridge = BatchedBridge.default ?? BatchedBridge;
|
|
26
|
+
batchedBridge.registerCallableModule(
|
|
27
|
+
'DatadogInternalReactBridge',
|
|
28
|
+
this
|
|
29
|
+
);
|
|
30
|
+
|
|
31
|
+
return true;
|
|
32
|
+
} catch (err) {
|
|
33
|
+
this.errorHandler(`ERROR: cannot initialize BatchedBridge: ${err}`);
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
addListener(
|
|
39
|
+
eventName: string,
|
|
40
|
+
callback: DatadogEventEmitterCallback
|
|
41
|
+
): void {
|
|
42
|
+
this.listeners[eventName] = callback;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
removeAllListeners(eventName: string): void {
|
|
46
|
+
delete this.listeners[eventName];
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
// Called directly from native layer.
|
|
50
|
+
__datadogOnMessageReceived(eventName: string, data: any): void {
|
|
51
|
+
const callback = this.listeners[eventName];
|
|
52
|
+
if (!callback) {
|
|
53
|
+
this.errorHandler(
|
|
54
|
+
`ERROR: No listeners registered for received event ${eventName} with data: ${JSON.stringify(
|
|
55
|
+
data,
|
|
56
|
+
null,
|
|
57
|
+
4
|
|
58
|
+
)}`
|
|
59
|
+
);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
callback(data);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
@@ -0,0 +1,46 @@
|
|
|
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 { DatadogBatchedBridgeEventEmitter } from './DatadogBatchedBridgeEventEmitter';
|
|
9
|
+
import type { DatadogEventEmitter } from './DatadogEventEmitter';
|
|
10
|
+
import { DatadogNativeEventEmitter } from './DatadogNativeEventEmitter';
|
|
11
|
+
|
|
12
|
+
export class DatadogDefaultEventEmitter implements DatadogEventEmitter {
|
|
13
|
+
private eventEmitter?: DatadogEventEmitter;
|
|
14
|
+
|
|
15
|
+
private get isNewArchitecture(): boolean {
|
|
16
|
+
return (global as any).RN$Bridgeless;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
constructor(errorHandler: (err: any) => void) {
|
|
20
|
+
try {
|
|
21
|
+
const ddSdkModule =
|
|
22
|
+
NativeModules.DdSdk ||
|
|
23
|
+
// eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
|
|
24
|
+
require('../../specs/NativeDdSdk').default;
|
|
25
|
+
this.eventEmitter = this.isNewArchitecture
|
|
26
|
+
? new DatadogNativeEventEmitter(ddSdkModule, errorHandler)
|
|
27
|
+
: new DatadogBatchedBridgeEventEmitter(errorHandler);
|
|
28
|
+
} catch (err) {
|
|
29
|
+
errorHandler(
|
|
30
|
+
`ERROR: failed to initialize DatadogDefaultEventEmitter: ${err}`
|
|
31
|
+
);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
initialize(): boolean {
|
|
36
|
+
return this.eventEmitter?.initialize() ?? false;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
public addListener(eventName: string, callback: (data: any) => void) {
|
|
40
|
+
this.eventEmitter?.addListener(eventName, callback);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
public removeAllListeners(eventName: string) {
|
|
44
|
+
this.eventEmitter?.removeAllListeners(eventName);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
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
|
+
export type DatadogEventEmitterCallback = (data: any) => void;
|
|
7
|
+
|
|
8
|
+
export interface DatadogEventEmitter {
|
|
9
|
+
initialize(): boolean;
|
|
10
|
+
addListener(eventName: string, callback: DatadogEventEmitterCallback): void;
|
|
11
|
+
removeAllListeners(eventName: string): void;
|
|
12
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
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
|
+
import type {
|
|
10
|
+
DatadogEventEmitterCallback,
|
|
11
|
+
DatadogEventEmitter
|
|
12
|
+
} from './DatadogEventEmitter';
|
|
13
|
+
|
|
14
|
+
export class DatadogNativeEventEmitter implements DatadogEventEmitter {
|
|
15
|
+
private nativeEventEmitter?: NativeEventEmitter;
|
|
16
|
+
private nativeModule?: NativeModule;
|
|
17
|
+
private errorHandler: (err: any) => void;
|
|
18
|
+
|
|
19
|
+
constructor(
|
|
20
|
+
nativeModule: NativeModule | undefined,
|
|
21
|
+
errorHandler: (err: any) => void
|
|
22
|
+
) {
|
|
23
|
+
this.nativeModule = nativeModule;
|
|
24
|
+
this.errorHandler = errorHandler;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
initialize(): boolean {
|
|
28
|
+
try {
|
|
29
|
+
if (Platform.OS === 'ios') {
|
|
30
|
+
if (!this.nativeModule) {
|
|
31
|
+
this.errorHandler(
|
|
32
|
+
'ERROR: Initializing iOS Native Event Emitter with undefined NativeModule.'
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
this.nativeEventEmitter = new NativeEventEmitter(
|
|
36
|
+
this.nativeModule
|
|
37
|
+
);
|
|
38
|
+
} else {
|
|
39
|
+
this.nativeEventEmitter = new NativeEventEmitter();
|
|
40
|
+
}
|
|
41
|
+
return true;
|
|
42
|
+
} catch (err) {
|
|
43
|
+
this.errorHandler(
|
|
44
|
+
`ERROR: cannot initialize NativeEventEmitter: ${err}`
|
|
45
|
+
);
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
addListener(
|
|
51
|
+
eventName: string,
|
|
52
|
+
callback: DatadogEventEmitterCallback
|
|
53
|
+
): void {
|
|
54
|
+
this.nativeEventEmitter?.addListener(eventName, callback);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
removeAllListeners(eventName: string): void {
|
|
58
|
+
this.nativeEventEmitter?.removeAllListeners(eventName);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
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 { InternalLog } from '../../InternalLog';
|
|
7
|
+
import { SdkVerbosity } from '../../SdkVerbosity';
|
|
8
|
+
import { setCachedSessionId } from '../../rum/sessionId/sessionIdHelper';
|
|
9
|
+
import { DatadogDefaultEventEmitter } from '../DatadogEventEmitter/DatadogDefaultEventEmitter';
|
|
10
|
+
import type { DatadogEventEmitter } from '../DatadogEventEmitter/DatadogEventEmitter';
|
|
11
|
+
|
|
12
|
+
import { DdSdkInternalNativeBridgeEvent as BridgeEvent } from './DdSdkInternalNativeBridgeEvent';
|
|
13
|
+
|
|
14
|
+
const DEFAULT_EVENTS = [
|
|
15
|
+
new BridgeEvent<string>('RUMSessionStarted', (sessionId: string) => {
|
|
16
|
+
setCachedSessionId(sessionId);
|
|
17
|
+
})
|
|
18
|
+
];
|
|
19
|
+
|
|
20
|
+
const defaultErrorHandler = (err: any) => {
|
|
21
|
+
InternalLog.log(err, SdkVerbosity.DEBUG);
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export class DdSdkInternalNativeBridge {
|
|
25
|
+
private eventEmitter: DatadogEventEmitter;
|
|
26
|
+
private errorHandler: (err: any) => void;
|
|
27
|
+
private _isInitialized: boolean = false;
|
|
28
|
+
|
|
29
|
+
private static _instance?: DdSdkInternalNativeBridge;
|
|
30
|
+
public static get isInitialized(): boolean {
|
|
31
|
+
return this._instance?._isInitialized ?? false;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
static initialize(
|
|
35
|
+
eventEmitter: DatadogEventEmitter,
|
|
36
|
+
errorHandler: (err: any) => void = defaultErrorHandler
|
|
37
|
+
): DdSdkInternalNativeBridge {
|
|
38
|
+
this._instance = new DdSdkInternalNativeBridge(
|
|
39
|
+
eventEmitter,
|
|
40
|
+
errorHandler
|
|
41
|
+
);
|
|
42
|
+
this._instance._isInitialized =
|
|
43
|
+
eventEmitter.initialize() &&
|
|
44
|
+
this._instance.registerDefaultListeners();
|
|
45
|
+
return this._instance;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
private constructor(
|
|
49
|
+
eventEmitter: DatadogEventEmitter,
|
|
50
|
+
errorHandler: (err: any) => void
|
|
51
|
+
) {
|
|
52
|
+
this.eventEmitter = eventEmitter;
|
|
53
|
+
this.errorHandler = errorHandler;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
private registerDefaultListeners(): boolean {
|
|
57
|
+
try {
|
|
58
|
+
DEFAULT_EVENTS.forEach(event => {
|
|
59
|
+
this.eventEmitter.addListener(event.eventName, event.callback);
|
|
60
|
+
});
|
|
61
|
+
return true;
|
|
62
|
+
} catch (err) {
|
|
63
|
+
this.errorHandler(
|
|
64
|
+
`An error occured while registering default listeners for event emitter: ${err}`
|
|
65
|
+
);
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export const registerNativeBridge = (
|
|
72
|
+
eventEmitter?: DatadogEventEmitter,
|
|
73
|
+
errorHandler: (err: any) => void = defaultErrorHandler
|
|
74
|
+
) => {
|
|
75
|
+
const nativeEventEmitter =
|
|
76
|
+
eventEmitter ?? new DatadogDefaultEventEmitter(errorHandler);
|
|
77
|
+
DdSdkInternalNativeBridge.initialize(nativeEventEmitter);
|
|
78
|
+
if (!DdSdkInternalNativeBridge.isInitialized) {
|
|
79
|
+
errorHandler('ERROR: Native Bridge initialization failed.');
|
|
80
|
+
}
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
export const hasNativeBridge = () => DdSdkInternalNativeBridge.isInitialized;
|