@datadog/mobile-react-native 3.1.0 → 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.
Files changed (57) hide show
  1. package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +20 -43
  2. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +3 -3
  3. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +18 -18
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +3 -2
  5. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  6. package/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt +18 -125
  7. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +4 -2
  8. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +6 -3
  9. package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +3 -4
  10. package/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt +1 -1
  11. package/android/src/test/resources/input/complete-configuration.json +10 -10
  12. package/ios/Sources/DdLogsImplementation.swift +13 -3
  13. package/ios/Sources/DdSdkConfiguration.swift +4 -4
  14. package/ios/Sources/DdSdkNativeInitialization.swift +2 -2
  15. package/ios/Sources/RNDdSdkConfiguration.swift +9 -8
  16. package/ios/Sources/SdkVersion.swift +1 -1
  17. package/lib/commonjs/InternalLog.js +9 -7
  18. package/lib/commonjs/InternalLog.js.map +1 -1
  19. package/lib/commonjs/logs/DdLogs.js +14 -44
  20. package/lib/commonjs/logs/DdLogs.js.map +1 -1
  21. package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
  22. package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
  23. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
  24. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  25. package/lib/commonjs/sdk/DatadogProvider/Buffer/BufferSingleton.js +10 -8
  26. package/lib/commonjs/sdk/DatadogProvider/Buffer/BufferSingleton.js.map +1 -1
  27. package/lib/commonjs/version.js +1 -1
  28. package/lib/module/InternalLog.js +9 -6
  29. package/lib/module/InternalLog.js.map +1 -1
  30. package/lib/module/logs/DdLogs.js +15 -45
  31. package/lib/module/logs/DdLogs.js.map +1 -1
  32. package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
  33. package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
  34. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
  35. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  36. package/lib/module/sdk/DatadogProvider/Buffer/BufferSingleton.js +10 -7
  37. package/lib/module/sdk/DatadogProvider/Buffer/BufferSingleton.js.map +1 -1
  38. package/lib/module/version.js +1 -1
  39. package/lib/typescript/InternalLog.d.ts +6 -4
  40. package/lib/typescript/InternalLog.d.ts.map +1 -1
  41. package/lib/typescript/logs/DdLogs.d.ts +0 -5
  42. package/lib/typescript/logs/DdLogs.d.ts.map +1 -1
  43. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +9 -0
  44. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
  45. package/lib/typescript/sdk/DatadogProvider/Buffer/BufferSingleton.d.ts +7 -5
  46. package/lib/typescript/sdk/DatadogProvider/Buffer/BufferSingleton.d.ts.map +1 -1
  47. package/lib/typescript/version.d.ts +1 -1
  48. package/package.json +2 -2
  49. package/src/InternalLog.tsx +14 -6
  50. package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +89 -0
  51. package/src/logs/DdLogs.ts +25 -58
  52. package/src/logs/__tests__/DdLogs.test.ts +2 -21
  53. package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +3 -3
  54. package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +25 -3
  55. package/src/sdk/DatadogProvider/Buffer/BufferSingleton.ts +16 -7
  56. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +13 -0
  57. package/src/version.ts +1 -1
@@ -5,14 +5,14 @@
5
5
  */
6
6
 
7
7
  import { DdAttributes } from '../DdAttributes';
