@datadog/mobile-react-native 1.2.1 → 1.3.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/android/src/main/kotlin/com/datadog/reactnative/DdSdk.kt +31 -1
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +222 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/GenericAssert.kt +6 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/ActionEventForgeryFactory.kt +106 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/BaseConfigurator.kt +2 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/ResourceEventForgeryFactory.kt +116 -0
- package/ios/Sources/Attributes.swift +14 -0
- package/ios/Sources/DdSdk.swift +18 -0
- package/lib/commonjs/DdSdkReactNative.js +40 -8
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/DdSdkReactNativeConfiguration.js +42 -2
- package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
- package/lib/commonjs/foundation.js +2 -139
- package/lib/commonjs/foundation.js.map +1 -1
- package/lib/commonjs/index.js +18 -14
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/logs/DdLogs.js +71 -0
- package/lib/commonjs/logs/DdLogs.js.map +1 -0
- package/lib/commonjs/logs/eventMapper.js +39 -0
- package/lib/commonjs/logs/eventMapper.js.map +1 -0
- package/lib/commonjs/logs/types.js +2 -0
- package/lib/commonjs/{rum/instrumentation/EventsInterceptor.js.map → logs/types.js.map} +0 -0
- package/lib/commonjs/nativeModulesTypes.js.map +1 -1
- package/lib/commonjs/rum/DdRum.js +234 -0
- package/lib/commonjs/rum/DdRum.js.map +1 -0
- package/lib/commonjs/rum/eventMappers/actionEventMapper.js +36 -0
- package/lib/commonjs/rum/eventMappers/actionEventMapper.js.map +1 -0
- package/lib/commonjs/rum/eventMappers/errorEventMapper.js +32 -0
- package/lib/commonjs/rum/eventMappers/errorEventMapper.js.map +1 -0
- package/lib/commonjs/rum/eventMappers/resourceEventMapper.js +38 -0
- package/lib/commonjs/rum/eventMappers/resourceEventMapper.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/DdRumErrorTracking.js +4 -4
- package/lib/commonjs/rum/instrumentation/DdRumErrorTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/{DdEventsInterceptor.js → interactionTracking/DdEventsInterceptor.js} +6 -6
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/{DdRumUserInteractionTracking.js → interactionTracking/DdRumUserInteractionTracking.js} +4 -4
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -0
- package/lib/commonjs/rum/instrumentation/{EventsInterceptor.js → interactionTracking/EventsInterceptor.js} +0 -0
- package/lib/{module/rum/instrumentation → commonjs/rum/instrumentation/interactionTracking}/EventsInterceptor.js.map +0 -0
- package/lib/commonjs/rum/instrumentation/{NoOpEventsInterceptor.js → interactionTracking/NoOpEventsInterceptor.js} +0 -0
- package/lib/commonjs/rum/instrumentation/{NoOpEventsInterceptor.js.map → interactionTracking/NoOpEventsInterceptor.js.map} +0 -0
- package/lib/commonjs/rum/instrumentation/{ShallowObjectEqualityChecker.js → interactionTracking/ShallowObjectEqualityChecker.js} +0 -0
- package/lib/commonjs/rum/instrumentation/{ShallowObjectEqualityChecker.js.map → interactionTracking/ShallowObjectEqualityChecker.js.map} +0 -0
- package/lib/commonjs/rum/instrumentation/{getJsxRuntime.js → interactionTracking/getJsxRuntime.js} +0 -0
- package/lib/commonjs/rum/instrumentation/{getJsxRuntime.js.map → interactionTracking/getJsxRuntime.js.map} +0 -0
- package/lib/commonjs/rum/instrumentation/resourceTracking/implementation/DatadogRumResource/ResourceReporter.js +3 -3
- package/lib/commonjs/rum/instrumentation/resourceTracking/implementation/DatadogRumResource/ResourceReporter.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/implementation/XHRProxy.js +2 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/implementation/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/types.js +42 -0
- package/lib/commonjs/rum/types.js.map +1 -0
- package/lib/commonjs/sdk/AttributesSingleton/AttributesSingleton.js +45 -0
- package/lib/commonjs/sdk/AttributesSingleton/AttributesSingleton.js.map +1 -0
- package/lib/commonjs/sdk/AttributesSingleton/types.js +2 -0
- package/lib/commonjs/sdk/AttributesSingleton/types.js.map +1 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/BoundedBuffer.js +4 -4
- package/lib/commonjs/sdk/DatadogProvider/Buffer/BoundedBuffer.js.map +1 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/BufferSingleton.js +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/BufferSingleton.js.map +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/DatadogBuffer.js +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/DatadogBuffer.js.map +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/PassThroughBuffer.js +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/PassThroughBuffer.js.map +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/bufferNativeCall.js +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/Buffer/bufferNativeCall.js.map +0 -0
- package/lib/commonjs/{DatadogProvider → sdk/DatadogProvider}/DatadogProvider.js +4 -4
- package/lib/commonjs/sdk/DatadogProvider/DatadogProvider.js.map +1 -0
- package/lib/commonjs/sdk/EventMappers/EventMapper.js +85 -0
- package/lib/commonjs/sdk/EventMappers/EventMapper.js.map +1 -0
- package/lib/commonjs/sdk/EventMappers/utils/deepClone.js +98 -0
- package/lib/commonjs/sdk/EventMappers/utils/deepClone.js.map +1 -0
- package/lib/commonjs/sdk/UserInfoSingleton/UserInfoSingleton.js +43 -0
- package/lib/commonjs/sdk/UserInfoSingleton/UserInfoSingleton.js.map +1 -0
- package/lib/commonjs/sdk/UserInfoSingleton/types.js +2 -0
- package/lib/commonjs/sdk/UserInfoSingleton/types.js.map +1 -0
- package/lib/commonjs/types.js +1 -26
- package/lib/commonjs/types.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/commonjs/version.js.map +1 -1
- package/lib/module/DdSdkReactNative.js +33 -7
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/DdSdkReactNativeConfiguration.js +42 -2
- package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
- package/lib/module/foundation.js +2 -124
- package/lib/module/foundation.js.map +1 -1
- package/lib/module/index.js +5 -3
- package/lib/module/index.js.map +1 -1
- package/lib/module/logs/DdLogs.js +64 -0
- package/lib/module/logs/DdLogs.js.map +1 -0
- package/lib/module/logs/eventMapper.js +20 -0
- package/lib/module/logs/eventMapper.js.map +1 -0
- package/lib/module/logs/types.js +2 -0
- package/lib/module/logs/types.js.map +1 -0
- package/lib/module/nativeModulesTypes.js.map +1 -1
- package/lib/module/rum/DdRum.js +212 -0
- package/lib/module/rum/DdRum.js.map +1 -0
- package/lib/module/rum/eventMappers/actionEventMapper.js +26 -0
- package/lib/module/rum/eventMappers/actionEventMapper.js.map +1 -0
- package/lib/module/rum/eventMappers/errorEventMapper.js +22 -0
- package/lib/module/rum/eventMappers/errorEventMapper.js.map +1 -0
- package/lib/module/rum/eventMappers/resourceEventMapper.js +28 -0
- package/lib/module/rum/eventMappers/resourceEventMapper.js.map +1 -0
- package/lib/module/rum/instrumentation/DdRumErrorTracking.js +2 -2
- package/lib/module/rum/instrumentation/DdRumErrorTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/{DdEventsInterceptor.js → interactionTracking/DdEventsInterceptor.js} +6 -6
- package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -0
- package/lib/module/rum/instrumentation/{DdRumUserInteractionTracking.js → interactionTracking/DdRumUserInteractionTracking.js} +4 -4
- package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -0
- package/lib/module/rum/instrumentation/{EventsInterceptor.js → interactionTracking/EventsInterceptor.js} +0 -0
- package/lib/module/rum/instrumentation/interactionTracking/EventsInterceptor.js.map +1 -0
- package/lib/module/rum/instrumentation/{NoOpEventsInterceptor.js → interactionTracking/NoOpEventsInterceptor.js} +0 -0
- package/lib/module/rum/instrumentation/{NoOpEventsInterceptor.js.map → interactionTracking/NoOpEventsInterceptor.js.map} +0 -0
- package/lib/module/rum/instrumentation/{ShallowObjectEqualityChecker.js → interactionTracking/ShallowObjectEqualityChecker.js} +0 -0
- package/lib/module/rum/instrumentation/{ShallowObjectEqualityChecker.js.map → interactionTracking/ShallowObjectEqualityChecker.js.map} +0 -0
- package/lib/module/rum/instrumentation/{getJsxRuntime.js → interactionTracking/getJsxRuntime.js} +0 -0
- package/lib/module/rum/instrumentation/{getJsxRuntime.js.map → interactionTracking/getJsxRuntime.js.map} +0 -0
- package/lib/module/rum/instrumentation/resourceTracking/implementation/DatadogRumResource/ResourceReporter.js +2 -2
- package/lib/module/rum/instrumentation/resourceTracking/implementation/DatadogRumResource/ResourceReporter.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/implementation/XHRProxy.js +2 -1
- package/lib/module/rum/instrumentation/resourceTracking/implementation/XHRProxy.js.map +1 -1
- package/lib/module/rum/types.js +33 -0
- package/lib/module/rum/types.js.map +1 -0
- package/lib/module/sdk/AttributesSingleton/AttributesSingleton.js +36 -0
- package/lib/module/sdk/AttributesSingleton/AttributesSingleton.js.map +1 -0
- package/lib/module/sdk/AttributesSingleton/types.js +2 -0
- package/lib/module/sdk/AttributesSingleton/types.js.map +1 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/BoundedBuffer.js +4 -4
- package/lib/module/sdk/DatadogProvider/Buffer/BoundedBuffer.js.map +1 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/BufferSingleton.js +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/BufferSingleton.js.map +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/DatadogBuffer.js +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/DatadogBuffer.js.map +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/PassThroughBuffer.js +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/PassThroughBuffer.js.map +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/bufferNativeCall.js +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/Buffer/bufferNativeCall.js.map +0 -0
- package/lib/module/{DatadogProvider → sdk/DatadogProvider}/DatadogProvider.js +4 -4
- package/lib/module/sdk/DatadogProvider/DatadogProvider.js.map +1 -0
- package/lib/module/sdk/EventMappers/EventMapper.js +72 -0
- package/lib/module/sdk/EventMappers/EventMapper.js.map +1 -0
- package/lib/module/sdk/EventMappers/utils/deepClone.js +89 -0
- package/lib/module/sdk/EventMappers/utils/deepClone.js.map +1 -0
- package/lib/module/sdk/UserInfoSingleton/UserInfoSingleton.js +34 -0
- package/lib/module/sdk/UserInfoSingleton/UserInfoSingleton.js.map +1 -0
- package/lib/module/sdk/UserInfoSingleton/types.js +2 -0
- package/lib/module/sdk/UserInfoSingleton/types.js.map +1 -0
- package/lib/module/types.js +0 -23
- package/lib/module/types.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/module/version.js.map +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts +7 -3
- package/lib/typescript/DdSdkReactNativeConfiguration.d.ts +22 -0
- package/lib/typescript/foundation.d.ts +2 -4
- package/lib/typescript/index.d.ts +5 -3
- package/lib/typescript/logs/DdLogs.d.ts +14 -0
- package/lib/typescript/logs/eventMapper.d.ts +11 -0
- package/lib/typescript/logs/types.d.ts +54 -0
- package/lib/typescript/nativeModulesTypes.d.ts +1 -1
- package/lib/typescript/rum/DdRum.d.ts +36 -0
- package/lib/typescript/rum/eventMappers/actionEventMapper.d.ts +21 -0
- package/lib/typescript/rum/eventMappers/errorEventMapper.d.ts +21 -0
- package/lib/typescript/rum/eventMappers/resourceEventMapper.d.ts +25 -0
- package/lib/typescript/rum/instrumentation/{DdEventsInterceptor.d.ts → interactionTracking/DdEventsInterceptor.d.ts} +0 -0
- package/lib/typescript/rum/instrumentation/{DdRumUserInteractionTracking.d.ts → interactionTracking/DdRumUserInteractionTracking.d.ts} +0 -0
- package/lib/typescript/rum/instrumentation/{EventsInterceptor.d.ts → interactionTracking/EventsInterceptor.d.ts} +0 -0
- package/lib/typescript/rum/instrumentation/{NoOpEventsInterceptor.d.ts → interactionTracking/NoOpEventsInterceptor.d.ts} +0 -0
- package/lib/typescript/rum/instrumentation/{ShallowObjectEqualityChecker.d.ts → interactionTracking/ShallowObjectEqualityChecker.d.ts} +0 -0
- package/lib/typescript/rum/instrumentation/{getJsxRuntime.d.ts → interactionTracking/getJsxRuntime.d.ts} +0 -0
- package/lib/typescript/rum/instrumentation/resourceTracking/domain/interfaces/RumResource.d.ts +3 -1
- package/lib/typescript/rum/types.d.ts +110 -0
- package/lib/typescript/sdk/AttributesSingleton/AttributesSingleton.d.ts +12 -0
- package/lib/typescript/sdk/AttributesSingleton/types.d.ts +3 -0
- package/lib/typescript/{DatadogProvider → sdk/DatadogProvider}/Buffer/BoundedBuffer.d.ts +0 -0
- package/lib/typescript/{DatadogProvider → sdk/DatadogProvider}/Buffer/BufferSingleton.d.ts +0 -0
- package/lib/typescript/{DatadogProvider → sdk/DatadogProvider}/Buffer/DatadogBuffer.d.ts +0 -0
- package/lib/typescript/{DatadogProvider → sdk/DatadogProvider}/Buffer/PassThroughBuffer.d.ts +0 -0
- package/lib/typescript/{DatadogProvider → sdk/DatadogProvider}/Buffer/bufferNativeCall.d.ts +0 -0
- package/lib/typescript/{DatadogProvider → sdk/DatadogProvider}/DatadogProvider.d.ts +2 -2
- package/lib/typescript/sdk/EventMappers/EventMapper.d.ts +24 -0
- package/lib/typescript/sdk/EventMappers/utils/deepClone.d.ts +10 -0
- package/lib/typescript/sdk/UserInfoSingleton/UserInfoSingleton.d.ts +12 -0
- package/lib/typescript/sdk/UserInfoSingleton/types.d.ts +6 -0
- package/lib/typescript/types.d.ts +0 -139
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/scripts/replace-react-require.js +3 -2
- package/src/DdSdkReactNative.tsx +41 -7
- package/src/DdSdkReactNativeConfiguration.tsx +83 -3
- package/src/__tests__/DdSdkReactNative.test.tsx +244 -13
- package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +22 -1
- package/src/__tests__/{longTasksUtils.ts → longTasksUtils.test.ts} +0 -0
- package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +4 -3
- package/src/__tests__/rum/instrumentation/DdRumErrorTracking.test.tsx +1 -1
- package/src/__tests__/rum/instrumentation/DdRumUserInteractionTracking.test.tsx +5 -3
- package/src/__tests__/rum/instrumentation/ShallowObjectEqualityChecker.test.ts +1 -1
- package/src/foundation.tsx +4 -114
- package/src/index.tsx +5 -3
- package/src/logs/DdLogs.ts +67 -0
- package/src/logs/__tests__/DdLogs.test.ts +51 -0
- package/src/logs/__tests__/eventMapper.test.ts +53 -0
- package/src/logs/eventMapper.ts +43 -0
- package/src/logs/types.ts +70 -0
- package/src/nativeModulesTypes.ts +1 -1
- package/src/rum/DdRum.ts +387 -0
- package/src/rum/__tests__/DdRum.test.ts +386 -0
- package/src/rum/eventMappers/actionEventMapper.ts +66 -0
- package/src/rum/eventMappers/errorEventMapper.ts +57 -0
- package/src/rum/eventMappers/resourceEventMapper.ts +74 -0
- package/src/rum/instrumentation/DdRumErrorTracking.tsx +2 -2
- package/src/rum/instrumentation/{DdEventsInterceptor.tsx → interactionTracking/DdEventsInterceptor.tsx} +14 -6
- package/src/rum/instrumentation/{DdRumUserInteractionTracking.tsx → interactionTracking/DdRumUserInteractionTracking.tsx} +4 -4
- package/src/rum/instrumentation/{EventsInterceptor.tsx → interactionTracking/EventsInterceptor.tsx} +0 -0
- package/src/rum/instrumentation/{NoOpEventsInterceptor.tsx → interactionTracking/NoOpEventsInterceptor.tsx} +0 -0
- package/src/rum/instrumentation/{ShallowObjectEqualityChecker.ts → interactionTracking/ShallowObjectEqualityChecker.ts} +0 -0
- package/src/rum/instrumentation/{getJsxRuntime.ts → interactionTracking/getJsxRuntime.ts} +0 -0
- package/src/rum/instrumentation/resourceTracking/__tests__/DdRumResourceTracking.test.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/domain/interfaces/RumResource.ts +2 -1
- package/src/rum/instrumentation/resourceTracking/implementation/DatadogRumResource/ResourceReporter.ts +3 -2
- package/src/rum/instrumentation/resourceTracking/implementation/DatadogRumResource/__tests__/ResourceReporter.test.ts +1 -1
- package/src/rum/instrumentation/resourceTracking/implementation/XHRProxy.ts +2 -1
- package/src/rum/instrumentation/resourceTracking/implementation/__tests__/XHRProxy.test.ts +83 -39
- package/src/rum/types.ts +182 -0
- package/src/sdk/AttributesSingleton/AttributesSingleton.ts +34 -0
- package/src/sdk/AttributesSingleton/__tests__/AttributesSingleton.test.ts +44 -0
- package/src/sdk/AttributesSingleton/types.ts +9 -0
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/BoundedBuffer.ts +4 -4
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/BufferSingleton.ts +0 -0
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/DatadogBuffer.ts +0 -0
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/PassThroughBuffer.ts +0 -0
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/__tests__/BoundedBuffer.test.ts +2 -2
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/__tests__/BufferSingleton.test.ts +0 -0
- package/src/{DatadogProvider → sdk/DatadogProvider}/Buffer/bufferNativeCall.ts +0 -0
- package/src/{DatadogProvider → sdk/DatadogProvider}/DatadogProvider.tsx +5 -5
- package/src/{DatadogProvider → sdk/DatadogProvider}/__tests__/__utils__/renderWithProvider.tsx +2 -2
- package/src/{DatadogProvider → sdk/DatadogProvider}/__tests__/initialization.test.tsx +8 -6
- package/src/{DatadogProvider → sdk/DatadogProvider}/__tests__/initializationModes.test.tsx +5 -5
- package/src/sdk/EventMappers/EventMapper.ts +94 -0
- package/src/sdk/EventMappers/__tests__/EventMapper.test.ts +50 -0
- package/src/sdk/EventMappers/utils/__tests__/deepClone.test.ts +79 -0
- package/src/sdk/EventMappers/utils/deepClone.ts +86 -0
- package/src/sdk/UserInfoSingleton/UserInfoSingleton.ts +31 -0
- package/src/sdk/UserInfoSingleton/__tests__/UserInfoSingleton.test.ts +29 -0
- package/src/sdk/UserInfoSingleton/types.ts +12 -0
- package/src/types.tsx +0 -210
- package/src/version.ts +1 -1
- package/lib/commonjs/DatadogProvider/Buffer/BoundedBuffer.js.map +0 -1
- package/lib/commonjs/DatadogProvider/DatadogProvider.js.map +0 -1
- package/lib/commonjs/rum/instrumentation/DdEventsInterceptor.js.map +0 -1
- package/lib/commonjs/rum/instrumentation/DdRumUserInteractionTracking.js.map +0 -1
- package/lib/module/DatadogProvider/Buffer/BoundedBuffer.js.map +0 -1
- package/lib/module/DatadogProvider/DatadogProvider.js.map +0 -1
- package/lib/module/rum/instrumentation/DdEventsInterceptor.js.map +0 -1
- package/lib/module/rum/instrumentation/DdRumUserInteractionTracking.js.map +0 -1
- package/src/__tests__/DdRumWrapper.test.tsx +0 -74
- package/src/__tests__/foundation.test.ts +0 -88
|
@@ -20,6 +20,8 @@ import com.datadog.android.privacy.TrackingConsent
|
|
|
20
20
|
import com.datadog.android.rum.GlobalRum
|
|
21
21
|
import com.datadog.android.rum.RumMonitor
|
|
22
22
|
import com.datadog.android.rum.RumPerformanceMetric
|
|
23
|
+
import com.datadog.android.rum.model.ActionEvent
|
|
24
|
+
import com.datadog.android.rum.model.ResourceEvent
|
|
23
25
|
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
|
|
24
26
|
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
|
|
25
27
|
import com.facebook.react.bridge.Promise
|
|
@@ -165,7 +167,7 @@ class DdSdk(
|
|
|
165
167
|
} ?: DEFAULT_APP_VERSION
|
|
166
168
|
}
|
|
167
169
|
|
|
168
|
-
@Suppress("ComplexMethod", "UnsafeCallOnNullableType")
|
|
170
|
+
@Suppress("ComplexMethod", "LongMethod", "UnsafeCallOnNullableType")
|
|
169
171
|
private fun buildConfiguration(configuration: DdSdkConfiguration): Configuration {
|
|
170
172
|
val additionalConfig = configuration.additionalConfig?.toMutableMap()
|
|
171
173
|
|
|
@@ -211,6 +213,13 @@ class DdSdk(
|
|
|
211
213
|
configBuilder.useViewTrackingStrategy(NoOpViewTrackingStrategy)
|
|
212
214
|
}
|
|
213
215
|
|
|
216
|
+
val interactionTracking = configuration.additionalConfig?.get(
|
|
217
|
+
DD_NATIVE_INTERACTION_TRACKING
|
|
218
|
+
) as? Boolean
|
|
219
|
+
if (interactionTracking == false) {
|
|
220
|
+
configBuilder.disableInteractionTracking()
|
|
221
|
+
}
|
|
222
|
+
|
|
214
223
|
val firstPartyHosts =
|
|
215
224
|
(configuration.additionalConfig?.get(DD_FIRST_PARTY_HOSTS) as? List<String>)
|
|
216
225
|
if (firstPartyHosts != null) {
|
|
@@ -221,6 +230,24 @@ class DdSdk(
|
|
|
221
230
|
configBuilder.setProxy(proxy, authenticator)
|
|
222
231
|
}
|
|
223
232
|
|
|
233
|
+
configBuilder.setRumResourceEventMapper(object : EventMapper<ResourceEvent> {
|
|
234
|
+
override fun map(event: ResourceEvent): ResourceEvent? {
|
|
235
|
+
if (event.context?.additionalProperties?.containsKey(DD_DROP_RESOURCE) == true) {
|
|
236
|
+
return null
|
|
237
|
+
}
|
|
238
|
+
return event
|
|
239
|
+
}
|
|
240
|
+
})
|
|
241
|
+
|
|
242
|
+
configBuilder.setRumActionEventMapper(object : EventMapper<ActionEvent> {
|
|
243
|
+
override fun map(event: ActionEvent): ActionEvent? {
|
|
244
|
+
if (event.context?.additionalProperties?.containsKey(DD_DROP_ACTION) == true) {
|
|
245
|
+
return null
|
|
246
|
+
}
|
|
247
|
+
return event
|
|
248
|
+
}
|
|
249
|
+
})
|
|
250
|
+
|
|
224
251
|
_InternalProxy.setTelemetryConfigurationEventMapper(
|
|
225
252
|
configBuilder,
|
|
226
253
|
object : EventMapper<TelemetryConfigurationEvent> {
|
|
@@ -399,6 +426,7 @@ class DdSdk(
|
|
|
399
426
|
companion object {
|
|
400
427
|
internal const val DEFAULT_APP_VERSION = "?"
|
|
401
428
|
internal const val DD_NATIVE_VIEW_TRACKING = "_dd.native_view_tracking"
|
|
429
|
+
internal const val DD_NATIVE_INTERACTION_TRACKING = "_dd.native_interaction_tracking"
|
|
402
430
|
internal const val DD_SDK_VERBOSITY = "_dd.sdk_verbosity"
|
|
403
431
|
internal const val DD_SERVICE_NAME = "_dd.service_name"
|
|
404
432
|
internal const val DD_FIRST_PARTY_HOSTS = "_dd.first_party_hosts"
|
|
@@ -409,6 +437,8 @@ class DdSdk(
|
|
|
409
437
|
internal const val DD_PROXY_TYPE = "_dd.proxy.type"
|
|
410
438
|
internal const val DD_PROXY_USERNAME = "_dd.proxy.username"
|
|
411
439
|
internal const val DD_PROXY_PASSWORD = "_dd.proxy.password"
|
|
440
|
+
internal const val DD_DROP_RESOURCE = "_dd.resource.drop_resource"
|
|
441
|
+
internal const val DD_DROP_ACTION = "_dd.action.drop_action"
|
|
412
442
|
internal const val MONITOR_JS_ERROR_MESSAGE = "Error monitoring JS refresh rate"
|
|
413
443
|
internal const val PACKAGE_INFO_NOT_FOUND_ERROR_MESSAGE = "Error getting package info"
|
|
414
444
|
}
|
|
@@ -22,6 +22,8 @@ import com.datadog.android.rum.GlobalRum
|
|
|
22
22
|
import com.datadog.android.rum.RumMonitor
|
|
23
23
|
import com.datadog.android.rum.RumPerformanceMetric
|
|
24
24
|
import com.datadog.android.rum._RumInternalProxy
|
|
25
|
+
import com.datadog.android.rum.model.ActionEvent
|
|
26
|
+
import com.datadog.android.rum.model.ResourceEvent
|
|
25
27
|
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
|
|
26
28
|
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
|
|
27
29
|
import com.datadog.tools.unit.GenericAssert.Companion.assertThat
|
|
@@ -1037,6 +1039,112 @@ internal class DdSdkTest {
|
|
|
1037
1039
|
}
|
|
1038
1040
|
}
|
|
1039
1041
|
|
|
1042
|
+
@Test
|
|
1043
|
+
fun `𝕄 initialize native SDK 𝕎 initialize() {no user action tracking}`(
|
|
1044
|
+
@Forgery configuration: DdSdkConfiguration
|
|
1045
|
+
) {
|
|
1046
|
+
// Given
|
|
1047
|
+
val bridgeConfiguration = configuration.copy(
|
|
1048
|
+
additionalConfig = mapOf(
|
|
1049
|
+
DdSdk.DD_NATIVE_INTERACTION_TRACKING to false
|
|
1050
|
+
)
|
|
1051
|
+
)
|
|
1052
|
+
val credentialCaptor = argumentCaptor<Credentials>()
|
|
1053
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1054
|
+
|
|
1055
|
+
// When
|
|
1056
|
+
testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1057
|
+
|
|
1058
|
+
// Then
|
|
1059
|
+
inOrder(mockDatadog) {
|
|
1060
|
+
verify(mockDatadog).initialize(
|
|
1061
|
+
same(mockContext),
|
|
1062
|
+
credentialCaptor.capture(),
|
|
1063
|
+
configCaptor.capture(),
|
|
1064
|
+
eq(configuration.trackingConsent.asTrackingConsent())
|
|
1065
|
+
)
|
|
1066
|
+
verify(mockDatadog).registerRumMonitor(any())
|
|
1067
|
+
}
|
|
1068
|
+
assertThat(configCaptor.firstValue)
|
|
1069
|
+
.hasField("rumConfig") {
|
|
1070
|
+
it.hasFieldWithClass(
|
|
1071
|
+
"userActionTrackingStrategy",
|
|
1072
|
+
"com.datadog.android.rum.internal.tracking.NoOpUserActionTrackingStrategy"
|
|
1073
|
+
)
|
|
1074
|
+
}
|
|
1075
|
+
}
|
|
1076
|
+
|
|
1077
|
+
@Test
|
|
1078
|
+
fun `𝕄 initialize native SDK 𝕎 initialize() {with user action tracking}`(
|
|
1079
|
+
@Forgery configuration: DdSdkConfiguration
|
|
1080
|
+
) {
|
|
1081
|
+
// Given
|
|
1082
|
+
val bridgeConfiguration = configuration.copy(
|
|
1083
|
+
additionalConfig = mapOf(
|
|
1084
|
+
DdSdk.DD_NATIVE_INTERACTION_TRACKING to true
|
|
1085
|
+
)
|
|
1086
|
+
)
|
|
1087
|
+
val credentialCaptor = argumentCaptor<Credentials>()
|
|
1088
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1089
|
+
|
|
1090
|
+
// When
|
|
1091
|
+
testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1092
|
+
|
|
1093
|
+
// Then
|
|
1094
|
+
inOrder(mockDatadog) {
|
|
1095
|
+
verify(mockDatadog).initialize(
|
|
1096
|
+
same(mockContext),
|
|
1097
|
+
credentialCaptor.capture(),
|
|
1098
|
+
configCaptor.capture(),
|
|
1099
|
+
eq(configuration.trackingConsent.asTrackingConsent())
|
|
1100
|
+
)
|
|
1101
|
+
verify(mockDatadog).registerRumMonitor(any())
|
|
1102
|
+
}
|
|
1103
|
+
assertThat(configCaptor.firstValue)
|
|
1104
|
+
.hasField("rumConfig") {
|
|
1105
|
+
it.hasFieldWithClass(
|
|
1106
|
+
"userActionTrackingStrategy",
|
|
1107
|
+
"com.datadog.android.rum.internal" +
|
|
1108
|
+
".instrumentation.UserActionTrackingStrategyLegacy"
|
|
1109
|
+
)
|
|
1110
|
+
}
|
|
1111
|
+
}
|
|
1112
|
+
|
|
1113
|
+
@Test
|
|
1114
|
+
fun `𝕄 initialize native SDK 𝕎 initialize() {invalid user action tracking}`(
|
|
1115
|
+
@Forgery configuration: DdSdkConfiguration
|
|
1116
|
+
) {
|
|
1117
|
+
// Given
|
|
1118
|
+
val bridgeConfiguration = configuration.copy(
|
|
1119
|
+
additionalConfig = mapOf(
|
|
1120
|
+
DdSdk.DD_NATIVE_INTERACTION_TRACKING to null
|
|
1121
|
+
)
|
|
1122
|
+
)
|
|
1123
|
+
val credentialCaptor = argumentCaptor<Credentials>()
|
|
1124
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1125
|
+
|
|
1126
|
+
// When
|
|
1127
|
+
testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1128
|
+
|
|
1129
|
+
// Then
|
|
1130
|
+
inOrder(mockDatadog) {
|
|
1131
|
+
verify(mockDatadog).initialize(
|
|
1132
|
+
same(mockContext),
|
|
1133
|
+
credentialCaptor.capture(),
|
|
1134
|
+
configCaptor.capture(),
|
|
1135
|
+
eq(configuration.trackingConsent.asTrackingConsent())
|
|
1136
|
+
)
|
|
1137
|
+
verify(mockDatadog).registerRumMonitor(any())
|
|
1138
|
+
}
|
|
1139
|
+
assertThat(configCaptor.firstValue)
|
|
1140
|
+
.hasField("rumConfig") {
|
|
1141
|
+
it.hasFieldWithClass(
|
|
1142
|
+
"userActionTrackingStrategy",
|
|
1143
|
+
"com.datadog.android.rum.internal" +
|
|
1144
|
+
".instrumentation.UserActionTrackingStrategyLegacy"
|
|
1145
|
+
)
|
|
1146
|
+
}
|
|
1147
|
+
}
|
|
1040
1148
|
@Test
|
|
1041
1149
|
fun `𝕄 initialize native SDK 𝕎 initialize() {sdk verbosity}`(
|
|
1042
1150
|
@Forgery configuration: DdSdkConfiguration,
|
|
@@ -1505,6 +1613,120 @@ internal class DdSdkTest {
|
|
|
1505
1613
|
|
|
1506
1614
|
// endregion
|
|
1507
1615
|
|
|
1616
|
+
// region resource mapper
|
|
1617
|
+
|
|
1618
|
+
@Test
|
|
1619
|
+
fun `𝕄 set a resource mapper that does not drop resources 𝕎 initialize() {}`(
|
|
1620
|
+
@Forgery resourceEvent: ResourceEvent,
|
|
1621
|
+
) {
|
|
1622
|
+
// Given
|
|
1623
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1624
|
+
|
|
1625
|
+
// When
|
|
1626
|
+
testedBridgeSdk.initialize(fakeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1627
|
+
|
|
1628
|
+
// Then
|
|
1629
|
+
verify(mockDatadog).initialize(
|
|
1630
|
+
same(mockContext),
|
|
1631
|
+
any(),
|
|
1632
|
+
configCaptor.capture(),
|
|
1633
|
+
any()
|
|
1634
|
+
)
|
|
1635
|
+
assertThat(configCaptor.firstValue)
|
|
1636
|
+
.hasField("rumConfig") {
|
|
1637
|
+
val resourceMapper = it
|
|
1638
|
+
.getActualValue<EventMapper<ResourceEvent>>("rumEventMapper")
|
|
1639
|
+
val notDroppedEvent = resourceMapper.map(resourceEvent)
|
|
1640
|
+
assertThat(notDroppedEvent).isNotNull
|
|
1641
|
+
}
|
|
1642
|
+
}
|
|
1643
|
+
|
|
1644
|
+
@Test
|
|
1645
|
+
fun `𝕄 set a resource mapper that drops flagged resources 𝕎 initialize() {}`(
|
|
1646
|
+
@Forgery resourceEvent: ResourceEvent,
|
|
1647
|
+
) {
|
|
1648
|
+
// Given
|
|
1649
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1650
|
+
resourceEvent.context?.additionalProperties?.put("_dd.resource.drop_resource", true)
|
|
1651
|
+
|
|
1652
|
+
// When
|
|
1653
|
+
testedBridgeSdk.initialize(fakeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1654
|
+
|
|
1655
|
+
// Then
|
|
1656
|
+
verify(mockDatadog).initialize(
|
|
1657
|
+
same(mockContext),
|
|
1658
|
+
any(),
|
|
1659
|
+
configCaptor.capture(),
|
|
1660
|
+
any()
|
|
1661
|
+
)
|
|
1662
|
+
assertThat(configCaptor.firstValue)
|
|
1663
|
+
.hasField("rumConfig") {
|
|
1664
|
+
val resourceMapper = it
|
|
1665
|
+
.getActualValue<EventMapper<ResourceEvent>>("rumEventMapper")
|
|
1666
|
+
val droppedEvent = resourceMapper.map(resourceEvent)
|
|
1667
|
+
assertThat(droppedEvent).isNull()
|
|
1668
|
+
}
|
|
1669
|
+
}
|
|
1670
|
+
|
|
1671
|
+
// endregion
|
|
1672
|
+
|
|
1673
|
+
// region action mapper
|
|
1674
|
+
|
|
1675
|
+
@Test
|
|
1676
|
+
fun `𝕄 set a action mapper that does not drop actions 𝕎 initialize() {}`(
|
|
1677
|
+
@Forgery actionEvent: ActionEvent,
|
|
1678
|
+
) {
|
|
1679
|
+
// Given
|
|
1680
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1681
|
+
|
|
1682
|
+
// When
|
|
1683
|
+
testedBridgeSdk.initialize(fakeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1684
|
+
|
|
1685
|
+
// Then
|
|
1686
|
+
verify(mockDatadog).initialize(
|
|
1687
|
+
same(mockContext),
|
|
1688
|
+
any(),
|
|
1689
|
+
configCaptor.capture(),
|
|
1690
|
+
any()
|
|
1691
|
+
)
|
|
1692
|
+
assertThat(configCaptor.firstValue)
|
|
1693
|
+
.hasField("rumConfig") {
|
|
1694
|
+
val actionMapper = it
|
|
1695
|
+
.getActualValue<EventMapper<ActionEvent>>("rumEventMapper")
|
|
1696
|
+
val notDroppedEvent = actionMapper.map(actionEvent)
|
|
1697
|
+
assertThat(notDroppedEvent).isNotNull
|
|
1698
|
+
}
|
|
1699
|
+
}
|
|
1700
|
+
|
|
1701
|
+
@Test
|
|
1702
|
+
fun `𝕄 set a action mapper that drops flagged actions 𝕎 initialize() {}`(
|
|
1703
|
+
@Forgery actionEvent: ActionEvent,
|
|
1704
|
+
) {
|
|
1705
|
+
// Given
|
|
1706
|
+
val configCaptor = argumentCaptor<Configuration>()
|
|
1707
|
+
actionEvent.context?.additionalProperties?.put("_dd.action.drop_action", true)
|
|
1708
|
+
|
|
1709
|
+
// When
|
|
1710
|
+
testedBridgeSdk.initialize(fakeConfiguration.toReadableJavaOnlyMap(), mockPromise)
|
|
1711
|
+
|
|
1712
|
+
// Then
|
|
1713
|
+
verify(mockDatadog).initialize(
|
|
1714
|
+
same(mockContext),
|
|
1715
|
+
any(),
|
|
1716
|
+
configCaptor.capture(),
|
|
1717
|
+
any()
|
|
1718
|
+
)
|
|
1719
|
+
assertThat(configCaptor.firstValue)
|
|
1720
|
+
.hasField("rumConfig") {
|
|
1721
|
+
val actionMapper = it
|
|
1722
|
+
.getActualValue<EventMapper<ActionEvent>>("rumEventMapper")
|
|
1723
|
+
val droppedEvent = actionMapper.map(actionEvent)
|
|
1724
|
+
assertThat(droppedEvent).isNull()
|
|
1725
|
+
}
|
|
1726
|
+
}
|
|
1727
|
+
|
|
1728
|
+
// endregion
|
|
1729
|
+
|
|
1508
1730
|
// region misc
|
|
1509
1731
|
|
|
1510
1732
|
@Test
|
|
@@ -49,6 +49,12 @@ class GenericAssert(actual: Any) :
|
|
|
49
49
|
return this
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
+
fun hasFieldWithClass(name: String, expectedClassName: String): GenericAssert {
|
|
53
|
+
val field: Any? = actual.getFieldValue(name)
|
|
54
|
+
assertThat(field?.javaClass?.name).isEqualTo(expectedClassName)
|
|
55
|
+
return this
|
|
56
|
+
}
|
|
57
|
+
|
|
52
58
|
fun isInstanceOf(expectedClassName: String): GenericAssert {
|
|
53
59
|
val className = actual.javaClass.canonicalName!!
|
|
54
60
|
assertThat(className).isEqualTo(expectedClassName)
|
|
@@ -0,0 +1,106 @@
|
|
|
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
|
+
package com.datadog.tools.unit.forge
|
|
8
|
+
|
|
9
|
+
import com.datadog.android.rum.model.ActionEvent
|
|
10
|
+
import fr.xgouchet.elmyr.Forge
|
|
11
|
+
import fr.xgouchet.elmyr.ForgeryFactory
|
|
12
|
+
import fr.xgouchet.elmyr.jvm.ext.aTimestamp
|
|
13
|
+
import java.net.URL
|
|
14
|
+
import java.util.UUID
|
|
15
|
+
|
|
16
|
+
internal class ActionEventForgeryFactory :
|
|
17
|
+
ForgeryFactory<ActionEvent> {
|
|
18
|
+
override fun getForgery(forge: Forge): ActionEvent {
|
|
19
|
+
return ActionEvent(
|
|
20
|
+
date = forge.aTimestamp(),
|
|
21
|
+
action = ActionEvent.ActionEventAction(
|
|
22
|
+
type = forge.getForgery(),
|
|
23
|
+
id = forge.aNullable { getForgery<UUID>().toString() },
|
|
24
|
+
target = forge.aNullable {
|
|
25
|
+
ActionEvent.ActionEventActionTarget(anAlphabeticalString())
|
|
26
|
+
},
|
|
27
|
+
error = forge.aNullable { ActionEvent.Error(aLong(0, 512)) },
|
|
28
|
+
crash = forge.aNullable { ActionEvent.Crash(aLong(0, 512)) },
|
|
29
|
+
resource = forge.aNullable { ActionEvent.Resource(aLong(0, 512)) },
|
|
30
|
+
longTask = forge.aNullable { ActionEvent.LongTask(aLong(0, 512)) },
|
|
31
|
+
loadingTime = forge.aNullable { aPositiveLong(strict = true) },
|
|
32
|
+
frustration = forge.aNullable {
|
|
33
|
+
ActionEvent.Frustration(
|
|
34
|
+
type = forge.aList {
|
|
35
|
+
forge.aValueFrom(ActionEvent.Type::class.java)
|
|
36
|
+
}.distinct()
|
|
37
|
+
)
|
|
38
|
+
}
|
|
39
|
+
),
|
|
40
|
+
view = ActionEvent.View(
|
|
41
|
+
id = forge.getForgery<UUID>().toString(),
|
|
42
|
+
url = forge.aStringMatching("https://[a-z]+.[a-z]{3}/[a-z0-9_/]+"),
|
|
43
|
+
referrer = forge.aNullable { getForgery<URL>().toString() },
|
|
44
|
+
name = forge.aNullable { anAlphabeticalString() },
|
|
45
|
+
inForeground = forge.aNullable { aBool() }
|
|
46
|
+
),
|
|
47
|
+
connectivity = forge.aNullable {
|
|
48
|
+
ActionEvent.Connectivity(
|
|
49
|
+
status = getForgery(),
|
|
50
|
+
interfaces = aList { getForgery() },
|
|
51
|
+
cellular = aNullable {
|
|
52
|
+
ActionEvent.Cellular(
|
|
53
|
+
technology = aNullable { anAlphabeticalString() },
|
|
54
|
+
carrierName = aNullable { anAlphabeticalString() }
|
|
55
|
+
)
|
|
56
|
+
}
|
|
57
|
+
)
|
|
58
|
+
},
|
|
59
|
+
synthetics = forge.aNullable {
|
|
60
|
+
ActionEvent.Synthetics(
|
|
61
|
+
testId = forge.anHexadecimalString(),
|
|
62
|
+
resultId = forge.anHexadecimalString()
|
|
63
|
+
)
|
|
64
|
+
},
|
|
65
|
+
usr = forge.aNullable {
|
|
66
|
+
ActionEvent.Usr(
|
|
67
|
+
id = aNullable { anHexadecimalString() },
|
|
68
|
+
name = aNullable { aStringMatching("[A-Z][a-z]+ [A-Z]\\. [A-Z][a-z]+") },
|
|
69
|
+
email = aNullable {
|
|
70
|
+
aStringMatching("[a-z]+\\.[a-z]+@[a-z]+\\.[a-z]{3}")
|
|
71
|
+
},
|
|
72
|
+
additionalProperties = mutableMapOf()
|
|
73
|
+
)
|
|
74
|
+
},
|
|
75
|
+
application = ActionEvent.Application(forge.getForgery<UUID>().toString()),
|
|
76
|
+
service = forge.aNullable { anAlphabeticalString() },
|
|
77
|
+
session = ActionEvent.ActionEventSession(
|
|
78
|
+
id = forge.getForgery<UUID>().toString(),
|
|
79
|
+
type = ActionEvent.ActionEventSessionType.USER,
|
|
80
|
+
hasReplay = forge.aNullable { aBool() }
|
|
81
|
+
),
|
|
82
|
+
source = forge.aNullable { aValueFrom(ActionEvent.Source::class.java) },
|
|
83
|
+
ciTest = forge.aNullable {
|
|
84
|
+
ActionEvent.CiTest(anHexadecimalString())
|
|
85
|
+
},
|
|
86
|
+
os = ActionEvent.Os(
|
|
87
|
+
name = forge.anAlphabeticalString(),
|
|
88
|
+
version = forge.aNumericalString(),
|
|
89
|
+
versionMajor = forge.aNumericalString()
|
|
90
|
+
),
|
|
91
|
+
device = ActionEvent.Device(
|
|
92
|
+
name = forge.anAlphabeticalString(),
|
|
93
|
+
model = forge.anAlphabeticalString(),
|
|
94
|
+
brand = forge.anAlphabeticalString(),
|
|
95
|
+
type = forge.aValueFrom(ActionEvent.DeviceType::class.java),
|
|
96
|
+
),
|
|
97
|
+
context = ActionEvent.Context(
|
|
98
|
+
additionalProperties = mutableMapOf()
|
|
99
|
+
),
|
|
100
|
+
dd = ActionEvent.Dd(
|
|
101
|
+
session = forge.aNullable { ActionEvent.DdSession(getForgery()) },
|
|
102
|
+
browserSdkVersion = forge.aNullable { aStringMatching("\\d+\\.\\d+\\.\\d+") }
|
|
103
|
+
)
|
|
104
|
+
)
|
|
105
|
+
}
|
|
106
|
+
}
|
|
@@ -22,6 +22,8 @@ open class BaseConfigurator :
|
|
|
22
22
|
forge.addFactory(DdSdkConfigurationForgeryFactory())
|
|
23
23
|
forge.addFactory(PackageInfoForgeryFactory())
|
|
24
24
|
forge.addFactory(TelemetryConfigurationEventForgeryFactory())
|
|
25
|
+
forge.addFactory(ResourceEventForgeryFactory())
|
|
26
|
+
forge.addFactory(ActionEventForgeryFactory())
|
|
25
27
|
forge.useJvmFactories()
|
|
26
28
|
}
|
|
27
29
|
}
|
|
@@ -0,0 +1,116 @@
|
|
|
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
|
+
package com.datadog.tools.unit.forge
|
|
8
|
+
|
|
9
|
+
import com.datadog.android.rum.model.ResourceEvent
|
|
10
|
+
import fr.xgouchet.elmyr.Forge
|
|
11
|
+
import fr.xgouchet.elmyr.ForgeryFactory
|
|
12
|
+
import fr.xgouchet.elmyr.jvm.ext.aTimestamp
|
|
13
|
+
import java.net.URL
|
|
14
|
+
import java.util.UUID
|
|
15
|
+
|
|
16
|
+
internal class ResourceEventForgeryFactory :
|
|
17
|
+
ForgeryFactory<ResourceEvent> {
|
|
18
|
+
override fun getForgery(forge: Forge): ResourceEvent {
|
|
19
|
+
return ResourceEvent(
|
|
20
|
+
date = forge.aTimestamp(),
|
|
21
|
+
resource = ResourceEvent.Resource(
|
|
22
|
+
id = forge.aNullable { getForgery<UUID>().toString() },
|
|
23
|
+
type = forge.getForgery(),
|
|
24
|
+
url = forge.aStringMatching("https://[a-z]+.[a-z]{3}/[a-z0-9_/]+"),
|
|
25
|
+
duration = forge.aPositiveLong(),
|
|
26
|
+
method = forge.aNullable(),
|
|
27
|
+
statusCode = forge.aNullable { aLong(200, 600) },
|
|
28
|
+
size = forge.aNullable { aPositiveLong() },
|
|
29
|
+
dns = null,
|
|
30
|
+
connect = null,
|
|
31
|
+
ssl = null,
|
|
32
|
+
firstByte = null,
|
|
33
|
+
download = null,
|
|
34
|
+
redirect = forge.aNullable {
|
|
35
|
+
ResourceEvent.Redirect(
|
|
36
|
+
aPositiveLong(),
|
|
37
|
+
aPositiveLong()
|
|
38
|
+
)
|
|
39
|
+
},
|
|
40
|
+
provider = forge.aNullable {
|
|
41
|
+
ResourceEvent.Provider(
|
|
42
|
+
domain = aNullable { aStringMatching("[a-z]+\\.[a-z]{3}") },
|
|
43
|
+
name = aNullable { anAlphabeticalString() },
|
|
44
|
+
type = aNullable()
|
|
45
|
+
)
|
|
46
|
+
}
|
|
47
|
+
),
|
|
48
|
+
view = ResourceEvent.View(
|
|
49
|
+
id = forge.getForgery<UUID>().toString(),
|
|
50
|
+
url = forge.aStringMatching("https://[a-z]+.[a-z]{3}/[a-z0-9_/]+"),
|
|
51
|
+
referrer = forge.aNullable { getForgery<URL>().toString() },
|
|
52
|
+
name = forge.aNullable { anAlphabeticalString() }
|
|
53
|
+
),
|
|
54
|
+
connectivity = forge.aNullable {
|
|
55
|
+
ResourceEvent.Connectivity(
|
|
56
|
+
status = getForgery(),
|
|
57
|
+
interfaces = aList { getForgery() },
|
|
58
|
+
cellular = aNullable {
|
|
59
|
+
ResourceEvent.Cellular(
|
|
60
|
+
technology = aNullable { anAlphabeticalString() },
|
|
61
|
+
carrierName = aNullable { anAlphabeticalString() }
|
|
62
|
+
)
|
|
63
|
+
}
|
|
64
|
+
)
|
|
65
|
+
},
|
|
66
|
+
synthetics = forge.aNullable {
|
|
67
|
+
ResourceEvent.Synthetics(
|
|
68
|
+
testId = forge.anHexadecimalString(),
|
|
69
|
+
resultId = forge.anHexadecimalString()
|
|
70
|
+
)
|
|
71
|
+
},
|
|
72
|
+
usr = forge.aNullable {
|
|
73
|
+
ResourceEvent.Usr(
|
|
74
|
+
id = aNullable { anHexadecimalString() },
|
|
75
|
+
name = aNullable { aStringMatching("[A-Z][a-z]+ [A-Z]\\. [A-Z][a-z]+") },
|
|
76
|
+
email = aNullable { aStringMatching("[a-z]+\\.[a-z]+@[a-z]+\\.[a-z]{3}") },
|
|
77
|
+
additionalProperties = mutableMapOf()
|
|
78
|
+
)
|
|
79
|
+
},
|
|
80
|
+
action = forge.aNullable {
|
|
81
|
+
ResourceEvent.Action(aList { getForgery<UUID>().toString() })
|
|
82
|
+
},
|
|
83
|
+
application = ResourceEvent.Application(forge.getForgery<UUID>().toString()),
|
|
84
|
+
service = forge.aNullable { anAlphabeticalString() },
|
|
85
|
+
session = ResourceEvent.ResourceEventSession(
|
|
86
|
+
id = forge.getForgery<UUID>().toString(),
|
|
87
|
+
type = ResourceEvent.ResourceEventSessionType.USER,
|
|
88
|
+
hasReplay = forge.aNullable { aBool() }
|
|
89
|
+
),
|
|
90
|
+
source = forge.aNullable { aValueFrom(ResourceEvent.Source::class.java) },
|
|
91
|
+
ciTest = forge.aNullable {
|
|
92
|
+
ResourceEvent.CiTest(anHexadecimalString())
|
|
93
|
+
},
|
|
94
|
+
os = ResourceEvent.Os(
|
|
95
|
+
name = forge.anAlphabeticalString(),
|
|
96
|
+
version = forge.aNumericalString(),
|
|
97
|
+
versionMajor = forge.aNumericalString()
|
|
98
|
+
),
|
|
99
|
+
device = ResourceEvent.Device(
|
|
100
|
+
name = forge.anAlphabeticalString(),
|
|
101
|
+
model = forge.anAlphabeticalString(),
|
|
102
|
+
brand = forge.anAlphabeticalString(),
|
|
103
|
+
type = forge.aValueFrom(ResourceEvent.DeviceType::class.java),
|
|
104
|
+
),
|
|
105
|
+
context = ResourceEvent.Context(
|
|
106
|
+
additionalProperties = mutableMapOf()
|
|
107
|
+
),
|
|
108
|
+
dd = ResourceEvent.Dd(
|
|
109
|
+
session = forge.aNullable { ResourceEvent.DdSession(getForgery()) },
|
|
110
|
+
browserSdkVersion = forge.aNullable { aStringMatching("\\d+\\.\\d+\\.\\d+") },
|
|
111
|
+
spanId = forge.aNullable { aNumericalString() },
|
|
112
|
+
traceId = forge.aNullable { aNumericalString() }
|
|
113
|
+
)
|
|
114
|
+
)
|
|
115
|
+
}
|
|
116
|
+
}
|
|
@@ -77,6 +77,10 @@ internal struct InternalConfigurationAttributes {
|
|
|
77
77
|
/// Expects `Bool?` value
|
|
78
78
|
static let nativeViewTracking = "_dd.native_view_tracking"
|
|
79
79
|
|
|
80
|
+
/// Enables native interaction tracking.
|
|
81
|
+
/// Expects `Bool?` value
|
|
82
|
+
static let nativeInteractionTracking = "_dd.native_interaction_tracking"
|
|
83
|
+
|
|
80
84
|
/// Enable overriding the service name.
|
|
81
85
|
/// Expects `String?` value
|
|
82
86
|
static let serviceName = "_dd.service_name"
|
|
@@ -94,4 +98,14 @@ internal struct InternalConfigurationAttributes {
|
|
|
94
98
|
/// Specify version suffix.
|
|
95
99
|
/// Expects `NSString?` value
|
|
96
100
|
static let versionSuffix = "_dd.version_suffix"
|
|
101
|
+
|
|
102
|
+
/// Custom attribute of the resource passed from bridge SDK.
|
|
103
|
+
/// It flags the resource as dropped by the user so it can be dropped in the resource mapper.
|
|
104
|
+
/// Expects `Bool` value.
|
|
105
|
+
static let dropResource = "_dd.resource.drop_resource"
|
|
106
|
+
|
|
107
|
+
/// Custom attribute of the action passed from bridge SDK.
|
|
108
|
+
/// It flags the action as dropped by the user so it can be dropped in the action mapper.
|
|
109
|
+
/// Expects `Bool` value.
|
|
110
|
+
static let dropAction = "_dd.action.drop_action"
|
|
97
111
|
}
|
package/ios/Sources/DdSdk.swift
CHANGED
|
@@ -197,6 +197,10 @@ class RNDdSdk: NSObject {
|
|
|
197
197
|
_ = ddConfigBuilder.trackUIKitRUMViews()
|
|
198
198
|
}
|
|
199
199
|
|
|
200
|
+
if let enableInteractionTracking = additionalConfig?[InternalConfigurationAttributes.nativeInteractionTracking] as? Bool, enableInteractionTracking {
|
|
201
|
+
_ = ddConfigBuilder.trackUIKitRUMActions()
|
|
202
|
+
}
|
|
203
|
+
|
|
200
204
|
if let serviceName = additionalConfig?[InternalConfigurationAttributes.serviceName] as? String {
|
|
201
205
|
_ = ddConfigBuilder.set(serviceName: serviceName)
|
|
202
206
|
}
|
|
@@ -213,6 +217,20 @@ class RNDdSdk: NSObject {
|
|
|
213
217
|
_ = ddConfigBuilder.enableCrashReporting(using: DDCrashReportingPlugin())
|
|
214
218
|
}
|
|
215
219
|
|
|
220
|
+
_ = ddConfigBuilder.setRUMResourceEventMapper({ resourceEvent in
|
|
221
|
+
if resourceEvent.context?.contextInfo[InternalConfigurationAttributes.dropResource] != nil {
|
|
222
|
+
return nil
|
|
223
|
+
}
|
|
224
|
+
return resourceEvent
|
|
225
|
+
})
|
|
226
|
+
|
|
227
|
+
_ = ddConfigBuilder.setRUMActionEventMapper({ actionEvent in
|
|
228
|
+
if actionEvent.context?.contextInfo[InternalConfigurationAttributes.dropResource] != nil {
|
|
229
|
+
return nil
|
|
230
|
+
}
|
|
231
|
+
return actionEvent
|
|
232
|
+
})
|
|
233
|
+
|
|
216
234
|
return ddConfigBuilder.build()
|
|
217
235
|
}
|
|
218
236
|
|