@datadog/mobile-react-native 3.1.1 → 3.1.2
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/DdLogsImplementation.kt +20 -43
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt +18 -125
- package/ios/Sources/DdLogsImplementation.swift +13 -3
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/logs/DdLogs.js +14 -44
- package/lib/commonjs/logs/DdLogs.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/logs/DdLogs.js +15 -45
- package/lib/module/logs/DdLogs.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
- package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/logs/DdLogs.d.ts +0 -5
- package/lib/typescript/logs/DdLogs.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +9 -0
- package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +89 -0
- package/src/logs/DdLogs.ts +25 -58
- package/src/logs/__tests__/DdLogs.test.ts +2 -21
- package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +3 -3
- package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +25 -3
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +13 -0
- package/src/version.ts +1 -1
|
@@ -5,14 +5,14 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { DdAttributes } from '../DdAttributes';
|
|
8
|
-
import {
|
|
8
|
+
import { InternalLog } from '../InternalLog';
|
|
9
9
|
import { SdkVerbosity } from '../config/types/SdkVerbosity';
|
|
10
10
|
import { debugId } from '../metro/debugIdResolver';
|
|
11
11
|
import { encodeAttributes } from '../sdk/AttributesEncoding/attributesEncoding';
|
|
12
|
+
import { bufferVoidNativeCall } from '../sdk/DatadogProvider/Buffer/bufferNativeCall';
|
|
12
13
|
import { getGlobalInstance } from '../utils/singletonUtils';
|
|
13
14
|
import { generateEventMapper } from './eventMapper';
|
|
14
15
|
const LOGS_MODULE = 'com.datadog.reactnative.logs';
|
|
15
|
-
const SDK_NOT_INITIALIZED_MESSAGE = 'DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT';
|
|
16
16
|
const generateEmptyPromise = () => new Promise(resolve => resolve());
|
|
17
17
|
|
|
18
18
|
/**
|
|
@@ -50,16 +50,6 @@ class DdLogsWrapper {
|
|
|
50
50
|
}
|
|
51
51
|
return this.log(args[0], args[1] ?? {}, 'error');
|
|
52
52
|
};
|
|
53
|
-
|
|
54
|
-
/**
|
|
55
|
-
* Since the InternalLog does not have a verbosity set yet in this case,
|
|
56
|
-
* we use console.warn to warn the user in dev mode.
|
|
57
|
-
*/
|
|
58
|
-
printLogDroppedSdkNotInitialized = (message, status) => {
|
|
59
|
-
if (__DEV__) {
|
|
60
|
-
console.warn(`${DATADOG_MESSAGE_PREFIX} Dropping ${status} log as the SDK is not initialized yet: "${message}"`);
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
53
|
printLogDroppedByMapper = (message, status) => {
|
|
64
54
|
InternalLog.log(`${status} log dropped by log mapper: "${message}"`, SdkVerbosity.DEBUG);
|
|
65
55
|
};
|
|
@@ -77,17 +67,7 @@ class DdLogsWrapper {
|
|
|
77
67
|
return generateEmptyPromise();
|
|
78
68
|
}
|
|
79
69
|
this.printLogTracked(event.message, status);
|
|
80
|
-
|
|
81
|
-
return await this.nativeLogs[status](event.message, encodeAttributes(event.context));
|
|
82
|
-
} catch (error) {
|
|
83
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
84
|
-
// @ts-ignore
|
|
85
|
-
if (error.message === SDK_NOT_INITIALIZED_MESSAGE) {
|
|
86
|
-
this.printLogDroppedSdkNotInitialized(message, status);
|
|
87
|
-
return generateEmptyPromise();
|
|
88
|
-
}
|
|
89
|
-
throw error;
|
|
90
|
-
}
|
|
70
|
+
return bufferVoidNativeCall(() => this.nativeLogs[status](event.message, encodeAttributes(event.context)));
|
|
91
71
|
};
|
|
92
72
|
logWithError = async (message, errorKind, errorMessage, stacktrace, context, status, fingerprint = '', source) => {
|
|
93
73
|
const rawLogEvent = {
|
|
@@ -106,29 +86,19 @@ class DdLogsWrapper {
|
|
|
106
86
|
return generateEmptyPromise();
|
|
107
87
|
}
|
|
108
88
|
this.printLogTracked(mappedEvent.message, status);
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
updatedContext[DdAttributes.debugId] = _debugId;
|
|
121
|
-
}
|
|
122
|
-
return await this.nativeLogs[`${status}WithError`](mappedEvent.message, mappedEvent.errorKind, mappedEvent.errorMessage, mappedEvent.stacktrace, updatedContext);
|
|
123
|
-
} catch (error) {
|
|
124
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
125
|
-
// @ts-ignore
|
|
126
|
-
if (error.message === SDK_NOT_INITIALIZED_MESSAGE) {
|
|
127
|
-
this.printLogDroppedSdkNotInitialized(message, status);
|
|
128
|
-
return generateEmptyPromise();
|
|
129
|
-
}
|
|
130
|
-
throw error;
|
|
89
|
+
const encodedContext = encodeAttributes(mappedEvent.context);
|
|
90
|
+
const updatedContext = {
|
|
91
|
+
...encodedContext,
|
|
92
|
+
[DdAttributes.errorSourceType]: 'react-native'
|
|
93
|
+
};
|
|
94
|
+
if (fingerprint && fingerprint !== '') {
|
|
95
|
+
updatedContext[DdAttributes.errorFingerprint] = fingerprint;
|
|
96
|
+
}
|
|
97
|
+
const _debugId = debugId;
|
|
98
|
+
if (_debugId) {
|
|
99
|
+
updatedContext[DdAttributes.debugId] = _debugId;
|
|
131
100
|
}
|
|
101
|
+
return bufferVoidNativeCall(() => this.nativeLogs[`${status}WithError`](mappedEvent.message, mappedEvent.errorKind, mappedEvent.errorMessage, mappedEvent.stacktrace, updatedContext));
|
|
132
102
|
};
|
|
133
103
|
registerLogEventMapper(logEventMapper) {
|
|
134
104
|
this.logEventMapper = generateEventMapper(logEventMapper);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DdAttributes","
|
|
1
|
+
{"version":3,"names":["DdAttributes","InternalLog","SdkVerbosity","debugId","encodeAttributes","bufferVoidNativeCall","getGlobalInstance","generateEventMapper","LOGS_MODULE","generateEmptyPromise","Promise","resolve","isLogWithError","args","undefined","DdLogsWrapper","nativeLogs","require","default","logEventMapper","debug","logWithError","log","info","warn","error","printLogDroppedByMapper","message","status","DEBUG","printLogTracked","context","event","applyEventMapper","errorKind","errorMessage","stacktrace","fingerprint","source","rawLogEvent","mappedEvent","encodedContext","updatedContext","errorSourceType","errorFingerprint","_debugId","registerLogEventMapper","unregisterLogEventMapper","DdLogs"],"sourceRoot":"../../../src","sources":["logs/DdLogs.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -57,8 +57,8 @@ class BabelInteractionTracking {
|
|
|
57
57
|
const getAccessibilityLabel = () => useAccessibilityLabel && accessibilityLabel ? accessibilityLabel : null;
|
|
58
58
|
const index = handlerArgs ? handlerArgs.find(x => typeof x === 'number') || 0 : 0;
|
|
59
59
|
|
|
60
|
-
// Order:
|
|
61
|
-
const selectedContent =
|
|
60
|
+
// Order: actionName → actionNameAttribute → accessibilityLabel → content
|
|
61
|
+
const selectedContent = actionName || Object.values(attrs)[0] || getAccessibilityLabel() || tryContent();
|
|
62
62
|
if (!selectedContent) {
|
|
63
63
|
return componentName;
|
|
64
64
|
}
|
package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DdSdk","getGlobalInstance","DefaultTimeProvider","BABEL_PLUGIN_TELEMETRY","ActionSource","BABEL_INTERACTION_TRACKING_MODULE","BabelInteractionTracking","config","trackInteractions","useAccessibilityLabel","timeProvider","telemetrySent","ddRum","isInitialized","getInstance","DdBabelInteractionTracking","attachRumInstance","getTelemetryConfig","babel_plugin","enabled","globalThis","__DD_RN_BABEL_PLUGIN_ENABLED__","track_interactions","getTargetName","targetObject","getContent","options","handlerArgs","componentName","actionName","accessibilityLabel","attrs","tryContent","content","length","getAccessibilityLabel","index","find","x","selectedContent","Object","values","output","useNamePrefix","wrapRumAction","func","action","args","sendTelemetryLog","onlyOnce","targetName","addAction","BABEL","now","catch","e","Error","telemetryError","message","stack"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,OAAOA,KAAK,MAAM,4BAA4B;AAC9C,SAASC,iBAAiB,QAAQ,+BAA+B;AACjE,SAASC,mBAAmB,QAAQ,kDAAkD;AAGtF,SAASC,sBAAsB,QAAQ,iBAAiB;AAExD,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,iCAAiC,GACnC,wDAAwD;AAiB5D,MAAMC,wBAAwB,CAAC;EAC3BC,MAAM,GAAgB;IAClBC,iBAAiB,EAAE,KAAK;IACxBC,qBAAqB,EAAE;EAC3B,CAAC;EAEOC,YAAY,GAAiB,IAAIR,mBAAmB,CAAC,CAAC;EAEtDS,aAAa,GAAY,KAAK;EAE9BC,KAAK,GAAwB,IAAI;EAEzCC,aAAa,GAAY,KAAK;EAE9BC,WAAWA,CAAA,EAAG;IACV,OAAOC,0BAA0B;EACrC;EAEAC,iBAAiBA,CAACJ,KAAmB,EAAE;IACnC,IAAI,CAACA,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,aAAa,GAAG,IAAI;EAC7B;EAEAI,kBAAkBA,CAAA,EAAG;IACjB,OAAO;MACHC,YAAY,EAAE;QACVC,OAAO,EAAE,CAAC,CAACC,UAAU,CAACC,8BAA8B;QACpDC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAACf,MAAM,CAACC;MACtC;IACJ,CAAC;EACL;EAEQe,aAAaA,CAACC,YAA0B,EAAE;IAC9C,MAAM;MACFC,UAAU;MACVC,OAAO;MACPC,WAAW;MACXC,aAAa;MACb,gBAAgB,EAAEC,UAAU;MAC5BC,kBAAkB;MAClB,GAAGC;IACP,CAAC,GAAGP,YAAY;IAEhB,MAAM;MAAEf;IAAsB,CAAC,GAAG,IAAI,CAACF,MAAM;IAE7C,MAAMyB,UAAU,GAAGA,CAAA,KAAM;MACrB,MAAMC,OAAO,GAAGR,UAAU,GAAG,CAAC;MAC9B,IAAIQ,OAAO,IAAIA,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;QAC/B,OAAOD,OAAO;MAClB;MAEA,OAAO,IAAI;IACf,CAAC;IAED,MAAME,qBAAqB,GAAGA,CAAA,KAC1B1B,qBAAqB,IAAIqB,kBAAkB,GACrCA,kBAAkB,GAClB,IAAI;IAEd,MAAMM,KAAK,GAAGT,WAAW,GACnBA,WAAW,CAACU,IAAI,CAACC,CAAC,IAAI,OAAOA,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GACjD,CAAC;;IAEP;IACA,MAAMC,eAAe,
|
|
1
|
+
{"version":3,"names":["DdSdk","getGlobalInstance","DefaultTimeProvider","BABEL_PLUGIN_TELEMETRY","ActionSource","BABEL_INTERACTION_TRACKING_MODULE","BabelInteractionTracking","config","trackInteractions","useAccessibilityLabel","timeProvider","telemetrySent","ddRum","isInitialized","getInstance","DdBabelInteractionTracking","attachRumInstance","getTelemetryConfig","babel_plugin","enabled","globalThis","__DD_RN_BABEL_PLUGIN_ENABLED__","track_interactions","getTargetName","targetObject","getContent","options","handlerArgs","componentName","actionName","accessibilityLabel","attrs","tryContent","content","length","getAccessibilityLabel","index","find","x","selectedContent","Object","values","output","useNamePrefix","wrapRumAction","func","action","args","sendTelemetryLog","onlyOnce","targetName","addAction","BABEL","now","catch","e","Error","telemetryError","message","stack"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -20,12 +20,13 @@ export class DdEventsInterceptor {
|
|
|
20
20
|
this.useAccessibilityLabel = options.useAccessibilityLabel ?? true;
|
|
21
21
|
}
|
|
22
22
|
interceptOnPress(...args) {
|
|
23
|
-
|
|
23
|
+
const event = this.resolveNativeEvent(args);
|
|
24
|
+
if (event) {
|
|
24
25
|
const currentTime = Date.now();
|
|
25
26
|
const timestampDifference = Math.abs(Date.now() - this.debouncingStartedTimestamp);
|
|
26
27
|
if (timestampDifference > DEBOUNCE_EVENT_THRESHOLD_IN_MS) {
|
|
27
|
-
const targetNode =
|
|
28
|
-
this.handleTargetEvent(targetNode,
|
|
28
|
+
const targetNode = event._targetInst;
|
|
29
|
+
this.handleTargetEvent(targetNode, event);
|
|
29
30
|
// we add an approximated 1 millisecond for the execution time of the `handleTargetEvent` function
|
|
30
31
|
this.debouncingStartedTimestamp = currentTime + HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS;
|
|
31
32
|
}
|
|
@@ -33,6 +34,27 @@ export class DdEventsInterceptor {
|
|
|
33
34
|
InternalLog.log(DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE, SdkVerbosity.DEBUG);
|
|
34
35
|
}
|
|
35
36
|
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
40
|
+
*
|
|
41
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
42
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
43
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
44
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
45
|
+
*/
|
|
46
|
+
resolveNativeEvent(args) {
|
|
47
|
+
if (args.length === 0 || !args[0]) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
if (args[0]._targetInst) {
|
|
51
|
+
return args[0];
|
|
52
|
+
}
|
|
53
|
+
if (args[0].event && args[0].event._targetInst) {
|
|
54
|
+
return args[0].event;
|
|
55
|
+
}
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
36
58
|
handleTargetEvent(targetNode, event) {
|
|
37
59
|
if (targetNode) {
|
|
38
60
|
const resolvedTargetName = this.resolveTargetName(targetNode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","DdRum","RumActionType","UNKNOWN_TARGET_NAME","DEBOUNCE_EVENT_THRESHOLD_IN_MS","HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS","DD_ACTION_NAME_PROP","DdEventsInterceptor","ACTION_EVENT_DROPPED_DEBUG_MESSAGE","debouncingStartedTimestamp","Number","MIN_VALUE","constructor","options","actionNameAttribute","useAccessibilityLabel","interceptOnPress","args","
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","DdRum","RumActionType","UNKNOWN_TARGET_NAME","DEBOUNCE_EVENT_THRESHOLD_IN_MS","HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS","DD_ACTION_NAME_PROP","DdEventsInterceptor","ACTION_EVENT_DROPPED_DEBUG_MESSAGE","debouncingStartedTimestamp","Number","MIN_VALUE","constructor","options","actionNameAttribute","useAccessibilityLabel","interceptOnPress","args","event","resolveNativeEvent","currentTime","Date","now","timestampDifference","Math","abs","targetNode","_targetInst","handleTargetEvent","log","DEBUG","length","resolvedTargetName","resolveTargetName","addAction","TAP","undefined","closestActionLabel","findClosestActionLabel","accessibilityLabel","memoizedProps","elementTypeName","resolveElementTypeName","elementType","name","currentNode","props","return"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"mappings":"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","ignoreList":[]}
|
package/lib/module/version.js
CHANGED
|
@@ -7,11 +7,6 @@ declare class DdLogsWrapper implements DdLogsType {
|
|
|
7
7
|
info: (...args: LogArguments | LogWithErrorArguments) => Promise<void>;
|
|
8
8
|
warn: (...args: LogArguments | LogWithErrorArguments) => Promise<void>;
|
|
9
9
|
error: (...args: LogArguments | LogWithErrorArguments) => Promise<void>;
|
|
10
|
-
/**
|
|
11
|
-
* Since the InternalLog does not have a verbosity set yet in this case,
|
|
12
|
-
* we use console.warn to warn the user in dev mode.
|
|
13
|
-
*/
|
|
14
|
-
private printLogDroppedSdkNotInitialized;
|
|
15
10
|
private printLogDroppedByMapper;
|
|
16
11
|
private printLogTracked;
|
|
17
12
|
private log;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DdLogs.d.ts","sourceRoot":"","sources":["../../../src/logs/DdLogs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DdLogs.d.ts","sourceRoot":"","sources":["../../../src/logs/DdLogs.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,UAAU,CAAC;AAI5D,OAAO,KAAK,EACR,UAAU,EACV,YAAY,EACZ,qBAAqB,EAGxB,MAAM,SAAS,CAAC;AAsBjB,cAAM,aAAc,YAAW,UAAU;IAErC,OAAO,CAAC,UAAU,CACL;IACb,OAAO,CAAC,cAAc,CAAkC;IAExD,KAAK,YAAa,YAAY,GAAG,qBAAqB,KAAG,QAAQ,IAAI,CAAC,CAapE;IAEF,IAAI,YAAa,YAAY,GAAG,qBAAqB,KAAG,QAAQ,IAAI,CAAC,CAanE;IAEF,IAAI,YAAa,YAAY,GAAG,qBAAqB,KAAG,QAAQ,IAAI,CAAC,CAanE;IAEF,KAAK,YAAa,YAAY,GAAG,qBAAqB,KAAG,QAAQ,IAAI,CAAC,CAcpE;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,eAAe,CAQrB;IAEF,OAAO,CAAC,GAAG,CAsBT;IAEF,OAAO,CAAC,YAAY,CAqDlB;IAEF,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAIrD,wBAAwB;CAG3B;AAED,eAAO,MAAM,MAAM,eAA4D,CAAC"}
|
|
@@ -17,6 +17,15 @@ export declare class DdEventsInterceptor implements EventsInterceptor {
|
|
|
17
17
|
private useAccessibilityLabel;
|
|
18
18
|
constructor(options?: DdEventsInterceptorOptions);
|
|
19
19
|
interceptOnPress(...args: any[]): void;
|
|
20
|
+
/**
|
|
21
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
22
|
+
*
|
|
23
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
24
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
25
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
26
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
27
|
+
*/
|
|
28
|
+
private resolveNativeEvent;
|
|
20
29
|
private handleTargetEvent;
|
|
21
30
|
private resolveTargetName;
|
|
22
31
|
private resolveElementTypeName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DdEventsInterceptor.d.ts","sourceRoot":"","sources":["../../../../../src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAKpD,MAAM,MAAM,0BAA0B,GAAG;IACrC;;SAEK;IACL,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;SAEK;IACL,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,iBAAiB;IACzD,MAAM,CAAC,kCAAkC,SAKK;IAE9C,OAAO,CAAC,0BAA0B,CAAoB;IAEtD,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,qBAAqB,CAAU;gBAE3B,OAAO,GAAE,0BAA+B;IAKpD,gBAAgB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"DdEventsInterceptor.d.ts","sourceRoot":"","sources":["../../../../../src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAKpD,MAAM,MAAM,0BAA0B,GAAG;IACrC;;SAEK;IACL,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;SAEK;IACL,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,iBAAiB;IACzD,MAAM,CAAC,kCAAkC,SAKK;IAE9C,OAAO,CAAC,0BAA0B,CAAoB;IAEtD,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,qBAAqB,CAAU;gBAE3B,OAAO,GAAE,0BAA+B;IAKpD,gBAAgB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAsBtC;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,sBAAsB;CAkBjC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "3.1.
|
|
1
|
+
export declare const version = "3.1.2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/mobile-react-native",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.2",
|
|
4
4
|
"description": "A client-side React Native module to interact with Datadog",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datadog",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"dependencies": {
|
|
119
119
|
"big-integer": "^1.6.52"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "fd99111071f3c514423f3da07ffe0e87c4ff62a2"
|
|
122
122
|
}
|
|
@@ -229,6 +229,95 @@ it('M send a RUM Action event W interceptOnPress { no accessibilityLabel, no ele
|
|
|
229
229
|
expect(DdRum.addAction.mock.calls[0][1]).toBe(UNKNOWN_TARGET_NAME);
|
|
230
230
|
});
|
|
231
231
|
|
|
232
|
+
it('M send a RUM Action event W interceptOnPress { event nested in props wrapper (react-native-ui-lib pattern) } ', async () => {
|
|
233
|
+
// GIVEN
|
|
234
|
+
const fakeAccessibilityLabel = 'wrapped_target';
|
|
235
|
+
const fakeEvent = {
|
|
236
|
+
_targetInst: {
|
|
237
|
+
memoizedProps: {
|
|
238
|
+
accessibilityLabel: fakeAccessibilityLabel
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
};
|
|
242
|
+
const fakeArguments = {
|
|
243
|
+
onPress: jest.fn(),
|
|
244
|
+
someOtherProp: 'value',
|
|
245
|
+
event: fakeEvent
|
|
246
|
+
};
|
|
247
|
+
|
|
248
|
+
// WHEN
|
|
249
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
250
|
+
|
|
251
|
+
// THEN
|
|
252
|
+
expect(DdRum.addAction.mock.calls.length).toBe(1);
|
|
253
|
+
expect(DdRum.addAction.mock.calls[0][0]).toBe(RumActionType.TAP);
|
|
254
|
+
expect(DdRum.addAction.mock.calls[0][1]).toBe(fakeAccessibilityLabel);
|
|
255
|
+
expect(DdRum.addAction.mock.calls[0][4]).toBe(fakeEvent);
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
it('M send a RUM Action event W interceptOnPress { event nested in props wrapper with dd-action-name } ', async () => {
|
|
259
|
+
// GIVEN
|
|
260
|
+
const fakeDdActionLabel = 'WrappedDdActionLabel';
|
|
261
|
+
const fakeEvent = {
|
|
262
|
+
_targetInst: {
|
|
263
|
+
memoizedProps: {
|
|
264
|
+
'dd-action-name': fakeDdActionLabel
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
};
|
|
268
|
+
const fakeArguments = {
|
|
269
|
+
onPress: jest.fn(),
|
|
270
|
+
event: fakeEvent
|
|
271
|
+
};
|
|
272
|
+
|
|
273
|
+
// WHEN
|
|
274
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
275
|
+
|
|
276
|
+
// THEN
|
|
277
|
+
expect(DdRum.addAction.mock.calls.length).toBe(1);
|
|
278
|
+
expect(DdRum.addAction.mock.calls[0][0]).toBe(RumActionType.TAP);
|
|
279
|
+
expect(DdRum.addAction.mock.calls[0][1]).toBe(fakeDdActionLabel);
|
|
280
|
+
expect(DdRum.addAction.mock.calls[0][4]).toBe(fakeEvent);
|
|
281
|
+
});
|
|
282
|
+
|
|
283
|
+
it('M do nothing W interceptOnPress { props wrapper without nested event (incubator pattern) } ', async () => {
|
|
284
|
+
// GIVEN - react-native-ui-lib Incubator passes props without event
|
|
285
|
+
const fakeArguments = {
|
|
286
|
+
onPress: jest.fn(),
|
|
287
|
+
someOtherProp: 'value'
|
|
288
|
+
};
|
|
289
|
+
|
|
290
|
+
// WHEN
|
|
291
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
292
|
+
|
|
293
|
+
// THEN
|
|
294
|
+
expect(DdRum.addAction.mock.calls.length).toBe(0);
|
|
295
|
+
expect(InternalLog.log.mock.calls.length).toBe(1);
|
|
296
|
+
expect(InternalLog.log.mock.calls[0][0]).toBe(
|
|
297
|
+
DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE
|
|
298
|
+
);
|
|
299
|
+
expect(InternalLog.log.mock.calls[0][1]).toBe(SdkVerbosity.DEBUG);
|
|
300
|
+
});
|
|
301
|
+
|
|
302
|
+
it('M do nothing W interceptOnPress { props wrapper with event that has no _targetInst } ', async () => {
|
|
303
|
+
// GIVEN - event property exists but is not a valid native event
|
|
304
|
+
const fakeArguments = {
|
|
305
|
+
onPress: jest.fn(),
|
|
306
|
+
event: { nativeEvent: { pageX: 0, pageY: 0 } }
|
|
307
|
+
};
|
|
308
|
+
|
|
309
|
+
// WHEN
|
|
310
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
311
|
+
|
|
312
|
+
// THEN
|
|
313
|
+
expect(DdRum.addAction.mock.calls.length).toBe(0);
|
|
314
|
+
expect(InternalLog.log.mock.calls.length).toBe(1);
|
|
315
|
+
expect(InternalLog.log.mock.calls[0][0]).toBe(
|
|
316
|
+
DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE
|
|
317
|
+
);
|
|
318
|
+
expect(InternalLog.log.mock.calls[0][1]).toBe(SdkVerbosity.DEBUG);
|
|
319
|
+
});
|
|
320
|
+
|
|
232
321
|
it('M do nothing W interceptOnPress { invalid arguments - empty object } ', async () => {
|
|
233
322
|
// GIVEN
|
|
234
323
|
const fakeArguments = {};
|
package/src/logs/DdLogs.ts
CHANGED
|
@@ -5,11 +5,12 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { DdAttributes } from '../DdAttributes';
|
|
8
|
-
import {
|
|
8
|
+
import { InternalLog } from '../InternalLog';
|
|
9
9
|
import { SdkVerbosity } from '../config/types/SdkVerbosity';
|
|
10
10
|
import { debugId } from '../metro/debugIdResolver';
|
|
11
11
|
import type { DdNativeLogsType } from '../nativeModulesTypes';
|
|
12
12
|
import { encodeAttributes } from '../sdk/AttributesEncoding/attributesEncoding';
|
|
13
|
+
import { bufferVoidNativeCall } from '../sdk/DatadogProvider/Buffer/bufferNativeCall';
|
|
13
14
|
import type { ErrorSource, LogEventMapper } from '../types';
|
|
14
15
|
import { getGlobalInstance } from '../utils/singletonUtils';
|
|
15
16
|
|
|
@@ -23,7 +24,6 @@ import type {
|
|
|
23
24
|
} from './types';
|
|
24
25
|
|
|
25
26
|
const LOGS_MODULE = 'com.datadog.reactnative.logs';
|
|
26
|
-
const SDK_NOT_INITIALIZED_MESSAGE = 'DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT';
|
|
27
27
|
|
|
28
28
|
const generateEmptyPromise = () => new Promise<void>(resolve => resolve());
|
|
29
29
|
|
|
@@ -110,21 +110,6 @@ class DdLogsWrapper implements DdLogsType {
|
|
|
110
110
|
return this.log(args[0], args[1] ?? {}, 'error');
|
|
111
111
|
};
|
|
112
112
|
|
|
113
|
-
/**
|
|
114
|
-
* Since the InternalLog does not have a verbosity set yet in this case,
|
|
115
|
-
* we use console.warn to warn the user in dev mode.
|
|
116
|
-
*/
|
|
117
|
-
private printLogDroppedSdkNotInitialized = (
|
|
118
|
-
message: string,
|
|
119
|
-
status: 'debug' | 'info' | 'warn' | 'error'
|
|
120
|
-
) => {
|
|
121
|
-
if (__DEV__) {
|
|
122
|
-
console.warn(
|
|
123
|
-
`${DATADOG_MESSAGE_PREFIX} Dropping ${status} log as the SDK is not initialized yet: "${message}"`
|
|
124
|
-
);
|
|
125
|
-
}
|
|
126
|
-
};
|
|
127
|
-
|
|
128
113
|
private printLogDroppedByMapper = (
|
|
129
114
|
message: string,
|
|
130
115
|
status: 'debug' | 'info' | 'warn' | 'error'
|
|
@@ -161,21 +146,12 @@ class DdLogsWrapper implements DdLogsType {
|
|
|
161
146
|
}
|
|
162
147
|
|
|
163
148
|
this.printLogTracked(event.message, status);
|
|
164
|
-
|
|
165
|
-
|
|
149
|
+
return bufferVoidNativeCall(() =>
|
|
150
|
+
this.nativeLogs[status](
|
|
166
151
|
event.message,
|
|
167
152
|
encodeAttributes(event.context)
|
|
168
|
-
)
|
|
169
|
-
|
|
170
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
171
|
-
// @ts-ignore
|
|
172
|
-
if (error.message === SDK_NOT_INITIALIZED_MESSAGE) {
|
|
173
|
-
this.printLogDroppedSdkNotInitialized(message, status);
|
|
174
|
-
return generateEmptyPromise();
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
throw error;
|
|
178
|
-
}
|
|
153
|
+
)
|
|
154
|
+
);
|
|
179
155
|
};
|
|
180
156
|
|
|
181
157
|
private logWithError = async (
|
|
@@ -207,39 +183,30 @@ class DdLogsWrapper implements DdLogsType {
|
|
|
207
183
|
}
|
|
208
184
|
|
|
209
185
|
this.printLogTracked(mappedEvent.message, status);
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
186
|
+
const encodedContext = encodeAttributes(mappedEvent.context);
|
|
187
|
+
const updatedContext = {
|
|
188
|
+
...encodedContext,
|
|
189
|
+
[DdAttributes.errorSourceType]: 'react-native'
|
|
190
|
+
};
|
|
191
|
+
|
|
192
|
+
if (fingerprint && fingerprint !== '') {
|
|
193
|
+
updatedContext[DdAttributes.errorFingerprint] = fingerprint;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
const _debugId = debugId;
|
|
197
|
+
if (_debugId) {
|
|
198
|
+
updatedContext[DdAttributes.debugId] = _debugId;
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
return bufferVoidNativeCall(() =>
|
|
202
|
+
this.nativeLogs[`${status}WithError`](
|
|
227
203
|
mappedEvent.message,
|
|
228
204
|
(mappedEvent as NativeLogWithError).errorKind,
|
|
229
205
|
(mappedEvent as NativeLogWithError).errorMessage,
|
|
230
206
|
(mappedEvent as NativeLogWithError).stacktrace,
|
|
231
207
|
updatedContext
|
|
232
|
-
)
|
|
233
|
-
|
|
234
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
235
|
-
// @ts-ignore
|
|
236
|
-
if (error.message === SDK_NOT_INITIALIZED_MESSAGE) {
|
|
237
|
-
this.printLogDroppedSdkNotInitialized(message, status);
|
|
238
|
-
return generateEmptyPromise();
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
throw error;
|
|
242
|
-
}
|
|
208
|
+
)
|
|
209
|
+
);
|
|
243
210
|
};
|
|
244
211
|
|
|
245
212
|
registerLogEventMapper(logEventMapper: LogEventMapper) {
|
|
@@ -12,7 +12,7 @@ import { CoreConfiguration } from '../../config/features/CoreConfiguration';
|
|
|
12
12
|
import { LogsConfiguration } from '../../config/features/LogsConfiguration';
|
|
13
13
|
import { RumConfiguration } from '../../config/features/RumConfiguration';
|
|
14
14
|
import { SdkVerbosity } from '../../config/types';
|
|
15
|
-
import
|
|
15
|
+
import { BufferSingleton } from '../../sdk/DatadogProvider/Buffer/BufferSingleton';
|
|
16
16
|
import { ErrorSource } from '../../types';
|
|
17
17
|
import type { LogEventMapper, LogEvent } from '../../types';
|
|
18
18
|
import { DdLogs } from '../DdLogs';
|
|
@@ -31,6 +31,7 @@ describe('DdLogs', () => {
|
|
|
31
31
|
beforeEach(() => {
|
|
32
32
|
jest.clearAllMocks();
|
|
33
33
|
DdLogs.unregisterLogEventMapper();
|
|
34
|
+
BufferSingleton.onInitialization();
|
|
34
35
|
});
|
|
35
36
|
|
|
36
37
|
it('registers event mapper and maps logs', async () => {
|
|
@@ -477,26 +478,6 @@ describe('DdLogs', () => {
|
|
|
477
478
|
});
|
|
478
479
|
});
|
|
479
480
|
|
|
480
|
-
describe('when SDK is not initialized', () => {
|
|
481
|
-
beforeEach(() => {
|
|
482
|
-
jest.clearAllMocks();
|
|
483
|
-
DdLogs.unregisterLogEventMapper();
|
|
484
|
-
});
|
|
485
|
-
|
|
486
|
-
it('does not crash and warns user', async () => {
|
|
487
|
-
(NativeModules.DdLogs.info as jest.MockedFunction<
|
|
488
|
-
DdNativeLogsType['debug']
|
|
489
|
-
>).mockRejectedValueOnce(
|
|
490
|
-
new Error('DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT')
|
|
491
|
-
);
|
|
492
|
-
const consoleSpy = jest.spyOn(console, 'warn');
|
|
493
|
-
await DdLogs.info('original message', {});
|
|
494
|
-
expect(consoleSpy).toHaveBeenCalledWith(
|
|
495
|
-
'DATADOG: Dropping info log as the SDK is not initialized yet: "original message"'
|
|
496
|
-
);
|
|
497
|
-
});
|
|
498
|
-
});
|
|
499
|
-
|
|
500
481
|
describe('log context', () => {
|
|
501
482
|
beforeEach(() => {
|
|
502
483
|
jest.clearAllMocks();
|
|
@@ -94,12 +94,12 @@ class BabelInteractionTracking {
|
|
|
94
94
|
? handlerArgs.find(x => typeof x === 'number') || 0
|
|
95
95
|
: 0;
|
|
96
96
|
|
|
97
|
-
// Order:
|
|
97
|
+
// Order: actionName → actionNameAttribute → accessibilityLabel → content
|
|
98
98
|
const selectedContent =
|
|
99
|
-
tryContent() ||
|
|
100
99
|
actionName ||
|
|
101
100
|
Object.values(attrs)[0] ||
|
|
102
|
-
getAccessibilityLabel()
|
|
101
|
+
getAccessibilityLabel() ||
|
|
102
|
+
tryContent();
|
|
103
103
|
|
|
104
104
|
if (!selectedContent) {
|
|
105
105
|
return componentName;
|
|
@@ -48,14 +48,15 @@ export class DdEventsInterceptor implements EventsInterceptor {
|
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
interceptOnPress(...args: any[]): void {
|
|
51
|
-
|
|
51
|
+
const event = this.resolveNativeEvent(args);
|
|
52
|
+
if (event) {
|
|
52
53
|
const currentTime = Date.now();
|
|
53
54
|
const timestampDifference = Math.abs(
|
|
54
55
|
Date.now() - this.debouncingStartedTimestamp
|
|
55
56
|
);
|
|
56
57
|
if (timestampDifference > DEBOUNCE_EVENT_THRESHOLD_IN_MS) {
|
|
57
|
-
const targetNode =
|
|
58
|
-
this.handleTargetEvent(targetNode,
|
|
58
|
+
const targetNode = event._targetInst;
|
|
59
|
+
this.handleTargetEvent(targetNode, event);
|
|
59
60
|
// we add an approximated 1 millisecond for the execution time of the `handleTargetEvent` function
|
|
60
61
|
this.debouncingStartedTimestamp =
|
|
61
62
|
currentTime + HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS;
|
|
@@ -68,6 +69,27 @@ export class DdEventsInterceptor implements EventsInterceptor {
|
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
|
|
72
|
+
/**
|
|
73
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
74
|
+
*
|
|
75
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
76
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
77
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
78
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
79
|
+
*/
|
|
80
|
+
private resolveNativeEvent(args: any[]): any | null {
|
|
81
|
+
if (args.length === 0 || !args[0]) {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
if (args[0]._targetInst) {
|
|
85
|
+
return args[0];
|
|
86
|
+
}
|
|
87
|
+
if (args[0].event && args[0].event._targetInst) {
|
|
88
|
+
return args[0].event;
|
|
89
|
+
}
|
|
90
|
+
return null;
|
|
91
|
+
}
|
|
92
|
+
|
|
71
93
|
private handleTargetEvent(targetNode: any, event: unknown) {
|
|
72
94
|
if (targetNode) {
|
|
73
95
|
const resolvedTargetName = this.resolveTargetName(targetNode);
|