8
- import { DATADOG_MESSAGE_PREFIX, InternalLog } from '../InternalLog';
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
- try {
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
- try {
110
- const encodedContext = encodeAttributes(mappedEvent.context);
111
- const updatedContext = {
112
- ...encodedContext,
113
- [DdAttributes.errorSourceType]: 'react-native'
114
- };
115
- if (fingerprint && fingerprint !== '') {
116
- updatedContext[DdAttributes.errorFingerprint] = fingerprint;
117
- }
118
- const _debugId = debugId;
119
- if (_debugId) {
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","DATADOG_MESSAGE_PREFIX","InternalLog","SdkVerbosity","debugId","encodeAttributes","getGlobalInstance","generateEventMapper","LOGS_MODULE","SDK_NOT_INITIALIZED_MESSAGE","generateEmptyPromise","Promise","resolve","isLogWithError","args","undefined","DdLogsWrapper","nativeLogs","require","default","logEventMapper","debug","logWithError","log","info","warn","error","printLogDroppedSdkNotInitialized","message","status","__DEV__","console","printLogDroppedByMapper","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":[]}
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: content → actionName → actionNameAttribute → accessibilityLabel
61
- const selectedContent = tryContent() || actionName || Object.values(attrs)[0] || getAccessibilityLabel();
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
  }
@@ -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":"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","ignoreList":[]}
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
- if (args.length > 0 && args[0] && args[0]._targetInst) {
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 = args[0]._targetInst;
28
- this.handleTargetEvent(targetNode, args[0]);
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","length","_targetInst","currentTime","Date","now","timestampDifference","Math","abs","targetNode","handleTargetEvent","log","DEBUG","event","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":[]}
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":[]}
@@ -4,19 +4,22 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
+ import { getGlobalInstance } from '../../../utils/singletonUtils';
7
8
  import { BoundedBuffer } from './BoundedBuffer';
8
9
  import { PassThroughBuffer } from './PassThroughBuffer';
9
- export class BufferSingleton {
10
- static bufferInstance = new BoundedBuffer();
11
- static getInstance = () => {
10
+ const BUFFER_SINGLETON_MODULE = 'com.datadog.reactnative.buffer_singleton';
11
+ class _BufferSingleton {
12
+ bufferInstance = new BoundedBuffer();
13
+ getInstance = () => {
12
14
  return BufferSingleton.bufferInstance;
13
15
  };
14
- static onInitialization = () => {
15
- BufferSingleton.bufferInstance.drain();
16
- BufferSingleton.bufferInstance = new PassThroughBuffer();
16
+ onInitialization = () => {
17
+ this.bufferInstance.drain();
18
+ this.bufferInstance = new PassThroughBuffer();
17
19
  };
18
- static reset = () => {
20
+ reset = () => {
19
21
  BufferSingleton.bufferInstance = new BoundedBuffer();
20
22
  };
21
23
  }
24
+ export const BufferSingleton = getGlobalInstance(BUFFER_SINGLETON_MODULE, () => new _BufferSingleton());
22
25
  //# sourceMappingURL=BufferSingleton.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["BoundedBuffer","PassThroughBuffer","BufferSingleton","bufferInstance","getInstance","onInitialization","drain","reset"],"sourceRoot":"../../../../../src","sources":["sdk/DatadogProvider/Buffer/BufferSingleton.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,aAAa,QAAQ,iBAAiB;AAE/C,SAASC,iBAAiB,QAAQ,qBAAqB;AAEvD,OAAO,MAAMC,eAAe,CAAC;EACzB,OAAeC,cAAc,GAAkB,IAAIH,aAAa,CAAC,CAAC;EAElE,OAAOI,WAAW,GAAGA,CAAA,KAAqB;IACtC,OAAOF,eAAe,CAACC,cAAc;EACzC,CAAC;EAED,OAAOE,gBAAgB,GAAGA,CAAA,KAAM;IAC5BH,eAAe,CAACC,cAAc,CAACG,KAAK,CAAC,CAAC;IACtCJ,eAAe,CAACC,cAAc,GAAG,IAAIF,iBAAiB,CAAC,CAAC;EAC5D,CAAC;EAED,OAAOM,KAAK,GAAGA,CAAA,KAAM;IACjBL,eAAe,CAACC,cAAc,GAAG,IAAIH,aAAa,CAAC,CAAC;EACxD,CAAC;AACL","ignoreList":[]}
1
+ {"version":3,"names":["getGlobalInstance","BoundedBuffer","PassThroughBuffer","BUFFER_SINGLETON_MODULE","_BufferSingleton","bufferInstance","getInstance","BufferSingleton","onInitialization","drain","reset"],"sourceRoot":"../../../../../src","sources":["sdk/DatadogProvider/Buffer/BufferSingleton.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,iBAAiB,QAAQ,+BAA+B;AAEjE,SAASC,aAAa,QAAQ,iBAAiB;AAE/C,SAASC,iBAAiB,QAAQ,qBAAqB;AAEvD,MAAMC,uBAAuB,GAAG,0CAA0C;AAE1E,MAAMC,gBAAgB,CAAC;EACXC,cAAc,GAAkB,IAAIJ,aAAa,CAAC,CAAC;EAE3DK,WAAW,GAAGA,CAAA,KAAqB;IAC/B,OAAOC,eAAe,CAACF,cAAc;EACzC,CAAC;EAEDG,gBAAgB,GAAGA,CAAA,KAAM;IACrB,IAAI,CAACH,cAAc,CAACI,KAAK,CAAC,CAAC;IAC3B,IAAI,CAACJ,cAAc,GAAG,IAAIH,iBAAiB,CAAC,CAAC;EACjD,CAAC;EAEDQ,KAAK,GAAGA,CAAA,KAAM;IACVH,eAAe,CAACF,cAAc,GAAG,IAAIJ,aAAa,CAAC,CAAC;EACxD,CAAC;AACL;AAEA,OAAO,MAAMM,eAAe,GAAGP,iBAAiB,CAC5CG,uBAAuB,EACvB,MAAM,IAAIC,gBAAgB,CAAC,CAC/B,CAAC","ignoreList":[]}
@@ -1,3 +1,3 @@
1
1
  // generated by genversion
2
- export const version = '3.1.0';
2
+ export const version = '3.1.2';
3
3
  //# sourceMappingURL=version.js.map
@@ -5,9 +5,11 @@ export declare const DATADOG_MESSAGE_PREFIX = "DATADOG:";
5
5
  *
6
6
  * This logger is only for debugging the Datadog SDK.
7
7
  */
8
- export declare class InternalLog {
9
- private static levelMap;
10
- static verbosity: SdkVerbosity | undefined;
11
- static log(message: string, verbosity: SdkVerbosity): void;
8
+ declare class _InternalLog {
9
+ private levelMap;
10
+ verbosity: SdkVerbosity | undefined;
11
+ log(message: string, verbosity: SdkVerbosity): void;
12
12
  }
13
+ export declare const InternalLog: _InternalLog;
14
+ export {};
13
15
  //# sourceMappingURL=InternalLog.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"InternalLog.d.ts","sourceRoot":"","sources":["../../src/InternalLog.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAKpB;IAEH,OAAc,SAAS,EAAE,YAAY,GAAG,SAAS,CAAa;WAEhD,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,GAAG,IAAI;CA0BpE"}
1
+ {"version":3,"file":"InternalLog.d.ts","sourceRoot":"","sources":["../../src/InternalLog.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAIjD;;;;GAIG;AACH,cAAM,YAAY;IACd,OAAO,CAAC,QAAQ,CAKb;IAEI,SAAS,EAAE,YAAY,GAAG,SAAS,CAAa;IAEhD,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,GAAG,IAAI;CA0B7D;AAED,eAAO,MAAM,WAAW,cAGvB,CAAC"}
@@ -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":"AAYA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,UAAU,CAAC;AAI5D,OAAO,KAAK,EACR,UAAU,EACV,YAAY,EACZ,qBAAqB,EAGxB,MAAM,SAAS,CAAC;AAuBjB,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;;;OAGG;IACH,OAAO,CAAC,gCAAgC,CAStC;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,eAAe,CAQrB;IAEF,OAAO,CAAC,GAAG,CA+BT;IAEF,OAAO,CAAC,YAAY,CA8DlB;IAEF,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAIrD,wBAAwB;CAG3B;AAED,eAAO,MAAM,MAAM,eAA4D,CAAC"}
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;IAqBtC,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,sBAAsB;CAkBjC"}
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,8 +1,10 @@
1
1
  import type { DatadogBuffer } from './DatadogBuffer';
2
- export declare class BufferSingleton {
3
- private static bufferInstance;
4
- static getInstance: () => DatadogBuffer;
5
- static onInitialization: () => void;
6
- static reset: () => void;
2
+ declare class _BufferSingleton {
3
+ private bufferInstance;
4
+ getInstance: () => DatadogBuffer;
5
+ onInitialization: () => void;
6
+ reset: () => void;
7
7
  }
8
+ export declare const BufferSingleton: _BufferSingleton;
9
+ export {};
8
10
  //# sourceMappingURL=BufferSingleton.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BufferSingleton.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/DatadogProvider/Buffer/BufferSingleton.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGrD,qBAAa,eAAe;IACxB,OAAO,CAAC,MAAM,CAAC,cAAc,CAAsC;IAEnE,MAAM,CAAC,WAAW,QAAO,aAAa,CAEpC;IAEF,MAAM,CAAC,gBAAgB,aAGrB;IAEF,MAAM,CAAC,KAAK,aAEV;CACL"}
1
+ {"version":3,"file":"BufferSingleton.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/DatadogProvider/Buffer/BufferSingleton.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAKrD,cAAM,gBAAgB;IAClB,OAAO,CAAC,cAAc,CAAsC;IAE5D,WAAW,QAAO,aAAa,CAE7B;IAEF,gBAAgB,aAGd;IAEF,KAAK,aAEH;CACL;AAED,eAAO,MAAM,eAAe,kBAG3B,CAAC"}
@@ -1,2 +1,2 @@
1
- export declare const version = "3.1.0";
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.0",
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": "fbb259da0575dba36fb1bb163aa21462d204940c"
121
+ "gitHead": "fd99111071f3c514423f3da07ffe0e87c4ff62a2"
122
122
  }
@@ -5,30 +5,33 @@
5
5
  */
6
6
 
7
7
  import { SdkVerbosity } from './config/types/SdkVerbosity';
8
+ import { getGlobalInstance } from './utils/singletonUtils';
8
9
 
9
10
  export const DATADOG_MESSAGE_PREFIX = 'DATADOG:';
10
11
 
12
+ const INTERNAL_LOG_MODULE = 'com.datadog.reactnative.internal_log';
13
+
11
14
  /**
12
15
  * /!\ DO NOT USE THIS IN YOUR APP /!\\
13
16
  *
14
17
  * This logger is only for debugging the Datadog SDK.
15
18
  */
16
- export class InternalLog {
17
- private static levelMap = new Map<SdkVerbosity, number>([
19
+ class _InternalLog {
20
+ private levelMap = new Map<SdkVerbosity, number>([
18
21
  [SdkVerbosity.DEBUG, 1],
19
22
  [SdkVerbosity.INFO, 2],
20
23
  [SdkVerbosity.WARN, 3],
21
24
  [SdkVerbosity.ERROR, 4]
22
25
  ]);
23
26
 
24
- public static verbosity: SdkVerbosity | undefined = undefined;
27
+ public verbosity: SdkVerbosity | undefined = undefined;
25
28
 
26
- public static log(message: string, verbosity: SdkVerbosity): void {
27
- if (InternalLog.verbosity === undefined) {
29
+ public log(message: string, verbosity: SdkVerbosity): void {
30
+ if (this.verbosity === undefined) {
28
31
  return;
29
32
  }
30
33
  const requiredLevel = InternalLog.levelMap.get(verbosity);
31
- const allowedLevel = InternalLog.levelMap.get(InternalLog.verbosity);
34
+ const allowedLevel = InternalLog.levelMap.get(this.verbosity);
32
35
  if (allowedLevel === undefined || requiredLevel === undefined) {
33
36
  return;
34
37
  }
@@ -50,3 +53,8 @@ export class InternalLog {
50
53
  }
51
54
  }
52
55
  }
56
+
57
+ export const InternalLog = getGlobalInstance(
58
+ INTERNAL_LOG_MODULE,
59
+ () => new _InternalLog()
60
+ );
@@ -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 = {};