@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.
- package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +20 -43
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +3 -3
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +18 -18
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +3 -2
- 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/DdSdkNativeInitializationTest.kt +4 -2
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +6 -3
- package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +3 -4
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt +1 -1
- package/android/src/test/resources/input/complete-configuration.json +10 -10
- package/ios/Sources/DdLogsImplementation.swift +13 -3
- package/ios/Sources/DdSdkConfiguration.swift +4 -4
- package/ios/Sources/DdSdkNativeInitialization.swift +2 -2
- package/ios/Sources/RNDdSdkConfiguration.swift +9 -8
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/InternalLog.js +9 -7
- package/lib/commonjs/InternalLog.js.map +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/sdk/DatadogProvider/Buffer/BufferSingleton.js +10 -8
- package/lib/commonjs/sdk/DatadogProvider/Buffer/BufferSingleton.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/InternalLog.js +9 -6
- package/lib/module/InternalLog.js.map +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/sdk/DatadogProvider/Buffer/BufferSingleton.js +10 -7
- package/lib/module/sdk/DatadogProvider/Buffer/BufferSingleton.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/InternalLog.d.ts +6 -4
- package/lib/typescript/InternalLog.d.ts.map +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/sdk/DatadogProvider/Buffer/BufferSingleton.d.ts +7 -5
- package/lib/typescript/sdk/DatadogProvider/Buffer/BufferSingleton.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/InternalLog.tsx +14 -6
- 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/Buffer/BufferSingleton.ts +16 -7
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +13 -0
- package/src/version.ts +1 -1
|
@@ -23,7 +23,6 @@ import Foundation
|
|
|
23
23
|
/// - batchSize: The preferred size of batches sent to Datadog.
|
|
24
24
|
/// - batchProcessingLevel: Maximum number of batches processed sequentially before applying a delay.
|
|
25
25
|
/// - proxyConfiguration: Configuration for proxying SDK data (proxy type, address, port, etc.).
|
|
26
|
-
/// - firstPartyHosts: List of backend hosts considered first-party for network tracing.
|
|
27
26
|
/// - rumConfiguration: Configuration for the RUM feature module.
|
|
28
27
|
/// - logsConfiguration: Configuration for the Logs feature module.
|
|
29
28
|
/// - traceConfiguration: Configuration for the Traces feature module.
|
|
@@ -41,7 +40,6 @@ public class DdSdkConfiguration: NSObject {
|
|
|
41
40
|
public var batchSize: Datadog.Configuration.BatchSize
|
|
42
41
|
public var batchProcessingLevel: Datadog.Configuration.BatchProcessingLevel
|
|
43
42
|
public var proxyConfiguration: [AnyHashable: Any]? = nil
|
|
44
|
-
public var firstPartyHosts: [String: Set<TracingHeaderType>]? = nil
|
|
45
43
|
public var rumConfiguration: RumConfiguration? = nil
|
|
46
44
|
public var logsConfiguration: LogsConfiguration? = nil
|
|
47
45
|
public var traceConfiguration: TraceConfiguration? = nil
|
|
@@ -59,7 +57,6 @@ public class DdSdkConfiguration: NSObject {
|
|
|
59
57
|
batchSize: Datadog.Configuration.BatchSize,
|
|
60
58
|
batchProcessingLevel: Datadog.Configuration.BatchProcessingLevel,
|
|
61
59
|
proxyConfiguration: [AnyHashable: Any]?,
|
|
62
|
-
firstPartyHosts: [String: Set<TracingHeaderType>]?,
|
|
63
60
|
rumConfiguration: RumConfiguration?,
|
|
64
61
|
logsConfiguration: LogsConfiguration?,
|
|
65
62
|
traceConfiguration: TraceConfiguration?,
|
|
@@ -76,7 +73,6 @@ public class DdSdkConfiguration: NSObject {
|
|
|
76
73
|
self.batchSize = batchSize
|
|
77
74
|
self.batchProcessingLevel = batchProcessingLevel
|
|
78
75
|
self.proxyConfiguration = proxyConfiguration
|
|
79
|
-
self.firstPartyHosts = firstPartyHosts
|
|
80
76
|
self.rumConfiguration = rumConfiguration
|
|
81
77
|
self.logsConfiguration = logsConfiguration
|
|
82
78
|
self.traceConfiguration = traceConfiguration
|
|
@@ -99,6 +95,7 @@ public class DdSdkConfiguration: NSObject {
|
|
|
99
95
|
/// - nativeLongTaskThresholdMs: The threshold for reporting native long tasks in milliseconds.
|
|
100
96
|
/// - nativeViewTracking: Enables tracking of native iOS/Android UI views.
|
|
101
97
|
/// - nativeInteractionTracking: Enables tracking of native UI interactions.
|
|
98
|
+
/// - firstPartyHosts: List of backend hosts considered first-party for network tracing.
|
|
102
99
|
/// - appHangThreshold: Threshold in seconds for reporting non-fatal app hangs (iOS only).
|
|
103
100
|
/// - trackWatchdogTerminations: Whether the SDK should track application terminations
|
|
104
101
|
/// caused by the iOS watchdog.
|
|
@@ -118,6 +115,7 @@ public class RumConfiguration: NSObject {
|
|
|
118
115
|
public var nativeLongTaskThresholdMs: Double? = nil
|
|
119
116
|
public var nativeViewTracking: Bool? = nil
|
|
120
117
|
public var nativeInteractionTracking: Bool? = nil
|
|
118
|
+
public var firstPartyHosts: [String: Set<TracingHeaderType>]? = nil
|
|
121
119
|
public var appHangThreshold: Double? = nil
|
|
122
120
|
public var trackWatchdogTerminations: Bool
|
|
123
121
|
public var initialResourceThreshold: Double? = nil
|
|
@@ -137,6 +135,7 @@ public class RumConfiguration: NSObject {
|
|
|
137
135
|
nativeLongTaskThresholdMs: Double? = nil,
|
|
138
136
|
nativeViewTracking: Bool?,
|
|
139
137
|
nativeInteractionTracking: Bool?,
|
|
138
|
+
firstPartyHosts: [String: Set<TracingHeaderType>]?,
|
|
140
139
|
appHangThreshold: Double?,
|
|
141
140
|
trackWatchdogTerminations: Bool,
|
|
142
141
|
initialResourceThreshold: Double?,
|
|
@@ -155,6 +154,7 @@ public class RumConfiguration: NSObject {
|
|
|
155
154
|
self.nativeLongTaskThresholdMs = nativeLongTaskThresholdMs
|
|
156
155
|
self.nativeViewTracking = nativeViewTracking
|
|
157
156
|
self.nativeInteractionTracking = nativeInteractionTracking
|
|
157
|
+
self.firstPartyHosts = firstPartyHosts
|
|
158
158
|
self.appHangThreshold = appHangThreshold
|
|
159
159
|
self.trackWatchdogTerminations = trackWatchdogTerminations
|
|
160
160
|
self.initialResourceThreshold = initialResourceThreshold
|
|
@@ -162,7 +162,7 @@ public class DdSdkNativeInitialization: NSObject {
|
|
|
162
162
|
}
|
|
163
163
|
|
|
164
164
|
var urlSessionTracking: RUM.Configuration.URLSessionTracking? = nil
|
|
165
|
-
if let firstPartyHosts =
|
|
165
|
+
if let firstPartyHosts = rumConfig.firstPartyHosts {
|
|
166
166
|
urlSessionTracking = RUM.Configuration.URLSessionTracking(
|
|
167
167
|
firstPartyHostsTracing: .traceWithHeaders(
|
|
168
168
|
hostsWithHeaders: firstPartyHosts,
|
|
@@ -272,4 +272,4 @@ public class DdSdkNativeInitialization: NSObject {
|
|
|
272
272
|
Datadog.verbosityLevel = nil
|
|
273
273
|
}
|
|
274
274
|
}
|
|
275
|
-
}
|
|
275
|
+
}
|
|
@@ -39,8 +39,6 @@ extension NSDictionary {
|
|
|
39
39
|
let proxyConfigurationDict = self["proxyConfiguration"] as? NSDictionary
|
|
40
40
|
let proxyConfiguration = proxyConfigurationDict?.asProxyConfiguration()
|
|
41
41
|
|
|
42
|
-
let firstPartyHostsArray = self["firstPartyHosts"] as? NSArray
|
|
43
|
-
let firstPartyHosts = firstPartyHostsArray?.asFirstPartyHosts()
|
|
44
42
|
|
|
45
43
|
// MARK: - RUM configuration
|
|
46
44
|
|
|
@@ -62,6 +60,9 @@ extension NSDictionary {
|
|
|
62
60
|
let nativeLongTaskThresholdMs = rumDict["nativeLongTaskThresholdMs"] as? Double
|
|
63
61
|
let nativeViewTracking = rumDict["nativeViewTracking"] as? Bool
|
|
64
62
|
let nativeInteractionTracking = rumDict["nativeInteractionTracking"] as? Bool
|
|
63
|
+
|
|
64
|
+
let firstPartyHostsArray = rumDict["firstPartyHosts"] as? NSArray
|
|
65
|
+
let firstPartyHosts = firstPartyHostsArray?.asFirstPartyHosts()
|
|
65
66
|
|
|
66
67
|
let appHangThreshold = rumDict["appHangThreshold"] as? Double
|
|
67
68
|
let trackWatchdogTerminations = rumDict["trackWatchdogTerminations"] as? Bool
|
|
@@ -88,6 +89,7 @@ extension NSDictionary {
|
|
|
88
89
|
nativeViewTracking: nativeViewTracking ?? DefaultConfiguration.nativeViewTracking,
|
|
89
90
|
nativeInteractionTracking: nativeInteractionTracking
|
|
90
91
|
?? DefaultConfiguration.nativeInteractionTracking,
|
|
92
|
+
firstPartyHosts: firstPartyHosts,
|
|
91
93
|
appHangThreshold: appHangThreshold,
|
|
92
94
|
trackWatchdogTerminations: trackWatchdogTerminations
|
|
93
95
|
?? DefaultConfiguration.trackWatchdogTerminations,
|
|
@@ -154,7 +156,6 @@ extension NSDictionary {
|
|
|
154
156
|
batchSize: batchSize,
|
|
155
157
|
batchProcessingLevel: batchProcessingLevel,
|
|
156
158
|
proxyConfiguration: proxyConfiguration,
|
|
157
|
-
firstPartyHosts: firstPartyHosts,
|
|
158
159
|
rumConfiguration: rumConfiguration,
|
|
159
160
|
logsConfiguration: logsConfiguration,
|
|
160
161
|
traceConfiguration: traceConfiguration,
|
|
@@ -317,10 +318,6 @@ extension Dictionary where Key == String, Value == AnyObject {
|
|
|
317
318
|
let proxyDict = configuration["proxyConfiguration"] as? NSDictionary
|
|
318
319
|
let proxyConfiguration = proxyDict?.asProxyConfiguration()
|
|
319
320
|
|
|
320
|
-
let firstPartyHostsArray = configuration["firstPartyHosts"] as? NSArray
|
|
321
|
-
let firstPartyHosts =
|
|
322
|
-
firstPartyHostsArray?.asFirstPartyHosts() ?? DefaultConfiguration.firstPartyHosts
|
|
323
|
-
|
|
324
321
|
// MARK: - RUM configuration
|
|
325
322
|
|
|
326
323
|
let rumDict = configuration["rumConfiguration"] as? [String: Any?]
|
|
@@ -355,6 +352,10 @@ extension Dictionary where Key == String, Value == AnyObject {
|
|
|
355
352
|
if let v = nativeLongTaskRaw as? Int { return Double(v) }
|
|
356
353
|
return nil
|
|
357
354
|
}()
|
|
355
|
+
|
|
356
|
+
let firstPartyHostsArray = rum["firstPartyHosts"] as? NSArray
|
|
357
|
+
let firstPartyHosts =
|
|
358
|
+
firstPartyHostsArray?.asFirstPartyHosts() ?? DefaultConfiguration.firstPartyHosts
|
|
358
359
|
|
|
359
360
|
rumConfiguration = RumConfiguration(
|
|
360
361
|
applicationId: applicationId,
|
|
@@ -377,6 +378,7 @@ extension Dictionary where Key == String, Value == AnyObject {
|
|
|
377
378
|
?? DefaultConfiguration.nativeViewTracking,
|
|
378
379
|
nativeInteractionTracking: rum["nativeInteractionTracking"] as? Bool
|
|
379
380
|
?? DefaultConfiguration.nativeInteractionTracking,
|
|
381
|
+
firstPartyHosts: firstPartyHosts,
|
|
380
382
|
appHangThreshold: rum["appHangThreshold"] as? Double,
|
|
381
383
|
trackWatchdogTerminations: rum["trackWatchdogTerminations"] as? Bool
|
|
382
384
|
?? DefaultConfiguration.trackWatchdogTerminations,
|
|
@@ -438,7 +440,6 @@ extension Dictionary where Key == String, Value == AnyObject {
|
|
|
438
440
|
batchSize: batchSize,
|
|
439
441
|
batchProcessingLevel: batchProcessingLevel,
|
|
440
442
|
proxyConfiguration: proxyConfiguration,
|
|
441
|
-
firstPartyHosts: firstPartyHosts,
|
|
442
443
|
rumConfiguration: rumConfiguration,
|
|
443
444
|
logsConfiguration: logsConfiguration,
|
|
444
445
|
traceConfiguration: traceConfiguration,
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.InternalLog = exports.DATADOG_MESSAGE_PREFIX = void 0;
|
|
7
7
|
var _SdkVerbosity = require("./config/types/SdkVerbosity");
|
|
8
|
+
var _singletonUtils = require("./utils/singletonUtils");
|
|
8
9
|
/*
|
|
9
10
|
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
10
11
|
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
@@ -12,21 +13,22 @@ var _SdkVerbosity = require("./config/types/SdkVerbosity");
|
|
|
12
13
|
*/
|
|
13
14
|
|
|
14
15
|
const DATADOG_MESSAGE_PREFIX = exports.DATADOG_MESSAGE_PREFIX = 'DATADOG:';
|
|
16
|
+
const INTERNAL_LOG_MODULE = 'com.datadog.reactnative.internal_log';
|
|
15
17
|
|
|
16
18
|
/**
|
|
17
19
|
* /!\ DO NOT USE THIS IN YOUR APP /!\\
|
|
18
20
|
*
|
|
19
21
|
* This logger is only for debugging the Datadog SDK.
|
|
20
22
|
*/
|
|
21
|
-
class
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
if (
|
|
23
|
+
class _InternalLog {
|
|
24
|
+
levelMap = new Map([[_SdkVerbosity.SdkVerbosity.DEBUG, 1], [_SdkVerbosity.SdkVerbosity.INFO, 2], [_SdkVerbosity.SdkVerbosity.WARN, 3], [_SdkVerbosity.SdkVerbosity.ERROR, 4]]);
|
|
25
|
+
verbosity = undefined;
|
|
26
|
+
log(message, verbosity) {
|
|
27
|
+
if (this.verbosity === undefined) {
|
|
26
28
|
return;
|
|
27
29
|
}
|
|
28
30
|
const requiredLevel = InternalLog.levelMap.get(verbosity);
|
|
29
|
-
const allowedLevel = InternalLog.levelMap.get(
|
|
31
|
+
const allowedLevel = InternalLog.levelMap.get(this.verbosity);
|
|
30
32
|
if (allowedLevel === undefined || requiredLevel === undefined) {
|
|
31
33
|
return;
|
|
32
34
|
}
|
|
@@ -45,5 +47,5 @@ class InternalLog {
|
|
|
45
47
|
}
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
|
-
exports.InternalLog =
|
|
50
|
+
const InternalLog = exports.InternalLog = (0, _singletonUtils.getGlobalInstance)(INTERNAL_LOG_MODULE, () => new _InternalLog());
|
|
49
51
|
//# sourceMappingURL=InternalLog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_SdkVerbosity","require","DATADOG_MESSAGE_PREFIX","exports","
|
|
1
|
+
{"version":3,"names":["_SdkVerbosity","require","_singletonUtils","DATADOG_MESSAGE_PREFIX","exports","INTERNAL_LOG_MODULE","_InternalLog","levelMap","Map","SdkVerbosity","DEBUG","INFO","WARN","ERROR","verbosity","undefined","log","message","requiredLevel","InternalLog","get","allowedLevel","prefixedMessage","console","error","warn","info","debug","getGlobalInstance"],"sourceRoot":"../../src","sources":["InternalLog.tsx"],"mappings":";;;;;;AAMA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAPA;AACA;AACA;AACA;AACA;;AAKO,MAAME,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,UAAU;AAEhD,MAAME,mBAAmB,GAAG,sCAAsC;;AAElE;AACA;AACA;AACA;AACA;AACA,MAAMC,YAAY,CAAC;EACPC,QAAQ,GAAG,IAAIC,GAAG,CAAuB,CAC7C,CAACC,0BAAY,CAACC,KAAK,EAAE,CAAC,CAAC,EACvB,CAACD,0BAAY,CAACE,IAAI,EAAE,CAAC,CAAC,EACtB,CAACF,0BAAY,CAACG,IAAI,EAAE,CAAC,CAAC,EACtB,CAACH,0BAAY,CAACI,KAAK,EAAE,CAAC,CAAC,CAC1B,CAAC;EAEKC,SAAS,GAA6BC,SAAS;EAE/CC,GAAGA,CAACC,OAAe,EAAEH,SAAuB,EAAQ;IACvD,IAAI,IAAI,CAACA,SAAS,KAAKC,SAAS,EAAE;MAC9B;IACJ;IACA,MAAMG,aAAa,GAAGC,WAAW,CAACZ,QAAQ,CAACa,GAAG,CAACN,SAAS,CAAC;IACzD,MAAMO,YAAY,GAAGF,WAAW,CAACZ,QAAQ,CAACa,GAAG,CAAC,IAAI,CAACN,SAAS,CAAC;IAC7D,IAAIO,YAAY,KAAKN,SAAS,IAAIG,aAAa,KAAKH,SAAS,EAAE;MAC3D;IACJ;IACA,MAAMO,eAAe,GAAG,GAAGnB,sBAAsB,IAAIc,OAAO,EAAE;IAC9D,IAAIH,SAAS,KAAKL,0BAAY,CAACI,KAAK,IAAIK,aAAa,IAAIG,YAAY,EAAE;MACnEE,OAAO,CAACC,KAAK,CAACF,eAAe,CAAC;IAClC;IAEA,IAAIR,SAAS,KAAKL,0BAAY,CAACG,IAAI,IAAIM,aAAa,IAAIG,YAAY,EAAE;MAClEE,OAAO,CAACE,IAAI,CAACH,eAAe,CAAC;IACjC;IAEA,IAAIR,SAAS,KAAKL,0BAAY,CAACE,IAAI,IAAIO,aAAa,IAAIG,YAAY,EAAE;MAClEE,OAAO,CAACG,IAAI,CAACJ,eAAe,CAAC;IACjC;IAEA,IAAIR,SAAS,KAAKL,0BAAY,CAACC,KAAK,IAAIQ,aAAa,IAAIG,YAAY,EAAE;MACnEE,OAAO,CAACI,KAAK,CAACL,eAAe,CAAC;IAClC;EACJ;AACJ;AAEO,MAAMH,WAAW,GAAAf,OAAA,CAAAe,WAAA,GAAG,IAAAS,iCAAiB,EACxCvB,mBAAmB,EACnB,MAAM,IAAIC,YAAY,CAAC,CAC3B,CAAC","ignoreList":[]}
|
|
@@ -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":[]}
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.BufferSingleton = void 0;
|
|
7
|
+
var _singletonUtils = require("../../../utils/singletonUtils");
|
|
7
8
|
var _BoundedBuffer = require("./BoundedBuffer");
|
|
8
9
|
var _PassThroughBuffer = require("./PassThroughBuffer");
|
|
9
10
|
/*
|
|
@@ -12,18 +13,19 @@ var _PassThroughBuffer = require("./PassThroughBuffer");
|
|
|
12
13
|
* Copyright 2016-Present Datadog, Inc.
|
|
13
14
|
*/
|
|
14
15
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
const BUFFER_SINGLETON_MODULE = 'com.datadog.reactnative.buffer_singleton';
|
|
17
|
+
class _BufferSingleton {
|
|
18
|
+
bufferInstance = new _BoundedBuffer.BoundedBuffer();
|
|
19
|
+
getInstance = () => {
|
|
18
20
|
return BufferSingleton.bufferInstance;
|
|
19
21
|
};
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
22
|
+
onInitialization = () => {
|
|
23
|
+
this.bufferInstance.drain();
|
|
24
|
+
this.bufferInstance = new _PassThroughBuffer.PassThroughBuffer();
|
|
23
25
|
};
|
|
24
|
-
|
|
26
|
+
reset = () => {
|
|
25
27
|
BufferSingleton.bufferInstance = new _BoundedBuffer.BoundedBuffer();
|
|
26
28
|
};
|
|
27
29
|
}
|
|
28
|
-
exports.BufferSingleton =
|
|
30
|
+
const BufferSingleton = exports.BufferSingleton = (0, _singletonUtils.getGlobalInstance)(BUFFER_SINGLETON_MODULE, () => new _BufferSingleton());
|
|
29
31
|
//# sourceMappingURL=BufferSingleton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_singletonUtils","require","_BoundedBuffer","_PassThroughBuffer","BUFFER_SINGLETON_MODULE","_BufferSingleton","bufferInstance","BoundedBuffer","getInstance","BufferSingleton","onInitialization","drain","PassThroughBuffer","reset","exports","getGlobalInstance"],"sourceRoot":"../../../../../src","sources":["sdk/DatadogProvider/Buffer/BufferSingleton.ts"],"mappings":";;;;;;AAMA,IAAAA,eAAA,GAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AAEA,IAAAE,kBAAA,GAAAF,OAAA;AAVA;AACA;AACA;AACA;AACA;;AAQA,MAAMG,uBAAuB,GAAG,0CAA0C;AAE1E,MAAMC,gBAAgB,CAAC;EACXC,cAAc,GAAkB,IAAIC,4BAAa,CAAC,CAAC;EAE3DC,WAAW,GAAGA,CAAA,KAAqB;IAC/B,OAAOC,eAAe,CAACH,cAAc;EACzC,CAAC;EAEDI,gBAAgB,GAAGA,CAAA,KAAM;IACrB,IAAI,CAACJ,cAAc,CAACK,KAAK,CAAC,CAAC;IAC3B,IAAI,CAACL,cAAc,GAAG,IAAIM,oCAAiB,CAAC,CAAC;EACjD,CAAC;EAEDC,KAAK,GAAGA,CAAA,KAAM;IACVJ,eAAe,CAACH,cAAc,GAAG,IAAIC,4BAAa,CAAC,CAAC;EACxD,CAAC;AACL;AAEO,MAAME,eAAe,GAAAK,OAAA,CAAAL,eAAA,GAAG,IAAAM,iCAAiB,EAC5CX,uBAAuB,EACvB,MAAM,IAAIC,gBAAgB,CAAC,CAC/B,CAAC","ignoreList":[]}
|
package/lib/commonjs/version.js
CHANGED
|
@@ -5,22 +5,24 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { SdkVerbosity } from './config/types/SdkVerbosity';
|
|
8
|
+
import { getGlobalInstance } from './utils/singletonUtils';
|
|
8
9
|
export const DATADOG_MESSAGE_PREFIX = 'DATADOG:';
|
|
10
|
+
const INTERNAL_LOG_MODULE = 'com.datadog.reactnative.internal_log';
|
|
9
11
|
|
|
10
12
|
/**
|
|
11
13
|
* /!\ DO NOT USE THIS IN YOUR APP /!\\
|
|
12
14
|
*
|
|
13
15
|
* This logger is only for debugging the Datadog SDK.
|
|
14
16
|
*/
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (
|
|
17
|
+
class _InternalLog {
|
|
18
|
+
levelMap = new Map([[SdkVerbosity.DEBUG, 1], [SdkVerbosity.INFO, 2], [SdkVerbosity.WARN, 3], [SdkVerbosity.ERROR, 4]]);
|
|
19
|
+
verbosity = undefined;
|
|
20
|
+
log(message, verbosity) {
|
|
21
|
+
if (this.verbosity === undefined) {
|
|
20
22
|
return;
|
|
21
23
|
}
|
|
22
24
|
const requiredLevel = InternalLog.levelMap.get(verbosity);
|
|
23
|
-
const allowedLevel = InternalLog.levelMap.get(
|
|
25
|
+
const allowedLevel = InternalLog.levelMap.get(this.verbosity);
|
|
24
26
|
if (allowedLevel === undefined || requiredLevel === undefined) {
|
|
25
27
|
return;
|
|
26
28
|
}
|
|
@@ -39,4 +41,5 @@ export class InternalLog {
|
|
|
39
41
|
}
|
|
40
42
|
}
|
|
41
43
|
}
|
|
44
|
+
export const InternalLog = getGlobalInstance(INTERNAL_LOG_MODULE, () => new _InternalLog());
|
|
42
45
|
//# sourceMappingURL=InternalLog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SdkVerbosity","DATADOG_MESSAGE_PREFIX","
|
|
1
|
+
{"version":3,"names":["SdkVerbosity","getGlobalInstance","DATADOG_MESSAGE_PREFIX","INTERNAL_LOG_MODULE","_InternalLog","levelMap","Map","DEBUG","INFO","WARN","ERROR","verbosity","undefined","log","message","requiredLevel","InternalLog","get","allowedLevel","prefixedMessage","console","error","warn","info","debug"],"sourceRoot":"../../src","sources":["InternalLog.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,YAAY,QAAQ,6BAA6B;AAC1D,SAASC,iBAAiB,QAAQ,wBAAwB;AAE1D,OAAO,MAAMC,sBAAsB,GAAG,UAAU;AAEhD,MAAMC,mBAAmB,GAAG,sCAAsC;;AAElE;AACA;AACA;AACA;AACA;AACA,MAAMC,YAAY,CAAC;EACPC,QAAQ,GAAG,IAAIC,GAAG,CAAuB,CAC7C,CAACN,YAAY,CAACO,KAAK,EAAE,CAAC,CAAC,EACvB,CAACP,YAAY,CAACQ,IAAI,EAAE,CAAC,CAAC,EACtB,CAACR,YAAY,CAACS,IAAI,EAAE,CAAC,CAAC,EACtB,CAACT,YAAY,CAACU,KAAK,EAAE,CAAC,CAAC,CAC1B,CAAC;EAEKC,SAAS,GAA6BC,SAAS;EAE/CC,GAAGA,CAACC,OAAe,EAAEH,SAAuB,EAAQ;IACvD,IAAI,IAAI,CAACA,SAAS,KAAKC,SAAS,EAAE;MAC9B;IACJ;IACA,MAAMG,aAAa,GAAGC,WAAW,CAACX,QAAQ,CAACY,GAAG,CAACN,SAAS,CAAC;IACzD,MAAMO,YAAY,GAAGF,WAAW,CAACX,QAAQ,CAACY,GAAG,CAAC,IAAI,CAACN,SAAS,CAAC;IAC7D,IAAIO,YAAY,KAAKN,SAAS,IAAIG,aAAa,KAAKH,SAAS,EAAE;MAC3D;IACJ;IACA,MAAMO,eAAe,GAAG,GAAGjB,sBAAsB,IAAIY,OAAO,EAAE;IAC9D,IAAIH,SAAS,KAAKX,YAAY,CAACU,KAAK,IAAIK,aAAa,IAAIG,YAAY,EAAE;MACnEE,OAAO,CAACC,KAAK,CAACF,eAAe,CAAC;IAClC;IAEA,IAAIR,SAAS,KAAKX,YAAY,CAACS,IAAI,IAAIM,aAAa,IAAIG,YAAY,EAAE;MAClEE,OAAO,CAACE,IAAI,CAACH,eAAe,CAAC;IACjC;IAEA,IAAIR,SAAS,KAAKX,YAAY,CAACQ,IAAI,IAAIO,aAAa,IAAIG,YAAY,EAAE;MAClEE,OAAO,CAACG,IAAI,CAACJ,eAAe,CAAC;IACjC;IAEA,IAAIR,SAAS,KAAKX,YAAY,CAACO,KAAK,IAAIQ,aAAa,IAAIG,YAAY,EAAE;MACnEE,OAAO,CAACI,KAAK,CAACL,eAAe,CAAC;IAClC;EACJ;AACJ;AAEA,OAAO,MAAMH,WAAW,GAAGf,iBAAiB,CACxCE,mBAAmB,EACnB,MAAM,IAAIC,YAAY,CAAC,CAC3B,CAAC","ignoreList":[]}
|