@datadog/mobile-react-native 2.8.0 → 2.8.1
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/DdSdkImplementation.kt +1 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +15 -25
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt +1 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkSessionStartedListener.kt +124 -0
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +26 -14
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +14 -4
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +0 -1
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkSessionStartedListenerTest.kt +140 -0
- package/ios/Sources/DdSdk.h +6 -4
- package/ios/Sources/DdSdk.mm +81 -31
- package/ios/Sources/DdSdkImplementation.swift +2 -2
- package/ios/Sources/DdSdkNativeInitialization.swift +14 -23
- package/ios/Sources/DdSdkSessionStartedListener.swift +105 -0
- package/ios/Sources/SdkVersion.swift +1 -1
- package/jest/mock.js +6 -2
- package/lib/commonjs/DdSdkReactNative.js +9 -7
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/index.js +4 -4
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/rum/DdRum.js +5 -12
- package/lib/commonjs/rum/DdRum.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -2
- package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/commonjs/rum/sessionId/sessionIdHelper.js +8 -60
- package/lib/commonjs/rum/sessionId/sessionIdHelper.js.map +1 -1
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js +48 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +41 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogEventEmitter.js +2 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js +43 -0
- package/lib/commonjs/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js.map +1 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js +61 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js.map +1 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js +29 -0
- package/lib/commonjs/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js.map +1 -0
- package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js +5 -2
- package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -1
- package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/DdSdkReactNative.js +9 -7
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/index.js +4 -8
- package/lib/module/index.js.map +1 -1
- package/lib/module/rum/DdRum.js +6 -13
- package/lib/module/rum/DdRum.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -2
- package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
- package/lib/module/rum/sessionId/sessionIdHelper.js +5 -54
- package/lib/module/rum/sessionId/sessionIdHelper.js.map +1 -1
- package/lib/module/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js +41 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js +33 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogEventEmitter.js +2 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js +35 -0
- package/lib/module/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.js.map +1 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js +51 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.js.map +1 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js +21 -0
- package/lib/module/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.js.map +1 -0
- package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js +5 -2
- package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -1
- package/lib/module/specs/NativeDdSdk.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts +3 -2
- package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
- package/lib/typescript/index.d.ts +7 -6
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/rum/DdRum.d.ts +0 -2
- package/lib/typescript/rum/DdRum.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts +3 -3
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts.map +1 -1
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +2 -2
- package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -1
- package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts +2 -25
- package/lib/typescript/rum/sessionId/sessionIdHelper.d.ts.map +1 -1
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.d.ts +11 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.d.ts +10 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogEventEmitter.d.ts +7 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.d.ts +12 -0
- package/lib/typescript/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.d.ts +14 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.d.ts.map +1 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.d.ts +6 -0
- package/lib/typescript/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.d.ts.map +1 -0
- package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts +2 -0
- package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts.map +1 -1
- package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/DdSdkReactNative.tsx +16 -10
- package/src/__tests__/DdSdkReactNative.test.tsx +1 -37
- package/src/__tests__/mock.test.ts +3 -0
- package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +1 -1
- package/src/__tests__/rum/instrumentation/DdRumUserInteractionTracking.test.tsx +1 -1
- package/src/index.tsx +10 -13
- package/src/rum/DdRum.ts +7 -17
- package/src/rum/__tests__/DdRum.test.ts +3 -3
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.tsx +3 -3
- package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +2 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +2 -2
- package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +82 -1
- package/src/rum/sessionId/sessionIdHelper.ts +5 -63
- package/src/sdk/DatadogEventEmitter/DatadogBatchedBridgeEventEmitter.tsx +65 -0
- package/src/sdk/DatadogEventEmitter/DatadogDefaultEventEmitter.tsx +46 -0
- package/src/sdk/DatadogEventEmitter/DatadogEventEmitter.tsx +12 -0
- package/src/sdk/DatadogEventEmitter/DatadogNativeEventEmitter.tsx +60 -0
- package/src/sdk/DatadogInternalBridge/DdSdkInternalNativeBridge.tsx +83 -0
- package/src/sdk/DatadogInternalBridge/DdSdkInternalNativeBridgeEvent.tsx +36 -0
- package/src/sdk/DatadogInternalBridge/__tests__/DdSdkNativeBridge.test.tsx +159 -0
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +2 -2
- package/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts +8 -2
- package/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts +6 -3
- package/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json +6 -1
- package/src/specs/NativeDdSdk.ts +0 -1
- package/src/version.ts +1 -1
- package/lib/commonjs/sdk/EventEmitter/EventEmitter.js +0 -51
- package/lib/commonjs/sdk/EventEmitter/EventEmitter.js.map +0 -1
- package/lib/module/sdk/EventEmitter/EventEmitter.js +0 -43
- package/lib/module/sdk/EventEmitter/EventEmitter.js.map +0 -1
- package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts +0 -12
- package/lib/typescript/sdk/EventEmitter/EventEmitter.d.ts.map +0 -1
- package/src/rum/sessionId/__tests__/sessionIdHelper.test.ts +0 -162
- package/src/sdk/EventEmitter/EventEmitter.ts +0 -55
- package/src/sdk/EventEmitter/__tests__/EventEmitter.test.ts +0 -181
|
@@ -38,7 +38,7 @@ class DdSdkImplementation(
|
|
|
38
38
|
fun initialize(configuration: ReadableMap, promise: Promise) {
|
|
39
39
|
val ddSdkConfiguration = configuration.asDdSdkConfiguration()
|
|
40
40
|
|
|
41
|
-
val nativeInitialization = DdSdkNativeInitialization(appContext,
|
|
41
|
+
val nativeInitialization = DdSdkNativeInitialization(appContext, datadog)
|
|
42
42
|
nativeInitialization.initialize(ddSdkConfiguration)
|
|
43
43
|
|
|
44
44
|
this.frameRateProvider = createFrameRateProvider(ddSdkConfiguration)
|
|
@@ -18,7 +18,6 @@ import com.datadog.android.event.EventMapper
|
|
|
18
18
|
import com.datadog.android.log.LogsConfiguration
|
|
19
19
|
import com.datadog.android.privacy.TrackingConsent
|
|
20
20
|
import com.datadog.android.rum.RumConfiguration
|
|
21
|
-
import com.datadog.android.rum.RumSessionListener
|
|
22
21
|
import com.datadog.android.rum._RumInternalProxy
|
|
23
22
|
import com.datadog.android.rum.configuration.VitalsUpdateFrequency
|
|
24
23
|
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
|
|
@@ -27,25 +26,22 @@ import com.datadog.android.rum.model.ResourceEvent
|
|
|
27
26
|
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
|
|
28
27
|
import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
|
|
29
28
|
import com.datadog.android.trace.TraceConfiguration
|
|
30
|
-
import com.facebook.react.bridge.ReactApplicationContext
|
|
31
|
-
import com.facebook.react.bridge.WritableNativeMap
|
|
32
|
-
import com.facebook.react.modules.core.DeviceEventManagerModule
|
|
33
29
|
import com.google.gson.Gson
|
|
34
30
|
import java.util.Locale
|
|
35
31
|
import kotlin.time.Duration.Companion.seconds
|
|
36
32
|
|
|
33
|
+
|
|
37
34
|
/**
|
|
38
35
|
* Initializes the Android Datadog SDK.
|
|
39
36
|
*/
|
|
40
37
|
class DdSdkNativeInitialization internal constructor(
|
|
41
38
|
private val appContext: Context,
|
|
42
|
-
private val reactContext: ReactApplicationContext,
|
|
43
39
|
private val datadog: DatadogWrapper = DatadogSDKWrapper(),
|
|
44
40
|
private val jsonFileReader: JSONFileReader = JSONFileReader()
|
|
45
41
|
) {
|
|
46
42
|
internal fun initialize(ddSdkConfiguration: DdSdkConfiguration) {
|
|
47
43
|
val sdkConfiguration = buildSdkConfiguration(ddSdkConfiguration)
|
|
48
|
-
val rumConfiguration = buildRumConfiguration(ddSdkConfiguration
|
|
44
|
+
val rumConfiguration = buildRumConfiguration(ddSdkConfiguration)
|
|
49
45
|
val logsConfiguration = buildLogsConfiguration(ddSdkConfiguration)
|
|
50
46
|
val traceConfiguration = buildTraceConfiguration(ddSdkConfiguration)
|
|
51
47
|
val trackingConsent = buildTrackingConsent(ddSdkConfiguration.trackingConsent)
|
|
@@ -53,6 +49,14 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
53
49
|
configureSdkVerbosity(ddSdkConfiguration)
|
|
54
50
|
configureRumAndTracesForLogs(ddSdkConfiguration)
|
|
55
51
|
|
|
52
|
+
if (datadog.isInitialized()) {
|
|
53
|
+
datadog.getRumMonitor().getCurrentSessionId {
|
|
54
|
+
it?.let { sessionId ->
|
|
55
|
+
DdSdkSessionStartedListener.getInstance().onSessionStarted(sessionId, false)
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
56
60
|
datadog.initialize(appContext, sdkConfiguration, trackingConsent)
|
|
57
61
|
|
|
58
62
|
datadog.enableRum(rumConfiguration)
|
|
@@ -105,7 +109,7 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
105
109
|
}
|
|
106
110
|
|
|
107
111
|
@Suppress("ComplexMethod")
|
|
108
|
-
private fun buildRumConfiguration(configuration: DdSdkConfiguration
|
|
112
|
+
private fun buildRumConfiguration(configuration: DdSdkConfiguration): RumConfiguration {
|
|
109
113
|
val configBuilder =
|
|
110
114
|
RumConfiguration.Builder(
|
|
111
115
|
applicationId = configuration.applicationId
|
|
@@ -209,28 +213,14 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
209
213
|
configBuilder.trackNonFatalAnrs(it)
|
|
210
214
|
}
|
|
211
215
|
|
|
212
|
-
configBuilder.setSessionListener(
|
|
213
|
-
object : RumSessionListener {
|
|
214
|
-
override fun onSessionStarted(sessionId: String, isDiscarded: Boolean) {
|
|
215
|
-
sendSessionIdEvent(sessionId, isDiscarded)
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
)
|
|
219
|
-
|
|
220
216
|
configuration.initialResourceThreshold?.let {
|
|
221
217
|
val milliseconds = it.seconds.inWholeMilliseconds
|
|
222
218
|
configBuilder.setInitialResourceIdentifier(TimeBasedInitialResourceIdentifier(milliseconds))
|
|
223
219
|
}
|
|
224
220
|
|
|
225
|
-
|
|
226
|
-
}
|
|
221
|
+
configBuilder.setSessionListener(DdSdkSessionStartedListener.getInstance())
|
|
227
222
|
|
|
228
|
-
|
|
229
|
-
val attributes = WritableNativeMap()
|
|
230
|
-
attributes.putString("sessionId", sessionId)
|
|
231
|
-
attributes.putBoolean("isDiscarded", isDiscarded)
|
|
232
|
-
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
|
233
|
-
.emit("RumSessionStarted", attributes)
|
|
223
|
+
return configBuilder.build()
|
|
234
224
|
}
|
|
235
225
|
|
|
236
226
|
private fun buildLogsConfiguration(configuration: DdSdkConfiguration): LogsConfiguration {
|
|
@@ -381,8 +371,8 @@ class DdSdkNativeInitialization internal constructor(
|
|
|
381
371
|
* @param appContext: The application context of your React Native application.
|
|
382
372
|
*/
|
|
383
373
|
@JvmStatic
|
|
384
|
-
fun initFromNative(appContext: Context
|
|
385
|
-
val nativeInitialization = DdSdkNativeInitialization(appContext.applicationContext
|
|
374
|
+
fun initFromNative(appContext: Context) {
|
|
375
|
+
val nativeInitialization = DdSdkNativeInitialization(appContext.applicationContext)
|
|
386
376
|
try {
|
|
387
377
|
nativeInitialization.initialize(nativeInitialization.getConfigurationFromJSONFile())
|
|
388
378
|
} catch (@Suppress("TooGenericExceptionCaught") error: Exception) {
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
package com.datadog.reactnative
|
|
8
8
|
|
|
9
9
|
import com.facebook.react.TurboReactPackage
|
|
10
|
+
import com.facebook.react.bridge.LifecycleEventListener
|
|
10
11
|
import com.facebook.react.bridge.NativeModule
|
|
11
12
|
import com.facebook.react.bridge.ReactApplicationContext
|
|
12
13
|
import com.facebook.react.module.model.ReactModuleInfo
|
|
@@ -17,7 +18,6 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
|
|
|
17
18
|
*/
|
|
18
19
|
class DdSdkReactNativePackage : TurboReactPackage() {
|
|
19
20
|
private val sdkWrapper = DatadogSDKWrapper()
|
|
20
|
-
|
|
21
21
|
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
|
|
22
22
|
return when (name) {
|
|
23
23
|
DdSdkImplementation.NAME -> DdSdk(reactContext, sdkWrapper)
|
|
@@ -0,0 +1,124 @@
|
|
|
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
|
+
package com.datadog.reactnative
|
|
7
|
+
|
|
8
|
+
import androidx.annotation.MainThread
|
|
9
|
+
import com.datadog.android.rum.RumSessionListener
|
|
10
|
+
import com.facebook.react.bridge.NativeArray
|
|
11
|
+
import com.facebook.react.bridge.ReactContext
|
|
12
|
+
import com.facebook.react.bridge.WritableNativeArray
|
|
13
|
+
import com.facebook.react.modules.core.DeviceEventManagerModule
|
|
14
|
+
import org.jetbrains.annotations.TestOnly
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
internal class DdSdkSessionStartedListener private constructor(): RumSessionListener {
|
|
18
|
+
companion object {
|
|
19
|
+
private const val BRIDGE_MODULE_NAME = "DatadogInternalReactBridge"
|
|
20
|
+
private const val BRIDGE_MODULE_METHOD = "__datadogOnMessageReceived"
|
|
21
|
+
|
|
22
|
+
private var instance: DdSdkSessionStartedListener? = null
|
|
23
|
+
|
|
24
|
+
fun getInstance(): DdSdkSessionStartedListener {
|
|
25
|
+
if (instance == null) {
|
|
26
|
+
instance = DdSdkSessionStartedListener()
|
|
27
|
+
}
|
|
28
|
+
return instance!!
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
fun invalidate() {
|
|
32
|
+
instance = null
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
private var reactContext: ReactContext? = null
|
|
37
|
+
private var lastSessionId: String? = null
|
|
38
|
+
private var convertToNativeArray: ((array: Array<String>) -> NativeArray?)? = null
|
|
39
|
+
private var exceptionHandler: ((error:Exception)->Unit)? = null
|
|
40
|
+
private var isNewArchitecture: Boolean? = null
|
|
41
|
+
|
|
42
|
+
override fun onSessionStarted(sessionId: String, isDiscarded: Boolean) {
|
|
43
|
+
sendSessionStartedToJS(sessionId)
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
fun setReactContext(reactContext: ReactContext) {
|
|
47
|
+
this.reactContext = reactContext
|
|
48
|
+
if (hasValidBridge()) {
|
|
49
|
+
this.lastSessionId?.let { sendSessionStartedToJS(it) }
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
@TestOnly
|
|
54
|
+
fun setConvertToNativeArray(convertToNativeArray: (array: Array<String>) -> NativeArray?) {
|
|
55
|
+
this.convertToNativeArray = convertToNativeArray
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
@TestOnly
|
|
59
|
+
fun setExceptionHandler(exceptionHandler: (error: Exception) -> Unit) {
|
|
60
|
+
this.exceptionHandler = exceptionHandler
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
private fun hasValidBridge(): Boolean {
|
|
64
|
+
val context = reactContext ?: return false
|
|
65
|
+
val instance = context.catalystInstance ?: return false
|
|
66
|
+
return !isNewArchitecture() &&
|
|
67
|
+
!instance.isDestroyed &&
|
|
68
|
+
context.hasActiveReactInstance()
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
private fun isNewArchitecture(): Boolean {
|
|
72
|
+
isNewArchitecture?.let { return it }
|
|
73
|
+
BuildConfig.IS_NEW_ARCHITECTURE_ENABLED.let {
|
|
74
|
+
isNewArchitecture = it
|
|
75
|
+
return it
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
private fun sendSessionStartedToJS(sessionId: String) {
|
|
80
|
+
this.lastSessionId = sessionId
|
|
81
|
+
if (hasValidBridge()) {
|
|
82
|
+
sendSessionIdWithBridge(sessionId)
|
|
83
|
+
} else {
|
|
84
|
+
sendSessionIdWithEventEmitter(sessionId)
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
@MainThread
|
|
89
|
+
private fun sendSessionIdWithBridge(sessionId: String) {
|
|
90
|
+
@Suppress("TooGenericExceptionCaught")
|
|
91
|
+
try {
|
|
92
|
+
val args = arrayOf(sessionId)
|
|
93
|
+
val nativeArray = if (convertToNativeArray != null) {
|
|
94
|
+
convertToNativeArray?.invoke(args)
|
|
95
|
+
} else {
|
|
96
|
+
WritableNativeArray().apply {
|
|
97
|
+
pushString("RUMSessionStarted")
|
|
98
|
+
pushString(sessionId)
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
reactContext?.catalystInstance?.callFunction(
|
|
103
|
+
BRIDGE_MODULE_NAME,
|
|
104
|
+
BRIDGE_MODULE_METHOD,
|
|
105
|
+
nativeArray
|
|
106
|
+
)
|
|
107
|
+
} catch(err: Exception) {
|
|
108
|
+
exceptionHandler?.invoke(err)
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
@MainThread
|
|
113
|
+
private fun sendSessionIdWithEventEmitter(sessionId: String) {
|
|
114
|
+
val context = reactContext ?: return
|
|
115
|
+
@Suppress("TooGenericExceptionCaught", "SwallowedException")
|
|
116
|
+
try {
|
|
117
|
+
context
|
|
118
|
+
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
|
119
|
+
.emit("RUMSessionStarted", sessionId)
|
|
120
|
+
} catch (err: Exception) {
|
|
121
|
+
/* empty */
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
@@ -7,11 +7,13 @@
|
|
|
7
7
|
package com.datadog.reactnative
|
|
8
8
|
|
|
9
9
|
import android.app.Activity
|
|
10
|
+
import androidx.annotation.MainThread
|
|
10
11
|
import com.facebook.react.bridge.LifecycleEventListener
|
|
11
12
|
import com.facebook.react.bridge.Promise
|
|
12
13
|
import com.facebook.react.bridge.ReactApplicationContext
|
|
13
14
|
import com.facebook.react.bridge.ReactMethod
|
|
14
15
|
import com.facebook.react.bridge.ReadableMap
|
|
16
|
+
import com.facebook.react.modules.core.DeviceEventManagerModule
|
|
15
17
|
|
|
16
18
|
/** The entry point to initialize Datadog's features. */
|
|
17
19
|
class DdSdk(
|
|
@@ -24,20 +26,7 @@ class DdSdk(
|
|
|
24
26
|
override fun getName(): String = DdSdkImplementation.NAME
|
|
25
27
|
|
|
26
28
|
init {
|
|
27
|
-
reactContext
|
|
28
|
-
override fun onHostResume() {
|
|
29
|
-
val currentActivity: Activity? = currentActivity
|
|
30
|
-
if (currentActivity != null) {
|
|
31
|
-
val intent = currentActivity.intent
|
|
32
|
-
val extras = intent.extras
|
|
33
|
-
DdSdkSynthetics.testId = extras?.getString("_dd.synthetics.test_id")
|
|
34
|
-
DdSdkSynthetics.resultId = extras?.getString("_dd.synthetics.result_id")
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
override fun onHostPause() {}
|
|
39
|
-
override fun onHostDestroy() {}
|
|
40
|
-
})
|
|
29
|
+
registerLifecycleEvents(reactContext)
|
|
41
30
|
}
|
|
42
31
|
|
|
43
32
|
/**
|
|
@@ -143,4 +132,27 @@ class DdSdk(
|
|
|
143
132
|
override fun removeListeners(count: Double) {
|
|
144
133
|
// No-op
|
|
145
134
|
}
|
|
135
|
+
|
|
136
|
+
private fun registerLifecycleEvents(reactContext: ReactApplicationContext) {
|
|
137
|
+
reactContext.addLifecycleEventListener(object : LifecycleEventListener {
|
|
138
|
+
override fun onHostResume() {
|
|
139
|
+
val currentActivity: Activity? = currentActivity
|
|
140
|
+
if (currentActivity != null) {
|
|
141
|
+
val intent = currentActivity.intent
|
|
142
|
+
val extras = intent.extras
|
|
143
|
+
DdSdkSynthetics.testId = extras?.getString("_dd.synthetics.test_id")
|
|
144
|
+
DdSdkSynthetics.resultId = extras?.getString("_dd.synthetics.result_id")
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
DdSdkSessionStartedListener.getInstance().setReactContext(reactContext)
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
override fun onHostPause() {
|
|
151
|
+
DdSdkSessionStartedListener.invalidate()
|
|
152
|
+
}
|
|
153
|
+
override fun onHostDestroy() {
|
|
154
|
+
DdSdkSessionStartedListener.invalidate()
|
|
155
|
+
}
|
|
156
|
+
})
|
|
157
|
+
}
|
|
146
158
|
}
|
|
@@ -21,11 +21,13 @@ class DdSdk(
|
|
|
21
21
|
) : ReactContextBaseJavaModule(reactContext) {
|
|
22
22
|
|
|
23
23
|
private val implementation = DdSdkImplementation(reactContext, datadog = datadogWrapper)
|
|
24
|
+
private var lifecycleEventListener: LifecycleEventListener? = null
|
|
24
25
|
|
|
25
26
|
override fun getName(): String = DdSdkImplementation.NAME
|
|
26
27
|
|
|
27
28
|
init {
|
|
28
|
-
reactContext.
|
|
29
|
+
lifecycleEventListener?.let { reactContext.removeLifecycleEventListener(it) }
|
|
30
|
+
lifecycleEventListener = object : LifecycleEventListener {
|
|
29
31
|
override fun onHostResume() {
|
|
30
32
|
val currentActivity: Activity? = currentActivity
|
|
31
33
|
if (currentActivity != null) {
|
|
@@ -34,11 +36,19 @@ class DdSdk(
|
|
|
34
36
|
DdSdkSynthetics.testId = extras?.getString("_dd.synthetics.test_id")
|
|
35
37
|
DdSdkSynthetics.resultId = extras?.getString("_dd.synthetics.result_id")
|
|
36
38
|
}
|
|
39
|
+
|
|
40
|
+
DdSdkSessionStartedListener.getInstance().setReactContext(reactContext)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
override fun onHostPause() {
|
|
44
|
+
DdSdkSessionStartedListener.invalidate()
|
|
37
45
|
}
|
|
38
46
|
|
|
39
|
-
override fun
|
|
40
|
-
|
|
41
|
-
|
|
47
|
+
override fun onHostDestroy() {
|
|
48
|
+
DdSdkSessionStartedListener.invalidate()
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
reactContext.addLifecycleEventListener(lifecycleEventListener)
|
|
42
52
|
}
|
|
43
53
|
|
|
44
54
|
/**
|
|
@@ -0,0 +1,140 @@
|
|
|
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
|
+
@file:Suppress("NonAsciiCharacters")
|
|
7
|
+
|
|
8
|
+
package com.datadog.reactnative
|
|
9
|
+
|
|
10
|
+
import com.datadog.tools.unit.GenericAssert.Companion.assertThat
|
|
11
|
+
import com.datadog.tools.unit.forge.BaseConfigurator
|
|
12
|
+
import com.facebook.react.bridge.CatalystInstance
|
|
13
|
+
import com.facebook.react.bridge.NativeArray
|
|
14
|
+
import com.facebook.react.bridge.ReactContext
|
|
15
|
+
import fr.xgouchet.elmyr.junit5.ForgeConfiguration
|
|
16
|
+
import fr.xgouchet.elmyr.junit5.ForgeExtension
|
|
17
|
+
import org.junit.jupiter.api.BeforeEach
|
|
18
|
+
import org.junit.jupiter.api.Test
|
|
19
|
+
import org.junit.jupiter.api.assertDoesNotThrow
|
|
20
|
+
import org.junit.jupiter.api.extension.ExtendWith
|
|
21
|
+
import org.junit.jupiter.api.extension.Extensions
|
|
22
|
+
import org.mockito.Mock
|
|
23
|
+
import org.mockito.junit.jupiter.MockitoExtension
|
|
24
|
+
import org.mockito.junit.jupiter.MockitoSettings
|
|
25
|
+
import org.mockito.kotlin.any
|
|
26
|
+
import org.mockito.kotlin.anyOrNull
|
|
27
|
+
import org.mockito.kotlin.argThat
|
|
28
|
+
import org.mockito.kotlin.argWhere
|
|
29
|
+
import org.mockito.kotlin.mock
|
|
30
|
+
import org.mockito.kotlin.verify
|
|
31
|
+
import org.mockito.kotlin.verifyNoInteractions
|
|
32
|
+
import org.mockito.kotlin.whenever
|
|
33
|
+
import org.mockito.quality.Strictness
|
|
34
|
+
|
|
35
|
+
@Extensions(
|
|
36
|
+
ExtendWith(MockitoExtension::class),
|
|
37
|
+
ExtendWith(ForgeExtension::class)
|
|
38
|
+
)
|
|
39
|
+
@MockitoSettings(strictness = Strictness.LENIENT)
|
|
40
|
+
@ForgeConfiguration(BaseConfigurator::class)
|
|
41
|
+
internal class DdSdkSessionStartedListenerTest {
|
|
42
|
+
|
|
43
|
+
@Mock
|
|
44
|
+
lateinit var mockListenerCallback: (sessionId: String) -> Unit
|
|
45
|
+
|
|
46
|
+
@Mock
|
|
47
|
+
lateinit var mockReactContext: ReactContext
|
|
48
|
+
|
|
49
|
+
@Mock
|
|
50
|
+
lateinit var mockCatalystInstance: CatalystInstance
|
|
51
|
+
|
|
52
|
+
@Mock
|
|
53
|
+
lateinit var mockExceptionHandler: (error: Exception) -> Unit
|
|
54
|
+
|
|
55
|
+
@BeforeEach
|
|
56
|
+
fun `set up`() {
|
|
57
|
+
DdSdkSessionStartedListener.invalidate()
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
@Test
|
|
61
|
+
fun `𝕄 getInstance implements singleton correctly`() {
|
|
62
|
+
// GIVEN
|
|
63
|
+
val instance1 = DdSdkSessionStartedListener.getInstance()
|
|
64
|
+
// WHEN
|
|
65
|
+
val instance2 = DdSdkSessionStartedListener.getInstance()
|
|
66
|
+
// THEN
|
|
67
|
+
assertThat(instance1).isEqualTo(instance2)
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
@Test
|
|
71
|
+
fun `𝕄 invalidate() invalidates previous instance`() {
|
|
72
|
+
// GIVEN
|
|
73
|
+
val instance1 = DdSdkSessionStartedListener.getInstance()
|
|
74
|
+
// WHEN
|
|
75
|
+
DdSdkSessionStartedListener.invalidate()
|
|
76
|
+
// THEN
|
|
77
|
+
assertThat(instance1).isNotEqualTo(DdSdkSessionStartedListener.getInstance())
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
@Test
|
|
81
|
+
fun `𝕄 onSessionStarted internally catches exception if catalyst instance throws`() {
|
|
82
|
+
// GIVEN
|
|
83
|
+
whenever(mockReactContext.hasActiveReactInstance()).thenReturn(true)
|
|
84
|
+
whenever(mockReactContext.catalystInstance).thenReturn(mockCatalystInstance)
|
|
85
|
+
whenever(mockCatalystInstance.isDestroyed).thenReturn(false)
|
|
86
|
+
whenever(mockReactContext.fabricUIManager).thenReturn(null)
|
|
87
|
+
whenever(mockCatalystInstance.callFunction(any(), any(), anyOrNull()))
|
|
88
|
+
.thenThrow(RuntimeException("TEST"))
|
|
89
|
+
|
|
90
|
+
val instance = DdSdkSessionStartedListener.getInstance()
|
|
91
|
+
instance.setReactContext(mockReactContext)
|
|
92
|
+
instance.setExceptionHandler(mockExceptionHandler)
|
|
93
|
+
|
|
94
|
+
val passedArgs = mutableListOf<String>()
|
|
95
|
+
instance.setConvertToNativeArray {
|
|
96
|
+
passedArgs.addAll(it)
|
|
97
|
+
// We cannot mock or test NativeArray as it relies on native runtime SO library
|
|
98
|
+
return@setConvertToNativeArray null
|
|
99
|
+
}
|
|
100
|
+
// WHEN
|
|
101
|
+
assertDoesNotThrow {
|
|
102
|
+
instance.onSessionStarted("TEST-SESSION-ID", false)
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
// THEN
|
|
106
|
+
verify(mockExceptionHandler).invoke(
|
|
107
|
+
argThat {
|
|
108
|
+
this.message == "TEST"
|
|
109
|
+
}
|
|
110
|
+
)
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
@Test
|
|
114
|
+
fun `𝕄 session ID event is delayed until context is available W { bridge }`() {
|
|
115
|
+
// GIVEN
|
|
116
|
+
whenever(mockReactContext.hasActiveReactInstance()).thenReturn(true)
|
|
117
|
+
whenever(mockReactContext.catalystInstance).thenReturn(mockCatalystInstance)
|
|
118
|
+
whenever(mockCatalystInstance.isDestroyed).thenReturn(false)
|
|
119
|
+
whenever(mockReactContext.fabricUIManager).thenReturn(null)
|
|
120
|
+
whenever(mockCatalystInstance.callFunction(any(), any(), anyOrNull()))
|
|
121
|
+
.thenThrow(RuntimeException("TEST"))
|
|
122
|
+
|
|
123
|
+
val instance = DdSdkSessionStartedListener.getInstance()
|
|
124
|
+
|
|
125
|
+
val mockConvertToNativeArray = mock<(array: Array<String>) -> NativeArray?>()
|
|
126
|
+
instance.setConvertToNativeArray(mockConvertToNativeArray)
|
|
127
|
+
|
|
128
|
+
// WHEN
|
|
129
|
+
instance.onSessionStarted("TEST-SESSION-ID", false)
|
|
130
|
+
|
|
131
|
+
// THEN
|
|
132
|
+
verifyNoInteractions(mockConvertToNativeArray)
|
|
133
|
+
|
|
134
|
+
// WHEN
|
|
135
|
+
instance.setReactContext(mockReactContext)
|
|
136
|
+
|
|
137
|
+
// THEN
|
|
138
|
+
verify(mockConvertToNativeArray).invoke(argWhere { it.first() == "TEST-SESSION-ID" })
|
|
139
|
+
}
|
|
140
|
+
}
|
package/ios/Sources/DdSdk.h
CHANGED
|
@@ -6,24 +6,26 @@
|
|
|
6
6
|
|
|
7
7
|
#import <Foundation/Foundation.h>
|
|
8
8
|
#import <React/RCTEventEmitter.h>
|
|
9
|
+
#import <React/RCTBridge.h>
|
|
10
|
+
#import <React/RCTReloadCommand.h>
|
|
11
|
+
#import <React/RCTUtils.h>
|
|
9
12
|
|
|
10
13
|
@class DdSdkImplementation;
|
|
11
14
|
|
|
12
15
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
13
16
|
|
|
14
17
|
#import <DdSdkReactNative/DdSdkReactNative.h>
|
|
15
|
-
@interface DdSdk : RCTEventEmitter <NativeDdSdkSpec>
|
|
18
|
+
@interface DdSdk : RCTEventEmitter <NativeDdSdkSpec, RCTBridgeModule, RCTReloadListener>
|
|
16
19
|
|
|
17
20
|
#else
|
|
18
21
|
|
|
19
22
|
#import <React/RCTBridgeModule.h>
|
|
20
|
-
@interface DdSdk : RCTEventEmitter <RCTBridgeModule>
|
|
23
|
+
@interface DdSdk : RCTEventEmitter <RCTBridgeModule, RCTReloadListener>
|
|
21
24
|
|
|
22
25
|
#endif
|
|
23
26
|
|
|
24
|
-
@property(nonatomic, strong) DdSdkImplementation *ddSdkImplementation;
|
|
27
|
+
@property(nonatomic, strong) DdSdkImplementation * _Nonnull ddSdkImplementation;
|
|
25
28
|
|
|
26
29
|
+ (void)initFromNative;
|
|
27
|
-
+ (RCTBridge * _Nullable)latestBridgeReference;
|
|
28
30
|
|
|
29
31
|
@end
|