@datadog/mobile-react-native 3.5.3 → 3.6.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/README.md +10 -0
- package/android/build.gradle +22 -8
- package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +23 -4
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +3 -2
- package/android/src/main/kotlin/com/datadog/reactnative/HeatmapActionHandler.kt +121 -0
- package/android/src/main/kotlin/com/datadog/reactnative/HeatmapTouchResolver.kt +108 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +19 -2
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +1 -1
- package/android/src/oldarch/kotlin/com/datadog/reactnative/HeatmapViewResolverFactory.kt +38 -0
- package/android/src/oldarch65/kotlin/com/datadog/reactnative/HeatmapViewResolverFactory.kt +20 -0
- package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdRum.kt +15 -2
- package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +482 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +94 -49
- package/android/src/test/kotlin/com/datadog/reactnative/HeatmapTouchResolverTest.kt +529 -0
- package/datadog-configuration.schema.json +4 -0
- package/ios/Sources/DdSdk.mm +2 -0
- package/ios/Sources/DdSdkImplementation.swift +0 -1
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/DdSdkReactNative.js +3 -1
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/config/FileBasedConfiguration.js +1 -0
- package/lib/commonjs/config/FileBasedConfiguration.js.map +1 -1
- package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js +1 -0
- package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js.map +1 -1
- package/lib/commonjs/config/features/RumConfiguration.js +4 -0
- package/lib/commonjs/config/features/RumConfiguration.js.map +1 -1
- package/lib/commonjs/flags/FlagsClient.js +268 -3
- package/lib/commonjs/flags/FlagsClient.js.map +1 -1
- package/lib/commonjs/flags/configuration/context.js +70 -0
- package/lib/commonjs/flags/configuration/context.js.map +1 -0
- package/lib/commonjs/flags/configuration/index.js +39 -0
- package/lib/commonjs/flags/configuration/index.js.map +1 -0
- package/lib/commonjs/flags/configuration/precomputed.js +172 -0
- package/lib/commonjs/flags/configuration/precomputed.js.map +1 -0
- package/lib/commonjs/flags/configuration/types.js +33 -0
- package/lib/commonjs/flags/configuration/types.js.map +1 -0
- package/lib/commonjs/flags/configuration/wire.js +19 -0
- package/lib/commonjs/flags/configuration/wire.js.map +1 -0
- package/lib/commonjs/flags/internal.js +7 -3
- package/lib/commonjs/flags/internal.js.map +1 -1
- package/lib/commonjs/index.js +13 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +27 -13
- package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +270 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +38 -72
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js +33 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +39 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.js +4 -4
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/internalDevResourceBlocklist.js +0 -18
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js +109 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.js +0 -9
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.js.map +1 -0
- package/lib/commonjs/version.js +1 -1
- package/lib/module/DdSdkReactNative.js +3 -1
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/config/FileBasedConfiguration.js +1 -0
- package/lib/module/config/FileBasedConfiguration.js.map +1 -1
- package/lib/module/config/async/AutoInstrumentationConfiguration.js +1 -0
- package/lib/module/config/async/AutoInstrumentationConfiguration.js.map +1 -1
- package/lib/module/config/features/RumConfiguration.js +4 -0
- package/lib/module/config/features/RumConfiguration.js.map +1 -1
- package/lib/module/flags/FlagsClient.js +268 -3
- package/lib/module/flags/FlagsClient.js.map +1 -1
- package/lib/module/flags/configuration/context.js +62 -0
- package/lib/module/flags/configuration/context.js.map +1 -0
- package/lib/module/flags/configuration/index.js +18 -0
- package/lib/module/flags/configuration/index.js.map +1 -0
- package/lib/module/flags/configuration/precomputed.js +165 -0
- package/lib/module/flags/configuration/precomputed.js.map +1 -0
- package/lib/module/flags/configuration/types.js +27 -0
- package/lib/module/flags/configuration/types.js.map +1 -0
- package/lib/module/flags/configuration/wire.js +13 -0
- package/lib/module/flags/configuration/wire.js.map +1 -0
- package/lib/module/flags/internal.js +7 -3
- package/lib/module/flags/internal.js.map +1 -1
- package/lib/module/index.js +2 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +27 -13
- package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +263 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +38 -72
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js +25 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +32 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.js +4 -4
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/internalDevResourceBlocklist.js +0 -18
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js +101 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.js +0 -9
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.js.map +1 -0
- package/lib/module/version.js +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
- package/lib/typescript/config/FileBasedConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/FileBasedConfiguration.type.d.ts +1 -0
- package/lib/typescript/config/FileBasedConfiguration.type.d.ts.map +1 -1
- package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts +2 -0
- package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfiguration.d.ts +2 -0
- package/lib/typescript/config/features/RumConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfiguration.type.d.ts +7 -0
- package/lib/typescript/config/features/RumConfiguration.type.d.ts.map +1 -1
- package/lib/typescript/flags/FlagsClient.d.ts +96 -0
- package/lib/typescript/flags/FlagsClient.d.ts.map +1 -1
- package/lib/typescript/flags/configuration/context.d.ts +20 -0
- package/lib/typescript/flags/configuration/context.d.ts.map +1 -0
- package/lib/typescript/flags/configuration/index.d.ts +5 -0
- package/lib/typescript/flags/configuration/index.d.ts.map +1 -0
- package/lib/typescript/flags/configuration/precomputed.d.ts +25 -0
- package/lib/typescript/flags/configuration/precomputed.d.ts.map +1 -0
- package/lib/typescript/flags/configuration/types.d.ts +24 -0
- package/lib/typescript/flags/configuration/types.d.ts.map +1 -0
- package/lib/typescript/flags/configuration/wire.d.ts +2 -0
- package/lib/typescript/flags/configuration/wire.d.ts.map +1 -0
- package/lib/typescript/flags/internal.d.ts.map +1 -1
- package/lib/typescript/flags/types.d.ts +1 -1
- package/lib/typescript/flags/types.d.ts.map +1 -1
- package/lib/typescript/index.d.ts +4 -2
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts +3 -2
- package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.d.ts +29 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.d.ts +8 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts +20 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.d.ts +2 -2
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.d.ts +3 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.d.ts +18 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.d.ts +0 -6
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.d.ts.map +1 -0
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +12 -2
- package/src/DdSdkReactNative.tsx +5 -1
- package/src/__tests__/DdSdkReactNative.test.tsx +5 -2
- package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +3 -0
- package/src/config/FileBasedConfiguration.ts +2 -0
- package/src/config/FileBasedConfiguration.type.ts +1 -0
- package/src/config/__tests__/FileBasedConfiguration.test.ts +3 -0
- package/src/config/__tests__/__fixtures__/configuration-all-fields.json +1 -0
- package/src/config/async/AutoInstrumentationConfiguration.ts +5 -0
- package/src/config/features/RumConfiguration.ts +4 -0
- package/src/config/features/RumConfiguration.type.ts +8 -0
- package/src/flags/FlagsClient.ts +305 -3
- package/src/flags/__tests__/FlagsClient.test.ts +596 -0
- package/src/flags/__tests__/internal.test.ts +45 -0
- package/src/flags/configuration/__tests__/context.test.ts +120 -0
- package/src/flags/configuration/__tests__/precomputed.test.ts +301 -0
- package/src/flags/configuration/__tests__/wire.test.ts +127 -0
- package/src/flags/configuration/context.ts +76 -0
- package/src/flags/configuration/index.ts +27 -0
- package/src/flags/configuration/precomputed.ts +215 -0
- package/src/flags/configuration/types.ts +47 -0
- package/src/flags/configuration/wire.ts +15 -0
- package/src/flags/internal.ts +6 -3
- package/src/flags/types.ts +3 -1
- package/src/index.tsx +8 -0
- package/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx +38 -13
- package/src/rum/instrumentation/resourceTracking/__tests__/DdRumResourceTracking.test.ts +101 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts +316 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/__tests__/FetchProxy.test.ts +393 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/ResourceReporter.test.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/internalDevResourceBlocklist.test.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +49 -115
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.ts +25 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts +54 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.ts +5 -5
- package/src/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/internalDevResourceBlocklist.ts +1 -17
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.ts +106 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.ts +0 -18
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +1 -0
- package/src/version.ts +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +0 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js.map +0 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js.map +0 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +0 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js.map +0 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js.map +0 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.d.ts.map +0 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.d.ts +0 -7
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.d.ts.map +0 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.d.ts.map +0 -1
- /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdFlags.kt +0 -0
- /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdLogs.kt +0 -0
- /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdSdk.kt +0 -0
- /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdTrace.kt +0 -0
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
3
|
+
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
4
|
+
* Copyright 2016-Present Datadog, Inc.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
// Wire (de)serialization is reused from `@datadog/flagging-core` (the canonical
|
|
8
|
+
// implementation) rather than reimplemented here. `configurationFromString` is lenient:
|
|
9
|
+
// it returns an empty configuration (`{}`) for malformed input or an unsupported wire
|
|
10
|
+
// version rather than throwing. `configurationToString` is the inverse (its fix from
|
|
11
|
+
// https://github.com/DataDog/openfeature-js-client/pull/331 shipped in flagging-core 2.0.0).
|
|
12
|
+
export { configurationFromString, configurationToString } from '@datadog/flagging-core';
|
|
13
|
+
//# sourceMappingURL=wire.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["configurationFromString","configurationToString"],"sourceRoot":"../../../../src","sources":["flags/configuration/wire.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,SACIA,uBAAuB,EACvBC,qBAAqB,QAClB,wBAAwB","ignoreList":[]}
|
|
@@ -13,7 +13,11 @@ export const processEvaluationContext = context => {
|
|
|
13
13
|
|
|
14
14
|
// We should ignore non-primitive values in the context as per FFE SDK requirements OF.3.
|
|
15
15
|
const providedAttributes = context.attributes ?? {};
|
|
16
|
-
|
|
16
|
+
|
|
17
|
+
// Accumulate in a Map so reserved keys such as "__proto__" are handled as data
|
|
18
|
+
// instead of hitting the Object.prototype setter (which would silently drop them or
|
|
19
|
+
// pollute the prototype). Object.fromEntries then materializes own properties safely.
|
|
20
|
+
const attributes = new Map();
|
|
17
21
|
for (const [key, value] of Object.entries(providedAttributes)) {
|
|
18
22
|
const isPrimitiveValue = typeof value === 'boolean' || typeof value === 'string' || typeof value === 'number' || value === undefined || value === null;
|
|
19
23
|
if (!isPrimitiveValue) {
|
|
@@ -23,11 +27,11 @@ export const processEvaluationContext = context => {
|
|
|
23
27
|
if (value === undefined) {
|
|
24
28
|
continue;
|
|
25
29
|
}
|
|
26
|
-
attributes
|
|
30
|
+
attributes.set(key, value);
|
|
27
31
|
}
|
|
28
32
|
return {
|
|
29
33
|
targetingKey,
|
|
30
|
-
attributes
|
|
34
|
+
attributes: Object.fromEntries(attributes)
|
|
31
35
|
};
|
|
32
36
|
};
|
|
33
37
|
//# sourceMappingURL=internal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","processEvaluationContext","context","targetingKey","providedAttributes","attributes","key","value","Object","entries","isPrimitiveValue","undefined","log","WARN"],"sourceRoot":"../../../src","sources":["flags/internal.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,gBAAgB;AAC5C,SAASC,YAAY,QAAQ,8BAA8B;AAgB3D,OAAO,MAAMC,wBAAwB,GACjCC,OAA0B,IACN;EACpB,MAAM;IAAEC;EAAa,CAAC,GAAGD,OAAO;;EAEhC;EACA,MAAME,kBAA2C,GAC7CF,OAAO,CAACG,UAAU,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","processEvaluationContext","context","targetingKey","providedAttributes","attributes","Map","key","value","Object","entries","isPrimitiveValue","undefined","log","WARN","set","fromEntries"],"sourceRoot":"../../../src","sources":["flags/internal.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,gBAAgB;AAC5C,SAASC,YAAY,QAAQ,8BAA8B;AAgB3D,OAAO,MAAMC,wBAAwB,GACjCC,OAA0B,IACN;EACpB,MAAM;IAAEC;EAAa,CAAC,GAAGD,OAAO;;EAEhC;EACA,MAAME,kBAA2C,GAC7CF,OAAO,CAACG,UAAU,IAAI,CAAC,CAAC;;EAE5B;EACA;EACA;EACA,MAAMA,UAAU,GAAG,IAAIC,GAAG,CAAyB,CAAC;EAEpD,KAAK,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACN,kBAAkB,CAAC,EAAE;IAC3D,MAAMO,gBAAgB,GAClB,OAAOH,KAAK,KAAK,SAAS,IAC1B,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAKI,SAAS,IACnBJ,KAAK,KAAK,IAAI;IAElB,IAAI,CAACG,gBAAgB,EAAE;MACnBZ,WAAW,CAACc,GAAG,CACX,sCAAsCN,GAAG,0EAA0E,EACnHP,YAAY,CAACc,IACjB,CAAC;MAED;IACJ;IAEA,IAAIN,KAAK,KAAKI,SAAS,EAAE;MACrB;IACJ;IAEAP,UAAU,CAACU,GAAG,CAACR,GAAG,EAAEC,KAAuB,CAAC;EAChD;EAEA,OAAO;IACHL,YAAY;IACZE,UAAU,EAAEI,MAAM,CAACO,WAAW,CAACX,UAAU;EAC7C,CAAC;AACL,CAAC","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -16,6 +16,7 @@ import { SdkVerbosity } from './config/types/SdkVerbosity';
|
|
|
16
16
|
import { TrackingConsent } from './config/types/TrackingConsent';
|
|
17
17
|
import { BatchProcessingLevel, BatchSize, InitializationMode, UploadFrequency, VitalsUpdateFrequency } from './config/types';
|
|
18
18
|
import { DdFlags } from './flags/DdFlags';
|
|
19
|
+
import { configurationFromString, configurationToString } from './flags/configuration';
|
|
19
20
|
import { DdLogs } from './logs/DdLogs';
|
|
20
21
|
import { DdRum } from './rum/DdRum';
|
|
21
22
|
import { DdBabelInteractionTracking } from './rum/instrumentation/interactionTracking/DdBabelInteractionTracking';
|
|
@@ -31,5 +32,5 @@ import { DdTrace } from './trace/DdTrace';
|
|
|
31
32
|
import { ErrorSource, FeatureOperationFailure } from './types';
|
|
32
33
|
import { DefaultTimeProvider } from './utils/time-provider/DefaultTimeProvider';
|
|
33
34
|
import { TimeProvider } from './utils/time-provider/TimeProvider';
|
|
34
|
-
export { DatadogProvider, DatadogProviderConfiguration, FileBasedConfiguration, InitializationMode, DdLogs, DdFlags, DdTrace, DdRum, RumActionType, ErrorSource, FeatureOperationFailure, CoreConfiguration, RumConfiguration, LogsConfiguration, TraceConfiguration, DdSdkReactNative, DdSdk, InternalLog, ProxyConfiguration, ProxyType, TrackingConsent, SdkVerbosity, VitalsUpdateFrequency, PropagatorType, UploadFrequency, BatchSize, BatchProcessingLevel, TimeProvider, DefaultTimeProvider, DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER, DATADOG_GRAPH_QL_OPERATION_NAME_HEADER, DATADOG_GRAPH_QL_VARIABLES_HEADER, DATADOG_GRAPH_QL_PAYLOAD_HEADER, DATADOG_GRAPH_QL_ERROR_HEADER, TracingIdType, TracingIdFormat, DatadogTracingIdentifier, DatadogTracingContext, DdBabelInteractionTracking, __ddExtractText };
|
|
35
|
+
export { DatadogProvider, DatadogProviderConfiguration, FileBasedConfiguration, InitializationMode, DdLogs, DdFlags, configurationFromString, configurationToString, DdTrace, DdRum, RumActionType, ErrorSource, FeatureOperationFailure, CoreConfiguration, RumConfiguration, LogsConfiguration, TraceConfiguration, DdSdkReactNative, DdSdk, InternalLog, ProxyConfiguration, ProxyType, TrackingConsent, SdkVerbosity, VitalsUpdateFrequency, PropagatorType, UploadFrequency, BatchSize, BatchProcessingLevel, TimeProvider, DefaultTimeProvider, DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER, DATADOG_GRAPH_QL_OPERATION_NAME_HEADER, DATADOG_GRAPH_QL_VARIABLES_HEADER, DATADOG_GRAPH_QL_PAYLOAD_HEADER, DATADOG_GRAPH_QL_ERROR_HEADER, TracingIdType, TracingIdFormat, DatadogTracingIdentifier, DatadogTracingContext, DdBabelInteractionTracking, __ddExtractText };
|
|
35
36
|
//# sourceMappingURL=index.js.map
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DdSdkReactNative","InternalLog","DatadogProviderConfiguration","FileBasedConfiguration","CoreConfiguration","LogsConfiguration","RumConfiguration","TraceConfiguration","ProxyConfiguration","ProxyType","SdkVerbosity","TrackingConsent","BatchProcessingLevel","BatchSize","InitializationMode","UploadFrequency","VitalsUpdateFrequency","DdFlags","DdLogs","DdRum","DdBabelInteractionTracking","__ddExtractText","DatadogTracingContext","DatadogTracingIdentifier","TracingIdFormat","TracingIdType","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","DATADOG_GRAPH_QL_VARIABLES_HEADER","DATADOG_GRAPH_QL_PAYLOAD_HEADER","DATADOG_GRAPH_QL_ERROR_HEADER","PropagatorType","RumActionType","DatadogProvider","DdSdk","DdTrace","ErrorSource","FeatureOperationFailure","DefaultTimeProvider","TimeProvider"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,SAASA,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,WAAW,QAAQ,eAAe;AAC3C,SAASC,4BAA4B,QAAQ,uCAAuC;AACpF,SAASC,sBAAsB,QAAQ,iCAAiC;AAIxE,SAASC,iBAAiB,QAAQ,qCAAqC;AAEvE,SAASC,iBAAiB,QAAQ,qCAAqC;AAEvE,SAASC,gBAAgB,QAAQ,oCAAoC;AAErE,SAASC,kBAAkB,QAAQ,sCAAsC;AACzE,SACIC,kBAAkB,EAClBC,SAAS,QACN,mCAAmC;AAC1C,SAASC,YAAY,QAAQ,6BAA6B;AAC1D,SAASC,eAAe,QAAQ,gCAAgC;AAChE,SACIC,oBAAoB,EACpBC,SAAS,EACTC,kBAAkB,EAClBC,eAAe,EACfC,qBAAqB,QAClB,gBAAgB;AACvB,SAASC,OAAO,QAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"names":["DdSdkReactNative","InternalLog","DatadogProviderConfiguration","FileBasedConfiguration","CoreConfiguration","LogsConfiguration","RumConfiguration","TraceConfiguration","ProxyConfiguration","ProxyType","SdkVerbosity","TrackingConsent","BatchProcessingLevel","BatchSize","InitializationMode","UploadFrequency","VitalsUpdateFrequency","DdFlags","configurationFromString","configurationToString","DdLogs","DdRum","DdBabelInteractionTracking","__ddExtractText","DatadogTracingContext","DatadogTracingIdentifier","TracingIdFormat","TracingIdType","DATADOG_GRAPH_QL_OPERATION_NAME_HEADER","DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER","DATADOG_GRAPH_QL_VARIABLES_HEADER","DATADOG_GRAPH_QL_PAYLOAD_HEADER","DATADOG_GRAPH_QL_ERROR_HEADER","PropagatorType","RumActionType","DatadogProvider","DdSdk","DdTrace","ErrorSource","FeatureOperationFailure","DefaultTimeProvider","TimeProvider"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,SAASA,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,WAAW,QAAQ,eAAe;AAC3C,SAASC,4BAA4B,QAAQ,uCAAuC;AACpF,SAASC,sBAAsB,QAAQ,iCAAiC;AAIxE,SAASC,iBAAiB,QAAQ,qCAAqC;AAEvE,SAASC,iBAAiB,QAAQ,qCAAqC;AAEvE,SAASC,gBAAgB,QAAQ,oCAAoC;AAErE,SAASC,kBAAkB,QAAQ,sCAAsC;AACzE,SACIC,kBAAkB,EAClBC,SAAS,QACN,mCAAmC;AAC1C,SAASC,YAAY,QAAQ,6BAA6B;AAC1D,SAASC,eAAe,QAAQ,gCAAgC;AAChE,SACIC,oBAAoB,EACpBC,SAAS,EACTC,kBAAkB,EAClBC,eAAe,EACfC,qBAAqB,QAClB,gBAAgB;AACvB,SAASC,OAAO,QAAQ,iBAAiB;AAEzC,SACIC,uBAAuB,EACvBC,qBAAqB,QAClB,uBAAuB;AAQ9B,SAASC,MAAM,QAAQ,eAAe;AACtC,SAASC,KAAK,QAAQ,aAAa;AACnC,SAASC,0BAA0B,QAAQ,sEAAsE;AACjH,SAASC,eAAe,QAAQ,wDAAwD;AACxF,SAASC,qBAAqB,QAAQ,iFAAiF;AACvH,SAASC,wBAAwB,QAAQ,oFAAoF;AAC7H,SACIC,eAAe,EACfC,aAAa,QACV,6EAA6E;AACpF,SACIC,sCAAsC,EACtCC,sCAAsC,EACtCC,iCAAiC,EACjCC,+BAA+B,EAC/BC,6BAA6B,QAC1B,+DAA+D;AAEtE,SAASC,cAAc,EAAEC,aAAa,QAAQ,aAAa;AAC3D,SAASC,eAAe,QAAQ,uCAAuC;AACvE,SAASC,KAAK,QAAQ,aAAa;AACnC,SAASC,OAAO,QAAQ,iBAAiB;AACzC,SAASC,WAAW,EAAEC,uBAAuB,QAAQ,SAAS;AAC9D,SAASC,mBAAmB,QAAQ,2CAA2C;AAE/E,SAASC,YAAY,QAAQ,oCAAoC;AAEjE,SACIN,eAAe,EACfjC,4BAA4B,EAC5BC,sBAAsB,EACtBW,kBAAkB,EAClBM,MAAM,EACNH,OAAO,EACPC,uBAAuB,EACvBC,qBAAqB,EACrBkB,OAAO,EACPhB,KAAK,EACLa,aAAa,EACbI,WAAW,EACXC,uBAAuB,EACvBnC,iBAAiB,EACjBE,gBAAgB,EAChBD,iBAAiB,EACjBE,kBAAkB,EAClBP,gBAAgB,EAChBoC,KAAK,EACLnC,WAAW,EACXO,kBAAkB,EAClBC,SAAS,EACTE,eAAe,EACfD,YAAY,EACZM,qBAAqB,EACrBiB,cAAc,EACdlB,eAAe,EACfF,SAAS,EACTD,oBAAoB,EACpB6B,YAAY,EACZD,mBAAmB,EACnBX,sCAAsC,EACtCD,sCAAsC,EACtCE,iCAAiC,EACjCC,+BAA+B,EAC/BC,6BAA6B,EAC7BL,aAAa,EACbD,eAAe,EACfD,wBAAwB,EACxBD,qBAAqB,EACrBF,0BAA0B,EAC1BC,eAAe","ignoreList":[]}
|
|
@@ -10,6 +10,7 @@ import { SdkVerbosity } from '../../../config/types/SdkVerbosity';
|
|
|
10
10
|
import { getGlobalInstance } from '../../../utils/singletonUtils';
|
|
11
11
|
import { DistributedTracingSampling } from './distributedTracing/distributedTracingSampling';
|
|
12
12
|
import { firstPartyHostsRegexMapBuilder } from './distributedTracing/firstPartyHosts';
|
|
13
|
+
import { FetchProxy } from './requestProxy/FetchProxy/FetchProxy';
|
|
13
14
|
import { XHRProxy } from './requestProxy/XHRProxy/XHRProxy';
|
|
14
15
|
const RUM_RESOURCE_TRACKING_MODULE = 'com.datadog.reactnative.rum.resource_tracking';
|
|
15
16
|
|
|
@@ -18,7 +19,7 @@ const RUM_RESOURCE_TRACKING_MODULE = 'com.datadog.reactnative.rum.resource_track
|
|
|
18
19
|
*/
|
|
19
20
|
class RumResourceTracking {
|
|
20
21
|
_isTracking = false;
|
|
21
|
-
|
|
22
|
+
_requestProxies = [];
|
|
22
23
|
_maxSampledTraceId = null;
|
|
23
24
|
get isTracking() {
|
|
24
25
|
return this._isTracking;
|
|
@@ -32,19 +33,32 @@ class RumResourceTracking {
|
|
|
32
33
|
*/
|
|
33
34
|
startTracking({
|
|
34
35
|
resourceTraceSampleRate,
|
|
35
|
-
firstPartyHosts
|
|
36
|
+
firstPartyHosts,
|
|
37
|
+
trackFetchResources = false
|
|
36
38
|
}) {
|
|
37
39
|
// extra safety to avoid proxying the XHR class twice
|
|
38
40
|
if (this._isTracking) {
|
|
39
|
-
InternalLog.log('Datadog SDK is already tracking
|
|
41
|
+
InternalLog.log('Datadog SDK is already tracking resources', SdkVerbosity.WARN);
|
|
40
42
|
return;
|
|
41
43
|
}
|
|
42
|
-
|
|
43
|
-
this._requestProxy.onTrackingStart({
|
|
44
|
+
const requestProxyOptions = {
|
|
44
45
|
tracingSamplingRate: resourceTraceSampleRate,
|
|
45
46
|
firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder(firstPartyHosts)
|
|
46
|
-
}
|
|
47
|
+
};
|
|
48
|
+
const xhrProxy = XHRProxy.createWithResourceReporter();
|
|
49
|
+
xhrProxy.onTrackingStart(requestProxyOptions);
|
|
50
|
+
this._requestProxies.push(xhrProxy);
|
|
47
51
|
InternalLog.log('Datadog SDK is tracking XHR resources', SdkVerbosity.INFO);
|
|
52
|
+
if (trackFetchResources) {
|
|
53
|
+
if (typeof globalThis.fetch !== 'function') {
|
|
54
|
+
InternalLog.log('Datadog SDK did not install Fetch resource tracking because global Fetch is not available', SdkVerbosity.INFO);
|
|
55
|
+
} else {
|
|
56
|
+
const fetchProxy = FetchProxy.createWithResourceReporter();
|
|
57
|
+
fetchProxy.onTrackingStart(requestProxyOptions);
|
|
58
|
+
this._requestProxies.push(fetchProxy);
|
|
59
|
+
InternalLog.log('Datadog SDK is tracking Fetch resources', SdkVerbosity.INFO);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
48
62
|
this._isTracking = true;
|
|
49
63
|
DistributedTracingSampling.setResourceTraceSampleRate(resourceTraceSampleRate);
|
|
50
64
|
}
|
|
@@ -59,11 +73,13 @@ class RumResourceTracking {
|
|
|
59
73
|
updateTrackingContext({
|
|
60
74
|
resourceTraceSampleRate
|
|
61
75
|
}) {
|
|
62
|
-
if (!this._isTracking
|
|
76
|
+
if (!this._isTracking) {
|
|
63
77
|
return;
|
|
64
78
|
}
|
|
65
|
-
this.
|
|
66
|
-
|
|
79
|
+
this._requestProxies.forEach(requestProxy => {
|
|
80
|
+
requestProxy.onTrackingUpdate({
|
|
81
|
+
tracingSamplingRate: resourceTraceSampleRate
|
|
82
|
+
});
|
|
67
83
|
});
|
|
68
84
|
// Keep the distributed-tracing sampler's max-trace-id in sync; the
|
|
69
85
|
// shouldSampleTrace path consults this for rates strictly between 0
|
|
@@ -73,10 +89,8 @@ class RumResourceTracking {
|
|
|
73
89
|
stopTracking() {
|
|
74
90
|
if (this._isTracking) {
|
|
75
91
|
this._isTracking = false;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
this._requestProxy = null;
|
|
92
|
+
this._requestProxies.forEach(requestProxy => requestProxy.onTrackingStop());
|
|
93
|
+
this._requestProxies = [];
|
|
80
94
|
this._maxSampledTraceId = null;
|
|
81
95
|
}
|
|
82
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BigInt","InternalLog","SdkVerbosity","getGlobalInstance","DistributedTracingSampling","firstPartyHostsRegexMapBuilder","XHRProxy","RUM_RESOURCE_TRACKING_MODULE","RumResourceTracking","_isTracking","
|
|
1
|
+
{"version":3,"names":["BigInt","InternalLog","SdkVerbosity","getGlobalInstance","DistributedTracingSampling","firstPartyHostsRegexMapBuilder","FetchProxy","XHRProxy","RUM_RESOURCE_TRACKING_MODULE","RumResourceTracking","_isTracking","_requestProxies","_maxSampledTraceId","isTracking","maxSampledTraceId","startTracking","resourceTraceSampleRate","firstPartyHosts","trackFetchResources","log","WARN","requestProxyOptions","tracingSamplingRate","firstPartyHostsRegexMap","xhrProxy","createWithResourceReporter","onTrackingStart","push","INFO","globalThis","fetch","fetchProxy","setResourceTraceSampleRate","updateTrackingContext","forEach","requestProxy","onTrackingUpdate","stopTracking","onTrackingStop","DdRumResourceTracking"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
3
|
+
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
4
|
+
* Copyright 2016-Present Datadog, Inc.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { InternalLog } from '../../../../../InternalLog';
|
|
8
|
+
import { SdkVerbosity } from '../../../../../config/types';
|
|
9
|
+
import { extractGraphQLErrors } from '../../graphql/graphqlUtils';
|
|
10
|
+
import { getErrorData } from '../XHRProxy/xhrUtils';
|
|
11
|
+
import { callOriginalFetch } from '../common/FetchProxyState';
|
|
12
|
+
import { createRequestContext } from '../common/RequestContext';
|
|
13
|
+
import { ResourceReporter } from '../common/ResourceReporter';
|
|
14
|
+
import { filterDevResource } from '../common/internalDevResourceBlocklist';
|
|
15
|
+
import { getInstrumentationHeaders, processRequestHeader } from '../common/requestHeaders';
|
|
16
|
+
import { RequestProxy } from '../interfaces/RequestProxy';
|
|
17
|
+
const RESPONSE_START_LABEL = 'response_start';
|
|
18
|
+
const MISSING_RESOURCE_SIZE = -1;
|
|
19
|
+
/**
|
|
20
|
+
* Proxies global Fetch implementations.
|
|
21
|
+
*/
|
|
22
|
+
export class FetchProxy extends RequestProxy {
|
|
23
|
+
context = null;
|
|
24
|
+
originalFetch = null;
|
|
25
|
+
installedFetch = null;
|
|
26
|
+
constructor(providers) {
|
|
27
|
+
super();
|
|
28
|
+
this.providers = providers;
|
|
29
|
+
}
|
|
30
|
+
static createWithResourceReporter() {
|
|
31
|
+
return new FetchProxy({
|
|
32
|
+
fetchGlobal: globalThis,
|
|
33
|
+
headersType: Headers,
|
|
34
|
+
resourceReporter: new ResourceReporter([filterDevResource])
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
onTrackingStart = context => {
|
|
38
|
+
this.context = context;
|
|
39
|
+
const originalFetch = this.providers.fetchGlobal.fetch;
|
|
40
|
+
this.originalFetch = originalFetch;
|
|
41
|
+
const installedFetch = (input, init) => {
|
|
42
|
+
return trackFetch({
|
|
43
|
+
input,
|
|
44
|
+
init,
|
|
45
|
+
originalFetch,
|
|
46
|
+
fetchThis: this.providers.fetchGlobal,
|
|
47
|
+
headersType: this.providers.headersType,
|
|
48
|
+
resourceReporter: this.providers.resourceReporter,
|
|
49
|
+
options: context
|
|
50
|
+
});
|
|
51
|
+
};
|
|
52
|
+
this.installedFetch = installedFetch;
|
|
53
|
+
this.providers.fetchGlobal.fetch = installedFetch;
|
|
54
|
+
};
|
|
55
|
+
onTrackingStop = () => {
|
|
56
|
+
if (this.originalFetch !== null && this.providers.fetchGlobal.fetch === this.installedFetch) {
|
|
57
|
+
this.providers.fetchGlobal.fetch = this.originalFetch;
|
|
58
|
+
}
|
|
59
|
+
this.context = null;
|
|
60
|
+
this.originalFetch = null;
|
|
61
|
+
this.installedFetch = null;
|
|
62
|
+
};
|
|
63
|
+
onTrackingUpdate = options => {
|
|
64
|
+
if (this.context === null) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
this.context.tracingSamplingRate = options.tracingSamplingRate;
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
const trackFetch = async ({
|
|
71
|
+
input,
|
|
72
|
+
init,
|
|
73
|
+
originalFetch,
|
|
74
|
+
fetchThis,
|
|
75
|
+
headersType,
|
|
76
|
+
resourceReporter,
|
|
77
|
+
options
|
|
78
|
+
}) => {
|
|
79
|
+
const url = getRequestUrl(input);
|
|
80
|
+
const method = getRequestMethod(input, init);
|
|
81
|
+
const context = createRequestContext({
|
|
82
|
+
method,
|
|
83
|
+
url,
|
|
84
|
+
options
|
|
85
|
+
});
|
|
86
|
+
const headers = buildHeaders({
|
|
87
|
+
input,
|
|
88
|
+
init,
|
|
89
|
+
context,
|
|
90
|
+
headersType
|
|
91
|
+
});
|
|
92
|
+
context.timer.start();
|
|
93
|
+
try {
|
|
94
|
+
const response = await callOriginalFetch(() => originalFetch.call(fetchThis, input, {
|
|
95
|
+
...(init ?? {}),
|
|
96
|
+
headers
|
|
97
|
+
}));
|
|
98
|
+
context.timer.recordTick(RESPONSE_START_LABEL);
|
|
99
|
+
context.timer.stop();
|
|
100
|
+
reportFetch({
|
|
101
|
+
context,
|
|
102
|
+
response,
|
|
103
|
+
resourceReporter
|
|
104
|
+
}).catch(error => {
|
|
105
|
+
const errorData = getErrorData(error);
|
|
106
|
+
if (errorData) {
|
|
107
|
+
InternalLog.log(`reportFetch failed: ${errorData}`, SdkVerbosity.WARN);
|
|
108
|
+
}
|
|
109
|
+
});
|
|
110
|
+
return response;
|
|
111
|
+
} catch (error) {
|
|
112
|
+
context.timer.stop();
|
|
113
|
+
reportFetchFailure({
|
|
114
|
+
context,
|
|
115
|
+
resourceReporter
|
|
116
|
+
});
|
|
117
|
+
throw error;
|
|
118
|
+
}
|
|
119
|
+
};
|
|
120
|
+
const getRequestUrl = input => {
|
|
121
|
+
if (typeof input === 'string') {
|
|
122
|
+
return input;
|
|
123
|
+
}
|
|
124
|
+
if (typeof input === 'object' && input !== null && 'url' in input && typeof input.url === 'string') {
|
|
125
|
+
return input.url;
|
|
126
|
+
}
|
|
127
|
+
return String(input);
|
|
128
|
+
};
|
|
129
|
+
const getRequestMethod = (input, init) => {
|
|
130
|
+
const requestMethod = typeof input === 'object' && input !== null && 'method' in input && typeof input.method === 'string' ? input.method : undefined;
|
|
131
|
+
return (init?.method ?? requestMethod ?? 'GET').toUpperCase();
|
|
132
|
+
};
|
|
133
|
+
const buildHeaders = ({
|
|
134
|
+
input,
|
|
135
|
+
init,
|
|
136
|
+
context,
|
|
137
|
+
headersType
|
|
138
|
+
}) => {
|
|
139
|
+
const requestHeaders = typeof input === 'object' && input !== null && 'headers' in input ? input.headers : undefined;
|
|
140
|
+
const headers = new headersType(init?.headers ?? requestHeaders);
|
|
141
|
+
const originalHeaders = [];
|
|
142
|
+
headers.forEach((value, header) => {
|
|
143
|
+
originalHeaders.push({
|
|
144
|
+
header,
|
|
145
|
+
value
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
originalHeaders.forEach(({
|
|
149
|
+
header
|
|
150
|
+
}) => headers.delete(header));
|
|
151
|
+
originalHeaders.forEach(({
|
|
152
|
+
header,
|
|
153
|
+
value
|
|
154
|
+
}) => {
|
|
155
|
+
applyHeader({
|
|
156
|
+
headers,
|
|
157
|
+
context,
|
|
158
|
+
header,
|
|
159
|
+
value
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
getInstrumentationHeaders(context).forEach(({
|
|
163
|
+
header,
|
|
164
|
+
value
|
|
165
|
+
}) => {
|
|
166
|
+
applyHeader({
|
|
167
|
+
headers,
|
|
168
|
+
context,
|
|
169
|
+
header,
|
|
170
|
+
value
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
return headers;
|
|
174
|
+
};
|
|
175
|
+
const applyHeader = ({
|
|
176
|
+
headers,
|
|
177
|
+
context,
|
|
178
|
+
header,
|
|
179
|
+
value
|
|
180
|
+
}) => {
|
|
181
|
+
const processedHeader = processRequestHeader({
|
|
182
|
+
context,
|
|
183
|
+
header,
|
|
184
|
+
value
|
|
185
|
+
});
|
|
186
|
+
if (processedHeader.type === 'send') {
|
|
187
|
+
headers.set(processedHeader.header, processedHeader.value);
|
|
188
|
+
}
|
|
189
|
+
};
|
|
190
|
+
const reportFetch = async ({
|
|
191
|
+
context,
|
|
192
|
+
response,
|
|
193
|
+
resourceReporter
|
|
194
|
+
}) => {
|
|
195
|
+
// Only extract GraphQL errors if operationType is set AND error tracking is enabled
|
|
196
|
+
if (context.graphql.operationType && context.graphql.trackErrors) {
|
|
197
|
+
try {
|
|
198
|
+
const body = await response.clone().json();
|
|
199
|
+
const errors = body?.errors;
|
|
200
|
+
if (Array.isArray(errors) && errors.length > 0) {
|
|
201
|
+
const filtered = extractGraphQLErrors(errors);
|
|
202
|
+
if (filtered.length > 0) {
|
|
203
|
+
context.graphql.errors = filtered;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
} catch (error) {
|
|
207
|
+
const errorData = getErrorData(error);
|
|
208
|
+
if (errorData) {
|
|
209
|
+
InternalLog.log(`reportFetch: ${errorData}`, SdkVerbosity.WARN);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
resourceReporter.reportResource({
|
|
214
|
+
key: `${context.timer.startTime}/${context.method}`,
|
|
215
|
+
request: {
|
|
216
|
+
method: context.method,
|
|
217
|
+
url: context.url,
|
|
218
|
+
kind: 'fetch'
|
|
219
|
+
},
|
|
220
|
+
graphqlAttributes: context.graphql,
|
|
221
|
+
tracingAttributes: context.tracingAttributes,
|
|
222
|
+
response: {
|
|
223
|
+
statusCode: response.status,
|
|
224
|
+
size: getResponseSize(response)
|
|
225
|
+
},
|
|
226
|
+
timings: {
|
|
227
|
+
startTime: context.timer.startTime,
|
|
228
|
+
stopTime: context.timer.stopTime,
|
|
229
|
+
responseStartTime: context.timer.timeAt(RESPONSE_START_LABEL)
|
|
230
|
+
}
|
|
231
|
+
});
|
|
232
|
+
};
|
|
233
|
+
const reportFetchFailure = ({
|
|
234
|
+
context,
|
|
235
|
+
resourceReporter
|
|
236
|
+
}) => {
|
|
237
|
+
resourceReporter.reportResource({
|
|
238
|
+
key: `${context.timer.startTime}/${context.method}`,
|
|
239
|
+
request: {
|
|
240
|
+
method: context.method,
|
|
241
|
+
url: context.url,
|
|
242
|
+
kind: 'fetch'
|
|
243
|
+
},
|
|
244
|
+
graphqlAttributes: context.graphql,
|
|
245
|
+
tracingAttributes: context.tracingAttributes,
|
|
246
|
+
response: {
|
|
247
|
+
statusCode: 0,
|
|
248
|
+
size: MISSING_RESOURCE_SIZE
|
|
249
|
+
},
|
|
250
|
+
timings: {
|
|
251
|
+
startTime: context.timer.startTime,
|
|
252
|
+
stopTime: context.timer.stopTime
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
};
|
|
256
|
+
const getResponseSize = response => {
|
|
257
|
+
const contentLength = response.headers.get('content-length');
|
|
258
|
+
if (contentLength === null || !/^\d+$/.test(contentLength)) {
|
|
259
|
+
return MISSING_RESOURCE_SIZE;
|
|
260
|
+
}
|
|
261
|
+
return Number(contentLength);
|
|
262
|
+
};
|
|
263
|
+
//# sourceMappingURL=FetchProxy.js.map
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","extractGraphQLErrors","getErrorData","callOriginalFetch","createRequestContext","ResourceReporter","filterDevResource","getInstrumentationHeaders","processRequestHeader","RequestProxy","RESPONSE_START_LABEL","MISSING_RESOURCE_SIZE","FetchProxy","context","originalFetch","installedFetch","constructor","providers","createWithResourceReporter","fetchGlobal","globalThis","headersType","Headers","resourceReporter","onTrackingStart","fetch","input","init","trackFetch","fetchThis","options","onTrackingStop","onTrackingUpdate","tracingSamplingRate","url","getRequestUrl","method","getRequestMethod","headers","buildHeaders","timer","start","response","call","recordTick","stop","reportFetch","catch","error","errorData","log","WARN","reportFetchFailure","String","requestMethod","undefined","toUpperCase","requestHeaders","originalHeaders","forEach","value","header","push","delete","applyHeader","processedHeader","type","set","graphql","operationType","trackErrors","body","clone","json","errors","Array","isArray","length","filtered","reportResource","key","startTime","request","kind","graphqlAttributes","tracingAttributes","statusCode","status","size","getResponseSize","timings","stopTime","responseStartTime","timeAt","contentLength","get","test","Number"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,19 +6,13 @@
|
|
|
6
6
|
|
|
7
7
|
import { InternalLog } from '../../../../../InternalLog';
|
|
8
8
|
import { SdkVerbosity } from '../../../../../config/types';
|
|
9
|
-
import { Timer } from '../../../../../utils/Timer';
|
|
10
|
-
import { getCachedAccountId, getCachedSessionId, getCachedUserId } from '../../../../helper';
|
|
11
|
-
import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
|
|
12
|
-
import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
|
|
13
|
-
import { BAGGAGE_HEADER_KEY, TRACKED_BY_HEADER_KEY, TRACKED_BY_HEADER_VALUE } from '../../distributedTracing/headers';
|
|
14
|
-
import { DATADOG_GRAPH_QL_ERROR_HEADER, DATADOG_GRAPH_QL_OPERATION_NAME_HEADER, DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER, DATADOG_GRAPH_QL_PAYLOAD_HEADER, DATADOG_GRAPH_QL_VARIABLES_HEADER } from '../../graphql/graphqlHeaders';
|
|
15
9
|
import { extractGraphQLErrors } from '../../graphql/graphqlUtils';
|
|
16
|
-
import {
|
|
10
|
+
import { isRunningWithinFetchProxy } from '../common/FetchProxyState';
|
|
11
|
+
import { createRequestContext } from '../common/RequestContext';
|
|
12
|
+
import { ResourceReporter } from '../common/ResourceReporter';
|
|
13
|
+
import { filterDevResource } from '../common/internalDevResourceBlocklist';
|
|
14
|
+
import { getInstrumentationHeaders, processRequestHeader } from '../common/requestHeaders';
|
|
17
15
|
import { RequestProxy } from '../interfaces/RequestProxy';
|
|
18
|
-
import { ResourceReporter } from './DatadogRumResource/ResourceReporter';
|
|
19
|
-
import { filterDevResource } from './DatadogRumResource/internalDevResourceBlocklist';
|
|
20
|
-
import { URLHostParser } from './URLHostParser';
|
|
21
|
-
import { formatBaggageHeader } from './baggageHeaderUtils';
|
|
22
16
|
import { calculateResponseSize } from './responseSize';
|
|
23
17
|
import { getErrorData, readXhrJsonBody } from './xhrUtils';
|
|
24
18
|
const RESPONSE_START_LABEL = 'response_start';
|
|
@@ -67,24 +61,21 @@ const proxyOpen = ({
|
|
|
67
61
|
}, context) => {
|
|
68
62
|
const originalXhrOpen = xhrType.prototype.open;
|
|
69
63
|
xhrType.prototype.open = function open(method, url) {
|
|
70
|
-
|
|
64
|
+
if (isRunningWithinFetchProxy()) {
|
|
65
|
+
this._datadog_xhr = undefined;
|
|
66
|
+
// eslint-disable-next-line prefer-rest-params
|
|
67
|
+
return originalXhrOpen.apply(this, arguments);
|
|
68
|
+
}
|
|
69
|
+
|
|
71
70
|
// Keep track of the method and url
|
|
72
71
|
// start time is tracked by the `send` method
|
|
73
72
|
this._datadog_xhr = {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
graphql: {},
|
|
79
|
-
tracingAttributes: getTracingAttributes({
|
|
80
|
-
hostname,
|
|
81
|
-
firstPartyHostsRegexMap: context.firstPartyHostsRegexMap,
|
|
82
|
-
tracingSamplingRate: context.tracingSamplingRate,
|
|
83
|
-
rumSessionId: getCachedSessionId(),
|
|
84
|
-
userId: getCachedUserId(),
|
|
85
|
-
accountId: getCachedAccountId()
|
|
73
|
+
...createRequestContext({
|
|
74
|
+
method,
|
|
75
|
+
url,
|
|
76
|
+
options: context
|
|
86
77
|
}),
|
|
87
|
-
|
|
78
|
+
reported: false
|
|
88
79
|
};
|
|
89
80
|
// eslint-disable-next-line prefer-rest-params
|
|
90
81
|
return originalXhrOpen.apply(this, arguments);
|
|
@@ -97,24 +88,14 @@ const proxySend = providers => {
|
|
|
97
88
|
if (this._datadog_xhr) {
|
|
98
89
|
// keep track of start time
|
|
99
90
|
this._datadog_xhr.timer.start();
|
|
100
|
-
|
|
101
|
-
// Tracing Headers
|
|
102
|
-
const tracingHeaders = getTracingHeadersFromAttributes(this._datadog_xhr.tracingAttributes);
|
|
103
|
-
tracingHeaders.forEach(({
|
|
91
|
+
getInstrumentationHeaders(this._datadog_xhr).forEach(({
|
|
104
92
|
header,
|
|
105
93
|
value
|
|
106
94
|
}) => {
|
|
107
95
|
this.setRequestHeader(header, value);
|
|
108
96
|
});
|
|
109
|
-
|
|
110
|
-
// Join all baggage header entries
|
|
111
|
-
const baggageHeader = formatBaggageHeader(this._datadog_xhr.baggageHeaderEntries);
|
|
112
|
-
if (baggageHeader) {
|
|
113
|
-
this.setRequestHeader(DATADOG_BAGGAGE_HEADER, baggageHeader);
|
|
114
|
-
}
|
|
115
|
-
this.setRequestHeader(TRACKED_BY_HEADER_KEY, TRACKED_BY_HEADER_VALUE);
|
|
97
|
+
proxyOnReadyStateChange(this, providers);
|
|
116
98
|
}
|
|
117
|
-
proxyOnReadyStateChange(this, providers);
|
|
118
99
|
|
|
119
100
|
// eslint-disable-next-line prefer-rest-params
|
|
120
101
|
return originalXhrSend.apply(this, arguments);
|
|
@@ -122,20 +103,24 @@ const proxySend = providers => {
|
|
|
122
103
|
};
|
|
123
104
|
const proxyOnReadyStateChange = (xhrProxy, providers) => {
|
|
124
105
|
const xhrType = providers.xhrType;
|
|
106
|
+
const requestContext = xhrProxy._datadog_xhr;
|
|
107
|
+
if (!requestContext) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
125
110
|
const originalOnreadystatechange = xhrProxy.onreadystatechange;
|
|
126
111
|
xhrProxy.onreadystatechange = function onreadystatechange() {
|
|
127
112
|
if (xhrProxy.readyState === xhrType.DONE) {
|
|
128
|
-
if (!
|
|
113
|
+
if (!requestContext.reported) {
|
|
129
114
|
reportXhr(xhrProxy, providers.resourceReporter).catch(error => {
|
|
130
115
|
const errorData = getErrorData(error);
|
|
131
116
|
if (errorData) {
|
|
132
117
|
InternalLog.log(`reportXhr failed: ${errorData}`, SdkVerbosity.WARN);
|
|
133
118
|
}
|
|
134
119
|
});
|
|
135
|
-
|
|
120
|
+
requestContext.reported = true;
|
|
136
121
|
}
|
|
137
122
|
} else if (xhrProxy.readyState === xhrType.HEADERS_RECEIVED) {
|
|
138
|
-
|
|
123
|
+
requestContext.timer.recordTick(RESPONSE_START_LABEL);
|
|
139
124
|
}
|
|
140
125
|
if (originalOnreadystatechange) {
|
|
141
126
|
// eslint-disable-next-line prefer-rest-params
|
|
@@ -146,6 +131,9 @@ const proxyOnReadyStateChange = (xhrProxy, providers) => {
|
|
|
146
131
|
const reportXhr = async (xhrProxy, resourceReporter) => {
|
|
147
132
|
const responseSize = calculateResponseSize(xhrProxy);
|
|
148
133
|
const context = xhrProxy._datadog_xhr;
|
|
134
|
+
if (!context) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
149
137
|
const key = `${context.timer.startTime}/${context.method}`;
|
|
150
138
|
context.timer.stop();
|
|
151
139
|
|
|
@@ -192,38 +180,16 @@ const proxySetRequestHeader = providers => {
|
|
|
192
180
|
const xhrType = providers.xhrType;
|
|
193
181
|
const originalXhrSetRequestHeader = xhrType.prototype.setRequestHeader;
|
|
194
182
|
xhrType.prototype.setRequestHeader = function sendRequestHeader(header, value) {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
this._datadog_xhr.graphql.variables = value;
|
|
206
|
-
break;
|
|
207
|
-
case DATADOG_GRAPH_QL_PAYLOAD_HEADER:
|
|
208
|
-
this._datadog_xhr.graphql.payload = value;
|
|
209
|
-
break;
|
|
210
|
-
case DATADOG_GRAPH_QL_ERROR_HEADER:
|
|
211
|
-
this._datadog_xhr.graphql.trackErrors = value === 'true' || value === '1';
|
|
212
|
-
break;
|
|
213
|
-
case DATADOG_BAGGAGE_HEADER:
|
|
214
|
-
// Apply Baggage Header only if pre-processed by Datadog
|
|
215
|
-
return originalXhrSetRequestHeader.apply(this, [BAGGAGE_HEADER_KEY, value]);
|
|
216
|
-
default:
|
|
217
|
-
return originalXhrSetRequestHeader.apply(this,
|
|
218
|
-
// eslint-disable-next-line prefer-rest-params
|
|
219
|
-
arguments);
|
|
220
|
-
}
|
|
221
|
-
} else if (key === BAGGAGE_HEADER_KEY) {
|
|
222
|
-
// Intercept User Baggage Header entries to apply them later
|
|
223
|
-
this._datadog_xhr.baggageHeaderEntries?.add(value);
|
|
224
|
-
} else {
|
|
225
|
-
// eslint-disable-next-line prefer-rest-params
|
|
226
|
-
return originalXhrSetRequestHeader.apply(this, arguments);
|
|
183
|
+
if (!this._datadog_xhr) {
|
|
184
|
+
return originalXhrSetRequestHeader.apply(this, [header, value]);
|
|
185
|
+
}
|
|
186
|
+
const processedHeader = processRequestHeader({
|
|
187
|
+
context: this._datadog_xhr,
|
|
188
|
+
header,
|
|
189
|
+
value
|
|
190
|
+
});
|
|
191
|
+
if (processedHeader.type === 'send') {
|
|
192
|
+
return originalXhrSetRequestHeader.apply(this, [processedHeader.header, processedHeader.value]);
|
|
227
193
|
}
|
|
228
194
|
};
|
|
229
195
|
};
|