@datadog/mobile-react-native 3.1.1 → 3.2.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 (62) hide show
  1. package/DatadogSDKReactNative.podspec +7 -7
  2. package/android/build.gradle +22 -7
  3. package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +20 -43
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +1 -0
  5. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +5 -0
  6. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  7. package/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt +18 -125
  8. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +54 -0
  9. package/ios/Sources/AnyEncodable.swift +16 -83
  10. package/ios/Sources/Attributes.swift +5 -0
  11. package/ios/Sources/DdLogsImplementation.swift +13 -3
  12. package/ios/Sources/DdRumImplementation.swift +2 -1
  13. package/ios/Sources/DdSdkNativeInitialization.swift +8 -1
  14. package/ios/Sources/RUMMonitorInternalProtocol.swift +8 -1
  15. package/ios/Sources/SdkVersion.swift +1 -1
  16. package/lib/commonjs/logs/DdLogs.js +14 -44
  17. package/lib/commonjs/logs/DdLogs.js.map +1 -1
  18. package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
  19. package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
  20. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
  21. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  22. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js +3 -1
  23. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
  24. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +1 -0
  25. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  26. package/lib/commonjs/trace/DdTrace.js +1 -1
  27. package/lib/commonjs/trace/DdTrace.js.map +1 -1
  28. package/lib/commonjs/version.js +1 -1
  29. package/lib/module/logs/DdLogs.js +15 -45
  30. package/lib/module/logs/DdLogs.js.map +1 -1
  31. package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
  32. package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
  33. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
  34. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  35. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js +2 -0
  36. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
  37. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -1
  38. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  39. package/lib/module/trace/DdTrace.js +1 -1
  40. package/lib/module/trace/DdTrace.js.map +1 -1
  41. package/lib/module/version.js +1 -1
  42. package/lib/typescript/logs/DdLogs.d.ts +0 -5
  43. package/lib/typescript/logs/DdLogs.d.ts.map +1 -1
  44. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +9 -0
  45. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
  46. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts +2 -0
  47. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts.map +1 -1
  48. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
  49. package/lib/typescript/trace/DdTrace.d.ts.map +1 -1
  50. package/lib/typescript/version.d.ts +1 -1
  51. package/package.json +2 -2
  52. package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +89 -0
  53. package/src/logs/DdLogs.ts +25 -58
  54. package/src/logs/__tests__/DdLogs.test.ts +2 -21
  55. package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +3 -3
  56. package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +25 -3
  57. package/src/rum/instrumentation/resourceTracking/distributedTracing/headers.ts +2 -0
  58. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +10 -1
  59. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +54 -1
  60. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +13 -0
  61. package/src/trace/DdTrace.ts +1 -4
  62. package/src/version.ts +1 -1
@@ -19,15 +19,15 @@ Pod::Spec.new do |s|
19
19
  s.dependency "React-Core"
20
20
 
21
21
  # /!\ Remember to keep the versions in sync with DatadogSDKReactNativeSessionReplay.podspec
22
- s.dependency 'DatadogCore', '3.5.0'
23
- s.dependency 'DatadogLogs', '3.5.0'
24
- s.dependency 'DatadogTrace', '3.5.0'
25
- s.dependency 'DatadogRUM', '3.5.0'
26
- s.dependency 'DatadogCrashReporting', '3.5.0'
27
- s.dependency 'DatadogFlags', '3.5.0'
22
+ s.dependency 'DatadogCore', '3.8.2'
23
+ s.dependency 'DatadogLogs', '3.8.2'
24
+ s.dependency 'DatadogTrace', '3.8.2'
25
+ s.dependency 'DatadogRUM', '3.8.2'
26
+ s.dependency 'DatadogCrashReporting', '3.8.2'
27
+ s.dependency 'DatadogFlags', '3.8.2'
28
28
 
29
29
  # DatadogWebViewTracking is not available for tvOS
30
- s.ios.dependency 'DatadogWebViewTracking', '3.5.0'
30
+ s.ios.dependency 'DatadogWebViewTracking', '3.8.2'
31
31
 
