@datadog/mobile-react-native 3.11.0 → 3.13.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 +357 -14
- package/README.md +5 -3
- package/android/build.gradle +23 -14
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +27 -2
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +27 -2
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +25 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +4 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +104 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +8 -0
- package/android/src/test/resources/input/complete-configuration.json +5 -0
- package/datadog-configuration.gradle +59 -18
- package/datadog-configuration.schema.json +140 -0
- package/ios/Sources/DdFlagsImplementation.swift +3 -0
- package/ios/Sources/DdSdkConfiguration.swift +11 -1
- package/ios/Sources/DdSdkNativeInitialization.swift +24 -2
- package/ios/Sources/RNDdSdkConfiguration.swift +14 -2
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/DdSdkReactNative.js +6 -1
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/config/FileBasedConfiguration.js +4 -1
- package/lib/commonjs/config/FileBasedConfiguration.js.map +1 -1
- package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js +3 -1
- package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js.map +1 -1
- package/lib/commonjs/config/features/RumConfiguration.js +8 -0
- package/lib/commonjs/config/features/RumConfiguration.js.map +1 -1
- package/lib/commonjs/config/features/RumConfigurationNative.js +4 -0
- package/lib/commonjs/config/types/TimeseriesConfiguration.js +25 -0
- package/lib/commonjs/config/types/TimeseriesConfiguration.js.map +1 -0
- package/lib/commonjs/config/types/index.js +7 -0
- package/lib/commonjs/config/types/index.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/index.js +7 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/internal.js +97 -0
- package/lib/commonjs/internal.js.map +1 -0
- package/lib/commonjs/logs/DdLogs.js +4 -2
- package/lib/commonjs/logs/DdLogs.js.map +1 -1
- package/lib/commonjs/rum/DdRum.js +4 -2
- package/lib/commonjs/rum/DdRum.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +20 -15
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +5 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js +2 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/README.md +142 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js +308 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js +275 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js +167 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js +36 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js +158 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js +58 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js +39 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js +38 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/types.js +2 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/headerCapture/types.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +17 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +25 -3
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js +2 -35
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +3 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js +8 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js +88 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js.map +1 -1
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +2 -3
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -1
- package/lib/commonjs/sdk/DdSdkInternal.js +27 -22
- package/lib/commonjs/sdk/DdSdkInternal.js.map +1 -1
- package/lib/commonjs/specs/NativeDdFlags.js +19 -3
- package/lib/commonjs/specs/NativeDdFlags.js.map +1 -1
- package/lib/commonjs/specs/NativeDdLogs.js +19 -3
- package/lib/commonjs/specs/NativeDdLogs.js.map +1 -1
- package/lib/commonjs/specs/NativeDdRum.js +19 -3
- package/lib/commonjs/specs/NativeDdRum.js.map +1 -1
- package/lib/commonjs/specs/NativeDdSdk.js +19 -3
- package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
- package/lib/commonjs/specs/NativeDdTrace.js +19 -3
- package/lib/commonjs/specs/NativeDdTrace.js.map +1 -1
- package/lib/commonjs/trace/DdTrace.js +4 -2
- package/lib/commonjs/trace/DdTrace.js.map +1 -1
- package/lib/commonjs/utils/stringUtils.js +48 -0
- package/lib/commonjs/utils/stringUtils.js.map +1 -0
- package/lib/commonjs/version.js +1 -1
- package/lib/module/DdSdkReactNative.js +6 -1
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/config/FileBasedConfiguration.js +4 -1
- package/lib/module/config/FileBasedConfiguration.js.map +1 -1
- package/lib/module/config/async/AutoInstrumentationConfiguration.js +3 -1
- package/lib/module/config/async/AutoInstrumentationConfiguration.js.map +1 -1
- package/lib/module/config/features/RumConfiguration.js +8 -0
- package/lib/module/config/features/RumConfiguration.js.map +1 -1
- package/lib/module/config/features/RumConfigurationNative.js +1 -1
- package/lib/module/config/types/TimeseriesConfiguration.js +19 -0
- package/lib/module/config/types/TimeseriesConfiguration.js.map +1 -0
- package/lib/module/config/types/index.js +1 -0
- package/lib/module/config/types/index.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/index.js +2 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/internal.js +27 -0
- package/lib/module/internal.js.map +1 -0
- package/lib/module/logs/DdLogs.js +4 -2
- package/lib/module/logs/DdLogs.js.map +1 -1
- package/lib/module/rum/DdRum.js +4 -2
- package/lib/module/rum/DdRum.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +20 -14
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +5 -2
- package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/README.md +142 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js +298 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js +268 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js +160 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js +30 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js +150 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js +51 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js +32 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js +32 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/types.js +2 -0
- package/lib/module/rum/instrumentation/resourceTracking/headerCapture/types.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +17 -2
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +25 -3
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js +1 -34
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +3 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js +8 -2
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js +79 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.js.map +1 -0
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js.map +1 -1
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +2 -3
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -1
- package/lib/module/sdk/DdSdkInternal.js +27 -22
- package/lib/module/sdk/DdSdkInternal.js.map +1 -1
- package/lib/module/specs/NativeDdFlags.js +14 -2
- package/lib/module/specs/NativeDdFlags.js.map +1 -1
- package/lib/module/specs/NativeDdLogs.js +14 -2
- package/lib/module/specs/NativeDdLogs.js.map +1 -1
- package/lib/module/specs/NativeDdRum.js +14 -2
- package/lib/module/specs/NativeDdRum.js.map +1 -1
- package/lib/module/specs/NativeDdSdk.js +14 -2
- package/lib/module/specs/NativeDdSdk.js.map +1 -1
- package/lib/module/specs/NativeDdTrace.js +14 -2
- package/lib/module/specs/NativeDdTrace.js.map +1 -1
- package/lib/module/trace/DdTrace.js +4 -2
- package/lib/module/trace/DdTrace.js.map +1 -1
- package/lib/module/utils/stringUtils.js +42 -0
- package/lib/module/utils/stringUtils.js.map +1 -0
- package/lib/module/version.js +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
- package/lib/typescript/config/FileBasedConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/FileBasedConfiguration.type.d.ts +4 -1
- package/lib/typescript/config/FileBasedConfiguration.type.d.ts.map +1 -1
- package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts +6 -0
- package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/async/PartialInitializationConfiguration.d.ts +2 -1
- package/lib/typescript/config/async/PartialInitializationConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfiguration.d.ts +6 -1
- package/lib/typescript/config/features/RumConfiguration.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfiguration.type.d.ts +116 -1
- package/lib/typescript/config/features/RumConfiguration.type.d.ts.map +1 -1
- package/lib/typescript/config/features/RumConfigurationNative.d.ts +2 -0
- package/lib/typescript/config/features/RumConfigurationNative.d.ts.map +1 -1
- package/lib/typescript/config/types/TimeseriesConfiguration.d.ts +19 -0
- package/lib/typescript/config/types/TimeseriesConfiguration.d.ts.map +1 -0
- package/lib/typescript/config/types/index.d.ts +2 -0
- package/lib/typescript/config/types/index.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 +5 -2
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/internal.d.ts +26 -0
- package/lib/typescript/internal.d.ts.map +1 -0
- package/lib/typescript/logs/DdLogs.d.ts +1 -1
- package/lib/typescript/logs/DdLogs.d.ts.map +1 -1
- package/lib/typescript/rum/DdRum.d.ts +1 -1
- package/lib/typescript/rum/DdRum.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts +3 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.d.ts +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.d.ts +85 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.d.ts +18 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.d.ts +24 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.d.ts +12 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.d.ts +28 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.d.ts +16 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.d.ts +13 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.d.ts +13 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/types.d.ts +27 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/headerCapture/types.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.d.ts +43 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.d.ts.map +1 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts +2 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts.map +1 -1
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.d.ts.map +1 -1
- package/lib/typescript/sdk/DdSdkInternal.d.ts +1 -0
- package/lib/typescript/sdk/DdSdkInternal.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdFlags.d.ts +7 -2
- package/lib/typescript/specs/NativeDdFlags.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdLogs.d.ts +7 -2
- package/lib/typescript/specs/NativeDdLogs.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdRum.d.ts +7 -2
- package/lib/typescript/specs/NativeDdRum.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdSdk.d.ts +7 -2
- package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdTrace.d.ts +7 -2
- package/lib/typescript/specs/NativeDdTrace.d.ts.map +1 -1
- package/lib/typescript/trace/DdTrace.d.ts.map +1 -1
- package/lib/typescript/utils/stringUtils.d.ts +12 -0
- package/lib/typescript/utils/stringUtils.d.ts.map +1 -0
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +8 -3
- package/src/DdSdkReactNative.tsx +11 -1
- package/src/__tests__/DdSdkReactNative.test.tsx +145 -20
- package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +6 -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 +6 -1
- package/src/config/FileBasedConfiguration.type.ts +4 -0
- package/src/config/__tests__/FileBasedConfiguration.test.ts +73 -0
- package/src/config/__tests__/__fixtures__/configuration-all-fields.json +14 -1
- package/src/config/async/AutoInstrumentationConfiguration.ts +9 -1
- package/src/config/async/PartialInitializationConfiguration.ts +2 -0
- package/src/config/features/RumConfiguration.ts +15 -0
- package/src/config/features/RumConfiguration.type.ts +128 -1
- package/src/config/features/RumConfigurationNative.ts +3 -0
- package/src/config/types/TimeseriesConfiguration.ts +26 -0
- package/src/config/types/index.ts +5 -0
- package/src/flags/DdFlags.ts +4 -3
- package/src/flags/FlagsClient.ts +4 -3
- package/src/index.tsx +15 -0
- package/src/internal.ts +32 -0
- package/src/logs/DdLogs.ts +4 -3
- package/src/rum/DdRum.ts +4 -3
- package/src/rum/__tests__/DdRum.test.ts +4 -4
- package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +33 -26
- package/src/rum/instrumentation/interactionTracking/__tests__/BabelOptionalHandlers.test.ts +120 -0
- package/src/rum/instrumentation/interactionTracking/__tests__/DdBabelInteractionTracking.test.ts +82 -2
- package/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx +7 -2
- package/src/rum/instrumentation/resourceTracking/__tests__/DdRumResourceTracking.test.ts +46 -0
- package/src/rum/instrumentation/resourceTracking/__tests__/__utils__/XMLHttpRequestMock.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/headerCapture/README.md +142 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/captureHeaders.test.ts +853 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/compileHeaderConfig.test.ts +697 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/enforceSizeLimits.integration.test.ts +183 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/enforceSizeLimits.test.ts +337 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/isHeaderAllowed.test.ts +35 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/normalizeUrlForMatching.test.ts +176 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/parseResponseHeaders.test.ts +114 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/sensitiveHeaderBlocklist.test.ts +112 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/__tests__/tracingHeaderExclusion.test.ts +59 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/captureHeaders.ts +437 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/compileHeaderConfig.ts +339 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/enforceSizeLimits.ts +208 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/isHeaderAllowed.ts +29 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/normalizeUrlForMatching.ts +181 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/parseResponseHeaders.ts +59 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/sensitiveHeaderBlocklist.ts +31 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/tracingHeaderExclusion.ts +61 -0
- package/src/rum/instrumentation/resourceTracking/headerCapture/types.ts +33 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts +21 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/__tests__/FetchProxy.test.ts +274 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/ResourceReporter.test.ts +120 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +34 -3
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +624 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/baggageHeaderUtils.ts +1 -34
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts +6 -1
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.ts +16 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/__tests__/headerCapture.test.ts +164 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/common/headerCapture.ts +119 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.ts +2 -0
- package/src/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.ts +2 -0
- package/src/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.tsx +3 -4
- package/src/sdk/DatadogInternalBridge/__tests__/DdSdkNativeBridge.test.tsx +35 -2
- package/src/sdk/DatadogProvider/Buffer/__tests__/BoundedBuffer.test.ts +5 -5
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +54 -1
- package/src/sdk/DdSdkInternal.ts +27 -24
- package/src/sdk/EventMappers/__tests__/EventMapper.test.ts +2 -2
- package/src/specs/NativeDdFlags.ts +14 -2
- package/src/specs/NativeDdLogs.ts +14 -2
- package/src/specs/NativeDdRum.ts +14 -2
- package/src/specs/NativeDdSdk.ts +14 -2
- package/src/specs/NativeDdTrace.ts +14 -2
- package/src/trace/DdTrace.ts +4 -3
- package/src/utils/__tests__/stringUtils.test.ts +90 -0
- package/src/utils/stringUtils.ts +41 -0
- package/src/version.ts +1 -1
|
@@ -19,6 +19,7 @@ import com.datadog.android.event.EventMapper
|
|
|
19
19
|
import com.datadog.android.log.Logs
|
|
20
20
|
import com.datadog.android.log.LogsConfiguration
|
|
21
21
|
import com.datadog.android.privacy.TrackingConsent
|
|
22
|
+
import com.datadog.android.rum.ExperimentalRumApi
|
|
22
23
|
import com.datadog.android.rum.Rum
|
|
23
24
|
import com.datadog.android.rum.RumConfiguration
|
|
24
25
|
import com.datadog.android._InternalProxy
|
|
@@ -27,6 +28,8 @@ import com.datadog.android.rum.configuration.VitalsUpdateFrequency
|
|
|
27
28
|
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
|
|
28
29
|
import com.datadog.android.rum.model.ActionEvent
|
|
29
30
|
import com.datadog.android.rum.model.ResourceEvent
|
|
31
|
+
import com.datadog.android.rum.timeseries.TimeseriesConfiguration as NativeTimeseriesConfiguration
|
|
32
|
+
import com.datadog.android.rum.timeseries.TimeseriesType as NativeTimeseriesType
|
|
30
33
|
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
|
|
31
34
|
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
|
|
32
35
|
import com.datadog.android.trace.Trace
|
|
@@ -253,11 +256,33 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
253
256
|
configBuilder.setInitialResourceIdentifier(TimeBasedInitialResourceIdentifier(milliseconds))
|
|
254
257
|
}
|
|
255
258
|
|
|
259
|
+
configuration.rumConfiguration?.timeseries?.let { timeseries ->
|
|
260
|
+
setTimeseriesConfiguration(configBuilder, timeseries)
|
|
261
|
+
}
|
|
262
|
+
|
|
256
263
|
configBuilder.setSessionListener(DdSdkSessionStartedListener.getInstance())
|
|
257
264
|
|
|
258
265
|
return configBuilder.build()
|
|
259
266
|
}
|
|
260
267
|
|
|
268
|
+
@OptIn(ExperimentalRumApi::class)
|
|
269
|
+
private fun setTimeseriesConfiguration(
|
|
270
|
+
configBuilder: RumConfiguration.Builder,
|
|
271
|
+
timeseries: TimeseriesConfiguration
|
|
272
|
+
) {
|
|
273
|
+
val collectTypes = timeseries.collectTypes.mapNotNull { it.asTimeseriesType() }.toSet()
|
|
274
|
+
|
|
275
|
+
configBuilder.setTimeseriesConfiguration(NativeTimeseriesConfiguration(collectTypes))
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
private fun String.asTimeseriesType(): NativeTimeseriesType? {
|
|
279
|
+
return when (lowercase(Locale.US)) {
|
|
280
|
+
"cpu" -> NativeTimeseriesType.CPU
|
|
281
|
+
"memory" -> NativeTimeseriesType.MEMORY
|
|
282
|
+
else -> null
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
|
|
261
286
|
private fun buildLogsConfiguration(configuration: DdSdkConfiguration): LogsConfiguration {
|
|
262
287
|
val configBuilder = LogsConfiguration.Builder()
|
|
263
288
|
configuration.logsConfiguration?.customEndpoint?.let {
|
|
@@ -144,6 +144,9 @@ internal class DdSdkNativeInitializationTest {
|
|
|
144
144
|
"[B3MULTI, TRACECONTEXT]"
|
|
145
145
|
)
|
|
146
146
|
assertThat(configuration.rumConfiguration?.initialResourceThreshold).isEqualTo(0.5)
|
|
147
|
+
assertThat(configuration.rumConfiguration?.timeseries?.collectTypes).isEqualTo(
|
|
148
|
+
listOf("cpu")
|
|
149
|
+
)
|
|
147
150
|
}
|
|
148
151
|
|
|
149
152
|
@Test
|
|
@@ -192,6 +195,7 @@ internal class DdSdkNativeInitializationTest {
|
|
|
192
195
|
assertThat(configuration.rumConfiguration?.firstPartyHosts).isNull()
|
|
193
196
|
assertThat(configuration.logsConfiguration?.customEndpoint).isNull()
|
|
194
197
|
assertThat(configuration.traceConfiguration?.customEndpoint).isNull()
|
|
198
|
+
assertThat(configuration.rumConfiguration?.timeseries).isNull()
|
|
195
199
|
}
|
|
196
200
|
|
|
197
201
|
@Test
|
|
@@ -31,6 +31,7 @@ import com.datadog.android.rum.configuration.VitalsUpdateFrequency
|
|
|
31
31
|
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
|
|
32
32
|
import com.datadog.android.rum.model.ActionEvent
|
|
33
33
|
import com.datadog.android.rum.model.ResourceEvent
|
|
34
|
+
import com.datadog.android.rum.timeseries.TimeseriesType
|
|
34
35
|
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
|
|
35
36
|
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
|
|
36
37
|
import com.datadog.android.trace.Trace
|
|
@@ -2369,6 +2370,109 @@ internal class DdSdkTest {
|
|
|
2369
2370
|
}
|
|
2370
2371
|
}
|
|
2371
2372
|
|
|
2373
|
+
@Test
|
|
2374
|
+
fun `𝕄 initialize native SDK 𝕎 initialize() {timeseries enabled}`(
|
|
2375
|
+
@Forgery configuration: DdSdkConfiguration
|
|
2376
|
+
) {
|
|
2377
|
+
// Given
|
|
2378
|
+
val rumConfiguration = configuration.rumConfiguration?.copy(
|
|
2379
|
+
timeseries = TimeseriesConfiguration(collectTypes = listOf("cpu", "memory"))
|
|
2380
|
+
)
|
|
2381
|
+
val bridgeConfiguration = configuration.copy(
|
|
2382
|
+
rumConfiguration = rumConfiguration
|
|
2383
|
+
)
|
|
2384
|
+
val sdkConfigCaptor = argumentCaptor<Configuration>()
|
|
2385
|
+
val rumConfigCaptor = argumentCaptor<RumConfiguration>()
|
|
2386
|
+
val logsConfigCaptor = argumentCaptor<LogsConfiguration>()
|
|
2387
|
+
val traceConfigCaptor = argumentCaptor<TraceConfiguration>()
|
|
2388
|
+
|
|
2389
|
+
val rumMock = org.mockito.Mockito.mockStatic(Rum::class.java)
|
|
2390
|
+
val traceMock = org.mockito.Mockito.mockStatic(Trace::class.java)
|
|
2391
|
+
val logsMock = org.mockito.Mockito.mockStatic(Logs::class.java)
|
|
2392
|
+
|
|
2393
|
+
try {
|
|
2394
|
+
rumMock.`when`<Unit> { Rum.enable(any(), any()) }.then { }
|
|
2395
|
+
logsMock.`when`<Unit> { Logs.enable(any(), any()) }.then { }
|
|
2396
|
+
traceMock.`when`<Unit> { Trace.enable(any(), any()) }.then { }
|
|
2397
|
+
|
|
2398
|
+
// When
|
|
2399
|
+
testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
2400
|
+
|
|
2401
|
+
// Then
|
|
2402
|
+
inOrder(mockDatadog) {
|
|
2403
|
+
verify(mockDatadog).initialize(
|
|
2404
|
+
same(mockContext),
|
|
2405
|
+
sdkConfigCaptor.capture(),
|
|
2406
|
+
any()
|
|
2407
|
+
)
|
|
2408
|
+
rumMock.verify { Rum.enable(rumConfigCaptor.capture(), any()) }
|
|
2409
|
+
traceMock.verify { Trace.enable(traceConfigCaptor.capture(), any()) }
|
|
2410
|
+
logsMock.verify { Logs.enable(logsConfigCaptor.capture(), any()) }
|
|
2411
|
+
}
|
|
2412
|
+
assertThat(rumConfigCaptor.firstValue)
|
|
2413
|
+
.hasField("featureConfiguration") {
|
|
2414
|
+
it.hasField("timeseriesConfiguration") { ts ->
|
|
2415
|
+
ts.hasFieldEqualTo(
|
|
2416
|
+
"collectTypes",
|
|
2417
|
+
setOf(TimeseriesType.CPU, TimeseriesType.MEMORY)
|
|
2418
|
+
)
|
|
2419
|
+
}
|
|
2420
|
+
}
|
|
2421
|
+
} finally {
|
|
2422
|
+
rumMock.close()
|
|
2423
|
+
logsMock.close()
|
|
2424
|
+
traceMock.close()
|
|
2425
|
+
}
|
|
2426
|
+
}
|
|
2427
|
+
|
|
2428
|
+
@Test
|
|
2429
|
+
fun `𝕄 initialize native SDK 𝕎 initialize() {timeseries disabled by default}`(
|
|
2430
|
+
@Forgery configuration: DdSdkConfiguration
|
|
2431
|
+
) {
|
|
2432
|
+
// Given
|
|
2433
|
+
val rumConfiguration = configuration.rumConfiguration?.copy(timeseries = null)
|
|
2434
|
+
val bridgeConfiguration = configuration.copy(
|
|
2435
|
+
rumConfiguration = rumConfiguration
|
|
2436
|
+
)
|
|
2437
|
+
val sdkConfigCaptor = argumentCaptor<Configuration>()
|
|
2438
|
+
val rumConfigCaptor = argumentCaptor<RumConfiguration>()
|
|
2439
|
+
val logsConfigCaptor = argumentCaptor<LogsConfiguration>()
|
|
2440
|
+
val traceConfigCaptor = argumentCaptor<TraceConfiguration>()
|
|
2441
|
+
|
|
2442
|
+
val rumMock = org.mockito.Mockito.mockStatic(Rum::class.java)
|
|
2443
|
+
val traceMock = org.mockito.Mockito.mockStatic(Trace::class.java)
|
|
2444
|
+
val logsMock = org.mockito.Mockito.mockStatic(Logs::class.java)
|
|
2445
|
+
|
|
2446
|
+
try {
|
|
2447
|
+
rumMock.`when`<Unit> { Rum.enable(any(), any()) }.then { }
|
|
2448
|
+
logsMock.`when`<Unit> { Logs.enable(any(), any()) }.then { }
|
|
2449
|
+
traceMock.`when`<Unit> { Trace.enable(any(), any()) }.then { }
|
|
2450
|
+
|
|
2451
|
+
// When
|
|
2452
|
+
testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
2453
|
+
|
|
2454
|
+
// Then
|
|
2455
|
+
inOrder(mockDatadog) {
|
|
2456
|
+
verify(mockDatadog).initialize(
|
|
2457
|
+
same(mockContext),
|
|
2458
|
+
sdkConfigCaptor.capture(),
|
|
2459
|
+
any()
|
|
2460
|
+
)
|
|
2461
|
+
rumMock.verify { Rum.enable(rumConfigCaptor.capture(), any()) }
|
|
2462
|
+
traceMock.verify { Trace.enable(traceConfigCaptor.capture(), any()) }
|
|
2463
|
+
logsMock.verify { Logs.enable(logsConfigCaptor.capture(), any()) }
|
|
2464
|
+
}
|
|
2465
|
+
assertThat(rumConfigCaptor.firstValue)
|
|
2466
|
+
.hasField("featureConfiguration") {
|
|
2467
|
+
it.hasFieldEqualTo("timeseriesConfiguration", null)
|
|
2468
|
+
}
|
|
2469
|
+
} finally {
|
|
2470
|
+
rumMock.close()
|
|
2471
|
+
logsMock.close()
|
|
2472
|
+
traceMock.close()
|
|
2473
|
+
}
|
|
2474
|
+
}
|
|
2475
|
+
|
|
2372
2476
|
@Test
|
|
2373
2477
|
fun `𝕄 initialize native SDK 𝕎 initialize() {never vitals frequency update}`(
|
|
2374
2478
|
@Forgery configuration: DdSdkConfiguration
|
|
@@ -13,6 +13,7 @@ import com.datadog.android.rum.configuration.VitalsUpdateFrequency
|
|
|
13
13
|
import com.datadog.reactnative.ConfigurationForTelemetry
|
|
14
14
|
import com.datadog.reactnative.DdSdkConfiguration
|
|
15
15
|
import com.datadog.reactnative.ProxyAuthenticator
|
|
16
|
+
import com.datadog.reactnative.TimeseriesConfiguration
|
|
16
17
|
import com.facebook.react.bridge.ReadableMap
|
|
17
18
|
import java.net.Proxy
|
|
18
19
|
|
|
@@ -67,6 +68,7 @@ fun DdSdkConfiguration.toReadableJavaOnlyMap(): ReadableMap {
|
|
|
67
68
|
rumMap["initialResourceThreshold"] = rum?.initialResourceThreshold ?: 0.1
|
|
68
69
|
rumMap["telemetrySampleRate"] = rum?.telemetrySampleRate ?: 20.0
|
|
69
70
|
rum?.customEndpoint?.let { rumMap["customEndpoint"] = it }
|
|
71
|
+
rum?.timeseries?.let { rumMap["unstable_timeseries"] = it.toReadableMap() }
|
|
70
72
|
map["rumConfiguration"] = rumMap.toReadableMap()
|
|
71
73
|
}
|
|
72
74
|
|
|
@@ -93,6 +95,12 @@ fun DdSdkConfiguration.toReadableJavaOnlyMap(): ReadableMap {
|
|
|
93
95
|
return map.toReadableMap()
|
|
94
96
|
}
|
|
95
97
|
|
|
98
|
+
internal fun TimeseriesConfiguration.toReadableMap(): ReadableMap {
|
|
99
|
+
val map = mutableMapOf<String, Any?>()
|
|
100
|
+
collectTypes?.let { map["collectTypes"] = it.toReadableArray() }
|
|
101
|
+
return map.toReadableMap()
|
|
102
|
+
}
|
|
103
|
+
|
|
96
104
|
internal fun ConfigurationForTelemetry.toReadableJavaOnlyMap(): ReadableMap {
|
|
97
105
|
val map = mutableMapOf<String, Any?>()
|
|
98
106
|
initializationType?.let { map.put("initializationType", it) }
|
|
@@ -28,28 +28,69 @@ def getConfigurationFile() {
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
/*
|
|
31
|
-
* Copies the configuration file into the
|
|
31
|
+
* Copies the configuration file into the output directory and renames it.
|
|
32
32
|
*/
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
33
|
+
abstract class CopyDatadogConfigurationFileTask extends DefaultTask {
|
|
34
|
+
@InputFile
|
|
35
|
+
@PathSensitive(PathSensitivity.NONE)
|
|
36
|
+
abstract RegularFileProperty getConfigurationFile()
|
|
37
|
+
|
|
38
|
+
@OutputDirectory
|
|
39
|
+
abstract DirectoryProperty getOutputDirectory()
|
|
40
|
+
|
|
41
|
+
@TaskAction
|
|
42
|
+
void copyConfigurationFile() {
|
|
43
|
+
def outputFile = new File(outputDirectory.get().asFile, 'datadog-configuration.json')
|
|
44
|
+
outputFile.bytes = configurationFile.get().asFile.bytes
|
|
45
45
|
}
|
|
46
|
+
}
|
|
46
47
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
def isVariantSourcesApiAvailable() {
|
|
49
|
+
def androidComponents = project.extensions.findByName("androidComponents")
|
|
50
|
+
if (androidComponents == null) {
|
|
51
|
+
return false
|
|
50
52
|
}
|
|
53
|
+
// Variant.sources.assets and addGeneratedSourceDirectory are available from AGP 7.3.
|
|
54
|
+
def version = androidComponents.pluginVersion
|
|
55
|
+
return version.major > 7 || (version.major == 7 && version.minor >= 3)
|
|
51
56
|
}
|
|
52
57
|
|
|
53
|
-
|
|
54
|
-
|
|
58
|
+
if (isVariantSourcesApiAvailable()) {
|
|
59
|
+
// AGP 9 rejects Provider instances in the SourceSet API, so the configuration file is
|
|
60
|
+
// registered as a generated assets directory of every variant instead.
|
|
61
|
+
def configurationFile = file(getConfigurationFile())
|
|
62
|
+
|
|
63
|
+
androidComponents.onVariants(androidComponents.selector().all(), { variant ->
|
|
64
|
+
def copyTask = project.tasks.register(
|
|
65
|
+
"copyDatadogConfigurationFile${variant.name.capitalize()}",
|
|
66
|
+
CopyDatadogConfigurationFileTask
|
|
67
|
+
) {
|
|
68
|
+
it.configurationFile.set(configurationFile)
|
|
69
|
+
}
|
|
70
|
+
variant.sources.assets?.addGeneratedSourceDirectory(copyTask, { it.outputDirectory })
|
|
71
|
+
})
|
|
72
|
+
} else {
|
|
73
|
+
task copyDatadogConfigurationFile() {
|
|
74
|
+
// Note: there can be multiple source sets depending on the variants declared, so we
|
|
75
|
+
// create a configuration for all of them. This prevents warnings in Android Studio when
|
|
76
|
+
// adding the same directory to sources for different variants.
|
|
77
|
+
android.sourceSets.forEach { source ->
|
|
78
|
+
copy {
|
|
79
|
+
from getConfigurationFile()
|
|
80
|
+
into getBuildAssetsDirectory(source.name)
|
|
81
|
+
rename {
|
|
82
|
+
'datadog-configuration.json'
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// Adds the copied configuration file to the assets of the app for every sourceSet.
|
|
88
|
+
android.sourceSets.forEach { source ->
|
|
89
|
+
source.assets.srcDir(getBuildAssetsDirectory(source.name))
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
gradle.projectsEvaluated {
|
|
94
|
+
preBuild.dependsOn(copyDatadogConfigurationFile)
|
|
95
|
+
}
|
|
55
96
|
}
|
|
@@ -192,6 +192,125 @@
|
|
|
192
192
|
"description": "The app hang threshold in seconds for non-fatal app hangs on iOS.",
|
|
193
193
|
"type": "number"
|
|
194
194
|
},
|
|
195
|
+
"headerCaptureRules": {
|
|
196
|
+
"description": "Controls which HTTP request and response headers are captured on RUM resource events. Omit to disable header capture (default). Use `\"defaults\"` to capture a predefined set of caching and content headers on all URLs, or an array of composable rules. Sensitive headers (cookies, authorization, tokens, ...) and SDK tracing headers are never captured. Only takes effect when resource tracking is enabled.",
|
|
197
|
+
"oneOf": [
|
|
198
|
+
{
|
|
199
|
+
"const": "defaults"
|
|
200
|
+
},
|
|
201
|
+
{
|
|
202
|
+
"type": "array",
|
|
203
|
+
"items": {
|
|
204
|
+
"oneOf": [
|
|
205
|
+
{
|
|
206
|
+
"description": "Captures the predefined set of caching and content headers from requests and responses.",
|
|
207
|
+
"type": "object",
|
|
208
|
+
"properties": {
|
|
209
|
+
"type": {
|
|
210
|
+
"const": "defaults"
|
|
211
|
+
},
|
|
212
|
+
"forURLs": {
|
|
213
|
+
"description": "URL patterns to scope this rule to. Supports hostname-only (`api.example.com`) or hostname + path prefix (`api.example.com/v2`). Omit (or use `[\"*\"]`) to match all URLs.",
|
|
214
|
+
"type": "array",
|
|
215
|
+
"items": {
|
|
216
|
+
"type": "string"
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
},
|
|
220
|
+
"required": [
|
|
221
|
+
"type"
|
|
222
|
+
],
|
|
223
|
+
"additionalProperties": false
|
|
224
|
+
},
|
|
225
|
+
{
|
|
226
|
+
"description": "Captures the given headers from both requests and responses.",
|
|
227
|
+
"type": "object",
|
|
228
|
+
"properties": {
|
|
229
|
+
"type": {
|
|
230
|
+
"const": "matchHeaders"
|
|
231
|
+
},
|
|
232
|
+
"headers": {
|
|
233
|
+
"description": "Header names to capture. Compared case-insensitively; the casing provided here is used in the reported attributes.",
|
|
234
|
+
"type": "array",
|
|
235
|
+
"items": {
|
|
236
|
+
"type": "string"
|
|
237
|
+
}
|
|
238
|
+
},
|
|
239
|
+
"forURLs": {
|
|
240
|
+
"description": "URL patterns to scope this rule to. Supports hostname-only (`api.example.com`) or hostname + path prefix (`api.example.com/v2`). Omit (or use `[\"*\"]`) to match all URLs.",
|
|
241
|
+
"type": "array",
|
|
242
|
+
"items": {
|
|
243
|
+
"type": "string"
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
},
|
|
247
|
+
"required": [
|
|
248
|
+
"type",
|
|
249
|
+
"headers"
|
|
250
|
+
],
|
|
251
|
+
"additionalProperties": false
|
|
252
|
+
},
|
|
253
|
+
{
|
|
254
|
+
"description": "Captures the given headers from requests only.",
|
|
255
|
+
"type": "object",
|
|
256
|
+
"properties": {
|
|
257
|
+
"type": {
|
|
258
|
+
"const": "matchRequestHeaders"
|
|
259
|
+
},
|
|
260
|
+
"headers": {
|
|
261
|
+
"description": "Header names to capture. Compared case-insensitively; the casing provided here is used in the reported attributes.",
|
|
262
|
+
"type": "array",
|
|
263
|
+
"items": {
|
|
264
|
+
"type": "string"
|
|
265
|
+
}
|
|
266
|
+
},
|
|
267
|
+
"forURLs": {
|
|
268
|
+
"description": "URL patterns to scope this rule to. Supports hostname-only (`api.example.com`) or hostname + path prefix (`api.example.com/v2`). Omit (or use `[\"*\"]`) to match all URLs.",
|
|
269
|
+
"type": "array",
|
|
270
|
+
"items": {
|
|
271
|
+
"type": "string"
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
},
|
|
275
|
+
"required": [
|
|
276
|
+
"type",
|
|
277
|
+
"headers"
|
|
278
|
+
],
|
|
279
|
+
"additionalProperties": false
|
|
280
|
+
},
|
|
281
|
+
{
|
|
282
|
+
"description": "Captures the given headers from responses only.",
|
|
283
|
+
"type": "object",
|
|
284
|
+
"properties": {
|
|
285
|
+
"type": {
|
|
286
|
+
"const": "matchResponseHeaders"
|
|
287
|
+
},
|
|
288
|
+
"headers": {
|
|
289
|
+
"description": "Header names to capture. Compared case-insensitively; the casing provided here is used in the reported attributes.",
|
|
290
|
+
"type": "array",
|
|
291
|
+
"items": {
|
|
292
|
+
"type": "string"
|
|
293
|
+
}
|
|
294
|
+
},
|
|
295
|
+
"forURLs": {
|
|
296
|
+
"description": "URL patterns to scope this rule to. Supports hostname-only (`api.example.com`) or hostname + path prefix (`api.example.com/v2`). Omit (or use `[\"*\"]`) to match all URLs.",
|
|
297
|
+
"type": "array",
|
|
298
|
+
"items": {
|
|
299
|
+
"type": "string"
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
},
|
|
303
|
+
"required": [
|
|
304
|
+
"type",
|
|
305
|
+
"headers"
|
|
306
|
+
],
|
|
307
|
+
"additionalProperties": false
|
|
308
|
+
}
|
|
309
|
+
]
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
]
|
|
313
|
+
},
|
|
195
314
|
"initialResourceThreshold": {
|
|
196
315
|
"description": "The amount of time after a view starts where a Resource should be considered when calculating Time to Network-Settled (TNS).",
|
|
197
316
|
"type": "number"
|
|
@@ -277,6 +396,27 @@
|
|
|
277
396
|
"customEndpoint": {
|
|
278
397
|
"description": "Target a custom server for RUM.",
|
|
279
398
|
"type": "string"
|
|
399
|
+
},
|
|
400
|
+
"unstable_timeseries": {
|
|
401
|
+
"description": "Experimental: configuration for memory and CPU timeseries collection. Presence of this object enables timeseries collection.",
|
|
402
|
+
"type": "object",
|
|
403
|
+
"properties": {
|
|
404
|
+
"collectTypes": {
|
|
405
|
+
"description": "The types of timeseries data to collect. Required. Use [\"cpu\", \"memory\"] to collect the default set.",
|
|
406
|
+
"type": "array",
|
|
407
|
+
"items": {
|
|
408
|
+
"description": "Type of timeseries data to collect.",
|
|
409
|
+
"type": "string",
|
|
410
|
+
"enum": [
|
|
411
|
+
"cpu",
|
|
412
|
+
"memory"
|
|
413
|
+
]
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
},
|
|
417
|
+
"required": [
|
|
418
|
+
"collectTypes"
|
|
419
|
+
]
|
|
280
420
|
}
|
|
281
421
|
},
|
|
282
422
|
"required": [
|
|
@@ -94,6 +94,9 @@ public class DdFlagsImplementation: NSObject {
|
|
|
94
94
|
case .networkError:
|
|
95
95
|
errorCode = "NETWORK_ERROR"
|
|
96
96
|
errorMessage = "A network error occurred while fetching feature flags for client '\(clientName)'."
|
|
97
|
+
case .initializationTimedOut:
|
|
98
|
+
errorCode = "INITIALIZATION_TIMED_OUT"
|
|
99
|
+
errorMessage = "The flags client '\(clientName)' timed out while initializing."
|
|
97
100
|
}
|
|
98
101
|
reject(errorCode, errorMessage, error as NSError)
|
|
99
102
|
}
|
|
@@ -110,6 +110,10 @@ public class DdSdkConfiguration: NSObject {
|
|
|
110
110
|
/// - trackMemoryWarnings: Whether memory warning events should be tracked.
|
|
111
111
|
/// - telemetrySampleRate: Sampling rate (0–100) for internal telemetry emitted via RUM.
|
|
112
112
|
/// - customEndpoint: A custom RUM intake endpoint to override the default Datadog intake.
|
|
113
|
+
/// - enableTimeseries: Experimental: enables collection of memory and CPU timeseries events.
|
|
114
|
+
/// - timeseriesCollectTypes: The types of timeseries data to collect ("cpu", "memory").
|
|
115
|
+
/// The native SDK requires an explicit set of types; if nil, this SDK
|
|
116
|
+
/// passes its default set (cpu and memory) on your behalf.
|
|
113
117
|
public class RumConfiguration: NSObject {
|
|
114
118
|
public var applicationId: String = ""
|
|
115
119
|
public var trackFrustrations: Bool? = true
|
|
@@ -131,6 +135,8 @@ public class RumConfiguration: NSObject {
|
|
|
131
135
|
public var trackMemoryWarnings: Bool? = nil
|
|
132
136
|
public var telemetrySampleRate: Double? = nil
|
|
133
137
|
public var customEndpoint: String? = nil
|
|
138
|
+
public var enableTimeseries: Bool? = nil
|
|
139
|
+
public var timeseriesCollectTypes: [String]? = nil
|
|
134
140
|
|
|
135
141
|
init(
|
|
136
142
|
applicationId: String,
|
|
@@ -152,7 +158,9 @@ public class RumConfiguration: NSObject {
|
|
|
152
158
|
initialResourceThreshold: Double?,
|
|
153
159
|
trackMemoryWarnings: Bool?,
|
|
154
160
|
telemetrySampleRate: Double?,
|
|
155
|
-
customEndpoint: String
|
|
161
|
+
customEndpoint: String?,
|
|
162
|
+
enableTimeseries: Bool? = nil,
|
|
163
|
+
timeseriesCollectTypes: [String]? = nil
|
|
156
164
|
) {
|
|
157
165
|
self.applicationId = applicationId
|
|
158
166
|
self.trackFrustrations = trackFrustrations
|
|
@@ -174,6 +182,8 @@ public class RumConfiguration: NSObject {
|
|
|
174
182
|
self.trackMemoryWarnings = trackMemoryWarnings
|
|
175
183
|
self.telemetrySampleRate = telemetrySampleRate
|
|
176
184
|
self.customEndpoint = customEndpoint
|
|
185
|
+
self.enableTimeseries = enableTimeseries
|
|
186
|
+
self.timeseriesCollectTypes = timeseriesCollectTypes
|
|
177
187
|
}
|
|
178
188
|
|
|
179
189
|
}
|
|
@@ -8,7 +8,7 @@ import DatadogCore
|
|
|
8
8
|
import DatadogCrashReporting
|
|
9
9
|
import DatadogInternal
|
|
10
10
|
import DatadogLogs
|
|
11
|
-
import DatadogRUM
|
|
11
|
+
@_spi(Experimental) import DatadogRUM
|
|
12
12
|
import DatadogTrace
|
|
13
13
|
import Foundation
|
|
14
14
|
import React
|
|
@@ -216,7 +216,7 @@ public class DdSdkNativeInitialization: NSObject {
|
|
|
216
216
|
threshold: initialThreshold)
|
|
217
217
|
}
|
|
218
218
|
|
|
219
|
-
|
|
219
|
+
var configuration = RUM.Configuration(
|
|
220
220
|
applicationID: rumConfig.applicationId,
|
|
221
221
|
sessionSampleRate: Float(
|
|
222
222
|
rumConfig.sessionSampleRate ?? DefaultConfiguration.sessionSamplingRate),
|
|
@@ -256,6 +256,28 @@ public class DdSdkNativeInitialization: NSObject {
|
|
|
256
256
|
telemetrySampleRate: Float(
|
|
257
257
|
rumConfig.telemetrySampleRate ?? DefaultConfiguration.telemetrySampleRate)
|
|
258
258
|
)
|
|
259
|
+
|
|
260
|
+
if rumConfig.enableTimeseries ?? false {
|
|
261
|
+
if let timeseriesCollectTypes = rumConfig.timeseriesCollectTypes {
|
|
262
|
+
let collectTypes: Set<RUM.Configuration.TimeseriesType> = Set(
|
|
263
|
+
timeseriesCollectTypes.compactMap {
|
|
264
|
+
switch $0.lowercased() {
|
|
265
|
+
case "cpu":
|
|
266
|
+
return .cpu
|
|
267
|
+
case "memory":
|
|
268
|
+
return .memory
|
|
269
|
+
default:
|
|
270
|
+
return nil
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
)
|
|
274
|
+
configuration.timeseries = RUM.Configuration.Timeseries(collectTypes: collectTypes)
|
|
275
|
+
} else {
|
|
276
|
+
configuration.timeseries = .default
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
return configuration
|
|
259
281
|
}
|
|
260
282
|
|
|
261
283
|
func buildLogsConfiguration(configuration: DdSdkConfiguration) -> Logs.Configuration {
|
|
@@ -74,6 +74,10 @@ extension NSDictionary {
|
|
|
74
74
|
let telemetrySampleRate = rumDict["telemetrySampleRate"] as? Double
|
|
75
75
|
let customEndpoint = rumDict["customEndpoint"] as? String
|
|
76
76
|
|
|
77
|
+
let timeseriesDict = rumDict["unstable_timeseries"] as? NSDictionary
|
|
78
|
+
let enableTimeseries = timeseriesDict != nil
|
|
79
|
+
let timeseriesCollectTypes = timeseriesDict?["collectTypes"] as? [String]
|
|
80
|
+
|
|
77
81
|
rumConfiguration = RumConfiguration(
|
|
78
82
|
applicationId: applicationId,
|
|
79
83
|
trackFrustrations: trackFrustrations ?? DefaultConfiguration.trackFrustrations,
|
|
@@ -103,7 +107,9 @@ extension NSDictionary {
|
|
|
103
107
|
?? DefaultConfiguration.trackMemoryWarnings,
|
|
104
108
|
telemetrySampleRate: telemetrySampleRate
|
|
105
109
|
?? DefaultConfiguration.telemetrySampleRate,
|
|
106
|
-
customEndpoint: customEndpoint
|
|
110
|
+
customEndpoint: customEndpoint,
|
|
111
|
+
enableTimeseries: enableTimeseries,
|
|
112
|
+
timeseriesCollectTypes: timeseriesCollectTypes
|
|
107
113
|
)
|
|
108
114
|
} else {
|
|
109
115
|
rumConfiguration = nil
|
|
@@ -362,6 +368,10 @@ extension Dictionary where Key == String, Value == AnyObject {
|
|
|
362
368
|
let firstPartyHosts =
|
|
363
369
|
firstPartyHostsArray?.asFirstPartyHosts() ?? DefaultConfiguration.firstPartyHosts
|
|
364
370
|
|
|
371
|
+
let timeseriesDict = rum["unstable_timeseries"] as? [String: Any?]
|
|
372
|
+
let enableTimeseries = timeseriesDict != nil
|
|
373
|
+
let timeseriesCollectTypes = timeseriesDict?["collectTypes"] as? [String]
|
|
374
|
+
|
|
365
375
|
rumConfiguration = RumConfiguration(
|
|
366
376
|
applicationId: applicationId,
|
|
367
377
|
trackFrustrations: rum["trackFrustrations"] as? Bool
|
|
@@ -396,7 +406,9 @@ extension Dictionary where Key == String, Value == AnyObject {
|
|
|
396
406
|
?? DefaultConfiguration.trackMemoryWarnings,
|
|
397
407
|
telemetrySampleRate: (rum["telemetrySampleRate"] as? Double)
|
|
398
408
|
?? DefaultConfiguration.telemetrySampleRate,
|
|
399
|
-
customEndpoint: rum["customEndpoint"] as? String
|
|
409
|
+
customEndpoint: rum["customEndpoint"] as? String,
|
|
410
|
+
enableTimeseries: enableTimeseries,
|
|
411
|
+
timeseriesCollectTypes: timeseriesCollectTypes
|
|
400
412
|
)
|
|
401
413
|
} else {
|
|
402
414
|
rumConfiguration = nil
|
|
@@ -337,6 +337,7 @@ class DdSdkReactNative {
|
|
|
337
337
|
const trackErrors = configuration.rumConfiguration?.trackErrors || _RumConfiguration.RUM_DEFAULTS.trackErrors;
|
|
338
338
|
const actionNameAttribute = configuration.rumConfiguration?.actionNameAttribute;
|
|
339
339
|
const resourceTraceSampleRate = configuration.rumConfiguration?.resourceTraceSampleRate || _RumConfiguration.RUM_DEFAULTS.resourceTraceSampleRate;
|
|
340
|
+
const headerCaptureRules = configuration.rumConfiguration?.headerCaptureRules;
|
|
340
341
|
const logEventMapper = configuration.logsConfiguration?.logEventMapper;
|
|
341
342
|
const errorEventMapper = configuration.rumConfiguration?.errorEventMapper;
|
|
342
343
|
const resourceEventMapper = configuration.rumConfiguration?.resourceEventMapper;
|
|
@@ -358,11 +359,15 @@ class DdSdkReactNative {
|
|
|
358
359
|
useAccessibilityLabel: configuration.rumConfiguration?.useAccessibilityLabel
|
|
359
360
|
});
|
|
360
361
|
}
|
|
362
|
+
if (!trackResources && headerCaptureRules != null) {
|
|
363
|
+
_InternalLog.InternalLog.log('headerCaptureRules is set but trackResources is false. Header capture will be disabled.', _SdkVerbosity.SdkVerbosity.WARN);
|
|
364
|
+
}
|
|
361
365
|
if (trackResources) {
|
|
362
366
|
_DdRumResourceTracking.DdRumResourceTracking.startTracking({
|
|
363
367
|
resourceTraceSampleRate,
|
|
364
368
|
firstPartyHosts,
|
|
365
|
-
trackFetchResources
|
|
369
|
+
trackFetchResources,
|
|
370
|
+
headerCaptureRules
|
|
366
371
|
});
|
|
367
372
|
}
|
|
368
373
|
if (trackErrors) {
|