@datadog/mobile-react-native 3.10.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/DatadogSDKReactNative.podspec +7 -7
- package/README.md +2 -1
- package/android/build.gradle +23 -13
- package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +10 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
- package/android/src/oldarchCommon/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +9 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/MockRumMonitor.kt +3 -3
- package/datadog-configuration.gradle +59 -18
- package/datadog-configuration.schema.json +119 -0
- package/ios/Sources/DdRum.mm +13 -1
- package/ios/Sources/DdRumImplementation.swift +6 -0
- package/ios/Sources/SdkVersion.swift +1 -1
- package/jest/mock.js +3 -0
- 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 +8 -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 +19 -4
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +26 -4
- 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 +10 -2
- 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/rum/types.js.map +1 -1
- package/lib/commonjs/sdk/AccountInfoSingleton/AccountInfoSingleton.js +1 -0
- package/lib/commonjs/sdk/AccountInfoSingleton/AccountInfoSingleton.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/sdk/UserInfoSingleton/UserInfoSingleton.js +1 -0
- package/lib/commonjs/sdk/UserInfoSingleton/UserInfoSingleton.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 +8 -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 +20 -5
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +27 -5
- 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 +8 -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/rum/types.js.map +1 -1
- package/lib/module/sdk/AccountInfoSingleton/AccountInfoSingleton.js +2 -1
- package/lib/module/sdk/AccountInfoSingleton/AccountInfoSingleton.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/sdk/UserInfoSingleton/UserInfoSingleton.js +2 -1
- package/lib/module/sdk/UserInfoSingleton/UserInfoSingleton.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 +2 -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 +4 -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/rum/types.d.ts +6 -0
- package/lib/typescript/rum/types.d.ts.map +1 -1
- package/lib/typescript/sdk/AccountInfoSingleton/AccountInfoSingleton.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/sdk/UserInfoSingleton/UserInfoSingleton.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 +13 -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 +14 -3
- package/src/rum/__tests__/DdRum.test.ts +14 -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 +24 -5
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/__tests__/FetchProxy.test.ts +303 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/ResourceReporter.test.ts +120 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +36 -5
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +664 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts +1 -34
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts +15 -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/rum/types.ts +7 -0
- package/src/sdk/AccountInfoSingleton/AccountInfoSingleton.ts +2 -1
- package/src/sdk/AccountInfoSingleton/__tests__/AccountInfoSingleton.test.ts +59 -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/sdk/UserInfoSingleton/UserInfoSingleton.ts +2 -1
- package/src/sdk/UserInfoSingleton/__tests__/UserInfoSingleton.test.ts +55 -0
- package/src/specs/NativeDdFlags.ts +14 -2
- package/src/specs/NativeDdLogs.ts +14 -2
- package/src/specs/NativeDdRum.ts +21 -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 @@
|
|
|
1
|
+
{"version":3,"names":["LEADING_TRAILING_C0_OR_SPACE","TAB_OR_NEWLINE","HTTP_SCHEME_AND_SLASHES","ENCODED_HOST_CHARACTER","HOST_CHARACTER","ALTERNATIVE_DOTS","FORBIDDEN_HOST_CHARACTER","SINGLE_DOT_SEGMENTS","Set","DOUBLE_DOT_SEGMENTS","normalizeUrlForMatching","rawUrl","url","replace","schemeEnd","indexOf","authorityEnd","findFirstOf","pathEnd","normalizeAuthority","slice","normalizePath","exports","normalizeHostname","hostname","test","toLowerCase","normalized","mapUnicodeHostname","decodeUtf8","encoded","hex","char","String","fromCharCode","parseInt","value","decodeURIComponent","_e","mapped","normalize","schemeAndAuthority","userinfoEnd","lastIndexOf","hostStart","hostAndPort","portMatch","exec","host","index","port","normalizedHost","startsWith","from","chars","i","length","includes","path","segments","split","output","forEach","segment","isLast","lowered","has","pop","push","join"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js
ADDED
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.parseResponseHeaders = void 0;
|
|
7
|
+
/*
|
|
8
|
+
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
9
|
+
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
10
|
+
* Copyright 2016-Present Datadog, Inc.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Parses a CRLF-delimited `getAllResponseHeaders()` string into a
|
|
15
|
+
* `Record<string, string>` of lowercase header names to trimmed values.
|
|
16
|
+
*
|
|
17
|
+
* Handles all edge cases defensively — SDK stability takes priority over
|
|
18
|
+
* strict compliance. Never throws on any input.
|
|
19
|
+
*
|
|
20
|
+
* - Splits on `\r?\n` to handle both CRLF and bare LF
|
|
21
|
+
* - Uses `indexOf(':')` so values containing colons (e.g. URLs) are preserved
|
|
22
|
+
* - Header names are trimmed and lowercased; values are trimmed (HTTP OWS)
|
|
23
|
+
* - Duplicate names resolve to last-value-wins
|
|
24
|
+
* - Malformed lines (no colon, empty name) are silently skipped
|
|
25
|
+
* - Headers rejected by `isAllowed` (if provided) are never stored
|
|
26
|
+
*/
|
|
27
|
+
const parseResponseHeaders = (rawHeaders, isAllowed) => {
|
|
28
|
+
if (!rawHeaders) {
|
|
29
|
+
return {};
|
|
30
|
+
}
|
|
31
|
+
const result = {};
|
|
32
|
+
const lines = rawHeaders.split(/\r?\n/);
|
|
33
|
+
for (const line of lines) {
|
|
34
|
+
// Skip empty lines (trailing delimiter produces empty last element)
|
|
35
|
+
if (line === '') {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
const colonIndex = line.indexOf(':');
|
|
39
|
+
|
|
40
|
+
// No colon found, or colon is first character (empty name) — skip
|
|
41
|
+
if (colonIndex <= 0) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const name = line.slice(0, colonIndex).trim().toLowerCase();
|
|
45
|
+
|
|
46
|
+
// Name is empty after trimming, or the header is not allowed — skip
|
|
47
|
+
if (name === '' || isAllowed !== undefined && !isAllowed(name)) {
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
const value = line.slice(colonIndex + 1).trim();
|
|
51
|
+
|
|
52
|
+
// Last value wins for duplicate header names
|
|
53
|
+
result[name] = value;
|
|
54
|
+
}
|
|
55
|
+
return result;
|
|
56
|
+
};
|
|
57
|
+
exports.parseResponseHeaders = parseResponseHeaders;
|
|
58
|
+
//# sourceMappingURL=parseResponseHeaders.js.map
|
package/lib/commonjs/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","exports"],"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;AACO,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;AAACY,OAAA,CAAAf,oBAAA,GAAAA,oBAAA","ignoreList":[]}
|
package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.isSensitiveHeader = void 0;
|
|
7
|
+
/*
|
|
8
|
+
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
9
|
+
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
10
|
+
* Copyright 2016-Present Datadog, Inc.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Compiled regex matching sensitive header name patterns.
|
|
15
|
+
*
|
|
16
|
+
* Matches headers containing: token, cookie, secret, authorization, password,
|
|
17
|
+
* credential, bearer, api/secret/access/app key variants, forwarding/IP headers.
|
|
18
|
+
*
|
|
19
|
+
* The `/i` flag ensures case-insensitive matching. Compiled once at module load
|
|
20
|
+
* time — no per-call allocation.
|
|
21
|
+
*/
|
|
22
|
+
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;
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Checks whether a header name matches a known sensitive header pattern.
|
|
26
|
+
* Sensitive headers (authorization, cookies, tokens, API keys, etc.) must
|
|
27
|
+
* never be captured regardless of configuration mode.
|
|
28
|
+
*
|
|
29
|
+
* Blocked headers are expected behavior, so they never produce WARN or ERROR
|
|
30
|
+
* logs; the capture pipeline only reports them at DEBUG verbosity.
|
|
31
|
+
*
|
|
32
|
+
* @param headerName - The header name to check (case-insensitive via regex /i flag).
|
|
33
|
+
* @returns `true` if the header is sensitive and must be blocked.
|
|
34
|
+
*/
|
|
35
|
+
const isSensitiveHeader = headerName => {
|
|
36
|
+
return SENSITIVE_HEADER_PATTERN.test(headerName);
|
|
37
|
+
};
|
|
38
|
+
exports.isSensitiveHeader = isSensitiveHeader;
|
|
39
|
+
//# sourceMappingURL=sensitiveHeaderBlocklist.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["SENSITIVE_HEADER_PATTERN","isSensitiveHeader","headerName","test","exports"],"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;AACO,MAAMC,iBAAiB,GAAIC,UAAkB,IAAc;EAC9D,OAAOF,wBAAwB,CAACG,IAAI,CAACD,UAAU,CAAC;AACpD,CAAC;AAACE,OAAA,CAAAH,iBAAA,GAAAA,iBAAA","ignoreList":[]}
|
package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js
ADDED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.isTracingHeader = void 0;
|
|
7
|
+
var _headers = require("../distributedTracing/headers");
|
|
8
|
+
/*
|
|
9
|
+
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
10
|
+
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
11
|
+
* Copyright 2016-Present Datadog, Inc.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Set of all SDK-injected distributed tracing (and tracking) header names, lowercased.
|
|
16
|
+
*
|
|
17
|
+
* Built once at module load time from the canonical header constants in
|
|
18
|
+
* `distributedTracing/headers.ts`. The B3 multi-headers have mixed case
|
|
19
|
+
* (e.g. `X-B3-TraceId`), so all values are lowercased for uniform lookup.
|
|
20
|
+
*/
|
|
21
|
+
const TRACING_HEADERS = new Set([_headers.SAMPLING_PRIORITY_HEADER_KEY, _headers.ORIGIN_HEADER_KEY, _headers.TRACE_ID_HEADER_KEY, _headers.PARENT_ID_HEADER_KEY, _headers.TAGS_HEADER_KEY, _headers.TRACECONTEXT_HEADER_KEY, _headers.TRACESTATE_HEADER_KEY, _headers.BAGGAGE_HEADER_KEY, _headers.B3_HEADER_KEY, _headers.B3_MULTI_TRACE_ID_HEADER_KEY, _headers.B3_MULTI_SPAN_ID_HEADER_KEY, _headers.B3_MULTI_SAMPLED_HEADER_KEY, _headers.TRACKED_BY_HEADER_KEY].map(h => h.toLowerCase()));
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Checks whether a header name is an SDK-injected distributed tracing header.
|
|
25
|
+
* Tracing headers must never be captured because they are SDK internals,
|
|
26
|
+
* not application-level headers.
|
|
27
|
+
*
|
|
28
|
+
* Uses an explicit list (not prefix matching) — `x-datadog-customer-id`
|
|
29
|
+
* would NOT be excluded.
|
|
30
|
+
*
|
|
31
|
+
* @param headerName - The header name to check (lowercased internally for lookup).
|
|
32
|
+
* @returns `true` if the header is a tracing header and must be excluded.
|
|
33
|
+
*/
|
|
34
|
+
const isTracingHeader = headerName => {
|
|
35
|
+
return TRACING_HEADERS.has(headerName.toLowerCase());
|
|
36
|
+
};
|
|
37
|
+
exports.isTracingHeader = isTracingHeader;
|
|
38
|
+
//# sourceMappingURL=tracingHeaderExclusion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_headers","require","TRACING_HEADERS","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","toLowerCase","isTracingHeader","headerName","has","exports"],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.ts"],"mappings":";;;;;;AAMA,IAAAA,QAAA,GAAAC,OAAA;AANA;AACA;AACA;AACA;AACA;;AAkBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,eAA4B,GAAG,IAAIC,GAAG,CACxC,CACIC,qCAA4B,EAC5BC,0BAAiB,EACjBC,4BAAmB,EACnBC,6BAAoB,EACpBC,wBAAe,EACfC,gCAAuB,EACvBC,8BAAqB,EACrBC,2BAAkB,EAClBC,sBAAa,EACbC,qCAA4B,EAC5BC,oCAA2B,EAC3BC,oCAA2B,EAC3BC,8BAAqB,CACxB,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,WAAW,CAAC,CAAC,CAC9B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,GAAIC,UAAkB,IAAc;EAC5D,OAAOnB,eAAe,CAACoB,GAAG,CAACD,UAAU,CAACF,WAAW,CAAC,CAAC,CAAC;AACxD,CAAC;AAACI,OAAA,CAAAH,eAAA,GAAAA,eAAA","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../../../../../src","sources":["rum/instrumentation/resourceTracking/headerCapture/types.ts"],"mappings":"","ignoreList":[]}
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js
CHANGED
|
@@ -11,6 +11,7 @@ var _xhrUtils = require("../XHRProxy/xhrUtils");
|
|
|
11
11
|
var _FetchProxyState = require("../common/FetchProxyState");
|
|
12
12
|
var _RequestContext = require("../common/RequestContext");
|
|
13
13
|
var _ResourceReporter = require("../common/ResourceReporter");
|
|
14
|
+
var _headerCapture = require("../common/headerCapture");
|
|
14
15
|
var _internalDevResourceBlocklist = require("../common/internalDevResourceBlocklist");
|
|
15
16
|
var _requestHeaders = require("../common/requestHeaders");
|
|
16
17
|
var _RequestProxy = require("../interfaces/RequestProxy");
|
|
@@ -159,12 +160,14 @@ const buildHeaders = ({
|
|
|
159
160
|
header,
|
|
160
161
|
value
|
|
161
162
|
}) => {
|
|
162
|
-
applyHeader({
|
|
163
|
+
if (applyHeader({
|
|
163
164
|
headers,
|
|
164
165
|
context,
|
|
165
166
|
header,
|
|
166
167
|
value
|
|
167
|
-
})
|
|
168
|
+
})) {
|
|
169
|
+
(0, _headerCapture.recordRequestHeader)(context.headerCapture, header, value);
|
|
170
|
+
}
|
|
168
171
|
});
|
|
169
172
|
(0, _requestHeaders.getInstrumentationHeaders)(context).forEach(({
|
|
170
173
|
header,
|
|
@@ -192,13 +195,24 @@ const applyHeader = ({
|
|
|
192
195
|
});
|
|
193
196
|
if (processedHeader.type === 'send') {
|
|
194
197
|
headers.set(processedHeader.header, processedHeader.value);
|
|
198
|
+
return true;
|
|
195
199
|
}
|
|
200
|
+
return false;
|
|
196
201
|
};
|
|
197
202
|
const reportFetch = async ({
|
|
198
203
|
context,
|
|
199
204
|
response,
|
|
200
205
|
resourceReporter
|
|
201
206
|
}) => {
|
|
207
|
+
// Snapshot before any await: some Fetch implementations expose mutable
|
|
208
|
+
// response headers that the app could change while the body is parsed.
|
|
209
|
+
const capturedHeaders = (0, _headerCapture.finalizeCapturedHeaders)({
|
|
210
|
+
state: context.headerCapture,
|
|
211
|
+
url: context.url,
|
|
212
|
+
statusCode: response.status,
|
|
213
|
+
responseHeaders: () => (0, _headerCapture.fetchHeadersToRecord)(response.headers)
|
|
214
|
+
});
|
|
215
|
+
|
|
202
216
|
// Only extract GraphQL errors if operationType is set AND error tracking is enabled
|
|
203
217
|
if (context.graphql.operationType && context.graphql.trackErrors) {
|
|
204
218
|
try {
|
|
@@ -218,7 +232,7 @@ const reportFetch = async ({
|
|
|
218
232
|
}
|
|
219
233
|
}
|
|
220
234
|
resourceReporter.reportResource({
|
|
221
|
-
key:
|
|
235
|
+
key: (0, _RequestContext.getResourceKey)(context),
|
|
222
236
|
request: {
|
|
223
237
|
method: context.method,
|
|
224
238
|
url: context.url,
|
|
@@ -226,6 +240,7 @@ const reportFetch = async ({
|
|
|
226
240
|
},
|
|
227
241
|
graphqlAttributes: context.graphql,
|
|
228
242
|
tracingAttributes: context.tracingAttributes,
|
|
243
|
+
...capturedHeaders,
|
|
229
244
|
response: {
|
|
230
245
|
statusCode: response.status,
|
|
231
246
|
size: getResponseSize(response)
|
|
@@ -242,7 +257,7 @@ const reportFetchFailure = ({
|
|
|
242
257
|
resourceReporter
|
|
243
258
|
}) => {
|
|
244
259
|
resourceReporter.reportResource({
|
|
245
|
-
key:
|
|
260
|
+
key: (0, _RequestContext.getResourceKey)(context),
|
|
246
261
|
request: {
|
|
247
262
|
method: context.method,
|
|
248
263
|
url: context.url,
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_types","_graphqlUtils","_xhrUtils","_FetchProxyState","_RequestContext","_ResourceReporter","_internalDevResourceBlocklist","_requestHeaders","_RequestProxy","RESPONSE_START_LABEL","MISSING_RESOURCE_SIZE","FetchProxy","RequestProxy","context","originalFetch","installedFetch","constructor","providers","createWithResourceReporter","fetchGlobal","globalThis","headersType","Headers","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","fetch","input","init","trackFetch","fetchThis","options","onTrackingStop","onTrackingUpdate","tracingSamplingRate","exports","url","getRequestUrl","method","getRequestMethod","createRequestContext","headers","buildHeaders","timer","start","response","callOriginalFetch","call","recordTick","stop","reportFetch","catch","error","errorData","getErrorData","InternalLog","log","SdkVerbosity","WARN","reportFetchFailure","String","requestMethod","undefined","toUpperCase","requestHeaders","originalHeaders","forEach","value","header","push","delete","applyHeader","getInstrumentationHeaders","processedHeader","processRequestHeader","type","set","graphql","operationType","trackErrors","body","clone","json","errors","Array","isArray","length","filtered","extractGraphQLErrors","reportResource","key","
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_types","_graphqlUtils","_xhrUtils","_FetchProxyState","_RequestContext","_ResourceReporter","_headerCapture","_internalDevResourceBlocklist","_requestHeaders","_RequestProxy","RESPONSE_START_LABEL","MISSING_RESOURCE_SIZE","FetchProxy","RequestProxy","context","originalFetch","installedFetch","constructor","providers","createWithResourceReporter","fetchGlobal","globalThis","headersType","Headers","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","fetch","input","init","trackFetch","fetchThis","options","onTrackingStop","onTrackingUpdate","tracingSamplingRate","exports","url","getRequestUrl","method","getRequestMethod","createRequestContext","headers","buildHeaders","timer","start","response","callOriginalFetch","call","recordTick","stop","reportFetch","catch","error","errorData","getErrorData","InternalLog","log","SdkVerbosity","WARN","reportFetchFailure","String","requestMethod","undefined","toUpperCase","requestHeaders","originalHeaders","forEach","value","header","push","delete","applyHeader","recordRequestHeader","headerCapture","getInstrumentationHeaders","processedHeader","processRequestHeader","type","set","capturedHeaders","finalizeCapturedHeaders","state","statusCode","status","responseHeaders","fetchHeadersToRecord","graphql","operationType","trackErrors","body","clone","json","errors","Array","isArray","length","filtered","extractGraphQLErrors","reportResource","key","getResourceKey","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 @@ exports.XHRProxy = void 0;
|
|
|
7
7
|
var _InternalLog = require("../../../../../InternalLog");
|
|
8
8
|
var _types = require("../../../../../config/types");
|
|
9
9
|
var _graphqlUtils = require("../../graphql/graphqlUtils");
|
|
10
|
+
var _isHeaderAllowed = require("../../headerCapture/isHeaderAllowed");
|
|
11
|
+
var _parseResponseHeaders = require("../../headerCapture/parseResponseHeaders");
|
|
10
12
|
var _FetchProxyState = require("../common/FetchProxyState");
|
|
11
13
|
var _RequestContext = require("../common/RequestContext");
|
|
12
14
|
var _ResourceReporter = require("../common/ResourceReporter");
|
|
15
|
+
var _headerCapture = require("../common/headerCapture");
|
|
13
16
|
var _internalDevResourceBlocklist = require("../common/internalDevResourceBlocklist");
|
|
14
17
|
var _requestHeaders = require("../common/requestHeaders");
|
|
15
18
|
var _RequestProxy = require("../interfaces/RequestProxy");
|
|
@@ -141,9 +144,21 @@ const reportXhr = async (xhrProxy, resourceReporter) => {
|
|
|
141
144
|
if (!context) {
|
|
142
145
|
return;
|
|
143
146
|
}
|
|
144
|
-
const key =
|
|
147
|
+
const key = (0, _RequestContext.getResourceKey)(context);
|
|
148
|
+
|
|
149
|
+
// Stop before header processing so it is not counted in the resource duration
|
|
145
150
|
context.timer.stop();
|
|
146
151
|
|
|
152
|
+
// Snapshot before any await: the app may reopen this XHR from its
|
|
153
|
+
// completion handler while the GraphQL body is being read.
|
|
154
|
+
const statusCode = xhrProxy.status;
|
|
155
|
+
const capturedHeaders = (0, _headerCapture.finalizeCapturedHeaders)({
|
|
156
|
+
state: context.headerCapture,
|
|
157
|
+
url: context.url,
|
|
158
|
+
statusCode,
|
|
159
|
+
responseHeaders: () => (0, _parseResponseHeaders.parseResponseHeaders)(xhrProxy.getAllResponseHeaders(), _isHeaderAllowed.isHeaderAllowed)
|
|
160
|
+
});
|
|
161
|
+
|
|
147
162
|
// Only extract GraphQL errors if operationType is set AND error tracking is enabled
|
|
148
163
|
if (context.graphql.operationType && context.graphql.trackErrors) {
|
|
149
164
|
try {
|
|
@@ -171,8 +186,9 @@ const reportXhr = async (xhrProxy, resourceReporter) => {
|
|
|
171
186
|
},
|
|
172
187
|
graphqlAttributes: context.graphql,
|
|
173
188
|
tracingAttributes: context.tracingAttributes,
|
|
189
|
+
...capturedHeaders,
|
|
174
190
|
response: {
|
|
175
|
-
statusCode
|
|
191
|
+
statusCode,
|
|
176
192
|
size: responseSize
|
|
177
193
|
},
|
|
178
194
|
timings: {
|
|
@@ -190,13 +206,19 @@ const proxySetRequestHeader = providers => {
|
|
|
190
206
|
if (!this._datadog_xhr) {
|
|
191
207
|
return originalXhrSetRequestHeader.apply(this, [header, value]);
|
|
192
208
|
}
|
|
209
|
+
|
|
210
|
+
// XHR coerces values to strings: do it once so the sent and the
|
|
211
|
+
// captured values are identical
|
|
212
|
+
const stringValue = String(value);
|
|
193
213
|
const processedHeader = (0, _requestHeaders.processRequestHeader)({
|
|
194
214
|
context: this._datadog_xhr,
|
|
195
215
|
header,
|
|
196
|
-
value
|
|
216
|
+
value: stringValue
|
|
197
217
|
});
|
|
198
218
|
if (processedHeader.type === 'send') {
|
|
199
|
-
|
|
219
|
+
const result = originalXhrSetRequestHeader.apply(this, [processedHeader.header, processedHeader.value]);
|
|
220
|
+
(0, _headerCapture.recordRequestHeader)(this._datadog_xhr.headerCapture, header, stringValue);
|
|
221
|
+
return result;
|
|
200
222
|
}
|
|
201
223
|
};
|
|
202
224
|
};
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_types","_graphqlUtils","_FetchProxyState","_RequestContext","_ResourceReporter","_internalDevResourceBlocklist","_requestHeaders","_RequestProxy","_responseSize","_xhrUtils","RESPONSE_START_LABEL","XHRProxy","RequestProxy","context","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","onTrackingUpdate","options","tracingSamplingRate","exports","proxyOpen","proxySend","proxySetRequestHeader","method","url","isRunningWithinFetchProxy","_datadog_xhr","undefined","apply","arguments","createRequestContext","reported","timer","start","getInstrumentationHeaders","forEach","header","value","proxyOnReadyStateChange","xhrProxy","requestContext","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","catch","error","errorData","getErrorData","InternalLog","log","SdkVerbosity","WARN","HEADERS_RECEIVED","recordTick","responseSize","calculateResponseSize","key","
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_types","_graphqlUtils","_isHeaderAllowed","_parseResponseHeaders","_FetchProxyState","_RequestContext","_ResourceReporter","_headerCapture","_internalDevResourceBlocklist","_requestHeaders","_RequestProxy","_responseSize","_xhrUtils","RESPONSE_START_LABEL","XHRProxy","RequestProxy","context","constructor","providers","createWithResourceReporter","xhrType","XMLHttpRequest","resourceReporter","ResourceReporter","filterDevResource","onTrackingStart","originalXhrOpen","prototype","open","originalXhrSend","send","originalXhrSetRequestHeader","setRequestHeader","proxyRequests","onTrackingStop","onTrackingUpdate","options","tracingSamplingRate","exports","proxyOpen","proxySend","proxySetRequestHeader","method","url","isRunningWithinFetchProxy","_datadog_xhr","undefined","apply","arguments","createRequestContext","reported","timer","start","getInstrumentationHeaders","forEach","header","value","proxyOnReadyStateChange","xhrProxy","requestContext","originalOnreadystatechange","onreadystatechange","readyState","DONE","reportXhr","catch","error","errorData","getErrorData","InternalLog","log","SdkVerbosity","WARN","HEADERS_RECEIVED","recordTick","responseSize","calculateResponseSize","key","getResourceKey","stop","statusCode","status","capturedHeaders","finalizeCapturedHeaders","state","headerCapture","responseHeaders","parseResponseHeaders","getAllResponseHeaders","isHeaderAllowed","graphql","operationType","trackErrors","body","readXhrJsonBody","errors","Array","isArray","length","filtered","extractGraphQLErrors","reportResource","request","kind","graphqlAttributes","tracingAttributes","response","size","timings","startTime","stopTime","responseStartTime","hasTickFor","timeAt","resourceContext","sendRequestHeader","stringValue","String","processedHeader","processRequestHeader","type","result","recordRequestHeader"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.formatBaggageHeader = formatBaggageHeader;
|
|
7
7
|
var _InternalLog = require("../../../../../InternalLog");
|
|
8
8
|
var _SdkVerbosity = require("../../../../../config/types/SdkVerbosity");
|
|
9
|
+
var _stringUtils = require("../../../../../utils/stringUtils");
|
|
9
10
|
var _headers = require("../../distributedTracing/headers");
|
|
10
11
|
/*
|
|
11
12
|
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
@@ -99,47 +100,13 @@ function formatBaggageHeader(entries) {
|
|
|
99
100
|
return null;
|
|
100
101
|
}
|
|
101
102
|
const headerValue = formattedParts.join(',');
|
|
102
|
-
const byteLength = utf8ByteLength(headerValue);
|
|
103
|
+
const byteLength = (0, _stringUtils.utf8ByteLength)(headerValue);
|
|
103
104
|
if (byteLength > MAX_BYTES) {
|
|
104
105
|
_InternalLog.InternalLog.log(`Baggage header too large: ${byteLength} bytes > ${MAX_BYTES} - entries may be dropped (https://www.w3.org/TR/baggage/#limits)`, _SdkVerbosity.SdkVerbosity.WARN);
|
|
105
106
|
}
|
|
106
107
|
return headerValue;
|
|
107
108
|
}
|
|
108
109
|
|
|
109
|
-
/**
|
|
110
|
-
* Returns the number of bytes needed to encode a string in UTF-8.
|
|
111
|
-
*
|
|
112
|
-
* Useful as a lightweight alternative to Node.js `Buffer.byteLength()`
|
|
113
|
-
* for older environments that do not support it.
|
|
114
|
-
*
|
|
115
|
-
* @param text - The input string.
|
|
116
|
-
* @returns The UTF-8 byte length of the string.
|
|
117
|
-
*/
|
|
118
|
-
function utf8ByteLength(text) {
|
|
119
|
-
let byteLength = text.length;
|
|
120
|
-
for (let i = text.length - 1; i >= 0; i--) {
|
|
121
|
-
const code = text.charCodeAt(i);
|
|
122
|
-
|
|
123
|
-
// 2-byte characters (U+0080 to U+07FF)
|
|
124
|
-
if (code > 0x7f && code <= 0x7ff) {
|
|
125
|
-
byteLength++;
|
|
126
|
-
}
|
|
127
|
-
// 3-byte characters (U+0800 to U+FFFF)
|
|
128
|
-
else if (code > 0x7ff && code <= 0xffff) {
|
|
129
|
-
byteLength += 2;
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
// Handle surrogate pairs (4-byte characters, e.g. emoji)
|
|
133
|
-
// These characters already count as 2 in the initial length
|
|
134
|
-
// Encountering the low surrogate already accounts for the full 4 bytes
|
|
135
|
-
// (2 from the initial length + 2 for the 3-byte characters logic above)
|
|
136
|
-
if (code >= 0xdc00 && code <= 0xdfff) {
|
|
137
|
-
i--; // prevents double counting the same character by skipping high surrogate
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
return byteLength;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
110
|
/**
|
|
144
111
|
* Returns a set of valid baggage header characters.
|
|
145
112
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_headers","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","InternalLog","log","SdkVerbosity","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","utf8ByteLength","
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_stringUtils","_headers","MAX_MEMBERS","MAX_BYTES","TOKEN_REGEX","baggageHeaderSafeChars","formatBaggageHeader","entries","formattedParts","rawEntry","includes","InternalLog","log","SdkVerbosity","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","utf8ByteLength","getBaggageHeaderSafeChars","safeChars","Set","c","add","String","fromCharCode","key","DD_RUM_SESSION_ID_TAG","DD_RUM_USER_ID_TAG","DD_RUM_ACCOUNT_ID_TAG","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/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js
CHANGED
|
@@ -3,23 +3,28 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.createRequestContext = void 0;
|
|
6
|
+
exports.getResourceKey = exports.createRequestContext = void 0;
|
|
7
7
|
var _Timer = require("../../../../../utils/Timer");
|
|
8
8
|
var _helper = require("../../../../helper");
|
|
9
9
|
var _distributedTracing = require("../../distributedTracing/distributedTracing");
|
|
10
10
|
var _URLHostParser = require("../XHRProxy/URLHostParser");
|
|
11
|
+
var _headerCapture = require("./headerCapture");
|
|
11
12
|
/*
|
|
12
13
|
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
|
|
13
14
|
* This product includes software developed at Datadog (https://www.datadoghq.com/).
|
|
14
15
|
* Copyright 2016-Present Datadog, Inc.
|
|
15
16
|
*/
|
|
16
17
|
|
|
18
|
+
// Disambiguates resources sharing the same start millisecond and method,
|
|
19
|
+
// which would otherwise collide on the native side.
|
|
20
|
+
let resourceSequence = 0;
|
|
17
21
|
const createRequestContext = ({
|
|
18
22
|
method,
|
|
19
23
|
url,
|
|
20
24
|
options
|
|
21
25
|
}) => {
|
|
22
26
|
return {
|
|
27
|
+
resourceId: ++resourceSequence,
|
|
23
28
|
method,
|
|
24
29
|
url,
|
|
25
30
|
timer: new _Timer.Timer(),
|
|
@@ -32,8 +37,11 @@ const createRequestContext = ({
|
|
|
32
37
|
userId: (0, _helper.getCachedUserId)(),
|
|
33
38
|
accountId: (0, _helper.getCachedAccountId)()
|
|
34
39
|
}),
|
|
35
|
-
baggageHeaderEntries: new Set()
|
|
40
|
+
baggageHeaderEntries: new Set(),
|
|
41
|
+
headerCapture: (0, _headerCapture.createHeaderCaptureState)(options.headerCaptureConfig)
|
|
36
42
|
};
|
|
37
43
|
};
|
|
38
44
|
exports.createRequestContext = createRequestContext;
|
|
45
|
+
const getResourceKey = context => `${context.timer.startTime}/${context.method}/${context.resourceId}`;
|
|
46
|
+
exports.getResourceKey = getResourceKey;
|
|
39
47
|
//# sourceMappingURL=RequestContext.js.map
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_Timer","require","_helper","_distributedTracing","_URLHostParser","createRequestContext","method","url","options","timer","Timer","graphql","tracingAttributes","getTracingAttributes","hostname","URLHostParser","firstPartyHostsRegexMap","tracingSamplingRate","rumSessionId","getCachedSessionId","userId","getCachedUserId","accountId","getCachedAccountId","baggageHeaderEntries","Set","exports"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts"],"mappings":";;;;;;AAMA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAMA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;
|
|
1
|
+
{"version":3,"names":["_Timer","require","_helper","_distributedTracing","_URLHostParser","_headerCapture","resourceSequence","createRequestContext","method","url","options","resourceId","timer","Timer","graphql","tracingAttributes","getTracingAttributes","hostname","URLHostParser","firstPartyHostsRegexMap","tracingSamplingRate","rumSessionId","getCachedSessionId","userId","getCachedUserId","accountId","getCachedAccountId","baggageHeaderEntries","Set","headerCapture","createHeaderCaptureState","headerCaptureConfig","exports","getResourceKey","context","startTime"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts"],"mappings":";;;;;;AAMA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAMA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAKA,IAAAI,cAAA,GAAAJ,OAAA;AAnBA;AACA;AACA;AACA;AACA;;AA8BA;AACA;AACA,IAAIK,gBAAgB,GAAG,CAAC;AAEjB,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,IAAIC,YAAK,CAAC,CAAC;IAClBC,OAAO,EAAE,CAAC,CAAC;IACXC,iBAAiB,EAAE,IAAAC,wCAAoB,EAAC;MACpCC,QAAQ,EAAE,IAAAC,4BAAa,EAACT,GAAG,CAAC;MAC5BU,uBAAuB,EAAET,OAAO,CAACS,uBAAuB;MACxDC,mBAAmB,EAAEV,OAAO,CAACU,mBAAmB;MAChDC,YAAY,EAAE,IAAAC,0BAAkB,EAAC,CAAC;MAClCC,MAAM,EAAE,IAAAC,uBAAe,EAAC,CAAC;MACzBC,SAAS,EAAE,IAAAC,0BAAkB,EAAC;IAClC,CAAC,CAAC;IACFC,oBAAoB,EAAE,IAAIC,GAAG,CAAS,CAAC;IACvCC,aAAa,EAAE,IAAAC,uCAAwB,EAACpB,OAAO,CAACqB,mBAAmB;EACvE,CAAC;AACL,CAAC;AAACC,OAAA,CAAAzB,oBAAA,GAAAA,oBAAA;AAEK,MAAM0B,cAAc,GAAIC,OAAuB,IAClD,GAAGA,OAAO,CAACtB,KAAK,CAACuB,SAAS,IAAID,OAAO,CAAC1B,MAAM,IAAI0B,OAAO,CAACvB,UAAU,EAAE;AAACqB,OAAA,CAAAC,cAAA,GAAAA,cAAA","ignoreList":[]}
|
package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js
CHANGED
|
@@ -38,7 +38,7 @@ const formatResourceStartContext = tracingAttributes => {
|
|
|
38
38
|
}
|
|
39
39
|
return attributes;
|
|
40
40
|
};
|
|
41
|
-
const formatResourceStopContext = (timings, graphqlAttributes) => {
|
|
41
|
+
const formatResourceStopContext = (timings, graphqlAttributes, capturedRequestHeaders, capturedResponseHeaders) => {
|
|
42
42
|
const attributes = {};
|
|
43
43
|
if (timings.responseStartTime !== undefined) {
|
|
44
44
|
attributes['_dd.resource_timings'] = (0, _resourceTiming.createTimings)(timings.startTime, timings.responseStartTime, timings.stopTime);
|
|
@@ -58,10 +58,16 @@ const formatResourceStopContext = (timings, graphqlAttributes) => {
|
|
|
58
58
|
attributes['_dd.graphql.errors'] = JSON.stringify(graphqlAttributes.errors);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
+
if (capturedRequestHeaders !== undefined) {
|
|
62
|
+
attributes['_dd.request_headers'] = capturedRequestHeaders;
|
|
63
|
+
}
|
|
64
|
+
if (capturedResponseHeaders !== undefined) {
|
|
65
|
+
attributes['_dd.response_headers'] = capturedResponseHeaders;
|
|
66
|
+
}
|
|
61
67
|
return attributes;
|
|
62
68
|
};
|
|
63
69
|
const reportResource = async resource => {
|
|
64
70
|
await _DdRum.DdRum.startResource(resource.key, resource.request.method, resource.request.url, formatResourceStartContext(resource.tracingAttributes), resource.timings.startTime);
|
|
65
|
-
_DdRum.DdRum.stopResource(resource.key, resource.response.statusCode, resource.request.kind, resource.response.size, formatResourceStopContext(resource.timings, resource.graphqlAttributes), resource.timings.stopTime, resource.resourceContext);
|
|
71
|
+
_DdRum.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);
|
|
66
72
|
};
|
|
67
73
|
//# sourceMappingURL=ResourceReporter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_DdRum","require","_TracingIdentifier","_resourceTiming","ResourceReporter","constructor","mappers","reportResource","resource","modifiedResource","mapper","exports","formatResourceStartContext","tracingAttributes","attributes","samplingPriorityHeader","spanId","toString","TracingIdFormat","decimal","traceId","paddedHex","rulePsr","formatResourceStopContext","timings","graphqlAttributes","responseStartTime","undefined","createTimings","startTime","stopTime","operationType","operationName","variables","payload","errors","JSON","stringify","DdRum","startResource","key","request","method","url","stopResource","response","statusCode","kind","size","resourceContext"],"sourceRoot":"../../../../../../../src","sources":["rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.ts"],"mappings":";;;;;;AAMA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAGA,IAAAE,eAAA,GAAAF,OAAA;AAVA;AACA;AACA;AACA;AACA;;AAUO,MAAMG,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;AAACE,OAAA,CAAAP,gBAAA,GAAAA,gBAAA;AAED,MAAMQ,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,CACzDC,kCAAe,CAACC,OACpB,CAAC;IACDL,UAAU,CAAC,cAAc,CAAC,GAAGD,iBAAiB,CAACO,OAAO,CAACH,QAAQ,CAC3DC,kCAAe,CAACG,SACpB,CAAC;IACDP,UAAU,CAAC,cAAc,CAAC,GAAGD,iBAAiB,CAACS,OAAO;EAC1D;EAEA,OAAOR,UAAU;AACrB,CAAC;AAED,MAAMS,yBAAyB,GAAGA,CAC9BC,OAA+B,EAC/BC,iBAAmD,
|
|
1
|
+
{"version":3,"names":["_DdRum","require","_TracingIdentifier","_resourceTiming","ResourceReporter","constructor","mappers","reportResource","resource","modifiedResource","mapper","exports","formatResourceStartContext","tracingAttributes","attributes","samplingPriorityHeader","spanId","toString","TracingIdFormat","decimal","traceId","paddedHex","rulePsr","formatResourceStopContext","timings","graphqlAttributes","capturedRequestHeaders","capturedResponseHeaders","responseStartTime","undefined","createTimings","startTime","stopTime","operationType","operationName","variables","payload","errors","JSON","stringify","DdRum","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":[]}
|