32
32
  s.test_spec 'Tests' do |test_spec|
33
33
  test_spec.source_files = 'ios/Tests/**/*.{swift,json}'
@@ -200,18 +200,33 @@ dependencies {
200
200
  // This breaks builds if the React Native target is below 0.76.0. as it relies on Gradle 8.5.0.
201
201
  // To avoid this, we enforce 1.0.0-beta01 on RN < 0.76.0
202
202
  if (reactNativeMinorVersion < 76) {
203
- implementation("com.datadoghq:dd-sdk-android-rum:3.5.0") {
203
+ implementation("com.datadoghq:dd-sdk-android-rum:3.8.0") {
204
204
  exclude group: "androidx.metrics", module: "metrics-performance"
205
205
  }
206
206
  implementation "androidx.metrics:metrics-performance:1.0.0-beta01"
207
+ // dd-sdk-android requires androidx.core:core and androidx.core:core-ktx
208
+ // From 3.8.0, it uses 1.15.0, which requires compileSdk 35.
209
+ // However, React Native versions below 0.76.0 use compileSdk 34,
210
+ // so we pin 1.13.1 on those, since it's the last version compatible with compileSdk 34.
211
+ // Use dependency constraints (strictly) so this requirement propagates to consumers.
212
+ implementation("androidx.core:core") {
213
+ version {
214
+ strictly("1.13.1")
215
+ }
216
+ }
217
+ implementation("androidx.core:core-ktx") {
218
+ version {
219
+ strictly("1.13.1")
220
+ }
221
+ }
207
222
  } else {
208
- implementation "com.datadoghq:dd-sdk-android-rum:3.5.0"
223
+ implementation "com.datadoghq:dd-sdk-android-rum:3.8.0"
209
224
  }
210
- implementation "com.datadoghq:dd-sdk-android-logs:3.5.0"
211
- implementation "com.datadoghq:dd-sdk-android-trace:3.5.0"
212
- implementation "com.datadoghq:dd-sdk-android-webview:3.5.0"
213
- implementation "com.datadoghq:dd-sdk-android-ndk:3.5.0"
214
- implementation "com.datadoghq:dd-sdk-android-flags:3.5.0"
225
+ implementation "com.datadoghq:dd-sdk-android-logs:3.8.0"
226
+ implementation "com.datadoghq:dd-sdk-android-trace:3.8.0"
227
+ implementation "com.datadoghq:dd-sdk-android-webview:3.8.0"
228
+ implementation "com.datadoghq:dd-sdk-android-ndk:3.8.0"
229
+ implementation "com.datadoghq:dd-sdk-android-flags:3.8.0"
215
230
  implementation "com.google.code.gson:gson:2.10.0"
216
231
  testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
217
232
  testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
@@ -16,20 +16,30 @@ import com.facebook.react.bridge.ReadableMap
16
16
  * The entry point to use Datadog's Logs feature.
17
17
  */
18
18
  class DdLogsImplementation(
19
- logger: Logger? = null,
20
- private val datadog: DatadogWrapper = DatadogSDKWrapper()
21
- ) {
22
- private val reactNativeLogger: Logger by lazy {
23
- val bundleLogsWithRum = datadog.bundleLogsWithRum
24
- val bundleLogsWithTraces = datadog.bundleLogsWithTraces
25
-
26
- logger ?: Logger.Builder(Datadog.getInstance())
19
+ private val datadog: DatadogWrapper = DatadogSDKWrapper(),
20
+ private val logger: () -> Logger = {
21
+ Logger.Builder(Datadog.getInstance())
27
22
  .setLogcatLogsEnabled(true)
28
- .setBundleWithRumEnabled(bundleLogsWithRum)
29
- .setBundleWithTraceEnabled(bundleLogsWithTraces)
23
+ .setBundleWithRumEnabled(datadog.bundleLogsWithRum)
24
+ .setBundleWithTraceEnabled(datadog.bundleLogsWithTraces)
30
25
  .setName("DdLogs")
31
26
  .build()
32
27
  }
28
+ ) {
29
+ private var loggerInstance: Logger? = null
30
+ private val reactNativeLogger: Logger
31
+ get() {
32
+ if (loggerInstance == null) {
33
+ loggerInstance = logger()
34
+ }
35
+ return loggerInstance!!
36
+ }
37
+
38
+ init {
39
+ DatadogSDKWrapperStorage.addOnInitializedListener {
40
+ loggerInstance = null
41
+ }
42
+ }
33
43
 
34
44
  /**
35
45
  * Send a log with Debug level.
@@ -37,10 +47,6 @@ class DdLogsImplementation(
37
47
  * @param context The additional context to send.
38
48
  */
39
49
  fun debug(message: String, context: ReadableMap, promise: Promise) {
40
- if (!datadog.isInitialized()) {
41
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
42
- return
43
- }
44
50
  reactNativeLogger.d(
45
51
  message = message,
46
52
  attributes = context.toHashMap() + GlobalState.globalAttributes
@@ -54,10 +60,6 @@ class DdLogsImplementation(
54
60
  * @param context The additional context to send.
55
61
  */
56
62
  fun info(message: String, context: ReadableMap, promise: Promise) {
57
- if (!datadog.isInitialized()) {
58
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
59
- return
60
- }
61
63
  reactNativeLogger.i(
62
64
  message = message,
63
65
  attributes = context.toHashMap() + GlobalState.globalAttributes
@@ -71,10 +73,6 @@ class DdLogsImplementation(
71
73
  * @param context The additional context to send.
72
74
  */
73
75
  fun warn(message: String, context: ReadableMap, promise: Promise) {
74
- if (!datadog.isInitialized()) {
75
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
76
- return
77
- }
78
76
  reactNativeLogger.w(
79
77
  message = message,
80
78
  attributes = context.toHashMap() + GlobalState.globalAttributes
@@ -88,10 +86,6 @@ class DdLogsImplementation(
88
86
  * @param context The additional context to send.
89
87
  */
90
88
  fun error(message: String, context: ReadableMap, promise: Promise) {
91
- if (!datadog.isInitialized()) {
92
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
93
- return
94
- }
95
89
  reactNativeLogger.e(
96
90
  message = message,
97
91
  attributes = context.toHashMap() + GlobalState.globalAttributes
@@ -116,10 +110,6 @@ class DdLogsImplementation(
116
110
  context: ReadableMap,
117
111
  promise: Promise
118
112
  ) {
119
- if (!datadog.isInitialized()) {
120
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
121
- return
122
- }
123
113
  reactNativeLogger.log(
124
114
  priority = AndroidLog.DEBUG,
125
115
  message = message,
@@ -148,10 +138,6 @@ class DdLogsImplementation(
148
138
  context: ReadableMap,
149
139
  promise: Promise
150
140
  ) {
151
- if (!datadog.isInitialized()) {
152
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
153
- return
154
- }
155
141
  reactNativeLogger.log(
156
142
  priority = AndroidLog.INFO,
157
143
  message = message,
@@ -180,10 +166,6 @@ class DdLogsImplementation(
180
166
  context: ReadableMap,
181
167
  promise: Promise
182
168
  ) {
183
- if (!datadog.isInitialized()) {
184
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
185
- return
186
- }
187
169
  reactNativeLogger.log(
188
170
  priority = AndroidLog.WARN,
189
171
  message = message,
@@ -212,10 +194,6 @@ class DdLogsImplementation(
212
194
  context: ReadableMap,
213
195
  promise: Promise
214
196
  ) {
215
- if (!datadog.isInitialized()) {
216
- promise.reject(IllegalStateException(SDK_NOT_INITIALIZED_MESSAGE))
217
- return
218
- }
219
197
  reactNativeLogger.log(
220
198
  priority = AndroidLog.ERROR,
221
199
  message = message,
@@ -228,7 +206,6 @@ class DdLogsImplementation(
228
206
  }
229
207
 
230
208
  internal companion object {
231
- private const val SDK_NOT_INITIALIZED_MESSAGE = "DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT"
232
209
  internal const val NAME = "DdLogs"
233
210
  }
234
211
  }
@@ -405,6 +405,7 @@ class DdSdkImplementation(
405
405
  internal const val DEFAULT_APP_VERSION = "?"
406
406
  internal const val DD_VERSION = "_dd.version"
407
407
  internal const val DD_VERSION_SUFFIX = "_dd.version_suffix"
408
+ internal const val DD_NEEDS_CLEAR_TEXT_HTTP = "_dd.needsClearTextHttp"
408
409
  internal const val DD_DROP_RESOURCE = "_dd.resource.drop_resource"
409
410
  internal const val DD_DROP_ACTION = "_dd.action.drop_action"
410
411
  internal const val MONITOR_JS_ERROR_MESSAGE = "Error monitoring JS refresh rate"
@@ -21,6 +21,7 @@ import com.datadog.android.log.LogsConfiguration
21
21
  import com.datadog.android.privacy.TrackingConsent
22
22
  import com.datadog.android.rum.Rum
23
23
  import com.datadog.android.rum.RumConfiguration
24
+ import com.datadog.android._InternalProxy
24
25
  import com.datadog.android.rum._RumInternalProxy
25
26
  import com.datadog.android.rum.configuration.VitalsUpdateFrequency
26
27
  import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
@@ -313,6 +314,10 @@ class DdSdkNativeInitialization internal constructor(
313
314
 
314
315
  configBuilder.setBatchProcessingLevel(buildBatchProcessingLevel(configuration.batchProcessingLevel))
315
316
 
317
+ if (additionalConfig?.get(DdSdkImplementation.DD_NEEDS_CLEAR_TEXT_HTTP) == true) {
318
+ _InternalProxy.allowClearTextHttp(configBuilder)
319
+ }
320
+
316
321
  return configBuilder.build()
317
322
  }
318
323
 
@@ -7,4 +7,4 @@
7
7
  package com.datadog.reactnative
8
8
 
9
9
  // This is automatically updated by the update-version.sh script
10
- internal const val SDK_VERSION = "3.1.1"
10
+ internal const val SDK_VERSION = "3.2.0"
@@ -8,7 +8,6 @@ package com.datadog.reactnative
8
8
 
9
9
  import android.util.Log
10
10
  import com.datadog.android.log.Logger
11
- import com.datadog.tools.unit.GenericAssert.Companion.assertThat
12
11
  import com.facebook.react.bridge.Promise
13
12
  import com.facebook.react.bridge.ReadableMap
14
13
  import fr.xgouchet.elmyr.Forge
@@ -25,11 +24,9 @@ import org.junit.jupiter.api.extension.Extensions
25
24
  import org.mockito.Mock
26
25
  import org.mockito.junit.jupiter.MockitoExtension
27
26
  import org.mockito.junit.jupiter.MockitoSettings
28
- import org.mockito.kotlin.argumentCaptor
29
- import org.mockito.kotlin.doReturn
27
+ import org.mockito.kotlin.mock
30
28
  import org.mockito.kotlin.times
31
29
  import org.mockito.kotlin.verify
32
- import org.mockito.kotlin.verifyNoInteractions
33
30
  import org.mockito.kotlin.whenever
34
31
  import org.mockito.quality.Strictness
35
32
 
@@ -71,8 +68,7 @@ internal class DdLogsTest {
71
68
 
72
69
  @BeforeEach
73
70
  fun `set up`(forge: Forge) {
74
- whenever(mockDatadog.isInitialized()) doReturn true
75
- testedLogs = DdLogsImplementation(mockLogger, mockDatadog)
71
+ testedLogs = DdLogsImplementation(datadog = mockDatadog, logger = { mockLogger })
76
72
  fakeErrorKind = forge.aNullable { forge.aString() }
77
73
  fakeErrorMessage = forge.aNullable { forge.aString() }
78
74
  fakeStacktrace = forge.aNullable { forge.aString() }
@@ -272,129 +268,26 @@ internal class DdLogsTest {
272
268
  }
273
269
 
274
270
  @Test
275
- fun `M not forward logs W SDK is not initialized`() {
276
- // When
277
- whenever(mockDatadog.isInitialized()) doReturn false
278
- var newTestedLogs = DdLogsImplementation(mockLogger, mockDatadog)
279
- newTestedLogs.debug(fakeMessage, mockContext, mockPromise)
280
- newTestedLogs.info(fakeMessage, mockContext, mockPromise)
281
- newTestedLogs.warn(fakeMessage, mockContext, mockPromise)
282
- newTestedLogs.error(fakeMessage, mockContext, mockPromise)
283
- testedLogs.debugWithError(
284
- fakeMessage,
285
- fakeErrorKind,
286
- fakeErrorMessage,
287
- fakeStacktrace,
288
- mockContext,
289
- mockPromise
290
- )
291
- testedLogs.infoWithError(
292
- fakeMessage,
293
- fakeErrorKind,
294
- fakeErrorMessage,
295
- fakeStacktrace,
296
- mockContext,
297
- mockPromise
298
- )
299
- testedLogs.warnWithError(
300
- fakeMessage,
301
- fakeErrorKind,
302
- fakeErrorMessage,
303
- fakeStacktrace,
304
- mockContext,
305
- mockPromise
306
- )
307
- testedLogs.errorWithError(
308
- fakeMessage,
309
- fakeErrorKind,
310
- fakeErrorMessage,
311
- fakeStacktrace,
312
- mockContext,
313
- mockPromise
271
+ fun `M recreate logger W SDK is initialized`() {
272
+ // Given
273
+ val mockLoggerFactory = mock<() -> Logger>()
274
+ whenever(mockLoggerFactory()).thenReturn(mockLogger)
275
+ val testedLogs = DdLogsImplementation(
276
+ datadog = mockDatadog,
277
+ logger = mockLoggerFactory
314
278
  )
315
279
 
280
+ // When
281
+ testedLogs.debug(fakeMessage, mockContext, mockPromise)
282
+
316
283
  // Then
317
- verifyNoInteractions(mockLogger)
318
- val exceptionCaptor = argumentCaptor<IllegalStateException>()
319
- verify(mockPromise, times(8)).reject(exceptionCaptor.capture())
320
- assertThat(exceptionCaptor.firstValue.message)
321
- .isEqualTo("DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT")
322
-
323
- // When SDK is finally initialized
324
- whenever(mockDatadog.isInitialized()) doReturn true
325
- newTestedLogs.debug(fakeMessage, mockContext, mockPromise)
326
- newTestedLogs.info(fakeMessage, mockContext, mockPromise)
327
- newTestedLogs.warn(fakeMessage, mockContext, mockPromise)
328
- newTestedLogs.error(fakeMessage, mockContext, mockPromise)
329
- testedLogs.debugWithError(
330
- fakeMessage,
331
- fakeErrorKind,
332
- fakeErrorMessage,
333
- fakeStacktrace,
334
- mockContext,
335
- mockPromise
336
- )
337
- testedLogs.infoWithError(
338
- fakeMessage,
339
- fakeErrorKind,
340
- fakeErrorMessage,
341
- fakeStacktrace,
342
- mockContext,
343
- mockPromise
344
- )
345
- testedLogs.warnWithError(
346
- fakeMessage,
347
- fakeErrorKind,
348
- fakeErrorMessage,
349
- fakeStacktrace,
350
- mockContext,
351
- mockPromise
352
- )
353
- testedLogs.errorWithError(
354
- fakeMessage,
355
- fakeErrorKind,
356
- fakeErrorMessage,
357
- fakeStacktrace,
358
- mockContext,
359
- mockPromise
360
- )
284
+ verify(mockLoggerFactory, times(1)).invoke()
285
+
286
+ // When
287
+ DatadogSDKWrapperStorage.notifyOnInitializedListeners(mock())
361
288
 
362
289
  // Then
363
- verify(mockLogger).i(fakeMessage, attributes = mockContext.toHashMap())
364
- verify(mockLogger).d(fakeMessage, attributes = mockContext.toHashMap())
365
- verify(mockLogger).w(fakeMessage, attributes = mockContext.toHashMap())
366
- verify(mockLogger).e(fakeMessage, attributes = mockContext.toHashMap())
367
- verify(mockLogger).log(
368
- Log.DEBUG,
369
- fakeMessage,
370
- fakeErrorKind,
371
- fakeErrorMessage,
372
- fakeStacktrace,
373
- attributes = mockContext.toHashMap()
374
- )
375
- verify(mockLogger).log(
376
- Log.INFO,
377
- fakeMessage,
378
- fakeErrorKind,
379
- fakeErrorMessage,
380
- fakeStacktrace,
381
- attributes = mockContext.toHashMap()
382
- )
383
- verify(mockLogger).log(
384
- Log.WARN,
385
- fakeMessage,
386
- fakeErrorKind,
387
- fakeErrorMessage,
388
- fakeStacktrace,
389
- attributes = mockContext.toHashMap()
390
- )
391
- verify(mockLogger).log(
392
- Log.ERROR,
393
- fakeMessage,
394
- fakeErrorKind,
395
- fakeErrorMessage,
396
- fakeStacktrace,
397
- attributes = mockContext.toHashMap()
398
- )
290
+ testedLogs.debug(fakeMessage, mockContext, mockPromise)
291
+ verify(mockLoggerFactory, times(2)).invoke()
399
292
  }
400
293
  }
@@ -582,6 +582,60 @@ internal class DdSdkTest {
582
582
 
583
583
  // endregion
584
584
 
585
+ // region initialize / needsClearTextHttp
586
+
587
+ @Test
588
+ fun `𝕄 initialize native SDK 𝕎 initialize() {needsClearTextHttp=true}`() {
589
+ // Given
590
+ val additionalConfig = (
591
+ fakeConfiguration.additionalConfiguration?.toMutableMap() ?: mutableMapOf()
592
+ ).also { it[DdSdkImplementation.DD_NEEDS_CLEAR_TEXT_HTTP] = true }
593
+ val bridgeConfiguration = fakeConfiguration.copy(additionalConfiguration = additionalConfig)
594
+ val sdkConfigCaptor = argumentCaptor<Configuration>()
595
+ val rumConfigCaptor = argumentCaptor<RumConfiguration>()
596
+ val logsConfigCaptor = argumentCaptor<LogsConfiguration>()
597
+ val traceConfigCaptor = argumentCaptor<TraceConfiguration>()
598
+
599
+ val rumMock = org.mockito.Mockito.mockStatic(Rum::class.java)
600
+ val traceMock = org.mockito.Mockito.mockStatic(Trace::class.java)
601
+ val logsMock = org.mockito.Mockito.mockStatic(Logs::class.java)
602
+
603
+ try {
604
+ rumMock.`when`<Unit> { Rum.enable(any(), any()) }.then { }
605
+ logsMock.`when`<Unit> { Logs.enable(any(), any()) }.then { }
606
+ traceMock.`when`<Unit> { Trace.enable(any(), any()) }.then { }
607
+
608
+ // When
609
+ testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
610
+
611
+ // Then
612
+ inOrder(mockDatadog) {
613
+ verify(mockDatadog).initialize(
614
+ same(mockContext),
615
+ sdkConfigCaptor.capture(),
616
+ any()
617
+ )
618
+ rumMock.verify { Rum.enable(rumConfigCaptor.capture(), any()) }
619
+ traceMock.verify { Trace.enable(traceConfigCaptor.capture(), any()) }
620
+ logsMock.verify { Logs.enable(logsConfigCaptor.capture(), any()) }
621
+ }
622
+ assertThat(sdkConfigCaptor.firstValue)
623
+ .hasField("coreConfig") {
624
+ it.hasFieldEqualTo("needsClearTextHttp", true)
625
+ it.hasFieldEqualTo("firstPartyHostsWithHeaderTypes", emptyMap<String, String>())
626
+ }
627
+ .hasFieldEqualTo("clientToken", fakeConfiguration.clientToken)
628
+ .hasFieldEqualTo("env", fakeConfiguration.env)
629
+ .hasFieldEqualTo("variant", "")
630
+ } finally {
631
+ rumMock.close()
632
+ logsMock.close()
633
+ traceMock.close()
634
+ }
635
+ }
636
+
637
+ // endregion
638
+
585
639
  // region initialize / site
586
640
 
587
641
  @Test
@@ -4,6 +4,7 @@
4
4
  * Copyright 2019-2020 Datadog, Inc.
5
5
  */
6
6
 
7
+ import DatadogInternal
7
8
  import Foundation
8
9
 
9
10
  internal func castAttributesToSwift(_ attributes: NSDictionary) -> [String: Encodable] {
@@ -29,39 +30,39 @@ internal func castValueToSwift(_ value: Any) -> Encodable {
29
30
  // Otherwise, cast by preserving its encoded value (and loosing type information)
30
31
  casted = castByPreservingEncodedValue(attributeValue: value)
31
32
  }
32
-
33
+
33
34
  return casted
34
35
  }
35
36
 
36
37
  /// Casts `Any` value to `Encodable` by preserving its type information.
37
38
  private func castByPreservingTypeInformation(attributeValue: Any) -> Encodable? {
38
39
  switch attributeValue {
39
- case let string as String: // unpacking `NSTaggedPointerString`
40
- return string // cast to String
41
- case let number as NSNumber: // unpacking `__NSCFNumber`
40
+ case let string as String: // unpacking `NSTaggedPointerString`
41
+ return string // cast to String
42
+ case let number as NSNumber: // unpacking `__NSCFNumber`
42
43
  switch CFNumberGetType(number) {
43
44
  case .charType:
44
- return number.boolValue // cast to Bool
45
+ return number.boolValue // cast to Bool
45
46
  case .sInt8Type:
46
- return number.int8Value // cast to Int8
47
+ return number.int8Value // cast to Int8
47
48
  case .sInt16Type:
48
- return number.int16Value // cast to Int16
49
+ return number.int16Value // cast to Int16
49
50
  case .sInt32Type:
50
- return number.int32Value // cast to Int32
51
+ return number.int32Value // cast to Int32
51
52
  case .sInt64Type:
52
- return number.int64Value // cast to Int64
53
+ return number.int64Value // cast to Int64
53
54
  case .shortType:
54
- return number.uint16Value // cast to UInt 16
55
+ return number.uint16Value // cast to UInt 16
55
56
  case .longType:
56
- return number.uint32Value // cast to UInt32
57
+ return number.uint32Value // cast to UInt32
57
58
  case .longLongType:
58
- return number.uint64Value // cast to UInt64
59
+ return number.uint64Value // cast to UInt64
59
60
  case .intType, .nsIntegerType, .cfIndexType:
60
- return number.intValue // cast to Int
61
+ return number.intValue // cast to Int
61
62
  case .floatType, .float32Type:
62
- return number.floatValue // cast to Float
63
+ return number.floatValue // cast to Float
63
64
  case .doubleType, .float64Type, .cgFloatType:
64
- return number.doubleValue // cast to Double
65
+ return number.doubleValue // cast to Double
65
66
  @unknown default:
66
67
  return nil
67
68
  }
@@ -75,71 +76,3 @@ private func castByPreservingTypeInformation(attributeValue: Any) -> Encodable?
75
76
  private func castByPreservingEncodedValue(attributeValue: Any) -> Encodable {
76
77
  return AnyEncodable(attributeValue)
77
78
  }
78
-
79
- /// Type erasing `Encodable` wrapper to bridge Objective-C's `Any` to Swift `Encodable`.
80
- ///
81
- /// Inspired by `AnyCodable` by Flight-School (MIT):
82
- /// https://github.com/Flight-School/AnyCodable/blob/master/Sources/AnyCodable/AnyEncodable.swift
83
- internal class AnyEncodable: Encodable {
84
- internal let value: Any
85
-
86
- init(_ value: Any) {
87
- self.value = value
88
- }
89
-
90
- func encode(to encoder: Encoder) throws {
91
- var container = encoder.singleValueContainer()
92
-
93
- switch value {
94
- case let number as NSNumber:
95
- try encodeNSNumber(number, into: &container)
96
- case is NSNull, is Void:
97
- try container.encodeNil()
98
- case let string as String:
99
- try container.encode(string)
100
- case let date as Date:
101
- try container.encode(date)
102
- case let url as URL:
103
- try container.encode(url)
104
- case let array as [Any]:
105
- try container.encode(array.map { AnyEncodable($0) })
106
- case let dictionary as [String: Any]:
107
- try container.encode(dictionary.mapValues { AnyEncodable($0) })
108
- default:
109
- let context = EncodingError.Context(
110
- codingPath: container.codingPath,
111
- debugDescription: "Value \(value) cannot be encoded - \(type(of: value)) is not supported by `AnyEncodable`."
112
- )
113
- throw EncodingError.invalidValue(value, context)
114
- }
115
- }
116
- }
117
-
118
- private func encodeNSNumber(_ nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws {
119
- switch CFNumberGetType(nsnumber) {
120
- case .charType:
121
- try container.encode(nsnumber.boolValue)
122
- case .sInt8Type:
123
- try container.encode(nsnumber.int8Value)
124
- case .sInt16Type:
125
- try container.encode(nsnumber.int16Value)
126
- case .sInt32Type:
127
- try container.encode(nsnumber.int32Value)
128
- case .sInt64Type:
129
- try container.encode(nsnumber.int64Value)
130
- case .shortType:
131
- try container.encode(nsnumber.uint16Value)
132
- case .longType:
133
- try container.encode(nsnumber.uint32Value)
134
- case .longLongType:
135
- try container.encode(nsnumber.uint64Value)
136
- case .intType, .nsIntegerType, .cfIndexType:
137
- try container.encode(nsnumber.intValue)
138
- case .floatType, .float32Type:
139
- try container.encode(nsnumber.floatValue)
140
- case .doubleType, .float64Type, .cgFloatType:
141
- try container.encode(nsnumber.doubleValue)
142
- @unknown default:
143
- return
144
- }
145
- }
@@ -99,6 +99,11 @@ internal struct InternalConfigurationAttributes {
99
99
  /// Expects `NSString?` value
100
100
  static let versionSuffix = "_dd.version_suffix"
101
101
 
102
+ /// Header key set by the JS layer to indicate the request origin.
103
+ static let trackedByHeaderKey = "x-datadog-tracked-by"
104
+ /// Header value set by the JS layer to indicate the request was tracked by React Native.
105
+ static let trackedByHeaderValue = "react-native"
106
+
102
107
  /// Custom attribute of the resource passed from bridge SDK.
103
108
  /// It flags the resource as dropped by the user so it can be dropped in the resource mapper.
104
109
  /// Expects `Bool` value.
@@ -11,11 +11,21 @@ import DatadogCore
11
11
 
12
12
  @objc
13
13
  public class DdLogsImplementation: NSObject {
14
- private lazy var logger: LoggerProtocol = loggerProvider()
14
+ private var loggerInstance: LoggerProtocol?
15
+ private var logger: LoggerProtocol {
16
+ if loggerInstance == nil {
17
+ loggerInstance = loggerProvider()
18
+ }
19
+ return loggerInstance!
20
+ }
15
21
  private let loggerProvider: () -> LoggerProtocol
16
-
22
+
17
23
  internal init(_ loggerProvider: @escaping () -> LoggerProtocol) {
18
24
  self.loggerProvider = loggerProvider
25
+ super.init()
26
+ DatadogSDKWrapper.shared.addOnSdkInitializedListener { [weak self] _ in
27
+ self?.loggerInstance = nil
28
+ }
19
29
  }
20
30
 
21
31
  @objc
@@ -94,4 +104,4 @@ internal extension DatadogLogs.Logger.Configuration {
94
104
  consoleLogFormat: .short
95
105
  )
96
106
  }
97
- }
107
+ }
@@ -319,7 +319,8 @@ public class DdRumImplementation: NSObject {
319
319
  download: download,
320
320
  // no need to define the size here, because if it is missing,
321
321
  // it will be taken from the command
322
- responseSize: nil,
322
+ responseBodySize: nil,
323
+ requestBodySize: nil,
323
324
  attributes: [:]
324
325
  )
325
326
  }