@datadog/mobile-react-native 3.1.1 → 3.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/DatadogSDKReactNative.podspec +7 -7
- package/android/build.gradle +22 -7
- package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +20 -43
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +1 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +5 -0
- 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/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +54 -0
- package/ios/Sources/AnyEncodable.swift +16 -83
- package/ios/Sources/Attributes.swift +5 -0
- package/ios/Sources/DdLogsImplementation.swift +13 -3
- package/ios/Sources/DdRumImplementation.swift +2 -1
- package/ios/Sources/DdSdkNativeInitialization.swift +8 -1
- package/ios/Sources/RUMMonitorInternalProtocol.swift +8 -1
- 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/rum/instrumentation/resourceTracking/distributedTracing/headers.js +3 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/trace/DdTrace.js +1 -1
- package/lib/commonjs/trace/DdTrace.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/rum/instrumentation/resourceTracking/distributedTracing/headers.js +2 -0
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/trace/DdTrace.js +1 -1
- package/lib/module/trace/DdTrace.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/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
- package/lib/typescript/trace/DdTrace.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/rum/instrumentation/resourceTracking/distributedTracing/headers.ts +2 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +10 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +54 -1
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +13 -0
- package/src/trace/DdTrace.ts +1 -4
- package/src/version.ts +1 -1
|
@@ -169,7 +169,14 @@ public class DdSdkNativeInitialization: NSObject {
|
|
|
169
169
|
sampleRate: Float(
|
|
170
170
|
configuration.rumConfiguration?.resourceTraceSampleRate
|
|
171
171
|
?? DefaultConfiguration.resourceTraceSampleRate)
|
|
172
|
-
)
|
|
172
|
+
),
|
|
173
|
+
resourceAttributesProvider: { request, _, _, _ in
|
|
174
|
+
let trackedBy = request.value(forHTTPHeaderField: InternalConfigurationAttributes.trackedByHeaderKey)
|
|
175
|
+
if trackedBy == InternalConfigurationAttributes.trackedByHeaderValue {
|
|
176
|
+
return [InternalConfigurationAttributes.dropResource: true]
|
|
177
|
+
}
|
|
178
|
+
return nil
|
|
179
|
+
}
|
|
173
180
|
)
|
|
174
181
|
}
|
|
175
182
|
|
|
@@ -22,6 +22,12 @@ public protocol RUMMonitorInternalProtocol {
|
|
|
22
22
|
attributes: [AttributeKey: AttributeValue]
|
|
23
23
|
)
|
|
24
24
|
|
|
25
|
+
func setInternalViewAttribute(
|
|
26
|
+
at time: Date,
|
|
27
|
+
key: AttributeKey,
|
|
28
|
+
value: AttributeValue
|
|
29
|
+
)
|
|
30
|
+
|
|
25
31
|
func addResourceMetrics(
|
|
26
32
|
at time: Date,
|
|
27
33
|
resourceKey: String,
|
|
@@ -32,7 +38,8 @@ public protocol RUMMonitorInternalProtocol {
|
|
|
32
38
|
ssl: (start: Date, end: Date)?,
|
|
33
39
|
firstByte: (start: Date, end: Date)?,
|
|
34
40
|
download: (start: Date, end: Date)?,
|
|
35
|
-
|
|
41
|
+
responseBodySize: (encoded: Int64, decoded: Int64)?,
|
|
42
|
+
requestBodySize: (encoded: Int64, decoded: Int64)?,
|
|
36
43
|
attributes: [AttributeKey: AttributeValue]
|
|
37
44
|
)
|
|
38
45
|
}
|
|
@@ -9,6 +9,7 @@ var _InternalLog = require("../InternalLog");
|
|
|
9
9
|
var _SdkVerbosity = require("../config/types/SdkVerbosity");
|
|
10
10
|
var _debugIdResolver = require("../metro/debugIdResolver");
|
|
11
11
|
var _attributesEncoding = require("../sdk/AttributesEncoding/attributesEncoding");
|
|
12
|
+
var _bufferNativeCall = require("../sdk/DatadogProvider/Buffer/bufferNativeCall");
|
|
12
13
|
var _singletonUtils = require("../utils/singletonUtils");
|
|
13
14
|
var _eventMapper = require("./eventMapper");
|
|
14
15
|
/*
|
|
@@ -18,7 +19,6 @@ var _eventMapper = require("./eventMapper");
|
|
|
18
19
|
*/
|
|
19
20
|
|
|
20
21
|
const LOGS_MODULE = 'com.datadog.reactnative.logs';
|
|
21
|
-
const SDK_NOT_INITIALIZED_MESSAGE = 'DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT';
|
|
22
22
|
const generateEmptyPromise = () => new Promise(resolve => resolve());
|
|
23
23
|
|
|
24
24
|
/**
|
|
@@ -56,16 +56,6 @@ class DdLogsWrapper {
|
|
|
56
56
|
}
|
|
57
57
|
return this.log(args[0], args[1] ?? {}, 'error');
|
|
58
58
|
};
|
|
59
|
-
|
|
60
|
-
/**
|
|
61
|
-
* Since the InternalLog does not have a verbosity set yet in this case,
|
|
62
|
-
* we use console.warn to warn the user in dev mode.
|
|
63
|
-
*/
|
|
64
|
-
printLogDroppedSdkNotInitialized = (message, status) => {
|
|
65
|
-
if (__DEV__) {
|
|
66
|
-
console.warn(`${_InternalLog.DATADOG_MESSAGE_PREFIX} Dropping ${status} log as the SDK is not initialized yet: "${message}"`);
|
|
67
|
-
}
|
|
68
|
-
};
|
|
69
59
|
printLogDroppedByMapper = (message, status) => {
|
|
70
60
|
_InternalLog.InternalLog.log(`${status} log dropped by log mapper: "${message}"`, _SdkVerbosity.SdkVerbosity.DEBUG);
|
|
71
61
|
};
|
|
@@ -83,17 +73,7 @@ class DdLogsWrapper {
|
|
|
83
73
|
return generateEmptyPromise();
|
|
84
74
|
}
|
|
85
75
|
this.printLogTracked(event.message, status);
|
|
86
|
-
|
|
87
|
-
return await this.nativeLogs[status](event.message, (0, _attributesEncoding.encodeAttributes)(event.context));
|
|
88
|
-
} catch (error) {
|
|
89
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
90
|
-
// @ts-ignore
|
|
91
|
-
if (error.message === SDK_NOT_INITIALIZED_MESSAGE) {
|
|
92
|
-
this.printLogDroppedSdkNotInitialized(message, status);
|
|
93
|
-
return generateEmptyPromise();
|
|
94
|
-
}
|
|
95
|
-
throw error;
|
|
96
|
-
}
|
|
76
|
+
return (0, _bufferNativeCall.bufferVoidNativeCall)(() => this.nativeLogs[status](event.message, (0, _attributesEncoding.encodeAttributes)(event.context)));
|
|
97
77
|
};
|
|
98
78
|
logWithError = async (message, errorKind, errorMessage, stacktrace, context, status, fingerprint = '', source) => {
|
|
99
79
|
const rawLogEvent = {
|
|
@@ -112,29 +92,19 @@ class DdLogsWrapper {
|
|
|
112
92
|
return generateEmptyPromise();
|
|
113
93
|
}
|
|
114
94
|
this.printLogTracked(mappedEvent.message, status);
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
updatedContext[_DdAttributes.DdAttributes.debugId] = _debugId;
|
|
127
|
-
}
|
|
128
|
-
return await this.nativeLogs[`${status}WithError`](mappedEvent.message, mappedEvent.errorKind, mappedEvent.errorMessage, mappedEvent.stacktrace, updatedContext);
|
|
129
|
-
} catch (error) {
|
|
130
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
131
|
-
// @ts-ignore
|
|
132
|
-
if (error.message === SDK_NOT_INITIALIZED_MESSAGE) {
|
|
133
|
-
this.printLogDroppedSdkNotInitialized(message, status);
|
|
134
|
-
return generateEmptyPromise();
|
|
135
|
-
}
|
|
136
|
-
throw error;
|
|
95
|
+
const encodedContext = (0, _attributesEncoding.encodeAttributes)(mappedEvent.context);
|
|
96
|
+
const updatedContext = {
|
|
97
|
+
...encodedContext,
|
|
98
|
+
[_DdAttributes.DdAttributes.errorSourceType]: 'react-native'
|
|
99
|
+
};
|
|
100
|
+
if (fingerprint && fingerprint !== '') {
|
|
101
|
+
updatedContext[_DdAttributes.DdAttributes.errorFingerprint] = fingerprint;
|
|
102
|
+
}
|
|
103
|
+
const _debugId = _debugIdResolver.debugId;
|
|
104
|
+
if (_debugId) {
|
|
105
|
+
updatedContext[_DdAttributes.DdAttributes.debugId] = _debugId;
|
|
137
106
|
}
|
|
107
|
+
return (0, _bufferNativeCall.bufferVoidNativeCall)(() => this.nativeLogs[`${status}WithError`](mappedEvent.message, mappedEvent.errorKind, mappedEvent.errorMessage, mappedEvent.stacktrace, updatedContext));
|
|
138
108
|
};
|
|
139
109
|
registerLogEventMapper(logEventMapper) {
|
|
140
110
|
this.logEventMapper = (0, _eventMapper.generateEventMapper)(logEventMapper);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_DdAttributes","require","_InternalLog","_SdkVerbosity","_debugIdResolver","_attributesEncoding","_singletonUtils","_eventMapper","LOGS_MODULE","
|
|
1
|
+
{"version":3,"names":["_DdAttributes","require","_InternalLog","_SdkVerbosity","_debugIdResolver","_attributesEncoding","_bufferNativeCall","_singletonUtils","_eventMapper","LOGS_MODULE","generateEmptyPromise","Promise","resolve","isLogWithError","args","undefined","DdLogsWrapper","nativeLogs","default","logEventMapper","generateEventMapper","debug","logWithError","log","info","warn","error","printLogDroppedByMapper","message","status","InternalLog","SdkVerbosity","DEBUG","printLogTracked","context","event","applyEventMapper","bufferVoidNativeCall","encodeAttributes","errorKind","errorMessage","stacktrace","fingerprint","source","rawLogEvent","mappedEvent","encodedContext","updatedContext","DdAttributes","errorSourceType","errorFingerprint","_debugId","debugId","registerLogEventMapper","unregisterLogEventMapper","DdLogs","exports","getGlobalInstance"],"sourceRoot":"../../../src","sources":["logs/DdLogs.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -64,8 +64,8 @@ class BabelInteractionTracking {
|
|
|
64
64
|
const getAccessibilityLabel = () => useAccessibilityLabel && accessibilityLabel ? accessibilityLabel : null;
|
|
65
65
|
const index = handlerArgs ? handlerArgs.find(x => typeof x === 'number') || 0 : 0;
|
|
66
66
|
|
|
67
|
-
// Order:
|
|
68
|
-
const selectedContent =
|
|
67
|
+
// Order: actionName → actionNameAttribute → accessibilityLabel → content
|
|
68
|
+
const selectedContent = actionName || Object.values(attrs)[0] || getAccessibilityLabel() || tryContent();
|
|
69
69
|
if (!selectedContent) {
|
|
70
70
|
return componentName;
|
|
71
71
|
}
|
package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_NativeDdSdk","_interopRequireDefault","require","_singletonUtils","_DefaultTimeProvider","_constants","_types","e","__esModule","default","BABEL_INTERACTION_TRACKING_MODULE","BabelInteractionTracking","config","trackInteractions","useAccessibilityLabel","timeProvider","DefaultTimeProvider","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","DdSdk","sendTelemetryLog","BABEL_PLUGIN_TELEMETRY","onlyOnce","targetName","addAction","ActionSource","BABEL","now","catch","Error","telemetryError","message","stack","exports","getGlobalInstance"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AAGA,IAAAG,UAAA,GAAAH,OAAA;AAEA,IAAAI,MAAA,GAAAJ,OAAA;AAA2C,SAAAD,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAb3C;AACA;AACA;AACA;AACA;;AAWA,MAAMG,iCAAiC,GACnC,wDAAwD;AAiB5D,MAAMC,wBAAwB,CAAC;EAC3BC,MAAM,GAAgB;IAClBC,iBAAiB,EAAE,KAAK;IACxBC,qBAAqB,EAAE;EAC3B,CAAC;EAEOC,YAAY,GAAiB,IAAIC,wCAAmB,CAAC,CAAC;EAEtDC,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,CAAChB,MAAM,CAACC;MACtC;IACJ,CAAC;EACL;EAEQgB,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;MAAEhB;IAAsB,CAAC,GAAG,IAAI,CAACF,MAAM;IAE7C,MAAM0B,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,KAC1B3B,qBAAqB,IAAIsB,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":["_NativeDdSdk","_interopRequireDefault","require","_singletonUtils","_DefaultTimeProvider","_constants","_types","e","__esModule","default","BABEL_INTERACTION_TRACKING_MODULE","BabelInteractionTracking","config","trackInteractions","useAccessibilityLabel","timeProvider","DefaultTimeProvider","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","DdSdk","sendTelemetryLog","BABEL_PLUGIN_TELEMETRY","onlyOnce","targetName","addAction","ActionSource","BABEL","now","catch","Error","telemetryError","message","stack","exports","getGlobalInstance"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -26,12 +26,13 @@ class DdEventsInterceptor {
|
|
|
26
26
|
this.useAccessibilityLabel = options.useAccessibilityLabel ?? true;
|
|
27
27
|
}
|
|
28
28
|
interceptOnPress(...args) {
|
|
29
|
-
|
|
29
|
+
const event = this.resolveNativeEvent(args);
|
|
30
|
+
if (event) {
|
|
30
31
|
const currentTime = Date.now();
|
|
31
32
|
const timestampDifference = Math.abs(Date.now() - this.debouncingStartedTimestamp);
|
|
32
33
|
if (timestampDifference > DEBOUNCE_EVENT_THRESHOLD_IN_MS) {
|
|
33
|
-
const targetNode =
|
|
34
|
-
this.handleTargetEvent(targetNode,
|
|
34
|
+
const targetNode = event._targetInst;
|
|
35
|
+
this.handleTargetEvent(targetNode, event);
|
|
35
36
|
// we add an approximated 1 millisecond for the execution time of the `handleTargetEvent` function
|
|
36
37
|
this.debouncingStartedTimestamp = currentTime + HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS;
|
|
37
38
|
}
|
|
@@ -39,6 +40,27 @@ class DdEventsInterceptor {
|
|
|
39
40
|
_InternalLog.InternalLog.log(DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE, _SdkVerbosity.SdkVerbosity.DEBUG);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
46
|
+
*
|
|
47
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
48
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
49
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
50
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
51
|
+
*/
|
|
52
|
+
resolveNativeEvent(args) {
|
|
53
|
+
if (args.length === 0 || !args[0]) {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
if (args[0]._targetInst) {
|
|
57
|
+
return args[0];
|
|
58
|
+
}
|
|
59
|
+
if (args[0].event && args[0].event._targetInst) {
|
|
60
|
+
return args[0].event;
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
42
64
|
handleTargetEvent(targetNode, event) {
|
|
43
65
|
if (targetNode) {
|
|
44
66
|
const resolvedTargetName = this.resolveTargetName(targetNode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_DdRum","_types","UNKNOWN_TARGET_NAME","exports","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","require","_SdkVerbosity","_DdRum","_types","UNKNOWN_TARGET_NAME","exports","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","InternalLog","log","SdkVerbosity","DEBUG","length","resolvedTargetName","resolveTargetName","DdRum","addAction","RumActionType","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":[]}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.TRACE_ID_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = exports.TRACECONTEXT_HEADER_KEY = exports.TAGS_HEADER_KEY = exports.SAMPLING_PRIORITY_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = exports.ORIGIN_RUM = exports.ORIGIN_HEADER_KEY = exports.DD_TRACE_ID_TAG = exports.DD_RUM_USER_ID_TAG = exports.DD_RUM_SESSION_ID_TAG = exports.DD_RUM_ACCOUNT_ID_TAG = exports.BAGGAGE_HEADER_KEY = exports.B3_MULTI_TRACE_ID_HEADER_KEY = exports.B3_MULTI_SPAN_ID_HEADER_KEY = exports.B3_MULTI_SAMPLED_HEADER_KEY = exports.B3_HEADER_KEY = void 0;
|
|
6
|
+
exports.TRACKED_BY_HEADER_VALUE = exports.TRACKED_BY_HEADER_KEY = exports.TRACE_ID_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = exports.TRACECONTEXT_HEADER_KEY = exports.TAGS_HEADER_KEY = exports.SAMPLING_PRIORITY_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = exports.ORIGIN_RUM = exports.ORIGIN_HEADER_KEY = exports.DD_TRACE_ID_TAG = exports.DD_RUM_USER_ID_TAG = exports.DD_RUM_SESSION_ID_TAG = exports.DD_RUM_ACCOUNT_ID_TAG = exports.BAGGAGE_HEADER_KEY = exports.B3_MULTI_TRACE_ID_HEADER_KEY = exports.B3_MULTI_SPAN_ID_HEADER_KEY = exports.B3_MULTI_SAMPLED_HEADER_KEY = exports.B3_HEADER_KEY = void 0;
|
|
7
7
|
/*
|
|
8
8
|
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
9
9
|
* Copyright 2016-Present Datadog, Inc.
|
|
@@ -14,6 +14,8 @@ exports.TRACE_ID_HEADER_KEY = exports.TRACESTATE_HEADER_KEY = exports.TRACECONTE
|
|
|
14
14
|
*/
|
|
15
15
|
const SAMPLING_PRIORITY_HEADER_KEY = exports.SAMPLING_PRIORITY_HEADER_KEY = 'x-datadog-sampling-priority';
|
|
16
16
|
const ORIGIN_HEADER_KEY = exports.ORIGIN_HEADER_KEY = 'x-datadog-origin';
|
|
17
|
+
const TRACKED_BY_HEADER_KEY = exports.TRACKED_BY_HEADER_KEY = 'x-datadog-tracked-by';
|
|
18
|
+
const TRACKED_BY_HEADER_VALUE = exports.TRACKED_BY_HEADER_VALUE = 'react-native';
|
|
17
19
|
const ORIGIN_RUM = exports.ORIGIN_RUM = 'rum';
|
|
18
20
|
const TRACE_ID_HEADER_KEY = exports.TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
|
|
19
21
|
const PARENT_ID_HEADER_KEY = exports.PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","exports","ORIGIN_HEADER_KEY","ORIGIN_RUM","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","DD_TRACE_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,6BAA6B;AAClE,MAAME,iBAAiB,GAAAD,OAAA,CAAAC,iBAAA,GAAG,kBAAkB;AAC5C,MAAMC,
|
|
1
|
+
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","exports","ORIGIN_HEADER_KEY","TRACKED_BY_HEADER_KEY","TRACKED_BY_HEADER_VALUE","ORIGIN_RUM","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","DD_TRACE_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/distributedTracing/headers.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACO,MAAMA,4BAA4B,GAAAC,OAAA,CAAAD,4BAAA,GAAG,6BAA6B;AAClE,MAAME,iBAAiB,GAAAD,OAAA,CAAAC,iBAAA,GAAG,kBAAkB;AAC5C,MAAMC,qBAAqB,GAAAF,OAAA,CAAAE,qBAAA,GAAG,sBAAsB;AACpD,MAAMC,uBAAuB,GAAAH,OAAA,CAAAG,uBAAA,GAAG,cAAc;AAC9C,MAAMC,UAAU,GAAAJ,OAAA,CAAAI,UAAA,GAAG,KAAK;AACxB,MAAMC,mBAAmB,GAAAL,OAAA,CAAAK,mBAAA,GAAG,oBAAoB;AAChD,MAAMC,oBAAoB,GAAAN,OAAA,CAAAM,oBAAA,GAAG,qBAAqB;AAClD,MAAMC,eAAe,GAAAP,OAAA,CAAAO,eAAA,GAAG,gBAAgB;AACxC,MAAMC,eAAe,GAAAR,OAAA,CAAAQ,eAAA,GAAG,WAAW;AACnC,MAAMC,qBAAqB,GAAAT,OAAA,CAAAS,qBAAA,GAAG,YAAY;AAC1C,MAAMC,kBAAkB,GAAAV,OAAA,CAAAU,kBAAA,GAAG,SAAS;AACpC,MAAMC,qBAAqB,GAAAX,OAAA,CAAAW,qBAAA,GAAG,YAAY;;AAEjD;AACA;AACA;AACO,MAAMC,uBAAuB,GAAAZ,OAAA,CAAAY,uBAAA,GAAG,aAAa;AAC7C,MAAMC,qBAAqB,GAAAb,OAAA,CAAAa,qBAAA,GAAG,YAAY;AAC1C,MAAMC,kBAAkB,GAAAd,OAAA,CAAAc,kBAAA,GAAG,SAAS;AACpC,MAAMC,aAAa,GAAAf,OAAA,CAAAe,aAAA,GAAG,IAAI;AAC1B,MAAMC,4BAA4B,GAAAhB,OAAA,CAAAgB,4BAAA,GAAG,cAAc;AACnD,MAAMC,2BAA2B,GAAAjB,OAAA,CAAAiB,2BAAA,GAAG,aAAa;AACjD,MAAMC,2BAA2B,GAAAlB,OAAA,CAAAkB,2BAAA,GAAG,cAAc","ignoreList":[]}
|
|
@@ -108,6 +108,7 @@ const proxySend = providers => {
|
|
|
108
108
|
if (baggageHeader) {
|
|
109
109
|
this.setRequestHeader(_headers2.DATADOG_BAGGAGE_HEADER, baggageHeader);
|
|
110
110
|
}
|
|
111
|
+
this.setRequestHeader(_headers.TRACKED_BY_HEADER_KEY, _headers.TRACKED_BY_HEADER_VALUE);
|
|
111
112
|
}
|
|
112
113
|
proxyOnReadyStateChange(this, providers);
|
|
113
114
|
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_Timer","require","_helper","_distributedTracingHeaders","_distributedTracing","_headers","_graphqlHeaders","_headers2","_RequestProxy","_ResourceReporter","_internalDevResourceBlocklist","_URLHostParser","_baggageHeaderUtils","_responseSize","RESPONSE_START_LABEL","XHRProxy","RequestProxy","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","context","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","exports","proxyOpen","proxySend","proxySetRequestHeader","firstPartyHostsRegexMap","tracingSamplingRate","method","url","hostname","URLHostParser","_datadog_xhr","reported","timer","Timer","graphql","tracingAttributes","getTracingAttributes","rumSessionId","getCachedSessionId","userId","getCachedUserId","accountId","getCachedAccountId","baggageHeaderEntries","Set","apply","arguments","start","tracingHeaders","getTracingHeadersFromAttributes","forEach","header","value","baggageHeader","formatBaggageHeader","DATADOG_BAGGAGE_HEADER","proxyOnReadyStateChange","xhrProxy","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","HEADERS_RECEIVED","recordTick","responseSize","calculateResponseSize","key","startTime","stop","reportResource","request","kind","graphqlAttributes","response","statusCode","status","size","timings","stopTime","responseStartTime","hasTickFor","timeAt","undefined","resourceContext","sendRequestHeader","toLowerCase","isDatadogCustomHeader","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","operationName","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","operationType","DATADOG_GRAPH_QL_VARIABLES_HEADER","variables","BAGGAGE_HEADER_KEY","add"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":";;;;;;AAMA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAMA,IAAAE,0BAAA,GAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;
|
|
1
|
+
{"version":3,"names":["_Timer","require","_helper","_distributedTracingHeaders","_distributedTracing","_headers","_graphqlHeaders","_headers2","_RequestProxy","_ResourceReporter","_internalDevResourceBlocklist","_URLHostParser","_baggageHeaderUtils","_responseSize","RESPONSE_START_LABEL","XHRProxy","RequestProxy","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","context","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","exports","proxyOpen","proxySend","proxySetRequestHeader","firstPartyHostsRegexMap","tracingSamplingRate","method","url","hostname","URLHostParser","_datadog_xhr","reported","timer","Timer","graphql","tracingAttributes","getTracingAttributes","rumSessionId","getCachedSessionId","userId","getCachedUserId","accountId","getCachedAccountId","baggageHeaderEntries","Set","apply","arguments","start","tracingHeaders","getTracingHeadersFromAttributes","forEach","header","value","baggageHeader","formatBaggageHeader","DATADOG_BAGGAGE_HEADER","TRACKED_BY_HEADER_KEY","TRACKED_BY_HEADER_VALUE","proxyOnReadyStateChange","xhrProxy","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","HEADERS_RECEIVED","recordTick","responseSize","calculateResponseSize","key","startTime","stop","reportResource","request","kind","graphqlAttributes","response","statusCode","status","size","timings","stopTime","responseStartTime","hasTickFor","timeAt","undefined","resourceContext","sendRequestHeader","toLowerCase","isDatadogCustomHeader","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","operationName","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","operationType","DATADOG_GRAPH_QL_VARIABLES_HEADER","variables","BAGGAGE_HEADER_KEY","add"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -23,7 +23,7 @@ class DdTraceWrapper {
|
|
|
23
23
|
nativeTrace = require('../specs/NativeDdTrace').default;
|
|
24
24
|
startSpan = (operation, context = {}, timestampMs = timeProvider.now()) => {
|
|
25
25
|
const spanId = (0, _bufferNativeCall.bufferNativeCallReturningId)(() => this.nativeTrace.startSpan(operation, (0, _attributesEncoding.encodeAttributes)(context), timestampMs));
|
|
26
|
-
_InternalLog.InternalLog.log(`Starting span “${operation}
|
|
26
|
+
_InternalLog.InternalLog.log(`Starting span “${operation}”`, _SdkVerbosity.SdkVerbosity.DEBUG);
|
|
27
27
|
return spanId;
|
|
28
28
|
};
|
|
29
29
|
finishSpan = (spanId, context = {}, timestampMs = timeProvider.now()) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_attributesEncoding","_bufferNativeCall","_singletonUtils","_DefaultTimeProvider","TRACE_MODULE","timeProvider","DefaultTimeProvider","DdTraceWrapper","nativeTrace","default","startSpan","operation","context","timestampMs","now","spanId","bufferNativeCallReturningId","encodeAttributes","InternalLog","log","SdkVerbosity","DEBUG","finishSpan","bufferNativeCallWithId","id","DdTrace","exports","getGlobalInstance"],"sourceRoot":"../../../src","sources":["trace/DdTrace.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAEA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAKA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAhBA;AACA;AACA;AACA;AACA;;AAcA,MAAMM,YAAY,GAAG,+BAA+B;AAEpD,MAAMC,YAAY,GAAG,IAAIC,wCAAmB,CAAC,CAAC;AAE9C,MAAMC,cAAc,CAAwB;EACxC;EACQC,WAAW,GAAsBV,OAAO,CAAC,wBAAwB,CAAC,CACrEW,OAAO;EAEZC,SAAS,GAAGA,CACRC,SAAiB,EACjBC,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACtB;IAClB,MAAMC,MAAM,GAAG,IAAAC,6CAA2B,EAAC,MACvC,IAAI,CAACR,WAAW,CAACE,SAAS,CACtBC,SAAS,EACT,IAAAM,oCAAgB,EAACL,OAAO,CAAC,EACzBC,WACJ,CACJ,CAAC;IACDK,wBAAW,CAACC,GAAG,
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_attributesEncoding","_bufferNativeCall","_singletonUtils","_DefaultTimeProvider","TRACE_MODULE","timeProvider","DefaultTimeProvider","DdTraceWrapper","nativeTrace","default","startSpan","operation","context","timestampMs","now","spanId","bufferNativeCallReturningId","encodeAttributes","InternalLog","log","SdkVerbosity","DEBUG","finishSpan","bufferNativeCallWithId","id","DdTrace","exports","getGlobalInstance"],"sourceRoot":"../../../src","sources":["trace/DdTrace.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAEA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAKA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAhBA;AACA;AACA;AACA;AACA;;AAcA,MAAMM,YAAY,GAAG,+BAA+B;AAEpD,MAAMC,YAAY,GAAG,IAAIC,wCAAmB,CAAC,CAAC;AAE9C,MAAMC,cAAc,CAAwB;EACxC;EACQC,WAAW,GAAsBV,OAAO,CAAC,wBAAwB,CAAC,CACrEW,OAAO;EAEZC,SAAS,GAAGA,CACRC,SAAiB,EACjBC,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACtB;IAClB,MAAMC,MAAM,GAAG,IAAAC,6CAA2B,EAAC,MACvC,IAAI,CAACR,WAAW,CAACE,SAAS,CACtBC,SAAS,EACT,IAAAM,oCAAgB,EAACL,OAAO,CAAC,EACzBC,WACJ,CACJ,CAAC;IACDK,wBAAW,CAACC,GAAG,CAAC,kBAAkBR,SAAS,GAAG,EAAES,0BAAY,CAACC,KAAK,CAAC;IACnE,OAAON,MAAM;EACjB,CAAC;EAEDO,UAAU,GAAGA,CACTP,MAAc,EACdH,OAAe,GAAG,CAAC,CAAC,EACpBC,WAAmB,GAAGR,YAAY,CAACS,GAAG,CAAC,CAAC,KACxB;IAChBI,wBAAW,CAACC,GAAG,CAAC,mBAAmBJ,MAAM,EAAE,EAAEK,0BAAY,CAACC,KAAK,CAAC;IAChE,OAAO,IAAAE,wCAAsB,EACzBC,EAAE,IACE,IAAI,CAAChB,WAAW,CAACc,UAAU,CACvBE,EAAE,EACF,IAAAP,oCAAgB,EAACL,OAAO,CAAC,EACzBC,WACJ,CAAC,EACLE,MACJ,CAAC;EACL,CAAC;AACL;AAEO,MAAMU,OAAoB,GAAAC,OAAA,CAAAD,OAAA,GAAG,IAAAE,iCAAiB,EACjDvB,YAAY,EACZ,MAAM,IAAIG,cAAc,CAAC,CAC7B,CAAC","ignoreList":[]}
|
package/lib/commonjs/version.js
CHANGED
|
@@ -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":[]}
|