@datadog/mobile-react-native 1.9.0 → 2.0.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.
Files changed (144) hide show
  1. package/DatadogSDKReactNative.podspec +8 -2
  2. package/android/build.gradle +7 -5
  3. package/android/gradle.properties +4 -4
  4. package/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +54 -13
  5. package/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt +36 -9
  6. package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +1 -2
  7. package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +37 -17
  8. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +1 -1
  9. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +3 -3
  10. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +71 -70
  11. package/android/src/main/kotlin/com/datadog/reactnative/DdTraceImplementation.kt +10 -2
  12. package/android/src/main/kotlin/com/datadog/reactnative/NoOpViewTrackingStrategy.kt +2 -1
  13. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdTrace.kt +1 -1
  14. package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +48 -30
  15. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +648 -641
  16. package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +1 -1
  17. package/android/src/test/kotlin/com/datadog/tools/unit/MockRumMonitor.kt +122 -0
  18. package/android/src/test/kotlin/com/datadog/tools/unit/ReflectUtils.kt +0 -1
  19. package/android/src/test/kotlin/com/datadog/tools/unit/forge/ActionEventForgeryFactory.kt +1 -1
  20. package/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt +3 -3
  21. package/android/src/test/kotlin/com/datadog/tools/unit/forge/ResourceEventForgeryFactory.kt +1 -1
  22. package/android/src/test/kotlin/com/datadog/tools/unit/forge/TelemetryConfigurationEventForgeryFactory.kt +4 -0
  23. package/ios/Sources/DdLogsImplementation.swift +10 -38
  24. package/ios/Sources/DdRumImplementation.swift +26 -39
  25. package/ios/Sources/DdSdkConfiguration.swift +55 -8
  26. package/ios/Sources/DdSdkImplementation.swift +141 -143
  27. package/ios/Sources/DdTraceImplementation.swift +2 -2
  28. package/ios/Sources/RNDdSdkConfiguration.swift +4 -2
  29. package/ios/Sources/RUMMonitorInternalProtocol.swift +40 -0
  30. package/lib/commonjs/DdSdkReactNative.js +2 -2
  31. package/lib/commonjs/DdSdkReactNative.js.map +1 -1
  32. package/lib/commonjs/DdSdkReactNativeConfiguration.js +1 -1
  33. package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
  34. package/lib/commonjs/index.js +20 -0
  35. package/lib/commonjs/index.js.map +1 -1
  36. package/lib/commonjs/rum/DdRum.js +2 -2
  37. package/lib/commonjs/rum/DdRum.js.map +1 -1
  38. package/lib/commonjs/rum/instrumentation/DdRumErrorTracking.js +10 -4
  39. package/lib/commonjs/rum/instrumentation/DdRumErrorTracking.js.map +1 -1
  40. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +2 -2
  41. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  42. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +19 -1
  43. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  44. package/lib/commonjs/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js +26 -0
  45. package/lib/commonjs/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js.map +1 -0
  46. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js +30 -10
  47. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +1 -1
  48. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +37 -1
  49. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  50. package/lib/commonjs/sdk/DatadogProvider/Buffer/BoundedBuffer.js +2 -2
  51. package/lib/commonjs/sdk/DatadogProvider/Buffer/BoundedBuffer.js.map +1 -1
  52. package/lib/commonjs/trace/DdTrace.js +2 -2
  53. package/lib/commonjs/trace/DdTrace.js.map +1 -1
  54. package/lib/commonjs/utils/jsUtils.js +26 -0
  55. package/lib/commonjs/utils/jsUtils.js.map +1 -0
  56. package/lib/commonjs/version.js +1 -1
  57. package/lib/commonjs/version.js.map +1 -1
  58. package/lib/module/DdSdkReactNative.js +1 -1
  59. package/lib/module/DdSdkReactNative.js.map +1 -1
  60. package/lib/module/DdSdkReactNativeConfiguration.js +1 -1
  61. package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
  62. package/lib/module/index.js +2 -1
  63. package/lib/module/index.js.map +1 -1
  64. package/lib/module/rum/DdRum.js +1 -1
  65. package/lib/module/rum/DdRum.js.map +1 -1
  66. package/lib/module/rum/instrumentation/DdRumErrorTracking.js +8 -3
  67. package/lib/module/rum/instrumentation/DdRumErrorTracking.js.map +1 -1
  68. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +1 -1
  69. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  70. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +17 -0
  71. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  72. package/lib/module/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js +13 -0
  73. package/lib/module/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js.map +1 -0
  74. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js +30 -10
  75. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +1 -1
  76. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +36 -1
  77. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  78. package/lib/module/sdk/DatadogProvider/Buffer/BoundedBuffer.js +1 -1
  79. package/lib/module/sdk/DatadogProvider/Buffer/BoundedBuffer.js.map +1 -1
  80. package/lib/module/trace/DdTrace.js +1 -1
  81. package/lib/module/trace/DdTrace.js.map +1 -1
  82. package/lib/module/utils/jsUtils.js +17 -0
  83. package/lib/module/utils/jsUtils.js.map +1 -0
  84. package/lib/module/version.js +1 -1
  85. package/lib/module/version.js.map +1 -1
  86. package/lib/typescript/index.d.ts +2 -1
  87. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +1 -0
  88. package/lib/typescript/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.d.ts +4 -0
  89. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts +1 -0
  90. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts +6 -0
  91. package/lib/typescript/utils/jsUtils.d.ts +1 -0
  92. package/lib/typescript/version.d.ts +1 -1
  93. package/package.json +11 -3
  94. package/src/DdSdkReactNative.tsx +1 -1
  95. package/src/DdSdkReactNativeConfiguration.tsx +4 -1
  96. package/src/__tests__/DdSdkReactNative.test.tsx +16 -4
  97. package/src/__tests__/rum/instrumentation/DdRumErrorTracking.test.tsx +2 -0
  98. package/src/index.tsx +9 -1
  99. package/src/rum/DdRum.ts +1 -1
  100. package/src/rum/__tests__/DdRum.test.ts +1 -1
  101. package/src/rum/instrumentation/DdRumErrorTracking.tsx +13 -4
  102. package/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx +1 -1
  103. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +35 -10
  104. package/src/rum/instrumentation/resourceTracking/graphql/__tests__/graphqlHeaders.test.ts +28 -0
  105. package/src/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.ts +15 -0
  106. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.ts +35 -20
  107. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +48 -1
  108. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +252 -5
  109. package/src/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.ts +7 -0
  110. package/src/sdk/DatadogProvider/Buffer/BoundedBuffer.ts +1 -1
  111. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +2 -2
  112. package/src/sdk/DatadogProvider/__tests__/initializationModes.test.tsx +8 -3
  113. package/src/trace/DdTrace.ts +1 -1
  114. package/src/utils/__mocks__/jsUtils.ts +21 -0
  115. package/src/utils/jsUtils.ts +20 -0
  116. package/src/version.ts +1 -1
  117. /package/lib/commonjs/{TimeProvider.js → utils/TimeProvider.js} +0 -0
  118. /package/lib/commonjs/{TimeProvider.js.map → utils/TimeProvider.js.map} +0 -0
  119. /package/lib/commonjs/{Timer.js → utils/Timer.js} +0 -0
  120. /package/lib/commonjs/{Timer.js.map → utils/Timer.js.map} +0 -0
  121. /package/lib/commonjs/{errorUtils.js → utils/errorUtils.js} +0 -0
  122. /package/lib/commonjs/{errorUtils.js.map → utils/errorUtils.js.map} +0 -0
  123. /package/lib/commonjs/{longTasksUtils.js → utils/longTasksUtils.js} +0 -0
  124. /package/lib/commonjs/{longTasksUtils.js.map → utils/longTasksUtils.js.map} +0 -0
  125. /package/lib/module/{TimeProvider.js → utils/TimeProvider.js} +0 -0
  126. /package/lib/module/{TimeProvider.js.map → utils/TimeProvider.js.map} +0 -0
  127. /package/lib/module/{Timer.js → utils/Timer.js} +0 -0
  128. /package/lib/module/{Timer.js.map → utils/Timer.js.map} +0 -0
  129. /package/lib/module/{errorUtils.js → utils/errorUtils.js} +0 -0
  130. /package/lib/module/{errorUtils.js.map → utils/errorUtils.js.map} +0 -0
  131. /package/lib/module/{longTasksUtils.js → utils/longTasksUtils.js} +0 -0
  132. /package/lib/module/{longTasksUtils.js.map → utils/longTasksUtils.js.map} +0 -0
  133. /package/lib/typescript/{TimeProvider.d.ts → utils/TimeProvider.d.ts} +0 -0
  134. /package/lib/typescript/{Timer.d.ts → utils/Timer.d.ts} +0 -0
  135. /package/lib/typescript/{errorUtils.d.ts → utils/errorUtils.d.ts} +0 -0
  136. /package/lib/typescript/{longTasksUtils.d.ts → utils/longTasksUtils.d.ts} +0 -0
  137. /package/src/{TimeProvider.tsx → utils/TimeProvider.tsx} +0 -0
  138. /package/src/{Timer.ts → utils/Timer.ts} +0 -0
  139. /package/src/{__tests__ → utils/__tests__}/TimeProvider.test.tsx +0 -0
  140. /package/src/{__tests__ → utils/__tests__}/Timer.test.ts +0 -0
  141. /package/src/{__tests__ → utils/__tests__}/errorUtils.test.ts +0 -0
  142. /package/src/{__tests__ → utils/__tests__}/longTasksUtils.test.ts +0 -0
  143. /package/src/{errorUtils.ts → utils/errorUtils.ts} +0 -0
  144. /package/src/{longTasksUtils.ts → utils/longTasksUtils.ts} +0 -0
