@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
|
@@ -0,0 +1,51 @@
|
|
|
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
|
+
/**
|
|
8
|
+
* Parses a CRLF-delimited `getAllResponseHeaders()` string into a
|
|
9
|
+
* `Record<string, string>` of lowercase header names to trimmed values.
|
|
10
|
+
*
|
|
11
|
+
* Handles all edge cases defensively — SDK stability takes priority over
|
|
12
|
+
* strict compliance. Never throws on any input.
|
|
13
|
+
*
|
|
14
|
+
* - Splits on `\r?\n` to handle both CRLF and bare LF
|
|
15
|
+
* - Uses `indexOf(':')` so values containing colons (e.g. URLs) are preserved
|
|
16
|
+
* - Header names are trimmed and lowercased; values are trimmed (HTTP OWS)
|
|
17
|
+
* - Duplicate names resolve to last-value-wins
|
|
18
|
+
* - Malformed lines (no colon, empty name) are silently skipped
|
|
19
|
+
* - Headers rejected by `isAllowed` (if provided) are never stored
|
|
20
|
+
*/
|
|
21
|
+
export const parseResponseHeaders = (rawHeaders, isAllowed) => {
|
|
22
|
+
if (!rawHeaders) {
|
|
23
|
+
return {};
|
|
24
|
+
}
|
|
25
|
+
const result = {};
|
|
26
|
+
const lines = rawHeaders.split(/\r?\n/);
|
|
27
|
+
for (const line of lines) {
|
|
28
|
+
// Skip empty lines (trailing delimiter produces empty last element)
|
|
29
|
+
if (line === '') {
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
const colonIndex = line.indexOf(':');
|
|
33
|
+
|
|
34
|
+
// No colon found, or colon is first character (empty name) — skip
|
|
35
|
+
if (colonIndex <= 0) {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
const name = line.slice(0, colonIndex).trim().toLowerCase();
|
|
39
|
+
|
|
40
|
+
// Name is empty after trimming, or the header is not allowed — skip
|
|
41
|
+
if (name === '' || isAllowed !== undefined && !isAllowed(name)) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const value = line.slice(colonIndex + 1).trim();
|
|
45
|
+
|
|
46
|
+
// Last value wins for duplicate header names
|
|
47
|
+
result[name] = value;
|
|
48
|
+
}
|
|
49
|
+
return result;
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=parseResponseHeaders.js.map
|
package/lib/module/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["parseResponseHeaders","rawHeaders","isAllowed","result","lines","split","line","colonIndex","indexOf","name","slice","trim","toLowerCase","undefined","value"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,oBAAoB,GAAGA,CAChCC,UAAqC,EACrCC,SAA2C,KAClB;EACzB,IAAI,CAACD,UAAU,EAAE;IACb,OAAO,CAAC,CAAC;EACb;EAEA,MAAME,MAA8B,GAAG,CAAC,CAAC;EACzC,MAAMC,KAAK,GAAGH,UAAU,CAACI,KAAK,CAAC,OAAO,CAAC;EAEvC,KAAK,MAAMC,IAAI,IAAIF,KAAK,EAAE;IACtB;IACA,IAAIE,IAAI,KAAK,EAAE,EAAE;MACb;IACJ;IAEA,MAAMC,UAAU,GAAGD,IAAI,CAACE,OAAO,CAAC,GAAG,CAAC;;IAEpC;IACA,IAAID,UAAU,IAAI,CAAC,EAAE;MACjB;IACJ;IAEA,MAAME,IAAI,GAAGH,IAAI,CAACI,KAAK,CAAC,CAAC,EAAEH,UAAU,CAAC,CAACI,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;;IAE3D;IACA,IAAIH,IAAI,KAAK,EAAE,IAAKP,SAAS,KAAKW,SAAS,IAAI,CAACX,SAAS,CAACO,IAAI,CAAE,EAAE;MAC9D;IACJ;IAEA,MAAMK,KAAK,GAAGR,IAAI,CAACI,KAAK,CAACH,UAAU,GAAG,CAAC,CAAC,CAACI,IAAI,CAAC,CAAC;;IAE/C;IACAR,MAAM,CAACM,IAAI,CAAC,GAAGK,KAAK;EACxB;EAEA,OAAOX,MAAM;AACjB,CAAC","ignoreList":[]}
|
package/lib/module/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
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
|
+
/**
|
|
8
|
+
* Compiled regex matching sensitive header name patterns.
|
|
9
|
+
*
|
|
10
|
+
* Matches headers containing: token, cookie, secret, authorization, password,
|
|
11
|
+
* credential, bearer, api/secret/access/app key variants, forwarding/IP headers.
|
|
12
|
+
*
|
|
13
|
+
* The `/i` flag ensures case-insensitive matching. Compiled once at module load
|
|
14
|
+
* time — no per-call allocation.
|
|
15
|
+
*/
|
|
16
|
+
const SENSITIVE_HEADER_PATTERN = /(?:token|cookie|secret|authorization|password|credential|bearer|(?:api|secret|access|app|application).?key|forwarded|real.?ip|connecting.?ip|client.?ip)/i;
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Checks whether a header name matches a known sensitive header pattern.
|
|
20
|
+
* Sensitive headers (authorization, cookies, tokens, API keys, etc.) must
|
|
21
|
+
* never be captured regardless of configuration mode.
|
|
22
|
+
*
|
|
23
|
+
* Blocked headers are expected behavior, so they never produce WARN or ERROR
|
|
24
|
+
* logs; the capture pipeline only reports them at DEBUG verbosity.
|
|
25
|
+
*
|
|
26
|
+
* @param headerName - The header name to check (case-insensitive via regex /i flag).
|
|
27
|
+
* @returns `true` if the header is sensitive and must be blocked.
|
|
28
|
+
*/
|
|
29
|
+
export const isSensitiveHeader = headerName => {
|
|
30
|
+
return SENSITIVE_HEADER_PATTERN.test(headerName);
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=sensitiveHeaderBlocklist.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["SENSITIVE_HEADER_PATTERN","isSensitiveHeader","headerName","test"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,wBAAwB,GAAG,2JAA2J;;AAE5L;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAIC,UAAkB,IAAc;EAC9D,OAAOF,wBAAwB,CAACG,IAAI,CAACD,UAAU,CAAC;AACpD,CAAC","ignoreList":[]}
|
package/lib/module/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
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 { SAMPLING_PRIORITY_HEADER_KEY, ORIGIN_HEADER_KEY, TRACE_ID_HEADER_KEY, PARENT_ID_HEADER_KEY, TAGS_HEADER_KEY, TRACECONTEXT_HEADER_KEY, TRACESTATE_HEADER_KEY, BAGGAGE_HEADER_KEY, B3_HEADER_KEY, B3_MULTI_TRACE_ID_HEADER_KEY, B3_MULTI_SPAN_ID_HEADER_KEY, B3_MULTI_SAMPLED_HEADER_KEY, TRACKED_BY_HEADER_KEY } from '../distributedTracing/headers';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Set of all SDK-injected distributed tracing (and tracking) header names, lowercased.
|
|
11
|
+
*
|
|
12
|
+
* Built once at module load time from the canonical header constants in
|
|
13
|
+
* `distributedTracing/headers.ts`. The B3 multi-headers have mixed case
|
|
14
|
+
* (e.g. `X-B3-TraceId`), so all values are lowercased for uniform lookup.
|
|
15
|
+
*/
|
|
16
|
+
const TRACING_HEADERS = new Set([SAMPLING_PRIORITY_HEADER_KEY, ORIGIN_HEADER_KEY, TRACE_ID_HEADER_KEY, PARENT_ID_HEADER_KEY, TAGS_HEADER_KEY, TRACECONTEXT_HEADER_KEY, TRACESTATE_HEADER_KEY, BAGGAGE_HEADER_KEY, B3_HEADER_KEY, B3_MULTI_TRACE_ID_HEADER_KEY, B3_MULTI_SPAN_ID_HEADER_KEY, B3_MULTI_SAMPLED_HEADER_KEY, TRACKED_BY_HEADER_KEY].map(h => h.toLowerCase()));
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Checks whether a header name is an SDK-injected distributed tracing header.
|
|
20
|
+
* Tracing headers must never be captured because they are SDK internals,
|
|
21
|
+
* not application-level headers.
|
|
22
|
+
*
|
|
23
|
+
* Uses an explicit list (not prefix matching) — `x-datadog-customer-id`
|
|
24
|
+
* would NOT be excluded.
|
|
25
|
+
*
|
|
26
|
+
* @param headerName - The header name to check (lowercased internally for lookup).
|
|
27
|
+
* @returns `true` if the header is a tracing header and must be excluded.
|
|
28
|
+
*/
|
|
29
|
+
export const isTracingHeader = headerName => {
|
|
30
|
+
return TRACING_HEADERS.has(headerName.toLowerCase());
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=tracingHeaderExclusion.js.map
|
package/lib/module/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["SAMPLING_PRIORITY_HEADER_KEY","ORIGIN_HEADER_KEY","TRACE_ID_HEADER_KEY","PARENT_ID_HEADER_KEY","TAGS_HEADER_KEY","TRACECONTEXT_HEADER_KEY","TRACESTATE_HEADER_KEY","BAGGAGE_HEADER_KEY","B3_HEADER_KEY","B3_MULTI_TRACE_ID_HEADER_KEY","B3_MULTI_SPAN_ID_HEADER_KEY","B3_MULTI_SAMPLED_HEADER_KEY","TRACKED_BY_HEADER_KEY","TRACING_HEADERS","Set","map","h","toLowerCase","isTracingHeader","headerName","has"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SACIA,4BAA4B,EAC5BC,iBAAiB,EACjBC,mBAAmB,EACnBC,oBAAoB,EACpBC,eAAe,EACfC,uBAAuB,EACvBC,qBAAqB,EACrBC,kBAAkB,EAClBC,aAAa,EACbC,4BAA4B,EAC5BC,2BAA2B,EAC3BC,2BAA2B,EAC3BC,qBAAqB,QAClB,+BAA+B;;AAEtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,eAA4B,GAAG,IAAIC,GAAG,CACxC,CACId,4BAA4B,EAC5BC,iBAAiB,EACjBC,mBAAmB,EACnBC,oBAAoB,EACpBC,eAAe,EACfC,uBAAuB,EACvBC,qBAAqB,EACrBC,kBAAkB,EAClBC,aAAa,EACbC,4BAA4B,EAC5BC,2BAA2B,EAC3BC,2BAA2B,EAC3BC,qBAAqB,CACxB,CAACG,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,WAAW,CAAC,CAAC,CAC9B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAIC,UAAkB,IAAc;EAC5D,OAAON,eAAe,CAACO,GAAG,CAACD,UAAU,CAACF,WAAW,CAAC,CAAC,CAAC;AACxD,CAAC","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/types.ts"],"mappings":"","ignoreList":[]}
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js
CHANGED
|
@@ -11,6 +11,7 @@ import { getErrorData } from '../XHRProxy/xhrUtils';
|
|
|
11
11
|
import { callOriginalFetch } from '../common/FetchProxyState';
|
|
12
12
|
import { createRequestContext, getResourceKey } from '../common/RequestContext';
|
|
13
13
|
import { ResourceReporter } from '../common/ResourceReporter';
|
|
14
|
+
import { fetchHeadersToRecord, finalizeCapturedHeaders, recordRequestHeader } from '../common/headerCapture';
|
|
14
15
|
import { filterDevResource } from '../common/internalDevResourceBlocklist';
|
|
15
16
|
import { getInstrumentationHeaders, processRequestHeader } from '../common/requestHeaders';
|
|
16
17
|
import { RequestProxy } from '../interfaces/RequestProxy';
|
|
@@ -152,12 +153,14 @@ const buildHeaders = ({
|
|
|
152
153
|
header,
|
|
153
154
|
value
|
|
154
155
|
}) => {
|
|
155
|
-
applyHeader({
|
|
156
|
+
if (applyHeader({
|
|
156
157
|
headers,
|
|
157
158
|
context,
|
|
158
159
|
header,
|
|
159
160
|
value
|
|
160
|
-
})
|
|
161
|
+
})) {
|
|
162
|
+
recordRequestHeader(context.headerCapture, header, value);
|
|
163
|
+
}
|
|
161
164
|
});
|
|
162
165
|
getInstrumentationHeaders(context).forEach(({
|
|
163
166
|
header,
|
|
@@ -185,13 +188,24 @@ const applyHeader = ({
|
|
|
185
188
|
});
|
|
186
189
|
if (processedHeader.type === 'send') {
|
|
187
190
|
headers.set(processedHeader.header, processedHeader.value);
|
|
191
|
+
return true;
|
|
188
192
|
}
|
|
193
|
+
return false;
|
|
189
194
|
};
|
|
190
195
|
const reportFetch = async ({
|
|
191
196
|
context,
|
|
192
197
|
response,
|
|
193
198
|
resourceReporter
|
|
194
199
|
}) => {
|
|
200
|
+
// Snapshot before any await: some Fetch implementations expose mutable
|
|
201
|
+
// response headers that the app could change while the body is parsed.
|
|
202
|
+
const capturedHeaders = finalizeCapturedHeaders({
|
|
203
|
+
state: context.headerCapture,
|
|
204
|
+
url: context.url,
|
|
205
|
+
statusCode: response.status,
|
|
206
|
+
responseHeaders: () => fetchHeadersToRecord(response.headers)
|
|
207
|
+
});
|
|
208
|
+
|
|
195
209
|
// Only extract GraphQL errors if operationType is set AND error tracking is enabled
|
|
196
210
|
if (context.graphql.operationType && context.graphql.trackErrors) {
|
|
197
211
|
try {
|
|
@@ -219,6 +233,7 @@ const reportFetch = async ({
|
|
|
219
233
|
},
|
|
220
234
|
graphqlAttributes: context.graphql,
|
|
221
235
|
tracingAttributes: context.tracingAttributes,
|
|
236
|
+
...capturedHeaders,
|
|
222
237
|
response: {
|
|
223
238
|
statusCode: response.status,
|
|
224
239
|
size: getResponseSize(response)
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","extractGraphQLErrors","getErrorData","callOriginalFetch","createRequestContext","getResourceKey","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","request","kind","graphqlAttributes","tracingAttributes","
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","extractGraphQLErrors","getErrorData","callOriginalFetch","createRequestContext","getResourceKey","ResourceReporter","fetchHeadersToRecord","finalizeCapturedHeaders","recordRequestHeader","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","headerCapture","processedHeader","type","set","capturedHeaders","state","statusCode","status","responseHeaders","graphql","operationType","trackErrors","body","clone","json","errors","Array","isArray","length","filtered","reportResource","key","request","kind","graphqlAttributes","tracingAttributes","size","getResponseSize","timings","startTime","stopTime","responseStartTime","timeAt","contentLength","get","test","Number"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,9 +7,12 @@
|
|
|
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 { createRequestContext, getResourceKey } from '../common/RequestContext';
|
|
12
14
|
import { ResourceReporter } from '../common/ResourceReporter';
|
|
15
|
+
import { finalizeCapturedHeaders, recordRequestHeader } from '../common/headerCapture';
|
|
13
16
|
import { filterDevResource } from '../common/internalDevResourceBlocklist';
|
|
14
17
|
import { getInstrumentationHeaders, processRequestHeader } from '../common/requestHeaders';
|
|
15
18
|
import { RequestProxy } from '../interfaces/RequestProxy';
|
|
@@ -135,8 +138,20 @@ const reportXhr = async (xhrProxy, resourceReporter) => {
|
|
|
135
138
|
return;
|
|
136
139
|
}
|
|
137
140
|
const key = getResourceKey(context);
|
|
141
|
+
|
|
142
|
+
// Stop before header processing so it is not counted in the resource duration
|
|
138
143
|
context.timer.stop();
|
|
139
144
|
|
|
145
|
+
// Snapshot before any await: the app may reopen this XHR from its
|
|
146
|
+
// completion handler while the GraphQL body is being read.
|
|
147
|
+
const statusCode = xhrProxy.status;
|
|
148
|
+
const capturedHeaders = finalizeCapturedHeaders({
|
|
149
|
+
state: context.headerCapture,
|
|
150
|
+
url: context.url,
|
|
151
|
+
statusCode,
|
|
152
|
+
responseHeaders: () => parseResponseHeaders(xhrProxy.getAllResponseHeaders(), isHeaderAllowed)
|
|
153
|
+
});
|
|
154
|
+
|
|
140
155
|
// Only extract GraphQL errors if operationType is set AND error tracking is enabled
|
|
141
156
|
if (context.graphql.operationType && context.graphql.trackErrors) {
|
|
142
157
|
try {
|
|
@@ -164,8 +179,9 @@ const reportXhr = async (xhrProxy, resourceReporter) => {
|
|
|
164
179
|
},
|
|
165
180
|
graphqlAttributes: context.graphql,
|
|
166
181
|
tracingAttributes: context.tracingAttributes,
|
|
182
|
+
...capturedHeaders,
|
|
167
183
|
response: {
|
|
168
|
-
statusCode
|
|
184
|
+
statusCode,
|
|
169
185
|
size: responseSize
|
|
170
186
|
},
|
|
171
187
|
timings: {
|
|
@@ -183,13 +199,19 @@ const proxySetRequestHeader = providers => {
|
|
|
183
199
|
if (!this._datadog_xhr) {
|
|
184
200
|
return originalXhrSetRequestHeader.apply(this, [header, value]);
|
|
185
201
|
}
|
|
202
|
+
|
|
203
|
+
// XHR coerces values to strings: do it once so the sent and the
|
|
204
|
+
// captured values are identical
|
|
205
|
+
const stringValue = String(value);
|
|
186
206
|
const processedHeader = processRequestHeader({
|
|
187
207
|
context: this._datadog_xhr,
|
|
188
208
|
header,
|
|
189
|
-
value
|
|
209
|
+
value: stringValue
|
|
190
210
|
});
|
|
191
211
|
if (processedHeader.type === 'send') {
|
|
192
|
-
|
|
212
|
+
const result = originalXhrSetRequestHeader.apply(this, [processedHeader.header, processedHeader.value]);
|
|
213
|
+
recordRequestHeader(this._datadog_xhr.headerCapture, header, stringValue);
|
|
214
|
+
return result;
|
|
193
215
|
}
|
|
194
216
|
};
|
|
195
217
|
};
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","extractGraphQLErrors","isRunningWithinFetchProxy","createRequestContext","getResourceKey","ResourceReporter","filterDevResource","getInstrumentationHeaders","processRequestHeader","RequestProxy","calculateResponseSize","getErrorData","readXhrJsonBody","RESPONSE_START_LABEL","XHRProxy","context","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","onTrackingStart","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","onTrackingUpdate","options","tracingSamplingRate","proxyOpen","proxySend","proxySetRequestHeader","method","url","_datadog_xhr","undefined","apply","arguments","reported","timer","start","forEach","header","value","proxyOnReadyStateChange","xhrProxy","requestContext","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","catch","error","errorData","log","WARN","HEADERS_RECEIVED","recordTick","responseSize","key","stop","graphql","operationType","trackErrors","body","errors","Array","isArray","length","filtered","reportResource","request","kind","graphqlAttributes","tracingAttributes","response","
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","extractGraphQLErrors","isHeaderAllowed","parseResponseHeaders","isRunningWithinFetchProxy","createRequestContext","getResourceKey","ResourceReporter","finalizeCapturedHeaders","recordRequestHeader","filterDevResource","getInstrumentationHeaders","processRequestHeader","RequestProxy","calculateResponseSize","getErrorData","readXhrJsonBody","RESPONSE_START_LABEL","XHRProxy","context","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","onTrackingStart","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","onTrackingUpdate","options","tracingSamplingRate","proxyOpen","proxySend","proxySetRequestHeader","method","url","_datadog_xhr","undefined","apply","arguments","reported","timer","start","forEach","header","value","proxyOnReadyStateChange","xhrProxy","requestContext","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","catch","error","errorData","log","WARN","HEADERS_RECEIVED","recordTick","responseSize","key","stop","statusCode","status","capturedHeaders","state","headerCapture","responseHeaders","getAllResponseHeaders","graphql","operationType","trackErrors","body","errors","Array","isArray","length","filtered","reportResource","request","kind","graphqlAttributes","tracingAttributes","response","size","timings","startTime","stopTime","responseStartTime","hasTickFor","timeAt","resourceContext","sendRequestHeader","stringValue","String","processedHeader","type","result"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
import { InternalLog } from '../../../../../InternalLog';
|
|
8
8
|
import { SdkVerbosity } from '../../../../../config/types/SdkVerbosity';
|
|
9
|
+
import { utf8ByteLength } from '../../../../../utils/stringUtils';
|
|
9
10
|
import { DD_RUM_ACCOUNT_ID_TAG, DD_RUM_SESSION_ID_TAG, DD_RUM_USER_ID_TAG } from '../../distributedTracing/headers';
|
|
10
11
|
|
|
11
12
|
// The resulting baggage-string should contain 64 list-members or less (https://www.w3.org/TR/baggage/#limits)
|
|
@@ -101,40 +102,6 @@ export function formatBaggageHeader(entries) {
|
|
|
101
102
|
return headerValue;
|
|
102
103
|
}
|
|
103
104
|
|
|
104
|
-
/**
|
|
105
|
-
* Returns the number of bytes needed to encode a string in UTF-8.
|
|
106
|
-
*
|
|
107
|
-
* Useful as a lightweight alternative to Node.js `Buffer.byteLength()`
|
|
108
|
-
* for older environments that do not support it.
|
|
109
|
-
*
|
|
110
|
-
* @param text - The input string.
|
|
111
|
-
* @returns The UTF-8 byte length of the string.
|
|
112
|
-
*/
|
|
113
|
-
function utf8ByteLength(text) {
|
|
114
|
-
let byteLength = text.length;
|
|
115
|
-
for (let i = text.length - 1; i >= 0; i--) {
|
|
116
|
-
const code = text.charCodeAt(i);
|
|
117
|
-
|
|
118
|
-
// 2-byte characters (U+0080 to U+07FF)
|
|
119
|
-
if (code > 0x7f && code <= 0x7ff) {
|
|
120
|
-
byteLength++;
|
|
121
|
-
}
|
|
122
|
-
// 3-byte characters (U+0800 to U+FFFF)
|
|
123
|
-
else if (code > 0x7ff && code <= 0xffff) {
|
|
124
|
-
byteLength += 2;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
// Handle surrogate pairs (4-byte characters, e.g. emoji)
|
|
128
|
-
// These characters already count as 2 in the initial length
|
|
129
|
-
// Encountering the low surrogate already accounts for the full 4 bytes
|
|
130
|
-
// (2 from the initial length + 2 for the 3-byte characters logic above)
|
|
131
|
-
if (code >= 0xdc00 && code <= 0xdfff) {
|
|
132
|
-
i--; // prevents double counting the same character by skipping high surrogate
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
return byteLength;
|
|
136
|
-
}
|
|
137
|
-
|
|
138
105
|
/**
|
|
139
106
|
* Returns a set of valid baggage header characters.
|
|
140
107
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","DD_RUM_ACCOUNT_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","log","ERROR","mainPart","rawProperties","split","idx","indexOf","rawKey","slice","trim","rawValue","isDatadogKey","isDatadogPropertyKey","encodedValue","encodeValue","test","WARN","isCompliantBaggageValue","properties","rawProperty","trimmed","eqIdx","propKey","push","propVal","joinedProps","length","join","headerValue","byteLength","
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","utf8ByteLength","DD_RUM_ACCOUNT_ID_TAG","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","log","ERROR","mainPart","rawProperties","split","idx","indexOf","rawKey","slice","trim","rawValue","isDatadogKey","isDatadogPropertyKey","encodedValue","encodeValue","test","WARN","isCompliantBaggageValue","properties","rawProperty","trimmed","eqIdx","propKey","push","propVal","joinedProps","length","join","headerValue","byteLength","getBaggageHeaderSafeChars","safeChars","Set","c","add","String","fromCharCode","key","raw","decoded","tryDecodeValue","result","ch","Array","from","has","utf8Bytes","Buffer","value","toString","toUpperCase","padStart","decodeURIComponent","isHexDigit","i","h1","h2"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js
CHANGED
|
@@ -8,6 +8,7 @@ import { Timer } from '../../../../../utils/Timer';
|
|
|
8
8
|
import { getCachedAccountId, getCachedSessionId, getCachedUserId } from '../../../../helper';
|
|
9
9
|
import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
|
|
10
10
|
import { URLHostParser } from '../XHRProxy/URLHostParser';
|
|
11
|
+
import { createHeaderCaptureState } from './headerCapture';
|
|
11
12
|
// Disambiguates resources sharing the same start millisecond and method,
|
|
12
13
|
// which would otherwise collide on the native side.
|
|
13
14
|
let resourceSequence = 0;
|
|
@@ -30,7 +31,8 @@ export const createRequestContext = ({
|
|
|
30
31
|
userId: getCachedUserId(),
|
|
31
32
|
accountId: getCachedAccountId()
|
|
32
33
|
}),
|
|
33
|
-
baggageHeaderEntries: new Set()
|
|
34
|
+
baggageHeaderEntries: new Set(),
|
|
35
|
+
headerCapture: createHeaderCaptureState(options.headerCaptureConfig)
|
|
34
36
|
};
|
|
35
37
|
};
|
|
36
38
|
export const getResourceKey = context => `${context.timer.startTime}/${context.method}/${context.resourceId}`;
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Timer","getCachedAccountId","getCachedSessionId","getCachedUserId","getTracingAttributes","URLHostParser","resourceSequence","createRequestContext","method","url","options","resourceId","timer","graphql","tracingAttributes","hostname","firstPartyHostsRegexMap","tracingSamplingRate","rumSessionId","userId","accountId","baggageHeaderEntries","Set","getResourceKey","context","startTime"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,KAAK,QAAQ,4BAA4B;AAClD,SACIC,kBAAkB,EAClBC,kBAAkB,EAClBC,eAAe,QACZ,oBAAoB;AAE3B,SAASC,oBAAoB,QAAQ,6CAA6C;AAClF,SAASC,aAAa,QAAQ,2BAA2B;
|
|
1
|
+
{"version":3,"names":["Timer","getCachedAccountId","getCachedSessionId","getCachedUserId","getTracingAttributes","URLHostParser","createHeaderCaptureState","resourceSequence","createRequestContext","method","url","options","resourceId","timer","graphql","tracingAttributes","hostname","firstPartyHostsRegexMap","tracingSamplingRate","rumSessionId","userId","accountId","baggageHeaderEntries","Set","headerCapture","headerCaptureConfig","getResourceKey","context","startTime"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,KAAK,QAAQ,4BAA4B;AAClD,SACIC,kBAAkB,EAClBC,kBAAkB,EAClBC,eAAe,QACZ,oBAAoB;AAE3B,SAASC,oBAAoB,QAAQ,6CAA6C;AAClF,SAASC,aAAa,QAAQ,2BAA2B;AAKzD,SAASC,wBAAwB,QAAQ,iBAAiB;AAe1D;AACA;AACA,IAAIC,gBAAgB,GAAG,CAAC;AAExB,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACjCC,MAAM;EACNC,GAAG;EACHC;AAKJ,CAAC,KAAqB;EAClB,OAAO;IACHC,UAAU,EAAE,EAAEL,gBAAgB;IAC9BE,MAAM;IACNC,GAAG;IACHG,KAAK,EAAE,IAAIb,KAAK,CAAC,CAAC;IAClBc,OAAO,EAAE,CAAC,CAAC;IACXC,iBAAiB,EAAEX,oBAAoB,CAAC;MACpCY,QAAQ,EAAEX,aAAa,CAACK,GAAG,CAAC;MAC5BO,uBAAuB,EAAEN,OAAO,CAACM,uBAAuB;MACxDC,mBAAmB,EAAEP,OAAO,CAACO,mBAAmB;MAChDC,YAAY,EAAEjB,kBAAkB,CAAC,CAAC;MAClCkB,MAAM,EAAEjB,eAAe,CAAC,CAAC;MACzBkB,SAAS,EAAEpB,kBAAkB,CAAC;IAClC,CAAC,CAAC;IACFqB,oBAAoB,EAAE,IAAIC,GAAG,CAAS,CAAC;IACvCC,aAAa,EAAElB,wBAAwB,CAACK,OAAO,CAACc,mBAAmB;EACvE,CAAC;AACL,CAAC;AAED,OAAO,MAAMC,cAAc,GAAIC,OAAuB,IAClD,GAAGA,OAAO,CAACd,KAAK,CAACe,SAAS,IAAID,OAAO,CAAClB,MAAM,IAAIkB,OAAO,CAACf,UAAU,EAAE","ignoreList":[]}
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js
CHANGED
|
@@ -31,7 +31,7 @@ const formatResourceStartContext = tracingAttributes => {
|
|
|
31
31
|
}
|
|
32
32
|
return attributes;
|
|
33
33
|
};
|
|
34
|
-
const formatResourceStopContext = (timings, graphqlAttributes) => {
|
|
34
|
+
const formatResourceStopContext = (timings, graphqlAttributes, capturedRequestHeaders, capturedResponseHeaders) => {
|
|
35
35
|
const attributes = {};
|
|
36
36
|
if (timings.responseStartTime !== undefined) {
|
|
37
37
|
attributes['_dd.resource_timings'] = createTimings(timings.startTime, timings.responseStartTime, timings.stopTime);
|
|
@@ -51,10 +51,16 @@ const formatResourceStopContext = (timings, graphqlAttributes) => {
|
|
|
51
51
|
attributes['_dd.graphql.errors'] = JSON.stringify(graphqlAttributes.errors);
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
+
if (capturedRequestHeaders !== undefined) {
|
|
55
|
+
attributes['_dd.request_headers'] = capturedRequestHeaders;
|
|
56
|
+
}
|
|
57
|
+
if (capturedResponseHeaders !== undefined) {
|
|
58
|
+
attributes['_dd.response_headers'] = capturedResponseHeaders;
|
|
59
|
+
}
|
|
54
60
|
return attributes;
|
|
55
61
|
};
|
|
56
62
|
const reportResource = async resource => {
|
|
57
63
|
await DdRum.startResource(resource.key, resource.request.method, resource.request.url, formatResourceStartContext(resource.tracingAttributes), resource.timings.startTime);
|
|
58
|
-
DdRum.stopResource(resource.key, resource.response.statusCode, resource.request.kind, resource.response.size, formatResourceStopContext(resource.timings, resource.graphqlAttributes), resource.timings.stopTime, resource.resourceContext);
|
|
64
|
+
DdRum.stopResource(resource.key, resource.response.statusCode, resource.request.kind, resource.response.size, formatResourceStopContext(resource.timings, resource.graphqlAttributes, resource.capturedRequestHeaders, resource.capturedResponseHeaders), resource.timings.stopTime, resource.resourceContext);
|
|
59
65
|
};
|
|
60
66
|
//# sourceMappingURL=ResourceReporter.js.map
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DdRum","TracingIdFormat","createTimings","ResourceReporter","constructor","mappers","reportResource","resource","modifiedResource","mapper","formatResourceStartContext","tracingAttributes","attributes","samplingPriorityHeader","spanId","toString","decimal","traceId","paddedHex","rulePsr","formatResourceStopContext","timings","graphqlAttributes","responseStartTime","undefined","startTime","stopTime","operationType","operationName","variables","payload","errors","JSON","stringify","startResource","key","request","method","url","stopResource","response","statusCode","kind","size","resourceContext"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SAASA,KAAK,QAAQ,mBAAmB;AACzC,SAASC,eAAe,QAAQ,4CAA4C;AAG5E,SAASC,aAAa,QAAQ,kBAAkB;AAIhD,OAAO,MAAMC,gBAAgB,CAAC;EAG1BC,WAAWA,CAACC,OAAyB,EAAE;IACnC,IAAI,CAACA,OAAO,GAAGA,OAAO;EAC1B;EAEAC,cAAc,GAAIC,QAAqB,IAAK;IACxC,IAAIC,gBAAoC,GAAGD,QAAQ;IAEnD,KAAK,MAAME,MAAM,IAAI,IAAI,CAACJ,OAAO,EAAE;MAC/BG,gBAAgB,GAAGC,MAAM,CAACF,QAAQ,CAAC;MACnC,IAAIC,gBAAgB,KAAK,IAAI,EAAE;QAC3B;MACJ;IACJ;IAEAF,cAAc,CAACE,gBAAgB,CAAC;EACpC,CAAC;AACL;AAEA,MAAME,0BAA0B,GAC5BC,iBAAmD,IACjB;EAClC,MAAMC,UAA2C,GAAG,CAAC,CAAC;EACtD,IAAID,iBAAiB,CAACE,sBAAsB,KAAK,GAAG,EAAE;IAClDD,UAAU,CAAC,aAAa,CAAC,GAAGD,iBAAiB,CAACG,MAAM,CAACC,QAAQ,CACzDd,eAAe,CAACe,OACpB,CAAC;IACDJ,UAAU,CAAC,cAAc,CAAC,GAAGD,iBAAiB,CAACM,OAAO,CAACF,QAAQ,CAC3Dd,eAAe,CAACiB,SACpB,CAAC;IACDN,UAAU,CAAC,cAAc,CAAC,GAAGD,iBAAiB,CAACQ,OAAO;EAC1D;EAEA,OAAOP,UAAU;AACrB,CAAC;AAED,MAAMQ,yBAAyB,GAAGA,CAC9BC,OAA+B,EAC/BC,iBAAmD,
|
|
1
|
+
{"version":3,"names":["DdRum","TracingIdFormat","createTimings","ResourceReporter","constructor","mappers","reportResource","resource","modifiedResource","mapper","formatResourceStartContext","tracingAttributes","attributes","samplingPriorityHeader","spanId","toString","decimal","traceId","paddedHex","rulePsr","formatResourceStopContext","timings","graphqlAttributes","capturedRequestHeaders","capturedResponseHeaders","responseStartTime","undefined","startTime","stopTime","operationType","operationName","variables","payload","errors","JSON","stringify","startResource","key","request","method","url","stopResource","response","statusCode","kind","size","resourceContext"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,79 @@
|
|
|
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 { accumulateRequestHeader, filterRequestHeadersByMode, filterResponseHeaders } from '../../headerCapture/captureHeaders';
|
|
8
|
+
import { enforceSizeLimits } from '../../headerCapture/enforceSizeLimits';
|
|
9
|
+
import { isHeaderAllowed } from '../../headerCapture/isHeaderAllowed';
|
|
10
|
+
import { isDatadogCustomHeader } from '../../headers';
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Per-request header capture state, shared by all request proxies.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
export const createHeaderCaptureState = config => ({
|
|
17
|
+
config: config ?? null,
|
|
18
|
+
requestHeaders: config != null ? {} : undefined
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Records a user-set request header. Datadog internal headers are ignored,
|
|
23
|
+
* sensitive headers are dropped before being stored.
|
|
24
|
+
* Values are stringified the same way XHR and Fetch coerce them, since
|
|
25
|
+
* untyped callers can pass `null`, numbers, etc.
|
|
26
|
+
*/
|
|
27
|
+
export const recordRequestHeader = (state, header, value) => {
|
|
28
|
+
if (state.requestHeaders === undefined || isDatadogCustomHeader(header.toLowerCase())) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
accumulateRequestHeader(state.requestHeaders, header, String(value));
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Applies rule filtering and size limits to the headers of a completed request.
|
|
36
|
+
* Nothing is reported for aborted or network-error requests (status 0).
|
|
37
|
+
* The request header store is released, so a retained request object does not
|
|
38
|
+
* keep unreported or untruncated header values alive.
|
|
39
|
+
*
|
|
40
|
+
* @param responseHeaders - Response headers keyed by lowercased name.
|
|
41
|
+
*/
|
|
42
|
+
export const finalizeCapturedHeaders = ({
|
|
43
|
+
state,
|
|
44
|
+
url,
|
|
45
|
+
statusCode,
|
|
46
|
+
responseHeaders
|
|
47
|
+
}) => {
|
|
48
|
+
const requestHeaders = state.requestHeaders;
|
|
49
|
+
state.requestHeaders = undefined;
|
|
50
|
+
if (state.config === null || requestHeaders === undefined || statusCode === 0) {
|
|
51
|
+
return {};
|
|
52
|
+
}
|
|
53
|
+
const limited = enforceSizeLimits(filterRequestHeadersByMode(requestHeaders, url, state.config), filterResponseHeaders(responseHeaders(), url, state.config));
|
|
54
|
+
return {
|
|
55
|
+
capturedRequestHeaders: limited.requestHeaders,
|
|
56
|
+
capturedResponseHeaders: limited.responseHeaders
|
|
57
|
+
};
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* Converts a Fetch `Headers` object into a record keyed by lowercased name.
|
|
62
|
+
* Blocked headers (sensitive or SDK-injected) are never copied.
|
|
63
|
+
* Some Fetch implementations (e.g. older `expo/fetch`) may not implement
|
|
64
|
+
* `forEach`, in which case no headers are returned.
|
|
65
|
+
*/
|
|
66
|
+
export const fetchHeadersToRecord = headers => {
|
|
67
|
+
const result = {};
|
|
68
|
+
if (!headers || typeof headers.forEach !== 'function') {
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
headers.forEach((value, name) => {
|
|
72
|
+
const lowered = name.toLowerCase();
|
|
73
|
+
if (isHeaderAllowed(lowered)) {
|
|
74
|
+
result[lowered] = value;
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
return result;
|
|
78
|
+
};
|
|
79
|
+
//# sourceMappingURL=headerCapture.js.map
|
package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["accumulateRequestHeader","filterRequestHeadersByMode","filterResponseHeaders","enforceSizeLimits","isHeaderAllowed","isDatadogCustomHeader","createHeaderCaptureState","config","requestHeaders","undefined","recordRequestHeader","state","header","value","toLowerCase","String","finalizeCapturedHeaders","url","statusCode","responseHeaders","limited","capturedRequestHeaders","capturedResponseHeaders","fetchHeadersToRecord","headers","result","forEach","name","lowered"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,SACIA,uBAAuB,EACvBC,0BAA0B,EAC1BC,qBAAqB,QAClB,oCAAoC;AAC3C,SAASC,iBAAiB,QAAQ,uCAAuC;AACzE,SAASC,eAAe,QAAQ,qCAAqC;AAErE,SAASC,qBAAqB,QAAQ,eAAe;;AAErD;AACA;AACA;;AAYA,OAAO,MAAMC,wBAAwB,GACjCC,MAA+C,KACzB;EACtBA,MAAM,EAAEA,MAAM,IAAI,IAAI;EACtBC,cAAc,EAAED,MAAM,IAAI,IAAI,GAAG,CAAC,CAAC,GAAGE;AAC1C,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAAGA,CAC/BC,KAAyB,EACzBC,MAAc,EACdC,KAAa,KACN;EACP,IACIF,KAAK,CAACH,cAAc,KAAKC,SAAS,IAClCJ,qBAAqB,CAACO,MAAM,CAACE,WAAW,CAAC,CAAC,CAAC,EAC7C;IACE;EACJ;EACAd,uBAAuB,CAACW,KAAK,CAACH,cAAc,EAAEI,MAAM,EAAEG,MAAM,CAACF,KAAK,CAAC,CAAC;AACxE,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMG,uBAAuB,GAAGA,CAAC;EACpCL,KAAK;EACLM,GAAG;EACHC,UAAU;EACVC;AAMJ,CAAC,KAAsB;EACnB,MAAMX,cAAc,GAAGG,KAAK,CAACH,cAAc;EAC3CG,KAAK,CAACH,cAAc,GAAGC,SAAS;EAEhC,IACIE,KAAK,CAACJ,MAAM,KAAK,IAAI,IACrBC,cAAc,KAAKC,SAAS,IAC5BS,UAAU,KAAK,CAAC,EAClB;IACE,OAAO,CAAC,CAAC;EACb;EAEA,MAAME,OAAO,GAAGjB,iBAAiB,CAC7BF,0BAA0B,CAACO,cAAc,EAAES,GAAG,EAAEN,KAAK,CAACJ,MAAM,CAAC,EAC7DL,qBAAqB,CAACiB,eAAe,CAAC,CAAC,EAAEF,GAAG,EAAEN,KAAK,CAACJ,MAAM,CAC9D,CAAC;EAED,OAAO;IACHc,sBAAsB,EAAED,OAAO,CAACZ,cAAc;IAC9Cc,uBAAuB,EAAEF,OAAO,CAACD;EACrC,CAAC;AACL,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMI,oBAAoB,GAC7BC,OAAmC,IACV;EACzB,MAAMC,MAA8B,GAAG,CAAC,CAAC;EACzC,IAAI,CAACD,OAAO,IAAI,OAAOA,OAAO,CAACE,OAAO,KAAK,UAAU,EAAE;IACnD,OAAOD,MAAM;EACjB;EACAD,OAAO,CAACE,OAAO,CAAC,CAACb,KAAa,EAAEc,IAAY,KAAK;IAC7C,MAAMC,OAAO,GAAGD,IAAI,CAACb,WAAW,CAAC,CAAC;IAClC,IAAIV,eAAe,CAACwB,OAAO,CAAC,EAAE;MAC1BH,MAAM,CAACG,OAAO,CAAC,GAAGf,KAAK;IAC3B;EACJ,CAAC,CAAC;EACF,OAAOY,MAAM;AACjB,CAAC","ignoreList":[]}
|