@datadog/mobile-react-native 3.11.0 → 3.12.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 +2 -1
- package/android/build.gradle +14 -5
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/datadog-configuration.gradle +59 -18
- package/datadog-configuration.schema.json +119 -0
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/DdSdkReactNative.js +6 -1
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/config/FileBasedConfiguration.js +2 -0
- package/lib/commonjs/config/FileBasedConfiguration.js.map +1 -1
- package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js +2 -1
- 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/DdFlags.js +4 -2
- package/lib/commonjs/flags/DdFlags.js.map +1 -1
- package/lib/commonjs/flags/FlagsClient.js +4 -2
- package/lib/commonjs/flags/FlagsClient.js.map +1 -1
- package/lib/commonjs/internal.js +97 -0
- package/lib/commonjs/internal.js.map +1 -0
- package/lib/commonjs/logs/DdLogs.js +4 -2
- package/lib/commonjs/logs/DdLogs.js.map +1 -1
- package/lib/commonjs/rum/DdRum.js +4 -2
- package/lib/commonjs/rum/DdRum.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +20 -15
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +5 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js +2 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/README.md +142 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js +308 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js +275 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js +167 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js +36 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js +158 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js +58 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js +39 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js +38 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/types.js +2 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/types.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +17 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +25 -3
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js +2 -35
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +3 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js +8 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js +88 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js.map +1 -1
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +2 -3
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -1
- package/lib/commonjs/sdk/DdSdkInternal.js +27 -22
- package/lib/commonjs/sdk/DdSdkInternal.js.map +1 -1
- package/lib/commonjs/specs/NativeDdFlags.js +19 -3
- package/lib/commonjs/specs/NativeDdFlags.js.map +1 -1
- package/lib/commonjs/specs/NativeDdLogs.js +19 -3
- package/lib/commonjs/specs/NativeDdLogs.js.map +1 -1
- package/lib/commonjs/specs/NativeDdRum.js +19 -3
- package/lib/commonjs/specs/NativeDdRum.js.map +1 -1
- package/lib/commonjs/specs/NativeDdSdk.js +19 -3
- package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
- package/lib/commonjs/specs/NativeDdTrace.js +19 -3
- package/lib/commonjs/specs/NativeDdTrace.js.map +1 -1
- package/lib/commonjs/trace/DdTrace.js +4 -2
- package/lib/commonjs/trace/DdTrace.js.map +1 -1
- package/lib/commonjs/utils/stringUtils.js +48 -0
- package/lib/commonjs/utils/stringUtils.js.map +1 -0
- package/lib/commonjs/version.js +1 -1
- package/lib/module/DdSdkReactNative.js +6 -1
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/config/FileBasedConfiguration.js +2 -0
- package/lib/module/config/FileBasedConfiguration.js.map +1 -1
- package/lib/module/config/async/AutoInstrumentationConfiguration.js +2 -1
- 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/DdFlags.js +4 -2
- package/lib/module/flags/DdFlags.js.map +1 -1
- package/lib/module/flags/FlagsClient.js +5 -2
- package/lib/module/flags/FlagsClient.js.map +1 -1
- package/lib/module/internal.js +27 -0
- package/lib/module/internal.js.map +1 -0
- package/lib/module/logs/DdLogs.js +4 -2
- package/lib/module/logs/DdLogs.js.map +1 -1
- package/lib/module/rum/DdRum.js +4 -2
- package/lib/module/rum/DdRum.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +20 -14
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +5 -2
- package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/README.md +142 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js +298 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js +268 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js +160 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js +30 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js +150 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js +51 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js +32 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js +32 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/types.js +2 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/types.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +17 -2
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +25 -3
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js +1 -34
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +3 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js +8 -2
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js +79 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js.map +1 -1
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +2 -3
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -1
- package/lib/module/sdk/DdSdkInternal.js +27 -22
- package/lib/module/sdk/DdSdkInternal.js.map +1 -1
- package/lib/module/specs/NativeDdFlags.js +14 -2
- package/lib/module/specs/NativeDdFlags.js.map +1 -1
- package/lib/module/specs/NativeDdLogs.js +14 -2
- package/lib/module/specs/NativeDdLogs.js.map +1 -1
- package/lib/module/specs/NativeDdRum.js +14 -2
- package/lib/module/specs/NativeDdRum.js.map +1 -1
- package/lib/module/specs/NativeDdSdk.js +14 -2
- package/lib/module/specs/NativeDdSdk.js.map +1 -1
- package/lib/module/specs/NativeDdTrace.js +14 -2
- package/lib/module/specs/NativeDdTrace.js.map +1 -1
- package/lib/module/trace/DdTrace.js +4 -2
- package/lib/module/trace/DdTrace.js.map +1 -1
- package/lib/module/utils/stringUtils.js +42 -0
- package/lib/module/utils/stringUtils.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 +2 -0
- package/lib/typescript/config/FileBasedConfiguration.type.d.ts.map +1 -1
- package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts +3 -0
- package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfiguration.d.ts +3 -1
- package/lib/typescript/config/features/RumConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfiguration.type.d.ts +107 -0
- package/lib/typescript/config/features/RumConfiguration.type.d.ts.map +1 -1
- package/lib/typescript/flags/DdFlags.d.ts.map +1 -1
- package/lib/typescript/flags/FlagsClient.d.ts +1 -1
- package/lib/typescript/flags/FlagsClient.d.ts.map +1 -1
- package/lib/typescript/index.d.ts +1 -0
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/internal.d.ts +26 -0
- package/lib/typescript/internal.d.ts.map +1 -0
- package/lib/typescript/logs/DdLogs.d.ts +1 -1
- package/lib/typescript/logs/DdLogs.d.ts.map +1 -1
- package/lib/typescript/rum/DdRum.d.ts +1 -1
- package/lib/typescript/rum/DdRum.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts +3 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.d.ts +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.d.ts +85 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.d.ts +18 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.d.ts +24 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.d.ts +12 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.d.ts +28 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.d.ts +16 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.d.ts +13 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.d.ts +13 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/types.d.ts +27 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/types.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.d.ts +43 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts.map +1 -1
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.d.ts.map +1 -1
- package/lib/typescript/sdk/DdSdkInternal.d.ts +1 -0
- package/lib/typescript/sdk/DdSdkInternal.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdFlags.d.ts +7 -2
- package/lib/typescript/specs/NativeDdFlags.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdLogs.d.ts +7 -2
- package/lib/typescript/specs/NativeDdLogs.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdRum.d.ts +7 -2
- package/lib/typescript/specs/NativeDdRum.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdSdk.d.ts +7 -2
- package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdTrace.d.ts +7 -2
- package/lib/typescript/specs/NativeDdTrace.d.ts.map +1 -1
- package/lib/typescript/trace/DdTrace.d.ts.map +1 -1
- package/lib/typescript/utils/stringUtils.d.ts +12 -0
- package/lib/typescript/utils/stringUtils.d.ts.map +1 -0
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +7 -2
- package/src/DdSdkReactNative.tsx +11 -1
- package/src/__tests__/DdSdkReactNative.test.tsx +145 -20
- package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +3 -0
- package/src/__tests__/internalEntry.test.ts +26 -0
- package/src/__tests__/mock.test.ts +1 -3
- package/src/__tests__/nativeSpecGetters.test.ts +102 -0
- package/src/__tests__/rum/instrumentation/DdRumUserInteractionTracking.test.tsx +3 -3
- package/src/__tests__/wrapperImportSafety.test.ts +129 -0
- package/src/config/FileBasedConfiguration.ts +3 -0
- package/src/config/FileBasedConfiguration.type.ts +2 -0
- package/src/config/__tests__/FileBasedConfiguration.test.ts +66 -0
- package/src/config/__tests__/__fixtures__/configuration-all-fields.json +8 -0
- package/src/config/async/AutoInstrumentationConfiguration.ts +5 -1
- package/src/config/features/RumConfiguration.ts +9 -0
- package/src/config/features/RumConfiguration.type.ts +117 -0
- package/src/flags/DdFlags.ts +4 -3
- package/src/flags/FlagsClient.ts +4 -3
- package/src/index.tsx +7 -0
- package/src/internal.ts +32 -0
- package/src/logs/DdLogs.ts +4 -3
- package/src/rum/DdRum.ts +4 -3
- package/src/rum/__tests__/DdRum.test.ts +4 -4
- package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +33 -26
- package/src/rum/instrumentation/interactionTracking/__tests__/BabelOptionalHandlers.test.ts +120 -0
- package/src/rum/instrumentation/interactionTracking/__tests__/DdBabelInteractionTracking.test.ts +82 -2
- package/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx +7 -2
- package/src/rum/instrumentation/resourceTracking/__tests__/DdRumResourceTracking.test.ts +46 -0
- package/src/rum/instrumentation/resourceTracking/__tests__/__utils__/XMLHttpRequestMock.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/headerCapture/README.md +142 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/captureHeaders.test.ts +853 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/compileHeaderConfig.test.ts +697 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/enforceSizeLimits.integration.test.ts +183 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/enforceSizeLimits.test.ts +337 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/isHeaderAllowed.test.ts +35 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/normalizeUrlForMatching.test.ts +176 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/parseResponseHeaders.test.ts +114 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/sensitiveHeaderBlocklist.test.ts +112 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/tracingHeaderExclusion.test.ts +59 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.ts +437 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.ts +339 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.ts +208 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.ts +29 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.ts +181 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.ts +59 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.ts +31 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.ts +61 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/types.ts +33 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts +21 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/__tests__/FetchProxy.test.ts +274 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/ResourceReporter.test.ts +120 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +34 -3
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +624 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts +1 -34
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts +6 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.ts +16 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/__tests__/headerCapture.test.ts +164 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.ts +119 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.ts +2 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.ts +2 -0
- package/src/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.tsx +3 -4
- package/src/sdk/DatadogInternalBridge/__tests__/DdSdkNativeBridge.test.tsx +35 -2
- package/src/sdk/DatadogProvider/Buffer/__tests__/BoundedBuffer.test.ts +5 -5
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +2 -1
- package/src/sdk/DdSdkInternal.ts +27 -24
- package/src/sdk/EventMappers/__tests__/EventMapper.test.ts +2 -2
- package/src/specs/NativeDdFlags.ts +14 -2
- package/src/specs/NativeDdLogs.ts +14 -2
- package/src/specs/NativeDdRum.ts +14 -2
- package/src/specs/NativeDdSdk.ts +14 -2
- package/src/specs/NativeDdTrace.ts +14 -2
- package/src/trace/DdTrace.ts +4 -3
- package/src/utils/__tests__/stringUtils.test.ts +90 -0
- package/src/utils/stringUtils.ts +41 -0
- package/src/version.ts +1 -1
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
DATADOG_GRAPH_QL_ERROR_HEADER,
|
|
17
17
|
DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER
|
|
18
18
|
} from '../../../graphql/graphqlHeaders';
|
|
19
|
+
import { compileHeaderCaptureConfig } from '../../../headerCapture/compileHeaderConfig';
|
|
19
20
|
import type { ResourceReporter } from '../../common/ResourceReporter';
|
|
20
21
|
import type { RUMResource } from '../../interfaces/RumResource';
|
|
21
22
|
import { FetchProxy } from '../FetchProxy';
|
|
@@ -419,4 +420,277 @@ describe('FetchProxy', () => {
|
|
|
419
420
|
expect(resource.graphqlAttributes?.errors).toBeUndefined();
|
|
420
421
|
});
|
|
421
422
|
});
|
|
423
|
+
|
|
424
|
+
describe('header capture', () => {
|
|
425
|
+
const getHeaderCaptureOptions = (
|
|
426
|
+
rules: Parameters<typeof compileHeaderCaptureConfig>[0]
|
|
427
|
+
) => ({
|
|
428
|
+
...getOptions(),
|
|
429
|
+
headerCaptureConfig: compileHeaderCaptureConfig(rules)
|
|
430
|
+
});
|
|
431
|
+
|
|
432
|
+
it('does not report headers when header capture is disabled', async () => {
|
|
433
|
+
const originalFetch = jest
|
|
434
|
+
.fn()
|
|
435
|
+
.mockResolvedValue(
|
|
436
|
+
createResponse({ headers: { 'cache-control': 'no-cache' } })
|
|
437
|
+
) as jest.MockedFunction<typeof fetch>;
|
|
438
|
+
const reportResource = jest.fn();
|
|
439
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
440
|
+
originalFetch,
|
|
441
|
+
reportResource
|
|
442
|
+
});
|
|
443
|
+
proxy.onTrackingStart(getOptions());
|
|
444
|
+
|
|
445
|
+
await fetchGlobal.fetch('https://api.example.com/users', {
|
|
446
|
+
headers: { 'Content-Type': 'application/json' }
|
|
447
|
+
});
|
|
448
|
+
await flushPromises();
|
|
449
|
+
|
|
450
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
451
|
+
expect(resource.capturedRequestHeaders).toBeUndefined();
|
|
452
|
+
expect(resource.capturedResponseHeaders).toBeUndefined();
|
|
453
|
+
});
|
|
454
|
+
|
|
455
|
+
it('captures default request and response headers', async () => {
|
|
456
|
+
const originalFetch = jest.fn().mockResolvedValue(
|
|
457
|
+
createResponse({
|
|
458
|
+
headers: {
|
|
459
|
+
'cache-control': 'max-age=60',
|
|
460
|
+
etag: '"abc"',
|
|
461
|
+
'set-cookie': 'session=secret',
|
|
462
|
+
'x-custom': 'value'
|
|
463
|
+
}
|
|
464
|
+
})
|
|
465
|
+
) as jest.MockedFunction<typeof fetch>;
|
|
466
|
+
const reportResource = jest.fn();
|
|
467
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
468
|
+
originalFetch,
|
|
469
|
+
reportResource
|
|
470
|
+
});
|
|
471
|
+
proxy.onTrackingStart(getHeaderCaptureOptions('defaults'));
|
|
472
|
+
|
|
473
|
+
await fetchGlobal.fetch('https://api.example.com/users', {
|
|
474
|
+
headers: {
|
|
475
|
+
'Content-Type': 'application/json',
|
|
476
|
+
Authorization: 'Bearer secret',
|
|
477
|
+
'X-Custom': 'value'
|
|
478
|
+
}
|
|
479
|
+
});
|
|
480
|
+
await flushPromises();
|
|
481
|
+
|
|
482
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
483
|
+
expect(resource.capturedRequestHeaders).toEqual({
|
|
484
|
+
'Content-Type': 'application/json'
|
|
485
|
+
});
|
|
486
|
+
expect(resource.capturedResponseHeaders).toEqual({
|
|
487
|
+
'Cache-Control': 'max-age=60',
|
|
488
|
+
ETag: '"abc"'
|
|
489
|
+
});
|
|
490
|
+
});
|
|
491
|
+
|
|
492
|
+
it('does not capture headers injected by the SDK', async () => {
|
|
493
|
+
const originalFetch = jest
|
|
494
|
+
.fn()
|
|
495
|
+
.mockResolvedValue(createResponse()) as jest.MockedFunction<
|
|
496
|
+
typeof fetch
|
|
497
|
+
>;
|
|
498
|
+
const reportResource = jest.fn();
|
|
499
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
500
|
+
originalFetch,
|
|
501
|
+
reportResource
|
|
502
|
+
});
|
|
503
|
+
proxy.onTrackingStart(
|
|
504
|
+
getHeaderCaptureOptions([
|
|
505
|
+
{
|
|
506
|
+
type: 'matchRequestHeaders',
|
|
507
|
+
headers: [
|
|
508
|
+
SAMPLING_PRIORITY_HEADER_KEY,
|
|
509
|
+
PARENT_ID_HEADER_KEY,
|
|
510
|
+
TRACKED_BY_HEADER_KEY,
|
|
511
|
+
DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER,
|
|
512
|
+
'x-request-id'
|
|
513
|
+
]
|
|
514
|
+
}
|
|
515
|
+
])
|
|
516
|
+
);
|
|
517
|
+
|
|
518
|
+
await fetchGlobal.fetch('https://api.example.com/graphql', {
|
|
519
|
+
headers: {
|
|
520
|
+
[DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER]: 'query',
|
|
521
|
+
'X-Request-Id': 'abc'
|
|
522
|
+
}
|
|
523
|
+
});
|
|
524
|
+
await flushPromises();
|
|
525
|
+
|
|
526
|
+
// Fetch Headers lowercase names, so the casing comes from the rule
|
|
527
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
528
|
+
expect(resource.capturedRequestHeaders).toEqual({
|
|
529
|
+
'x-request-id': 'abc'
|
|
530
|
+
});
|
|
531
|
+
});
|
|
532
|
+
|
|
533
|
+
it('captures headers set on a Request-like input', async () => {
|
|
534
|
+
const originalFetch = jest
|
|
535
|
+
.fn()
|
|
536
|
+
.mockResolvedValue(
|
|
537
|
+
createResponse({ headers: { 'x-cache': 'HIT' } })
|
|
538
|
+
) as jest.MockedFunction<typeof fetch>;
|
|
539
|
+
const reportResource = jest.fn();
|
|
540
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
541
|
+
originalFetch,
|
|
542
|
+
reportResource
|
|
543
|
+
});
|
|
544
|
+
proxy.onTrackingStart(getHeaderCaptureOptions('defaults'));
|
|
545
|
+
|
|
546
|
+
await fetchGlobal.fetch(({
|
|
547
|
+
url: 'https://api.example.com/users',
|
|
548
|
+
method: 'GET',
|
|
549
|
+
headers: new HeadersMock({ 'cache-control': 'no-cache' })
|
|
550
|
+
} as unknown) as Request);
|
|
551
|
+
await flushPromises();
|
|
552
|
+
|
|
553
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
554
|
+
expect(resource.capturedRequestHeaders).toEqual({
|
|
555
|
+
'Cache-Control': 'no-cache'
|
|
556
|
+
});
|
|
557
|
+
expect(resource.capturedResponseHeaders).toEqual({
|
|
558
|
+
'X-Cache': 'HIT'
|
|
559
|
+
});
|
|
560
|
+
});
|
|
561
|
+
|
|
562
|
+
it('applies URL-scoped rules', async () => {
|
|
563
|
+
const originalFetch = jest
|
|
564
|
+
.fn()
|
|
565
|
+
.mockResolvedValue(
|
|
566
|
+
createResponse({ headers: { 'x-request-id': 'abc' } })
|
|
567
|
+
) as jest.MockedFunction<typeof fetch>;
|
|
568
|
+
const reportResource = jest.fn();
|
|
569
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
570
|
+
originalFetch,
|
|
571
|
+
reportResource
|
|
572
|
+
});
|
|
573
|
+
proxy.onTrackingStart(
|
|
574
|
+
getHeaderCaptureOptions([
|
|
575
|
+
{
|
|
576
|
+
type: 'matchResponseHeaders',
|
|
577
|
+
headers: ['x-request-id'],
|
|
578
|
+
forURLs: ['api.example.com']
|
|
579
|
+
}
|
|
580
|
+
])
|
|
581
|
+
);
|
|
582
|
+
|
|
583
|
+
await fetchGlobal.fetch('https://api.example.com/users');
|
|
584
|
+
await fetchGlobal.fetch('https://other.example.org/users');
|
|
585
|
+
await flushPromises();
|
|
586
|
+
|
|
587
|
+
const [matched, unmatched] = reportResource.mock.calls.map(
|
|
588
|
+
call => call[0] as RUMResource
|
|
589
|
+
);
|
|
590
|
+
expect(matched.capturedResponseHeaders).toEqual({
|
|
591
|
+
'x-request-id': 'abc'
|
|
592
|
+
});
|
|
593
|
+
expect(unmatched.capturedResponseHeaders).toBeUndefined();
|
|
594
|
+
});
|
|
595
|
+
|
|
596
|
+
it('does not report headers for failed requests', async () => {
|
|
597
|
+
const originalFetch = jest
|
|
598
|
+
.fn()
|
|
599
|
+
.mockRejectedValue(
|
|
600
|
+
new Error('network failed')
|
|
601
|
+
) as jest.MockedFunction<typeof fetch>;
|
|
602
|
+
const reportResource = jest.fn();
|
|
603
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
604
|
+
originalFetch,
|
|
605
|
+
reportResource
|
|
606
|
+
});
|
|
607
|
+
proxy.onTrackingStart(getHeaderCaptureOptions('defaults'));
|
|
608
|
+
|
|
609
|
+
await expect(
|
|
610
|
+
fetchGlobal.fetch('https://api.example.com/users', {
|
|
611
|
+
headers: { 'Content-Type': 'application/json' }
|
|
612
|
+
})
|
|
613
|
+
).rejects.toThrow('network failed');
|
|
614
|
+
|
|
615
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
616
|
+
expect(resource.capturedRequestHeaders).toBeUndefined();
|
|
617
|
+
expect(resource.capturedResponseHeaders).toBeUndefined();
|
|
618
|
+
});
|
|
619
|
+
|
|
620
|
+
it('captures response headers before the GraphQL body is parsed', async () => {
|
|
621
|
+
const headers = new HeadersMock({ 'cache-control': 'max-age=60' });
|
|
622
|
+
let resolveBody: (body: unknown) => void = () => {};
|
|
623
|
+
const response = ({
|
|
624
|
+
status: 200,
|
|
625
|
+
headers,
|
|
626
|
+
clone() {
|
|
627
|
+
return response;
|
|
628
|
+
},
|
|
629
|
+
json: () =>
|
|
630
|
+
new Promise(resolve => {
|
|
631
|
+
resolveBody = resolve;
|
|
632
|
+
})
|
|
633
|
+
} as unknown) as Response;
|
|
634
|
+
const originalFetch = jest
|
|
635
|
+
.fn()
|
|
636
|
+
.mockResolvedValue(response) as jest.MockedFunction<
|
|
637
|
+
typeof fetch
|
|
638
|
+
>;
|
|
639
|
+
const reportResource = jest.fn();
|
|
640
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
641
|
+
originalFetch,
|
|
642
|
+
reportResource
|
|
643
|
+
});
|
|
644
|
+
proxy.onTrackingStart(getHeaderCaptureOptions('defaults'));
|
|
645
|
+
|
|
646
|
+
await fetchGlobal.fetch('https://api.example.com/graphql', {
|
|
647
|
+
headers: {
|
|
648
|
+
[DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER]: 'query',
|
|
649
|
+
[DATADOG_GRAPH_QL_ERROR_HEADER]: 'true'
|
|
650
|
+
}
|
|
651
|
+
});
|
|
652
|
+
// The app mutates the response headers while the body is parsed
|
|
653
|
+
headers.delete('cache-control');
|
|
654
|
+
headers.set('etag', '"later"');
|
|
655
|
+
resolveBody({ data: {} });
|
|
656
|
+
await flushPromises();
|
|
657
|
+
|
|
658
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
659
|
+
expect(resource.capturedResponseHeaders).toEqual({
|
|
660
|
+
'Cache-Control': 'max-age=60'
|
|
661
|
+
});
|
|
662
|
+
});
|
|
663
|
+
|
|
664
|
+
it('still reports request headers when response headers cannot be iterated', async () => {
|
|
665
|
+
const response = ({
|
|
666
|
+
status: 200,
|
|
667
|
+
headers: { get: () => null },
|
|
668
|
+
clone() {
|
|
669
|
+
return response;
|
|
670
|
+
}
|
|
671
|
+
} as unknown) as Response;
|
|
672
|
+
const originalFetch = jest
|
|
673
|
+
.fn()
|
|
674
|
+
.mockResolvedValue(response) as jest.MockedFunction<
|
|
675
|
+
typeof fetch
|
|
676
|
+
>;
|
|
677
|
+
const reportResource = jest.fn();
|
|
678
|
+
const { fetchGlobal, proxy } = createProxy({
|
|
679
|
+
originalFetch,
|
|
680
|
+
reportResource
|
|
681
|
+
});
|
|
682
|
+
proxy.onTrackingStart(getHeaderCaptureOptions('defaults'));
|
|
683
|
+
|
|
684
|
+
await fetchGlobal.fetch('https://api.example.com/users', {
|
|
685
|
+
headers: { 'Content-Type': 'application/json' }
|
|
686
|
+
});
|
|
687
|
+
await flushPromises();
|
|
688
|
+
|
|
689
|
+
const resource = reportResource.mock.calls[0][0] as RUMResource;
|
|
690
|
+
expect(resource.capturedRequestHeaders).toEqual({
|
|
691
|
+
'Content-Type': 'application/json'
|
|
692
|
+
});
|
|
693
|
+
expect(resource.capturedResponseHeaders).toBeUndefined();
|
|
694
|
+
});
|
|
695
|
+
});
|
|
422
696
|
});
|
|
@@ -83,4 +83,124 @@ describe('Resource reporter', () => {
|
|
|
83
83
|
expect(DdRum.startResource).not.toHaveBeenCalled();
|
|
84
84
|
expect(DdRum.stopResource).not.toHaveBeenCalled();
|
|
85
85
|
});
|
|
86
|
+
|
|
87
|
+
describe('captured header attributes in stopResource context', () => {
|
|
88
|
+
it('includes _dd.request_headers in stopResource context when captured request headers are present', async () => {
|
|
89
|
+
// GIVEN
|
|
90
|
+
const resourceReporter = new ResourceReporter([]);
|
|
91
|
+
const resource = resourceMockFactory.getCustomResource({
|
|
92
|
+
capturedRequestHeaders: {
|
|
93
|
+
'content-type': 'application/json',
|
|
94
|
+
'cache-control': 'no-cache'
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
// WHEN
|
|
99
|
+
resourceReporter.reportResource(resource);
|
|
100
|
+
await flushPromises();
|
|
101
|
+
|
|
102
|
+
// THEN
|
|
103
|
+
const stopContext = DdRum.stopResource.mock.calls[0][4];
|
|
104
|
+
expect(stopContext).toEqual(
|
|
105
|
+
expect.objectContaining({
|
|
106
|
+
'_dd.request_headers': {
|
|
107
|
+
'content-type': 'application/json',
|
|
108
|
+
'cache-control': 'no-cache'
|
|
109
|
+
}
|
|
110
|
+
})
|
|
111
|
+
);
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
it('includes _dd.response_headers in stopResource context when captured response headers are present', async () => {
|
|
115
|
+
// GIVEN
|
|
116
|
+
const resourceReporter = new ResourceReporter([]);
|
|
117
|
+
const resource = resourceMockFactory.getCustomResource({
|
|
118
|
+
capturedResponseHeaders: {
|
|
119
|
+
etag: '"abc123"',
|
|
120
|
+
'cache-control': 'max-age=3600'
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
// WHEN
|
|
125
|
+
resourceReporter.reportResource(resource);
|
|
126
|
+
await flushPromises();
|
|
127
|
+
|
|
128
|
+
// THEN
|
|
129
|
+
const stopContext = DdRum.stopResource.mock.calls[0][4];
|
|
130
|
+
expect(stopContext).toEqual(
|
|
131
|
+
expect.objectContaining({
|
|
132
|
+
'_dd.response_headers': {
|
|
133
|
+
etag: '"abc123"',
|
|
134
|
+
'cache-control': 'max-age=3600'
|
|
135
|
+
}
|
|
136
|
+
})
|
|
137
|
+
);
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
it('includes both _dd.request_headers and _dd.response_headers when both are present', async () => {
|
|
141
|
+
// GIVEN
|
|
142
|
+
const resourceReporter = new ResourceReporter([]);
|
|
143
|
+
const resource = resourceMockFactory.getCustomResource({
|
|
144
|
+
capturedRequestHeaders: {
|
|
145
|
+
'content-type': 'text/plain'
|
|
146
|
+
},
|
|
147
|
+
capturedResponseHeaders: { 'x-cache': 'HIT' }
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
// WHEN
|
|
151
|
+
resourceReporter.reportResource(resource);
|
|
152
|
+
await flushPromises();
|
|
153
|
+
|
|
154
|
+
// THEN
|
|
155
|
+
const stopContext = DdRum.stopResource.mock.calls[0][4];
|
|
156
|
+
expect(stopContext).toEqual(
|
|
157
|
+
expect.objectContaining({
|
|
158
|
+
'_dd.request_headers': {
|
|
159
|
+
'content-type': 'text/plain'
|
|
160
|
+
},
|
|
161
|
+
'_dd.response_headers': { 'x-cache': 'HIT' }
|
|
162
|
+
})
|
|
163
|
+
);
|
|
164
|
+
});
|
|
165
|
+
|
|
166
|
+
it('does not include _dd.request_headers or _dd.response_headers when headers are undefined', async () => {
|
|
167
|
+
// GIVEN
|
|
168
|
+
const resourceReporter = new ResourceReporter([]);
|
|
169
|
+
const resource = resourceMockFactory.getBasicResource();
|
|
170
|
+
|
|
171
|
+
// WHEN
|
|
172
|
+
resourceReporter.reportResource(resource);
|
|
173
|
+
await flushPromises();
|
|
174
|
+
|
|
175
|
+
// THEN
|
|
176
|
+
const stopContext = DdRum.stopResource.mock.calls[0][4];
|
|
177
|
+
expect(stopContext).not.toHaveProperty('_dd.request_headers');
|
|
178
|
+
expect(stopContext).not.toHaveProperty('_dd.response_headers');
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
it('does not include _dd.request_headers when only response headers are present', async () => {
|
|
182
|
+
// GIVEN
|
|
183
|
+
const resourceReporter = new ResourceReporter([]);
|
|
184
|
+
const resource = resourceMockFactory.getCustomResource({
|
|
185
|
+
capturedResponseHeaders: {
|
|
186
|
+
'x-request-id': '12345'
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
// WHEN
|
|
191
|
+
resourceReporter.reportResource(resource);
|
|
192
|
+
await flushPromises();
|
|
193
|
+
|
|
194
|
+
// THEN
|
|
195
|
+
const stopContext = DdRum.stopResource.mock.calls[0][4];
|
|
196
|
+
expect(stopContext).toEqual(
|
|
197
|
+
expect.objectContaining({
|
|
198
|
+
'_dd.response_headers': {
|
|
199
|
+
'x-request-id': '12345'
|
|
200
|
+
}
|
|
201
|
+
})
|
|
202
|
+
);
|
|
203
|
+
expect(stopContext).not.toHaveProperty('_dd.request_headers');
|
|
204
|
+
});
|
|
205
|
+
});
|
|
86
206
|
});
|
|
@@ -7,10 +7,16 @@
|
|
|
7
7
|
import { InternalLog } from '../../../../../InternalLog';
|
|
8
8
|
import { SdkVerbosity } from '../../../../../config/types';
|
|
9
9
|
import { extractGraphQLErrors } from '../../graphql/graphqlUtils';
|
|
10
|
+
import { isHeaderAllowed } from '../../headerCapture/isHeaderAllowed';
|
|
11
|
+
import { parseResponseHeaders } from '../../headerCapture/parseResponseHeaders';
|
|
10
12
|
import { isRunningWithinFetchProxy } from '../common/FetchProxyState';
|
|
11
13
|
import type { RequestContext } from '../common/RequestContext';
|
|
12
14
|
import { createRequestContext, getResourceKey } from '../common/RequestContext';
|
|
13
15
|
import { ResourceReporter } from '../common/ResourceReporter';
|
|
16
|
+
import {
|
|
17
|
+
finalizeCapturedHeaders,
|
|
18
|
+
recordRequestHeader
|
|
19
|
+
} from '../common/headerCapture';
|
|
14
20
|
import { filterDevResource } from '../common/internalDevResourceBlocklist';
|
|
15
21
|
import {
|
|
16
22
|
getInstrumentationHeaders,
|
|
@@ -191,8 +197,23 @@ const reportXhr = async (
|
|
|
191
197
|
|
|
192
198
|
const key = getResourceKey(context);
|
|
193
199
|
|
|
200
|
+
// Stop before header processing so it is not counted in the resource duration
|
|
194
201
|
context.timer.stop();
|
|
195
202
|
|
|
203
|
+
// Snapshot before any await: the app may reopen this XHR from its
|
|
204
|
+
// completion handler while the GraphQL body is being read.
|
|
205
|
+
const statusCode = xhrProxy.status;
|
|
206
|
+
const capturedHeaders = finalizeCapturedHeaders({
|
|
207
|
+
state: context.headerCapture,
|
|
208
|
+
url: context.url,
|
|
209
|
+
statusCode,
|
|
210
|
+
responseHeaders: () =>
|
|
211
|
+
parseResponseHeaders(
|
|
212
|
+
xhrProxy.getAllResponseHeaders(),
|
|
213
|
+
isHeaderAllowed
|
|
214
|
+
)
|
|
215
|
+
});
|
|
216
|
+
|
|
196
217
|
// Only extract GraphQL errors if operationType is set AND error tracking is enabled
|
|
197
218
|
if (context.graphql.operationType && context.graphql.trackErrors) {
|
|
198
219
|
try {
|
|
@@ -223,8 +244,9 @@ const reportXhr = async (
|
|
|
223
244
|
},
|
|
224
245
|
graphqlAttributes: context.graphql,
|
|
225
246
|
tracingAttributes: context.tracingAttributes,
|
|
247
|
+
...capturedHeaders,
|
|
226
248
|
response: {
|
|
227
|
-
statusCode
|
|
249
|
+
statusCode,
|
|
228
250
|
size: responseSize
|
|
229
251
|
},
|
|
230
252
|
timings: {
|
|
@@ -251,17 +273,26 @@ const proxySetRequestHeader = (providers: XHRProxyProviders): void => {
|
|
|
251
273
|
return originalXhrSetRequestHeader.apply(this, [header, value]);
|
|
252
274
|
}
|
|
253
275
|
|
|
276
|
+
// XHR coerces values to strings: do it once so the sent and the
|
|
277
|
+
// captured values are identical
|
|
278
|
+
const stringValue = String(value);
|
|
254
279
|
const processedHeader = processRequestHeader({
|
|
255
280
|
context: this._datadog_xhr,
|
|
256
281
|
header,
|
|
257
|
-
value
|
|
282
|
+
value: stringValue
|
|
258
283
|
});
|
|
259
284
|
|
|
260
285
|
if (processedHeader.type === 'send') {
|
|
261
|
-
|
|
286
|
+
const result = originalXhrSetRequestHeader.apply(this, [
|
|
262
287
|
processedHeader.header,
|
|
263
288
|
processedHeader.value
|
|
264
289
|
]);
|
|
290
|
+
recordRequestHeader(
|
|
291
|
+
this._datadog_xhr.headerCapture,
|
|
292
|
+
header,
|
|
293
|
+
stringValue
|
|
294
|
+
);
|
|
295
|
+
return result;
|
|
265
296
|
}
|
|
266
297
|
};
|
|
267
298
|
};
|