@@ -11,22 +11,22 @@ import android.content.pm.PackageManager
11
11
  import android.util.Log
12
12
  import android.view.Choreographer
13
13
  import com.datadog.android.DatadogSite
14
- import com.datadog.android._InternalProxy
15
14
  import com.datadog.android.core.configuration.BatchSize
16
15
  import com.datadog.android.core.configuration.Configuration
17
- import com.datadog.android.core.configuration.Credentials
18
16
  import com.datadog.android.core.configuration.UploadFrequency
19
- import com.datadog.android.core.configuration.VitalsUpdateFrequency
20
17
  import com.datadog.android.event.EventMapper
18
+ import com.datadog.android.log.LogsConfiguration
21
19
  import com.datadog.android.privacy.TrackingConsent
22
- import com.datadog.android.rum.GlobalRum
23
- import com.datadog.android.rum.RumMonitor
20
+ import com.datadog.android.rum.configuration.VitalsUpdateFrequency
21
+ import com.datadog.android.rum.RumConfiguration
24
22
  import com.datadog.android.rum.RumPerformanceMetric
23
+ import com.datadog.android.rum._RumInternalProxy
25
24
  import com.datadog.android.rum.model.ActionEvent
26
25
  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
- import com.datadog.android.tracing.TracingHeaderType
28
+ import com.datadog.android.trace.TraceConfiguration
29
+ import com.datadog.android.trace.TracingHeaderType
30
30
  import com.facebook.react.bridge.Promise
