@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
package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts
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 {
|
|
10
11
|
DD_RUM_ACCOUNT_ID_TAG,
|
|
11
12
|
DD_RUM_SESSION_ID_TAG,
|
|
@@ -138,40 +139,6 @@ export function formatBaggageHeader(entries: Set<string>): string | null {
|
|
|
138
139
|
return headerValue;
|
|
139
140
|
}
|
|
140
141
|
|
|
141
|
-
/**
|
|
142
|
-
* Returns the number of bytes needed to encode a string in UTF-8.
|
|
143
|
-
*
|
|
144
|
-
* Useful as a lightweight alternative to Node.js `Buffer.byteLength()`
|
|
145
|
-
* for older environments that do not support it.
|
|
146
|
-
*
|
|
147
|
-
* @param text - The input string.
|
|
148
|
-
* @returns The UTF-8 byte length of the string.
|
|
149
|
-
*/
|
|
150
|
-
function utf8ByteLength(text: string): number {
|
|
151
|
-
let byteLength = text.length;
|
|
152
|
-
for (let i = text.length - 1; i >= 0; i--) {
|
|
153
|
-
const code = text.charCodeAt(i);
|
|
154
|
-
|
|
155
|
-
// 2-byte characters (U+0080 to U+07FF)
|
|
156
|
-
if (code > 0x7f && code <= 0x7ff) {
|
|
157
|
-
byteLength++;
|
|
158
|
-
}
|
|
159
|
-
// 3-byte characters (U+0800 to U+FFFF)
|
|
160
|
-
else if (code > 0x7ff && code <= 0xffff) {
|
|
161
|
-
byteLength += 2;
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
// Handle surrogate pairs (4-byte characters, e.g. emoji)
|
|
165
|
-
// These characters already count as 2 in the initial length
|
|
166
|
-
// Encountering the low surrogate already accounts for the full 4 bytes
|
|
167
|
-
// (2 from the initial length + 2 for the 3-byte characters logic above)
|
|
168
|
-
if (code >= 0xdc00 && code <= 0xdfff) {
|
|
169
|
-
i--; // prevents double counting the same character by skipping high surrogate
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
return byteLength;
|
|
173
|
-
}
|
|
174
|
-
|
|
175
142
|
/**
|
|
176
143
|
* Returns a set of valid baggage header characters.
|
|
177
144
|
*/
|
|
@@ -16,7 +16,11 @@ import { URLHostParser } from '../XHRProxy/URLHostParser';
|
|
|
16
16
|
import type { RequestProxyOptions } from '../interfaces/RequestProxy';
|
|
17
17
|
import type { DdRumResourceGraphqlAttributes } from '../interfaces/RumResource';
|
|
18
18
|
|
|
19
|
+
import type { HeaderCaptureState } from './headerCapture';
|
|
20
|
+
import { createHeaderCaptureState } from './headerCapture';
|
|
21
|
+
|
|
19
22
|
export interface RequestContext {
|
|
23
|
+
resourceId: number;
|
|
20
24
|
graphql: DdRumResourceGraphqlAttributes & {
|
|
21
25
|
trackErrors?: boolean;
|
|
22
26
|
};
|
|
@@ -25,8 +29,13 @@ export interface RequestContext {
|
|
|
25
29
|
timer: Timer;
|
|
26
30
|
tracingAttributes: DdRumResourceTracingAttributes;
|
|
27
31
|
baggageHeaderEntries: Set<string>;
|
|
32
|
+
headerCapture: HeaderCaptureState;
|
|
28
33
|
}
|
|
29
34
|
|
|
35
|
+
// Disambiguates resources sharing the same start millisecond and method,
|
|
36
|
+
// which would otherwise collide on the native side.
|
|
37
|
+
let resourceSequence = 0;
|
|
38
|
+
|
|
30
39
|
export const createRequestContext = ({
|
|
31
40
|
method,
|
|
32
41
|
url,
|
|
@@ -37,6 +46,7 @@ export const createRequestContext = ({
|
|
|
37
46
|
options: RequestProxyOptions;
|
|
38
47
|
}): RequestContext => {
|
|
39
48
|
return {
|
|
49
|
+
resourceId: ++resourceSequence,
|
|
40
50
|
method,
|
|
41
51
|
url,
|
|
42
52
|
timer: new Timer(),
|
|
@@ -49,6 +59,10 @@ export const createRequestContext = ({
|
|
|
49
59
|
userId: getCachedUserId(),
|
|
50
60
|
accountId: getCachedAccountId()
|
|
51
61
|
}),
|
|
52
|
-
baggageHeaderEntries: new Set<string>()
|
|
62
|
+
baggageHeaderEntries: new Set<string>(),
|
|
63
|
+
headerCapture: createHeaderCaptureState(options.headerCaptureConfig)
|
|
53
64
|
};
|
|
54
65
|
};
|
|
66
|
+
|
|
67
|
+
export const getResourceKey = (context: RequestContext): string =>
|
|
68
|
+
`${context.timer.startTime}/${context.method}/${context.resourceId}`;
|
|
@@ -52,7 +52,9 @@ const formatResourceStartContext = (
|
|
|
52
52
|
|
|
53
53
|
const formatResourceStopContext = (
|
|
54
54
|
timings: RUMResource['timings'],
|
|
55
|
-
graphqlAttributes: RUMResource['graphqlAttributes']
|
|
55
|
+
graphqlAttributes: RUMResource['graphqlAttributes'],
|
|
56
|
+
capturedRequestHeaders?: Record<string, string>,
|
|
57
|
+
capturedResponseHeaders?: Record<string, string>
|
|
56
58
|
): Record<string, unknown> => {
|
|
57
59
|
const attributes: Record<string, unknown> = {};
|
|
58
60
|
|
|
@@ -86,6 +88,13 @@ const formatResourceStopContext = (
|
|
|
86
88
|
}
|
|
87
89
|
}
|
|
88
90
|
|
|
91
|
+
if (capturedRequestHeaders !== undefined) {
|
|
92
|
+
attributes['_dd.request_headers'] = capturedRequestHeaders;
|
|
93
|
+
}
|
|
94
|
+
if (capturedResponseHeaders !== undefined) {
|
|
95
|
+
attributes['_dd.response_headers'] = capturedResponseHeaders;
|
|
96
|
+
}
|
|
97
|
+
|
|
89
98
|
return attributes;
|
|
90
99
|
};
|
|
91
100
|
|
|
@@ -103,7 +112,12 @@ const reportResource = async (resource: RUMResource) => {
|
|
|
103
112
|
resource.response.statusCode,
|
|
104
113
|
resource.request.kind,
|
|
105
114
|
resource.response.size,
|
|
106
|
-
formatResourceStopContext(
|
|
115
|
+
formatResourceStopContext(
|
|
116
|
+
resource.timings,
|
|
117
|
+
resource.graphqlAttributes,
|
|
118
|
+
resource.capturedRequestHeaders,
|
|
119
|
+
resource.capturedResponseHeaders
|
|
120
|
+
),
|
|
107
121
|
resource.timings.stopTime,
|
|
108
122
|
resource.resourceContext
|
|
109
123
|
);
|
package/src/rum/instrumentation/resourceTracking/requestProxy/common/__tests__/headerCapture.test.ts
ADDED
|
@@ -0,0 +1,164 @@
|
|
|
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 { DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER } from '../../../graphql/graphqlHeaders';
|
|
8
|
+
import { compileHeaderCaptureConfig } from '../../../headerCapture/compileHeaderConfig';
|
|
9
|
+
import {
|
|
10
|
+
createHeaderCaptureState,
|
|
11
|
+
fetchHeadersToRecord,
|
|
12
|
+
finalizeCapturedHeaders,
|
|
13
|
+
recordRequestHeader
|
|
14
|
+
} from '../headerCapture';
|
|
15
|
+
|
|
16
|
+
jest.mock('../../../../../../InternalLog');
|
|
17
|
+
|
|
18
|
+
const URL = 'https://api.example.com/users';
|
|
19
|
+
|
|
20
|
+
describe('headerCapture', () => {
|
|
21
|
+
describe('createHeaderCaptureState', () => {
|
|
22
|
+
it('does not accumulate request headers when capture is disabled', () => {
|
|
23
|
+
const state = createHeaderCaptureState(null);
|
|
24
|
+
recordRequestHeader(state, 'Content-Type', 'application/json');
|
|
25
|
+
|
|
26
|
+
expect(state.requestHeaders).toBeUndefined();
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it('treats a missing config as disabled', () => {
|
|
30
|
+
expect(createHeaderCaptureState(undefined)).toEqual({
|
|
31
|
+
config: null,
|
|
32
|
+
requestHeaders: undefined
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
describe('recordRequestHeader', () => {
|
|
38
|
+
it('ignores Datadog internal and sensitive headers', () => {
|
|
39
|
+
const state = createHeaderCaptureState(
|
|
40
|
+
compileHeaderCaptureConfig('defaults')
|
|
41
|
+
);
|
|
42
|
+
recordRequestHeader(
|
|
43
|
+
state,
|
|
44
|
+
DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER,
|
|
45
|
+
'query'
|
|
46
|
+
);
|
|
47
|
+
recordRequestHeader(state, 'Authorization', 'Bearer secret');
|
|
48
|
+
recordRequestHeader(state, 'Content-Type', 'application/json');
|
|
49
|
+
|
|
50
|
+
expect(state.requestHeaders).toEqual({
|
|
51
|
+
'Content-Type': 'application/json'
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
describe('finalizeCapturedHeaders', () => {
|
|
57
|
+
it('returns no headers when capture is disabled', () => {
|
|
58
|
+
const responseHeaders = jest.fn(() => ({ etag: 'abc' }));
|
|
59
|
+
|
|
60
|
+
expect(
|
|
61
|
+
finalizeCapturedHeaders({
|
|
62
|
+
state: createHeaderCaptureState(null),
|
|
63
|
+
url: URL,
|
|
64
|
+
statusCode: 200,
|
|
65
|
+
responseHeaders
|
|
66
|
+
})
|
|
67
|
+
).toEqual({});
|
|
68
|
+
expect(responseHeaders).not.toHaveBeenCalled();
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it('returns no headers for status 0 requests', () => {
|
|
72
|
+
const state = createHeaderCaptureState(
|
|
73
|
+
compileHeaderCaptureConfig('defaults')
|
|
74
|
+
);
|
|
75
|
+
recordRequestHeader(state, 'Content-Type', 'application/json');
|
|
76
|
+
|
|
77
|
+
expect(
|
|
78
|
+
finalizeCapturedHeaders({
|
|
79
|
+
state,
|
|
80
|
+
url: URL,
|
|
81
|
+
statusCode: 0,
|
|
82
|
+
responseHeaders: () => ({ etag: 'abc' })
|
|
83
|
+
})
|
|
84
|
+
).toEqual({});
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it.each([200, 0])(
|
|
88
|
+
'releases the request header store (status %s)',
|
|
89
|
+
statusCode => {
|
|
90
|
+
const state = createHeaderCaptureState(
|
|
91
|
+
compileHeaderCaptureConfig('defaults')
|
|
92
|
+
);
|
|
93
|
+
recordRequestHeader(state, 'Content-Type', 'application/json');
|
|
94
|
+
|
|
95
|
+
finalizeCapturedHeaders({
|
|
96
|
+
state,
|
|
97
|
+
url: URL,
|
|
98
|
+
statusCode,
|
|
99
|
+
responseHeaders: () => ({})
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
expect(state.requestHeaders).toBeUndefined();
|
|
103
|
+
}
|
|
104
|
+
);
|
|
105
|
+
|
|
106
|
+
it('filters by rules and enforces size limits', () => {
|
|
107
|
+
const state = createHeaderCaptureState(
|
|
108
|
+
compileHeaderCaptureConfig('defaults')
|
|
109
|
+
);
|
|
110
|
+
recordRequestHeader(state, 'Content-Type', 'application/json');
|
|
111
|
+
recordRequestHeader(state, 'X-Custom', 'value');
|
|
112
|
+
|
|
113
|
+
const result = finalizeCapturedHeaders({
|
|
114
|
+
state,
|
|
115
|
+
url: URL,
|
|
116
|
+
statusCode: 200,
|
|
117
|
+
responseHeaders: () => ({
|
|
118
|
+
etag: 'x'.repeat(500),
|
|
119
|
+
'x-custom': 'value'
|
|
120
|
+
})
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
expect(result.capturedRequestHeaders).toEqual({
|
|
124
|
+
'Content-Type': 'application/json'
|
|
125
|
+
});
|
|
126
|
+
expect(result.capturedResponseHeaders?.ETag).toHaveLength(128);
|
|
127
|
+
expect(
|
|
128
|
+
result.capturedResponseHeaders?.['x-custom']
|
|
129
|
+
).toBeUndefined();
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
describe('fetchHeadersToRecord', () => {
|
|
134
|
+
it('never copies blocked headers', () => {
|
|
135
|
+
expect(
|
|
136
|
+
fetchHeadersToRecord(
|
|
137
|
+
new Headers({
|
|
138
|
+
'Set-Cookie': 'session=secret',
|
|
139
|
+
Authorization: 'Bearer secret',
|
|
140
|
+
'x-datadog-tracked-by': 'react-native',
|
|
141
|
+
'Cache-Control': 'no-cache'
|
|
142
|
+
})
|
|
143
|
+
)
|
|
144
|
+
).toEqual({ 'cache-control': 'no-cache' });
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
it('lowercases header names', () => {
|
|
148
|
+
expect(
|
|
149
|
+
fetchHeadersToRecord(
|
|
150
|
+
new Headers({ 'Cache-Control': 'no-cache' })
|
|
151
|
+
)
|
|
152
|
+
).toEqual({ 'cache-control': 'no-cache' });
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it('returns an empty record when headers cannot be iterated', () => {
|
|
156
|
+
expect(fetchHeadersToRecord(undefined)).toEqual({});
|
|
157
|
+
expect(
|
|
158
|
+
fetchHeadersToRecord(({
|
|
159
|
+
get: () => null
|
|
160
|
+
} as unknown) as Headers)
|
|
161
|
+
).toEqual({});
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
});
|
|
@@ -0,0 +1,119 @@
|
|
|
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 {
|
|
8
|
+
accumulateRequestHeader,
|
|
9
|
+
filterRequestHeadersByMode,
|
|
10
|
+
filterResponseHeaders
|
|
11
|
+
} from '../../headerCapture/captureHeaders';
|
|
12
|
+
import { enforceSizeLimits } from '../../headerCapture/enforceSizeLimits';
|
|
13
|
+
import { isHeaderAllowed } from '../../headerCapture/isHeaderAllowed';
|
|
14
|
+
import type { CompiledHeaderCaptureConfig } from '../../headerCapture/types';
|
|
15
|
+
import { isDatadogCustomHeader } from '../../headers';
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Per-request header capture state, shared by all request proxies.
|
|
19
|
+
*/
|
|
20
|
+
export interface HeaderCaptureState {
|
|
21
|
+
config: CompiledHeaderCaptureConfig;
|
|
22
|
+
/** `undefined` when header capture is disabled. */
|
|
23
|
+
requestHeaders: Record<string, string> | undefined;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export type CapturedHeaders = {
|
|
27
|
+
capturedRequestHeaders?: Record<string, string>;
|
|
28
|
+
capturedResponseHeaders?: Record<string, string>;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
export const createHeaderCaptureState = (
|
|
32
|
+
config: CompiledHeaderCaptureConfig | undefined
|
|
33
|
+
): HeaderCaptureState => ({
|
|
34
|
+
config: config ?? null,
|
|
35
|
+
requestHeaders: config != null ? {} : undefined
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Records a user-set request header. Datadog internal headers are ignored,
|
|
40
|
+
* sensitive headers are dropped before being stored.
|
|
41
|
+
* Values are stringified the same way XHR and Fetch coerce them, since
|
|
42
|
+
* untyped callers can pass `null`, numbers, etc.
|
|
43
|
+
*/
|
|
44
|
+
export const recordRequestHeader = (
|
|
45
|
+
state: HeaderCaptureState,
|
|
46
|
+
header: string,
|
|
47
|
+
value: string
|
|
48
|
+
): void => {
|
|
49
|
+
if (
|
|
50
|
+
state.requestHeaders === undefined ||
|
|
51
|
+
isDatadogCustomHeader(header.toLowerCase())
|
|
52
|
+
) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
accumulateRequestHeader(state.requestHeaders, header, String(value));
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Applies rule filtering and size limits to the headers of a completed request.
|
|
60
|
+
* Nothing is reported for aborted or network-error requests (status 0).
|
|
61
|
+
* The request header store is released, so a retained request object does not
|
|
62
|
+
* keep unreported or untruncated header values alive.
|
|
63
|
+
*
|
|
64
|
+
* @param responseHeaders - Response headers keyed by lowercased name.
|
|
65
|
+
*/
|
|
66
|
+
export const finalizeCapturedHeaders = ({
|
|
67
|
+
state,
|
|
68
|
+
url,
|
|
69
|
+
statusCode,
|
|
70
|
+
responseHeaders
|
|
71
|
+
}: {
|
|
72
|
+
state: HeaderCaptureState;
|
|
73
|
+
url: string;
|
|
74
|
+
statusCode: number;
|
|
75
|
+
responseHeaders: () => Record<string, string>;
|
|
76
|
+
}): CapturedHeaders => {
|
|
77
|
+
const requestHeaders = state.requestHeaders;
|
|
78
|
+
state.requestHeaders = undefined;
|
|
79
|
+
|
|
80
|
+
if (
|
|
81
|
+
state.config === null ||
|
|
82
|
+
requestHeaders === undefined ||
|
|
83
|
+
statusCode === 0
|
|
84
|
+
) {
|
|
85
|
+
return {};
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
const limited = enforceSizeLimits(
|
|
89
|
+
filterRequestHeadersByMode(requestHeaders, url, state.config),
|
|
90
|
+
filterResponseHeaders(responseHeaders(), url, state.config)
|
|
91
|
+
);
|
|
92
|
+
|
|
93
|
+
return {
|
|
94
|
+
capturedRequestHeaders: limited.requestHeaders,
|
|
95
|
+
capturedResponseHeaders: limited.responseHeaders
|
|
96
|
+
};
|
|
97
|
+
};
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Converts a Fetch `Headers` object into a record keyed by lowercased name.
|
|
101
|
+
* Blocked headers (sensitive or SDK-injected) are never copied.
|
|
102
|
+
* Some Fetch implementations (e.g. older `expo/fetch`) may not implement
|
|
103
|
+
* `forEach`, in which case no headers are returned.
|
|
104
|
+
*/
|
|
105
|
+
export const fetchHeadersToRecord = (
|
|
106
|
+
headers: Headers | null | undefined
|
|
107
|
+
): Record<string, string> => {
|
|
108
|
+
const result: Record<string, string> = {};
|
|
109
|
+
if (!headers || typeof headers.forEach !== 'function') {
|
|
110
|
+
return result;
|
|
111
|
+
}
|
|
112
|
+
headers.forEach((value: string, name: string) => {
|
|
113
|
+
const lowered = name.toLowerCase();
|
|
114
|
+
if (isHeaderAllowed(lowered)) {
|
|
115
|
+
result[lowered] = value;
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
return result;
|
|
119
|
+
};
|
|
@@ -5,10 +5,12 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import type { PropagatorType } from '../../../../types';
|
|
8
|
+
import type { CompiledHeaderCaptureConfig } from '../../headerCapture/types';
|
|
8
9
|
|
|
9
10
|
export interface RequestProxyOptions {
|
|
10
11
|
tracingSamplingRate: number;
|
|
11
12
|
firstPartyHostsRegexMap: RegexMap;
|
|
13
|
+
headerCaptureConfig?: CompiledHeaderCaptureConfig;
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
export type RegexMap = {
|
|
@@ -26,6 +26,8 @@ export interface RUMResource {
|
|
|
26
26
|
responseStartTime?: number;
|
|
27
27
|
};
|
|
28
28
|
resourceContext?: XMLHttpRequest;
|
|
29
|
+
capturedRequestHeaders?: Record<string, string>;
|
|
30
|
+
capturedResponseHeaders?: Record<string, string>;
|
|
29
31
|
}
|
|
30
32
|
|
|
31
33
|
export type DdRumResourceGraphqlError = {
|
package/src/rum/types.ts
CHANGED
|
@@ -181,6 +181,13 @@ export type DdRumType = {
|
|
|
181
181
|
*/
|
|
182
182
|
addViewLoadingTime(overwrite: boolean): Promise<void>;
|
|
183
183
|
|
|
184
|
+
/**
|
|
185
|
+
* This method can be used to mark the moment in time when the UI of the app is considered fully displayed.
|
|
186
|
+
* The duration between the application launch and this moment of time will be shown as TTFD (time to full display)
|
|
187
|
+
* in the RUM session explorer. Only the first call to this method will have any effect for a given RUM session.
|
|
188
|
+
*/
|
|
189
|
+
reportAppFullyDisplayed(): Promise<void>;
|
|
190
|
+
|
|
184
191
|
/**
|
|
185
192
|
* Stops the current RUM Session.
|
|
186
193
|
*/
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Copyright 2016-Present Datadog, Inc.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { setCachedAccountId } from '../../rum/helper';
|
|
7
|
+
import { clearCachedAccountId, setCachedAccountId } from '../../rum/helper';
|
|
8
8
|
|
|
9
9
|
import type { AccountInfo } from './types';
|
|
10
10
|
|
|
@@ -33,6 +33,7 @@ class AccountInfoProvider {
|
|
|
33
33
|
|
|
34
34
|
clearAccountInfo = () => {
|
|
35
35
|
this.accountInfo = undefined;
|
|
36
|
+
clearCachedAccountId();
|
|
36
37
|
};
|
|
37
38
|
}
|
|
38
39
|
|
|
@@ -4,11 +4,49 @@
|
|
|
4
4
|
* Copyright 2016-Present Datadog, Inc.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import {
|
|
8
|
+
clearCachedAccountId,
|
|
9
|
+
clearCachedSessionId,
|
|
10
|
+
clearCachedUserId,
|
|
11
|
+
getCachedAccountId
|
|
12
|
+
} from '../../../rum/helper';
|
|
13
|
+
import { firstPartyHostsRegexMapBuilder } from '../../../rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts';
|
|
14
|
+
import { DATADOG_BAGGAGE_HEADER } from '../../../rum/instrumentation/resourceTracking/headers';
|
|
15
|
+
import { createRequestContext } from '../../../rum/instrumentation/resourceTracking/requestProxy/common/RequestContext';
|
|
16
|
+
import { getInstrumentationHeaders } from '../../../rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders';
|
|
17
|
+
import { PropagatorType } from '../../../rum/types';
|
|
7
18
|
import { AccountInfoSingleton } from '../AccountInfoSingleton';
|
|
8
19
|
|
|
20
|
+
const firstPartyRequestOptions = {
|
|
21
|
+
tracingSamplingRate: 100,
|
|
22
|
+
firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([
|
|
23
|
+
{
|
|
24
|
+
match: 'api.example.com',
|
|
25
|
+
propagatorTypes: [
|
|
26
|
+
PropagatorType.DATADOG,
|
|
27
|
+
PropagatorType.TRACECONTEXT
|
|
28
|
+
]
|
|
29
|
+
}
|
|
30
|
+
])
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
const getBaggageHeader = (): string | undefined => {
|
|
34
|
+
const context = createRequestContext({
|
|
35
|
+
method: 'GET',
|
|
36
|
+
url: 'https://api.example.com/v1/resource',
|
|
37
|
+
options: firstPartyRequestOptions
|
|
38
|
+
});
|
|
39
|
+
return getInstrumentationHeaders(context).find(
|
|
40
|
+
header => header.header === DATADOG_BAGGAGE_HEADER
|
|
41
|
+
)?.value;
|
|
42
|
+
};
|
|
43
|
+
|
|
9
44
|
describe('AccountInfoSingleton', () => {
|
|
10
45
|
beforeEach(() => {
|
|
11
46
|
AccountInfoSingleton.reset();
|
|
47
|
+
clearCachedSessionId();
|
|
48
|
+
clearCachedUserId();
|
|
49
|
+
clearCachedAccountId();
|
|
12
50
|
});
|
|
13
51
|
|
|
14
52
|
it('returns undefined by default', () => {
|
|
@@ -87,4 +125,25 @@ describe('AccountInfoSingleton', () => {
|
|
|
87
125
|
|
|
88
126
|
expect(a).toBe(b);
|
|
89
127
|
});
|
|
128
|
+
|
|
129
|
+
it('clears the cached account id used by RequestContext baggage after clearAccountInfo', () => {
|
|
130
|
+
const accountId = 'previous-account';
|
|
131
|
+
AccountInfoSingleton.getInstance().setAccountInfo({
|
|
132
|
+
id: accountId,
|
|
133
|
+
extraInfo: {}
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
expect(getCachedAccountId()).toBe(accountId);
|
|
137
|
+
expect(getBaggageHeader()).toBe(`account.id=${accountId}`);
|
|
138
|
+
|
|
139
|
+
AccountInfoSingleton.getInstance().clearAccountInfo();
|
|
140
|
+
|
|
141
|
+
expect(
|
|
142
|
+
AccountInfoSingleton.getInstance().getAccountInfo()
|
|
143
|
+
).toBeUndefined();
|
|
144
|
+
expect(getCachedAccountId()).toBeUndefined();
|
|
145
|
+
expect(getBaggageHeader() ?? '').not.toContain(
|
|
146
|
+
`account.id=${accountId}`
|
|
147
|
+
);
|
|
148
|
+
});
|
|
90
149
|
});
|
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { NativeModules } from 'react-native';
|
|
7
7
|
|
|
8
|
+
import { getNativeDdSdk } from '../../specs/NativeDdSdk';
|
|
9
|
+
|
|
8
10
|
import { DatadogBatchedBridgeEventEmitter } from './DatadogBatchedBridgeEventEmitter';
|
|
9
11
|
import type { DatadogEventEmitter } from './DatadogEventEmitter';
|
|
10
12
|
import { DatadogNativeEventEmitter } from './DatadogNativeEventEmitter';
|
|
@@ -18,10 +20,7 @@ export class DatadogDefaultEventEmitter implements DatadogEventEmitter {
|
|
|
18
20
|
|
|
19
21
|
constructor(errorHandler: (err: any) => void) {
|
|
20
22
|
try {
|
|
21
|
-
const ddSdkModule =
|
|
22
|
-
NativeModules.DdSdk ||
|
|
23
|
-
// eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
|
|
24
|
-
require('../../specs/NativeDdSdk').default;
|
|
23
|
+
const ddSdkModule = NativeModules.DdSdk || getNativeDdSdk();
|
|
25
24
|
this.eventEmitter = this.isNewArchitecture
|
|
26
25
|
? new DatadogNativeEventEmitter(ddSdkModule, errorHandler)
|
|
27
26
|
: new DatadogBatchedBridgeEventEmitter(errorHandler);
|
|
@@ -66,7 +66,9 @@ describe('DdSdkNativeBridge', () => {
|
|
|
66
66
|
})
|
|
67
67
|
);
|
|
68
68
|
|
|
69
|
-
jest.mock('../../../specs/NativeDdSdk', () =>
|
|
69
|
+
jest.mock('../../../specs/NativeDdSdk', () => ({
|
|
70
|
+
getNativeDdSdk: jest.fn(() => mockNativeDdSdkSpec)
|
|
71
|
+
}));
|
|
70
72
|
});
|
|
71
73
|
|
|
72
74
|
afterEach(() => {
|
|
@@ -96,8 +98,39 @@ describe('DdSdkNativeBridge', () => {
|
|
|
96
98
|
expect(ddBridge.hasNativeBridge()).toBe(true);
|
|
97
99
|
});
|
|
98
100
|
|
|
101
|
+
it('falls back to the spec getter when NativeModules.DdSdk is missing', () => {
|
|
102
|
+
const { NativeModules } = require('react-native');
|
|
103
|
+
const legacyModule = NativeModules.DdSdk;
|
|
104
|
+
delete NativeModules.DdSdk;
|
|
105
|
+
try {
|
|
106
|
+
const {
|
|
107
|
+
DatadogNativeEventEmitter
|
|
108
|
+
} = require('../../DatadogEventEmitter/DatadogNativeEventEmitter');
|
|
109
|
+
const ddBridge = require('../DdSdkInternalNativeBridge');
|
|
110
|
+
const defaultEventEmitter = require('../../DatadogEventEmitter/DatadogDefaultEventEmitter');
|
|
111
|
+
mockNativeEventEmitter.initialize.mockReturnValueOnce(true);
|
|
112
|
+
|
|
113
|
+
ddBridge.registerNativeBridge(
|
|
114
|
+
new defaultEventEmitter.DatadogDefaultEventEmitter(
|
|
115
|
+
mockErrorHandler
|
|
116
|
+
)
|
|
117
|
+
);
|
|
118
|
+
|
|
119
|
+
expect(DatadogNativeEventEmitter).toHaveBeenCalledWith(
|
|
120
|
+
mockNativeDdSdkSpec,
|
|
121
|
+
mockErrorHandler
|
|
122
|
+
);
|
|
123
|
+
expect(mockErrorHandler).not.toHaveBeenCalled();
|
|
124
|
+
expect(ddBridge.hasNativeBridge()).toBe(true);
|
|
125
|
+
} finally {
|
|
126
|
+
NativeModules.DdSdk = legacyModule;
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
|
|
99
130
|
it('catches errors when native event emitter init fails', () => {
|
|
100
|
-
jest.mock('../../../specs/NativeDdSdk', () =>
|
|
131
|
+
jest.mock('../../../specs/NativeDdSdk', () => ({
|
|
132
|
+
getNativeDdSdk: jest.fn(() => null)
|
|
133
|
+
}));
|
|
101
134
|
|
|
102
135
|
const ddBridge = require('../DdSdkInternalNativeBridge');
|
|
103
136
|
const defaultEventEmitter = require('../../DatadogEventEmitter/DatadogDefaultEventEmitter');
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { InternalLog } from '../../../../InternalLog';
|
|
8
|
-
import
|
|
8
|
+
import { getNativeDdSdk } from '../../../../specs/NativeDdSdk';
|
|
9
9
|
import { BoundedBuffer } from '../BoundedBuffer';
|
|
10
10
|
|
|
11
11
|
describe('BoundedBuffer', () => {
|
|
@@ -126,7 +126,7 @@ describe('BoundedBuffer', () => {
|
|
|
126
126
|
await buffer.drain();
|
|
127
127
|
expect(callbackWithId).toHaveBeenCalledTimes(1);
|
|
128
128
|
expect(callbackWithId).toHaveBeenNthCalledWith(1, 'callbackId1');
|
|
129
|
-
expect(
|
|
129
|
+
expect(getNativeDdSdk()?.telemetryError).toHaveBeenCalledWith(
|
|
130
130
|
'Could not generate enough random numbers happened 2 times.',
|
|
131
131
|
'',
|
|
132
132
|
'RandomIdGenerationError'
|
|
@@ -146,7 +146,7 @@ describe('BoundedBuffer', () => {
|
|
|
146
146
|
|
|
147
147
|
await buffer.drain();
|
|
148
148
|
expect(fakeCallback).toHaveBeenCalledTimes(3);
|
|
149
|
-
expect(
|
|
149
|
+
expect(getNativeDdSdk()?.telemetryError).toHaveBeenCalledWith(
|
|
150
150
|
'Buffer overflow happened 1 times.',
|
|
151
151
|
'',
|
|
152
152
|
'BufferOverflow'
|
|
@@ -171,7 +171,7 @@ describe('BoundedBuffer', () => {
|
|
|
171
171
|
expect(fakeCallback).toHaveBeenCalledTimes(1);
|
|
172
172
|
expect(callbackReturningId).not.toHaveBeenCalled();
|
|
173
173
|
expect(callbackWithId).not.toHaveBeenCalled();
|
|
174
|
-
expect(
|
|
174
|
+
expect(getNativeDdSdk()?.telemetryError).toHaveBeenCalledWith(
|
|
175
175
|
'Buffer overflow happened 2 times.',
|
|
176
176
|
'',
|
|
177
177
|
'BufferOverflow'
|
|
@@ -196,7 +196,7 @@ describe('BoundedBuffer', () => {
|
|
|
196
196
|
expect(fakeCallback).toHaveBeenCalledTimes(1);
|
|
197
197
|
expect(callbackReturningId).toHaveBeenCalledTimes(1);
|
|
198
198
|
expect(callbackWithId).toHaveBeenCalledTimes(1);
|
|
199
|
-
expect(
|
|
199
|
+
expect(getNativeDdSdk()?.telemetryError).not.toHaveBeenCalled();
|
|
200
200
|
});
|
|
201
201
|
});
|
|
202
202
|
});
|