31
31
  import com.facebook.react.bridge.ReactApplicationContext
32
32
  import com.facebook.react.bridge.ReadableArray
@@ -54,16 +54,21 @@ class DdSdkImplementation(
54
54
  */
55
55
  fun initialize(configuration: ReadableMap, promise: Promise) {
56
56
  val ddSdkConfiguration = configuration.asDdSdkConfiguration()
57
- val credentials = buildCredentials(ddSdkConfiguration)
58
- val nativeConfiguration = buildConfiguration(ddSdkConfiguration)
57
+ val sdkConfiguration = buildSdkConfiguration(ddSdkConfiguration)
58
+ val rumConfiguration = buildRumConfiguration(ddSdkConfiguration)
59
59
  val trackingConsent = buildTrackingConsent(ddSdkConfiguration.trackingConsent)
60
60
 
61
61
  configureSdkVerbosity(ddSdkConfiguration)
62
62
 
63
- datadog.initialize(appContext, credentials, nativeConfiguration, trackingConsent)
63
+ datadog.initialize(appContext, sdkConfiguration, trackingConsent)
64
64
 
65
- datadog.registerRumMonitor(RumMonitor.Builder().build())
65
+ datadog.enableRum(rumConfiguration)
66
66
  monitorJsRefreshRate(ddSdkConfiguration)
67
+
68
+ datadog.enableTrace(TraceConfiguration.Builder().build())
69
+
70
+ datadog.enableLogs(LogsConfiguration.Builder().build())
71
+
67
72
  initialized.set(true)
68
73
 
69
74
  promise.resolve(null)
@@ -165,55 +170,31 @@ class DdSdkImplementation(
165
170
  return packageInfo?.let {
166
171
  // we need to use the deprecated method because getLongVersionCode method is only
167
172
  // available from API 28 and above
168
- @Suppress("DEPRECATION") it.versionName ?: it.versionCode.toString()
173
+ @Suppress("DEPRECATION")
174
+ it.versionName ?: it.versionCode.toString()
169
175
  }
170
176
  ?: DEFAULT_APP_VERSION
171
177
  }
172
178
 
173
179
  @Suppress("ComplexMethod", "LongMethod", "UnsafeCallOnNullableType")
174
- private fun buildConfiguration(configuration: DdSdkConfiguration): Configuration {
175
- val additionalConfig = configuration.additionalConfig?.toMutableMap()
176
-
177
- val versionSuffix = configuration.additionalConfig?.get(DD_VERSION_SUFFIX) as? String
178
- if (versionSuffix != null && additionalConfig != null) {
179
- val defaultVersion = getDefaultAppVersion()
180
- additionalConfig.put(DD_VERSION, defaultVersion + versionSuffix)
181
- }
182
-
180
+ private fun buildRumConfiguration(configuration: DdSdkConfiguration): RumConfiguration {
183
181
  val configBuilder =
184
- Configuration.Builder(
185
- logsEnabled = true,
186
- tracesEnabled = true,
187
- crashReportsEnabled = configuration.nativeCrashReportEnabled
188
- ?: false,
189
- rumEnabled = true
182
+ RumConfiguration.Builder(
183
+ applicationId = configuration.applicationId
190
184
  )
191
- .setAdditionalConfiguration(
192
- additionalConfig?.filterValues { it != null }?.mapValues {
193
- it.value!!
194
- }
195
- ?: emptyMap()
196
- )
197
185
  if (configuration.sampleRate != null) {
198
- configBuilder.sampleRumSessions(configuration.sampleRate.toFloat())
186
+ configBuilder.setSessionSampleRate(configuration.sampleRate.toFloat())
199
187
  }
200
188
 
201
189
  configBuilder.trackFrustrations(configuration.trackFrustrations ?: true)
202
- configBuilder.trackBackgroundRumEvents(configuration.trackBackgroundEvents ?: false)
190
+ configBuilder.trackBackgroundEvents(configuration.trackBackgroundEvents ?: false)
203
191
 
204
- configBuilder.useSite(buildSite(configuration.site))
205
192
  configBuilder.setVitalsUpdateFrequency(
206
193
  buildVitalUpdateFrequency(configuration.vitalsUpdateFrequency)
207
194
  )
208
- configBuilder.setUploadFrequency(
209
- buildUploadFrequency(configuration.uploadFrequency)
210
- )
211
- configBuilder.setBatchSize(
212
- buildBatchSize(configuration.batchSize)
213
- )
214
195
 
215
196
  val telemetrySampleRate = (configuration.telemetrySampleRate as? Number)?.toFloat()
216
- telemetrySampleRate?.let { configBuilder.sampleTelemetry(it) }
197
+ telemetrySampleRate?.let { configBuilder.setTelemetrySampleRate(it) }
217
198
 
218
199
  val longTask = (configuration.nativeLongTaskThresholdMs as? Number)?.toLong()
219
200
  if (longTask != null) {
@@ -231,25 +212,10 @@ class DdSdkImplementation(
231
212
  val interactionTracking =
232
213
  configuration.additionalConfig?.get(DD_NATIVE_INTERACTION_TRACKING) as? Boolean
233
214
  if (interactionTracking == false) {
234
- configBuilder.disableInteractionTracking()
235
- }
236
-
237
- @Suppress("UNCHECKED_CAST")
238
- val firstPartyHosts =
239
- (configuration.additionalConfig?.get(DD_FIRST_PARTY_HOSTS) as? ReadableArray)
240
- ?.toArrayList() as?
241
- List<ReadableMap>
242
- if (firstPartyHosts != null) {
243
- val firstPartyHostsWithHeaderTypes = buildFirstPartyHosts(firstPartyHosts)
244
-
245
- configBuilder.setFirstPartyHostsWithHeaderType(firstPartyHostsWithHeaderTypes)
215
+ configBuilder.disableUserInteractionTracking()
246
216
  }
247
217
 
248
- buildProxyConfiguration(configuration)?.let { (proxy, authenticator) ->
249
- configBuilder.setProxy(proxy, authenticator)
250
- }
251
-
252
- configBuilder.setRumResourceEventMapper(
218
+ configBuilder.setResourceEventMapper(
253
219
  object : EventMapper<ResourceEvent> {
254
220
  override fun map(event: ResourceEvent): ResourceEvent? {
255
221
  if (event.context?.additionalProperties?.containsKey(DD_DROP_RESOURCE) ==
@@ -262,7 +228,7 @@ class DdSdkImplementation(
262
228
  }
263
229
  )
264
230
 
265
- configBuilder.setRumActionEventMapper(
231
+ configBuilder.setActionEventMapper(
266
232
  object : EventMapper<ActionEvent> {
267
233
  override fun map(event: ActionEvent): ActionEvent? {
268
234
  if (event.context?.additionalProperties?.containsKey(DD_DROP_ACTION) == true
@@ -274,7 +240,7 @@ class DdSdkImplementation(
274
240
  }
275
241
  )
276
242
 
277
- _InternalProxy.setTelemetryConfigurationEventMapper(
243
+ _RumInternalProxy.setTelemetryConfigurationEventMapper(
278
244
  configBuilder,
279
245
  object : EventMapper<TelemetryConfigurationEvent> {
280
246
  override fun map(
@@ -341,15 +307,51 @@ class DdSdkImplementation(
341
307
  return firstPartyHostsWithHeaderTypes
342
308
  }
343
309
 
344
- private fun buildCredentials(configuration: DdSdkConfiguration): Credentials {
310
+ private fun buildSdkConfiguration(configuration: DdSdkConfiguration): Configuration {
345
311
  val serviceName = configuration.additionalConfig?.get(DD_SERVICE_NAME) as? String
346
- return Credentials(
312
+ val configBuilder = Configuration.Builder(
347
313
  clientToken = configuration.clientToken,
348
- envName = configuration.env,
349
- rumApplicationId = configuration.applicationId,
314
+ env = configuration.env,
350
315
  variant = "",
351
- serviceName = serviceName
316
+ service = serviceName
317
+ )
318
+
319
+ val additionalConfig = configuration.additionalConfig?.toMutableMap()
320
+ val versionSuffix = configuration.additionalConfig?.get(DD_VERSION_SUFFIX) as? String
321
+ if (versionSuffix != null && additionalConfig != null) {
322
+ val defaultVersion = getDefaultAppVersion()
323
+ additionalConfig.put(DD_VERSION, defaultVersion + versionSuffix)
324
+ }
325
+ configBuilder.setAdditionalConfiguration(
326
+ additionalConfig?.filterValues { it != null }?.mapValues {
327
+ it.value
328
+ } as Map<String, Any>? ?: emptyMap()
329
+ )
330
+
331
+ configBuilder.setCrashReportsEnabled(configuration.nativeCrashReportEnabled ?: false)
332
+ configBuilder.useSite(buildSite(configuration.site))
333
+ configBuilder.setUploadFrequency(
334
+ buildUploadFrequency(configuration.uploadFrequency)
335
+ )
336
+ configBuilder.setBatchSize(
337
+ buildBatchSize(configuration.batchSize)
352
338
  )
339
+
340
+ buildProxyConfiguration(configuration)?.let { (proxy, authenticator) ->
341
+ configBuilder.setProxy(proxy, authenticator)
342
+ }
343
+
344
+ @Suppress("UNCHECKED_CAST")
345
+ val firstPartyHosts =
346
+ (configuration.additionalConfig?.get(DD_FIRST_PARTY_HOSTS) as? ReadableArray)
347
+ ?.toArrayList() as?
348
+ List<ReadableMap>
349
+ if (firstPartyHosts != null) {
350
+ val firstPartyHostsWithHeaderTypes = buildFirstPartyHosts(firstPartyHosts)
351
+ configBuilder.setFirstPartyHostsWithHeaderType(firstPartyHostsWithHeaderTypes)
352
+ }
353
+
354
+ return configBuilder.build()
353
355
  }
354
356
 
355
357
  internal fun buildTrackingConsent(trackingConsent: String?): TrackingConsent {
@@ -435,8 +437,7 @@ class DdSdkImplementation(
435
437
  }
436
438
 
437
439
  private fun buildUploadFrequency(uploadFrequency: String?): UploadFrequency {
438
- val uploadFrequency = uploadFrequency?.lowercase(Locale.US)
439
- return when (uploadFrequency) {
440
+ return when (uploadFrequency?.lowercase(Locale.US)) {
440
441
  "rare" -> UploadFrequency.RARE
441
442
  "average" -> UploadFrequency.AVERAGE
442
443
  "frequent" -> UploadFrequency.FREQUENT
@@ -489,7 +490,7 @@ class DdSdkImplementation(
489
490
 
490
491
  return {
491
492
  if (jsRefreshRateMonitoringEnabled && it > 0.0) {
492
- GlobalRum.get()
493
+ datadog.getRumMonitor()
493
494
  ._getInternal()
494
495
  ?.updatePerformanceMetric(RumPerformanceMetric.JS_FRAME_TIME, it)
495
496
  }
@@ -499,7 +500,7 @@ class DdSdkImplementation(
499
500
  ddSdkConfiguration.longTaskThresholdMs?.toLong() ?: 0L
500
501
  )
501
502
  ) {
502
- GlobalRum.get()._getInternal()?.addLongTask(it.toLong(), "javascript")
503
+ datadog.getRumMonitor()._getInternal()?.addLongTask(it.toLong(), "javascript")
503
504
  }
504
505
  }
505
506
  }
@@ -6,18 +6,26 @@
6
6
 
7
7
  package com.datadog.reactnative
8
8
 
9
- import com.datadog.android.tracing.AndroidTracer
9
+ import com.datadog.android.trace.AndroidTracer
10
+ import com.datadog.android.trace.Trace
11
+ import com.datadog.android.trace.TraceConfiguration
10
12
  import com.facebook.react.bridge.Promise
11
13
  import com.facebook.react.bridge.ReadableMap
12
14
  import io.opentracing.Span
13
15
  import io.opentracing.Tracer
16
+ import io.opentracing.util.GlobalTracer
14
17
  import java.util.concurrent.TimeUnit
15
18
 
16
19
  /**
17
20
  * The entry point to use Datadog's Trace feature.
18
21
  */
19
22
  class DdTraceImplementation(
20
- private val tracerProvider: () -> Tracer = { AndroidTracer.Builder().build() }
23
+ private val tracerProvider: () -> Tracer = {
24
+ val tracer = AndroidTracer.Builder().build()
25
+ GlobalTracer.registerIfAbsent(tracer)
26
+
27
+ GlobalTracer.get()
28
+ }
21
29
  ) {
22
30
  private val spanMap: MutableMap<String, Span> = mutableMapOf()
23
31
 
@@ -7,13 +7,14 @@
7
7
  package com.datadog.reactnative
8
8
 
9
9
  import android.content.Context
10
+ import com.datadog.android.api.SdkCore
10
11
  import com.datadog.android.rum.tracking.ViewTrackingStrategy
11
12
 
12
13
  /**
13
14
  * No-op implementation of the [ViewTrackingStrategy].
14
15
  */
15
16
  object NoOpViewTrackingStrategy : ViewTrackingStrategy {
16
- override fun register(context: Context) {
17
+ override fun register(sdkCore: SdkCore, context: Context) {
17
18
  // No-op
18
19
  }
19
20
 
@@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableMap
16
16
  * The entry point to use Datadog's Trace feature.
17
17
  */
18
18
  class DdTrace(
19
- reactContext: ReactApplicationContext,
19
+ reactContext: ReactApplicationContext
20
20
  ) : ReactContextBaseJavaModule(reactContext) {
21
21
 
22
22
  private val implementation = DdTraceImplementation()
@@ -6,19 +6,18 @@
6
6
 
7
7
  package com.datadog.reactnative
8
8
 
9
- import com.datadog.android.rum.GlobalRum
10
9
  import com.datadog.android.rum.RumActionType
11
10
  import com.datadog.android.rum.RumAttributes
12
11
  import com.datadog.android.rum.RumErrorSource
13
12
  import com.datadog.android.rum.RumMonitor
14
13
  import com.datadog.android.rum.RumResourceKind
14
+ import com.datadog.android.rum.RumResourceMethod
15
15
  import com.datadog.tools.unit.forge.BaseConfigurator
16
- import com.datadog.tools.unit.getStaticValue
17
- import com.datadog.tools.unit.setStaticValue
18
16
  import com.datadog.tools.unit.toReadableMap
19
17
  import com.facebook.react.bridge.Promise
20
- import com.nhaarman.mockitokotlin2.mock
18
+ import com.nhaarman.mockitokotlin2.doReturn
21
19
  import com.nhaarman.mockitokotlin2.verify
20
+ import com.nhaarman.mockitokotlin2.whenever
22
21
  import fr.xgouchet.elmyr.Forge
23
22
  import fr.xgouchet.elmyr.annotation.BoolForgery
24
23
  import fr.xgouchet.elmyr.annotation.DoubleForgery
@@ -29,7 +28,6 @@ import fr.xgouchet.elmyr.annotation.StringForgeryType
29
28
  import fr.xgouchet.elmyr.junit5.ForgeConfiguration
30
29
  import fr.xgouchet.elmyr.junit5.ForgeExtension
31
30
  import java.util.Date
32
- import java.util.concurrent.atomic.AtomicBoolean
33
31
  import org.junit.jupiter.api.AfterEach
34
32
  import org.junit.jupiter.api.BeforeEach
35
33
  import org.junit.jupiter.api.Test
@@ -55,6 +53,9 @@ internal class DdRumTest {
55
53
  @Mock
56
54
  lateinit var mockRumMonitor: RumMonitor
57
55
 
56
+ @Mock
57
+ lateinit var mockDatadog: DatadogWrapper
58
+
58
59
  @Mock
59
60
  lateinit var mockPromise: Promise
60
61
 
@@ -65,7 +66,7 @@ internal class DdRumTest {
65
66
 
66
67
  @BeforeEach
67
68
  fun `set up`(forge: Forge) {
68
- GlobalRum.registerIfAbsent(mockRumMonitor)
69
+ whenever(mockDatadog.getRumMonitor()) doReturn mockRumMonitor
69
70
 
70
71
  fakeContext = forge.aMap {
71
72
  anAlphabeticalString() to aNullable {
@@ -79,13 +80,11 @@ internal class DdRumTest {
79
80
  }
80
81
  }
81
82
 
82
- testedDdRum = DdRumImplementation()
83
+ testedDdRum = DdRumImplementation(mockDatadog)
83
84
  }
84
85
 
85
86
  @AfterEach
86
87
  fun `tear down`() {
87
- GlobalRum.javaClass.setStaticValue("monitor", mock<RumMonitor>())
88
- GlobalRum.javaClass.getStaticValue<GlobalRum, AtomicBoolean>("isRegistered").set(false)
89
88
  }
90
89
 
91
90
  @Test
@@ -133,12 +132,15 @@ internal class DdRumTest {
133
132
 
134
133
  // When
135
134
  testedDdRum.addAction(
136
- type.name, name, fakeContext.toReadableMap(),
137
- fakeTimestamp, mockPromise
135
+ type.name,
136
+ name,
137
+ fakeContext.toReadableMap(),
138
+ fakeTimestamp,
139
+ mockPromise
138
140
  )
139
141
 
140
142
  // Then
141
- verify(mockRumMonitor).addUserAction(type, name, updatedContext)
143
+ verify(mockRumMonitor).addAction(type, name, updatedContext)
142
144
  }
143
145
 
144
146
  @Test
@@ -155,7 +157,7 @@ internal class DdRumTest {
155
157
  testedDdRum.addAction(type, name, fakeContext.toReadableMap(), fakeTimestamp, mockPromise)
156
158
 
157
159
  // Then
158
- verify(mockRumMonitor).addUserAction(RumActionType.CUSTOM, name, updatedContext)
160
+ verify(mockRumMonitor).addAction(RumActionType.CUSTOM, name, updatedContext)
159
161
  }
160
162
 
161
163
  @Test
@@ -170,12 +172,15 @@ internal class DdRumTest {
170
172
 
171
173
  // When
172
174
  testedDdRum.startAction(
173
- type.name, name, fakeContext.toReadableMap(),
174
- fakeTimestamp, mockPromise
175
+ type.name,
176
+ name,
177
+ fakeContext.toReadableMap(),
178
+ fakeTimestamp,
179
+ mockPromise
175
180
  )
176
181
 
177
182
  // Then
178
- verify(mockRumMonitor).startUserAction(type, name, updatedContext)
183
+ verify(mockRumMonitor).startAction(type, name, updatedContext)
179
184
  }
180
185
 
181
186
  @Test
@@ -192,7 +197,7 @@ internal class DdRumTest {
192
197
  testedDdRum.startAction(type, name, fakeContext.toReadableMap(), fakeTimestamp, mockPromise)
193
198
 
194
199
  // Then
195
- verify(mockRumMonitor).startUserAction(RumActionType.CUSTOM, name, updatedContext)
200
+ verify(mockRumMonitor).startAction(RumActionType.CUSTOM, name, updatedContext)
196
201
  }
197
202
 
198
203
  @Test
@@ -207,12 +212,15 @@ internal class DdRumTest {
207
212
 
208
213
  // When
209
214
  testedDdRum.stopAction(
210
- type.name, name, fakeContext.toReadableMap(),
211
- fakeTimestamp, mockPromise
215
+ type.name,
216
+ name,
217
+ fakeContext.toReadableMap(),
218
+ fakeTimestamp,
219
+ mockPromise
212
220
  )
213
221
 
214
222
  // Then
215
- verify(mockRumMonitor).stopUserAction(type, name, updatedContext)
223
+ verify(mockRumMonitor).stopAction(type, name, updatedContext)
216
224
  }
217
225
 
218
226
  @Test
@@ -229,13 +237,13 @@ internal class DdRumTest {
229
237
  testedDdRum.stopAction(type, name, fakeContext.toReadableMap(), fakeTimestamp, mockPromise)
230
238
 
231
239
  // Then
232
- verify(mockRumMonitor).stopUserAction(RumActionType.CUSTOM, name, updatedContext)
240
+ verify(mockRumMonitor).stopAction(RumActionType.CUSTOM, name, updatedContext)
233
241
  }
234
242
 
235
243
  @Test
236
244
  fun `M call startResource W startResource()`(
237
245
  @StringForgery key: String,
238
- @StringForgery(regex = "GET|POST|DELETE") method: String,
246
+ @Forgery method: RumResourceMethod,
239
247
  @StringForgery(regex = "http(s?)://[a-z]+\\.com/\\w+") url: String
240
248
  ) {
241
249
  // Given
@@ -245,8 +253,12 @@ internal class DdRumTest {
245
253
 
246
254
  // When
247
255
  testedDdRum.startResource(
248
- key, method, url, fakeContext.toReadableMap(),
249
- fakeTimestamp, mockPromise
256
+ key,
257
+ method.toString(),
258
+ url,
259
+ fakeContext.toReadableMap(),
260
+ fakeTimestamp,
261
+ mockPromise
250
262
  )
251
263
 
252
264
  // Then
@@ -364,8 +376,12 @@ internal class DdRumTest {
364
376
 
365
377
  // When
366
378
  testedDdRum.addError(
367
- message, source.name, stackTrace, fakeContext.toReadableMap(),
368
- fakeTimestamp, mockPromise
379
+ message,
380
+ source.name,
381
+ stackTrace,
382
+ fakeContext.toReadableMap(),
383
+ fakeTimestamp,
384
+ mockPromise
369
385
  )
370
386
 
371
387
  // Then
@@ -385,8 +401,12 @@ internal class DdRumTest {
385
401
 
386
402
  // When
387
403
  testedDdRum.addError(
388
- message, source, stackTrace, fakeContext.toReadableMap(),
389
- fakeTimestamp, mockPromise
404
+ message,
405
+ source,
406
+ stackTrace,
407
+ fakeContext.toReadableMap(),
408
+ fakeTimestamp,
409
+ mockPromise
390
410
  )
391
411
 
392
412
  // Then
@@ -400,7 +420,6 @@ internal class DdRumTest {
400
420
 
401
421
  @Test
402
422
  fun `M call addTiming W addTiming()`(@StringForgery timing: String) {
403
-
404
423
  // When
405
424
  testedDdRum.addTiming(timing, mockPromise)
406
425
 
@@ -410,7 +429,6 @@ internal class DdRumTest {
410
429
 
411
430
  @Test
412
431
  fun `M call stopSession W stopSession()`() {
413
-
414
432
  // When
415
433
  testedDdRum.stopSession(mockPromise)
416
434