@datadog/mobile-react-native 2.4.1 → 2.4.2

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 (434) hide show
  1. package/DatadogSDKReactNative.podspec +6 -6
  2. package/android/build.gradle +1 -0
  3. package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +6 -0
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +31 -24
  5. package/android/src/main/kotlin/com/datadog/reactnative/FrameRateProvider.kt +63 -0
  6. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  7. package/android/src/main/kotlin/com/datadog/reactnative/UiThreadExecutor.kt +25 -0
  8. package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -1
  9. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -1
  10. package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +29 -0
  11. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +34 -14
  12. package/android/src/test/kotlin/com/datadog/tools/unit/TestUiThreadExecutor.kt +16 -0
  13. package/datadog-sourcemaps.gradle +3 -5
  14. package/ios/Sources/DdRum.mm +4 -3
  15. package/ios/Sources/DdRumImplementation.swift +15 -2
  16. package/ios/Sources/SdkVersion.swift +1 -1
  17. package/lib/commonjs/DdSdkReactNative.js +107 -145
  18. package/lib/commonjs/DdSdkReactNative.js.map +1 -1
  19. package/lib/commonjs/DdSdkReactNativeConfiguration.js +54 -119
  20. package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
  21. package/lib/commonjs/InternalLog.js +8 -19
  22. package/lib/commonjs/InternalLog.js.map +1 -1
  23. package/lib/commonjs/ProxyConfiguration.js +3 -15
  24. package/lib/commonjs/ProxyConfiguration.js.map +1 -1
  25. package/lib/commonjs/SdkVerbosity.js +3 -7
  26. package/lib/commonjs/SdkVerbosity.js.map +1 -1
  27. package/lib/commonjs/TrackingConsent.js +3 -7
  28. package/lib/commonjs/TrackingConsent.js.map +1 -1
  29. package/lib/commonjs/index.js +50 -66
  30. package/lib/commonjs/index.js.map +1 -1
  31. package/lib/commonjs/logs/DdLogs.js +103 -123
  32. package/lib/commonjs/logs/DdLogs.js.map +1 -1
  33. package/lib/commonjs/logs/eventMapper.js +4 -11
  34. package/lib/commonjs/logs/eventMapper.js.map +1 -1
  35. package/lib/commonjs/logs/types.js +4 -0
  36. package/lib/commonjs/logs/types.js.map +1 -1
  37. package/lib/commonjs/nativeModulesTypes.js +4 -3
  38. package/lib/commonjs/nativeModulesTypes.js.map +1 -1
  39. package/lib/commonjs/polyfills.js +1 -4
  40. package/lib/commonjs/polyfills.js.map +1 -1
  41. package/lib/commonjs/rum/DdAttributes.js +26 -0
  42. package/lib/commonjs/rum/DdAttributes.js.map +1 -0
  43. package/lib/commonjs/rum/DdRum.js +143 -208
  44. package/lib/commonjs/rum/DdRum.js.map +1 -1
  45. package/lib/commonjs/rum/eventMappers/actionEventMapper.js +5 -8
  46. package/lib/commonjs/rum/eventMappers/actionEventMapper.js.map +1 -1
  47. package/lib/commonjs/rum/eventMappers/errorEventMapper.js +3 -7
  48. package/lib/commonjs/rum/eventMappers/errorEventMapper.js.map +1 -1
  49. package/lib/commonjs/rum/eventMappers/resourceEventMapper.js +5 -8
  50. package/lib/commonjs/rum/eventMappers/resourceEventMapper.js.map +1 -1
  51. package/lib/commonjs/rum/instrumentation/DdRumErrorTracking.js +68 -89
  52. package/lib/commonjs/rum/instrumentation/DdRumErrorTracking.js.map +1 -1
  53. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +13 -46
  54. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  55. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +52 -66
  56. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  57. package/lib/commonjs/rum/instrumentation/interactionTracking/EventsInterceptor.js.map +1 -1
  58. package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +3 -4
  59. package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
  60. package/lib/commonjs/rum/instrumentation/interactionTracking/ShallowObjectEqualityChecker.js +0 -6
  61. package/lib/commonjs/rum/instrumentation/interactionTracking/ShallowObjectEqualityChecker.js.map +1 -1
  62. package/lib/commonjs/rum/instrumentation/interactionTracking/getJsxRuntime.js +18 -19
  63. package/lib/commonjs/rum/instrumentation/interactionTracking/getJsxRuntime.js.map +1 -1
  64. package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +6 -21
  65. package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
  66. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +32 -55
  67. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
  68. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +1 -9
  69. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  70. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +15 -41
  71. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  72. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js +3 -13
  73. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js.map +1 -1
  74. package/lib/commonjs/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js +5 -10
  75. package/lib/commonjs/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js.map +1 -1
  76. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js +16 -35
  77. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +1 -1
  78. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js +2 -5
  79. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js.map +1 -1
  80. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js +4 -7
  81. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js.map +1 -1
  82. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/URLHostParser.js +4 -10
  83. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/URLHostParser.js.map +1 -1
  84. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +25 -58
  85. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  86. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/responseSize.js +4 -26
  87. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/responseSize.js.map +1 -1
  88. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js +1 -11
  89. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js.map +1 -1
  90. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.js +4 -0
  91. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.js.map +1 -1
  92. package/lib/commonjs/rum/types.js +15 -27
  93. package/lib/commonjs/rum/types.js.map +1 -1
  94. package/lib/commonjs/sdk/AttributesSingleton/AttributesSingleton.js +20 -30
  95. package/lib/commonjs/sdk/AttributesSingleton/AttributesSingleton.js.map +1 -1
  96. package/lib/commonjs/sdk/AttributesSingleton/types.js.map +1 -1
  97. package/lib/commonjs/sdk/DatadogProvider/Buffer/BoundedBuffer.js +112 -144
  98. package/lib/commonjs/sdk/DatadogProvider/Buffer/BoundedBuffer.js.map +1 -1
  99. package/lib/commonjs/sdk/DatadogProvider/Buffer/BufferSingleton.js +19 -22
  100. package/lib/commonjs/sdk/DatadogProvider/Buffer/BufferSingleton.js.map +1 -1
  101. package/lib/commonjs/sdk/DatadogProvider/Buffer/DatadogBuffer.js +1 -15
  102. package/lib/commonjs/sdk/DatadogProvider/Buffer/DatadogBuffer.js.map +1 -1
  103. package/lib/commonjs/sdk/DatadogProvider/Buffer/PassThroughBuffer.js +9 -16
  104. package/lib/commonjs/sdk/DatadogProvider/Buffer/PassThroughBuffer.js.map +1 -1
  105. package/lib/commonjs/sdk/DatadogProvider/Buffer/bufferNativeCall.js +2 -8
  106. package/lib/commonjs/sdk/DatadogProvider/Buffer/bufferNativeCall.js.map +1 -1
  107. package/lib/commonjs/sdk/DatadogProvider/DatadogProvider.js +8 -25
  108. package/lib/commonjs/sdk/DatadogProvider/DatadogProvider.js.map +1 -1
  109. package/lib/commonjs/sdk/DdSdk.js +2 -4
  110. package/lib/commonjs/sdk/DdSdk.js.map +1 -1
  111. package/lib/commonjs/sdk/EventMappers/EventMapper.js +31 -51
  112. package/lib/commonjs/sdk/EventMappers/EventMapper.js.map +1 -1
  113. package/lib/commonjs/sdk/EventMappers/utils/deepClone.js +9 -24
  114. package/lib/commonjs/sdk/EventMappers/utils/deepClone.js.map +1 -1
  115. package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js +6 -38
  116. package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -1
  117. package/lib/commonjs/sdk/GlobalState/GlobalState.js +6 -11
  118. package/lib/commonjs/sdk/GlobalState/GlobalState.js.map +1 -1
  119. package/lib/commonjs/sdk/UserInfoSingleton/UserInfoSingleton.js +17 -28
  120. package/lib/commonjs/sdk/UserInfoSingleton/UserInfoSingleton.js.map +1 -1
  121. package/lib/commonjs/sdk/UserInfoSingleton/types.js.map +1 -1
  122. package/lib/commonjs/specs/NativeDdLogs.js +4 -6
  123. package/lib/commonjs/specs/NativeDdLogs.js.map +1 -1
  124. package/lib/commonjs/specs/NativeDdRum.js +4 -6
  125. package/lib/commonjs/specs/NativeDdRum.js.map +1 -1
  126. package/lib/commonjs/specs/NativeDdSdk.js +4 -6
  127. package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
  128. package/lib/commonjs/specs/NativeDdTrace.js +4 -6
  129. package/lib/commonjs/specs/NativeDdTrace.js.map +1 -1
  130. package/lib/commonjs/trace/DdTrace.js +17 -29
  131. package/lib/commonjs/trace/DdTrace.js.map +1 -1
  132. package/lib/commonjs/types.js +4 -3
  133. package/lib/commonjs/types.js.map +1 -1
  134. package/lib/commonjs/utils/Timer.js +7 -22
  135. package/lib/commonjs/utils/Timer.js.map +1 -1
  136. package/lib/commonjs/utils/argsUtils.js +3 -11
  137. package/lib/commonjs/utils/argsUtils.js.map +1 -1
  138. package/lib/commonjs/utils/errorUtils.js +9 -22
  139. package/lib/commonjs/utils/errorUtils.js.map +1 -1
  140. package/lib/commonjs/utils/jsUtils.js +1 -2
  141. package/lib/commonjs/utils/jsUtils.js.map +1 -1
  142. package/lib/commonjs/utils/longTasksUtils.js +2 -7
  143. package/lib/commonjs/utils/longTasksUtils.js.map +1 -1
  144. package/lib/commonjs/utils/time-provider/DefaultTimeProvider.js +9 -15
  145. package/lib/commonjs/utils/time-provider/DefaultTimeProvider.js.map +1 -1
  146. package/lib/commonjs/utils/time-provider/TimeProvider.js +1 -11
  147. package/lib/commonjs/utils/time-provider/TimeProvider.js.map +1 -1
  148. package/lib/commonjs/version.js +1 -2
  149. package/lib/commonjs/version.js.map +1 -1
  150. package/lib/module/DdSdkReactNative.js +104 -116
  151. package/lib/module/DdSdkReactNative.js.map +1 -1
  152. package/lib/module/DdSdkReactNativeConfiguration.js +49 -101
  153. package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
  154. package/lib/module/InternalLog.js +4 -15
  155. package/lib/module/InternalLog.js.map +1 -1
  156. package/lib/module/ProxyConfiguration.js +3 -14
  157. package/lib/module/ProxyConfiguration.js.map +1 -1
  158. package/lib/module/SdkVerbosity.js +3 -4
  159. package/lib/module/SdkVerbosity.js.map +1 -1
  160. package/lib/module/TrackingConsent.js +3 -4
  161. package/lib/module/TrackingConsent.js.map +1 -1
  162. package/lib/module/index.js +2 -2
  163. package/lib/module/index.js.map +1 -1
  164. package/lib/module/logs/DdLogs.js +98 -117
  165. package/lib/module/logs/DdLogs.js.map +1 -1
  166. package/lib/module/logs/eventMapper.js +3 -1
  167. package/lib/module/logs/eventMapper.js.map +1 -1
  168. package/lib/module/logs/types.js +1 -1
  169. package/lib/module/logs/types.js.map +1 -1
  170. package/lib/module/nativeModulesTypes.js +5 -1
  171. package/lib/module/nativeModulesTypes.js.map +1 -1
  172. package/lib/module/polyfills.js +1 -3
  173. package/lib/module/polyfills.js.map +1 -1
  174. package/lib/module/rum/DdAttributes.js +20 -0
  175. package/lib/module/rum/DdAttributes.js.map +1 -0
  176. package/lib/module/rum/DdRum.js +138 -185
  177. package/lib/module/rum/DdRum.js.map +1 -1
  178. package/lib/module/rum/eventMappers/actionEventMapper.js +5 -5
  179. package/lib/module/rum/eventMappers/actionEventMapper.js.map +1 -1
  180. package/lib/module/rum/eventMappers/errorEventMapper.js +3 -4
  181. package/lib/module/rum/eventMappers/errorEventMapper.js.map +1 -1
  182. package/lib/module/rum/eventMappers/resourceEventMapper.js +5 -5
  183. package/lib/module/rum/eventMappers/resourceEventMapper.js.map +1 -1
  184. package/lib/module/rum/instrumentation/DdRumErrorTracking.js +64 -79
  185. package/lib/module/rum/instrumentation/DdRumErrorTracking.js.map +1 -1
  186. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +7 -36
  187. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  188. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +49 -54
  189. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  190. package/lib/module/rum/instrumentation/interactionTracking/EventsInterceptor.js.map +1 -1
  191. package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +3 -2
  192. package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
  193. package/lib/module/rum/instrumentation/interactionTracking/ShallowObjectEqualityChecker.js +0 -4
  194. package/lib/module/rum/instrumentation/interactionTracking/ShallowObjectEqualityChecker.js.map +1 -1
  195. package/lib/module/rum/instrumentation/interactionTracking/getJsxRuntime.js +16 -14
  196. package/lib/module/rum/instrumentation/interactionTracking/getJsxRuntime.js.map +1 -1
  197. package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +2 -12
  198. package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
  199. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js +33 -45
  200. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.js.map +1 -1
  201. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +1 -4
  202. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  203. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +2 -10
  204. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  205. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js +3 -5
  206. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.js.map +1 -1
  207. package/lib/module/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js +1 -0
  208. package/lib/module/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.js.map +1 -1
  209. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js +12 -30
  210. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +1 -1
  211. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js +2 -3
  212. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js.map +1 -1
  213. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js +4 -4
  214. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js.map +1 -1
  215. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/URLHostParser.js +4 -5
  216. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/URLHostParser.js.map +1 -1
  217. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +20 -48
  218. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  219. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/responseSize.js +2 -20
  220. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/responseSize.js.map +1 -1
  221. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js +1 -9
  222. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.js.map +1 -1
  223. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.js +1 -1
  224. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.js.map +1 -1
  225. package/lib/module/rum/types.js +14 -18
  226. package/lib/module/rum/types.js.map +1 -1
  227. package/lib/module/sdk/AttributesSingleton/AttributesSingleton.js +20 -28
  228. package/lib/module/sdk/AttributesSingleton/AttributesSingleton.js.map +1 -1
  229. package/lib/module/sdk/AttributesSingleton/types.js.map +1 -1
  230. package/lib/module/sdk/DatadogProvider/Buffer/BoundedBuffer.js +108 -137
  231. package/lib/module/sdk/DatadogProvider/Buffer/BoundedBuffer.js.map +1 -1
  232. package/lib/module/sdk/DatadogProvider/Buffer/BufferSingleton.js +14 -18
  233. package/lib/module/sdk/DatadogProvider/Buffer/BufferSingleton.js.map +1 -1
  234. package/lib/module/sdk/DatadogProvider/Buffer/DatadogBuffer.js +1 -13
  235. package/lib/module/sdk/DatadogProvider/Buffer/DatadogBuffer.js.map +1 -1
  236. package/lib/module/sdk/DatadogProvider/Buffer/PassThroughBuffer.js +5 -14
  237. package/lib/module/sdk/DatadogProvider/Buffer/PassThroughBuffer.js.map +1 -1
  238. package/lib/module/sdk/DatadogProvider/Buffer/bufferNativeCall.js +1 -0
  239. package/lib/module/sdk/DatadogProvider/Buffer/bufferNativeCall.js.map +1 -1
  240. package/lib/module/sdk/DatadogProvider/DatadogProvider.js +6 -14
  241. package/lib/module/sdk/DatadogProvider/DatadogProvider.js.map +1 -1
  242. package/lib/module/sdk/DdSdk.js +1 -1
  243. package/lib/module/sdk/DdSdk.js.map +1 -1
  244. package/lib/module/sdk/EventMappers/EventMapper.js +27 -41
  245. package/lib/module/sdk/EventMappers/EventMapper.js.map +1 -1
  246. package/lib/module/sdk/EventMappers/utils/deepClone.js +9 -22
  247. package/lib/module/sdk/EventMappers/utils/deepClone.js.map +1 -1
  248. package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js +5 -29
  249. package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -1
  250. package/lib/module/sdk/GlobalState/GlobalState.js +6 -9
  251. package/lib/module/sdk/GlobalState/GlobalState.js.map +1 -1
  252. package/lib/module/sdk/UserInfoSingleton/UserInfoSingleton.js +17 -26
  253. package/lib/module/sdk/UserInfoSingleton/UserInfoSingleton.js.map +1 -1
  254. package/lib/module/sdk/UserInfoSingleton/types.js.map +1 -1
  255. package/lib/module/specs/NativeDdLogs.js +2 -0
  256. package/lib/module/specs/NativeDdLogs.js.map +1 -1
  257. package/lib/module/specs/NativeDdRum.js +2 -0
  258. package/lib/module/specs/NativeDdRum.js.map +1 -1
  259. package/lib/module/specs/NativeDdSdk.js +2 -0
  260. package/lib/module/specs/NativeDdSdk.js.map +1 -1
  261. package/lib/module/specs/NativeDdTrace.js +2 -0
  262. package/lib/module/specs/NativeDdTrace.js.map +1 -1
  263. package/lib/module/trace/DdTrace.js +12 -19
  264. package/lib/module/trace/DdTrace.js.map +1 -1
  265. package/lib/module/types.js +5 -1
  266. package/lib/module/types.js.map +1 -1
  267. package/lib/module/utils/Timer.js +3 -20
  268. package/lib/module/utils/Timer.js.map +1 -1
  269. package/lib/module/utils/argsUtils.js +3 -5
  270. package/lib/module/utils/argsUtils.js.map +1 -1
  271. package/lib/module/utils/errorUtils.js +6 -9
  272. package/lib/module/utils/errorUtils.js.map +1 -1
  273. package/lib/module/utils/jsUtils.js +1 -0
  274. package/lib/module/utils/jsUtils.js.map +1 -1
  275. package/lib/module/utils/longTasksUtils.js +2 -5
  276. package/lib/module/utils/longTasksUtils.js.map +1 -1
  277. package/lib/module/utils/time-provider/DefaultTimeProvider.js +5 -13
  278. package/lib/module/utils/time-provider/DefaultTimeProvider.js.map +1 -1
  279. package/lib/module/utils/time-provider/TimeProvider.js +1 -9
  280. package/lib/module/utils/time-provider/TimeProvider.js.map +1 -1
  281. package/lib/module/version.js +1 -1
  282. package/lib/module/version.js.map +1 -1
  283. package/lib/typescript/DdSdkReactNative.d.ts +1 -0
  284. package/lib/typescript/DdSdkReactNative.d.ts.map +1 -0
  285. package/lib/typescript/DdSdkReactNativeConfiguration.d.ts +1 -0
  286. package/lib/typescript/DdSdkReactNativeConfiguration.d.ts.map +1 -0
  287. package/lib/typescript/InternalLog.d.ts +1 -0
  288. package/lib/typescript/InternalLog.d.ts.map +1 -0
  289. package/lib/typescript/ProxyConfiguration.d.ts +1 -0
  290. package/lib/typescript/ProxyConfiguration.d.ts.map +1 -0
  291. package/lib/typescript/SdkVerbosity.d.ts +1 -0
  292. package/lib/typescript/SdkVerbosity.d.ts.map +1 -0
  293. package/lib/typescript/TrackingConsent.d.ts +1 -0
  294. package/lib/typescript/TrackingConsent.d.ts.map +1 -0
  295. package/lib/typescript/index.d.ts +1 -0
  296. package/lib/typescript/index.d.ts.map +1 -0
  297. package/lib/typescript/logs/DdLogs.d.ts +1 -0
  298. package/lib/typescript/logs/DdLogs.d.ts.map +1 -0
  299. package/lib/typescript/logs/eventMapper.d.ts +1 -0
  300. package/lib/typescript/logs/eventMapper.d.ts.map +1 -0
  301. package/lib/typescript/logs/types.d.ts +6 -1
  302. package/lib/typescript/logs/types.d.ts.map +1 -0
  303. package/lib/typescript/nativeModulesTypes.d.ts +3 -1
  304. package/lib/typescript/nativeModulesTypes.d.ts.map +1 -0
  305. package/lib/typescript/rum/DdAttributes.d.ts +14 -0
  306. package/lib/typescript/rum/DdAttributes.d.ts.map +1 -0
  307. package/lib/typescript/rum/DdRum.d.ts +3 -2
  308. package/lib/typescript/rum/DdRum.d.ts.map +1 -0
  309. package/lib/typescript/rum/eventMappers/actionEventMapper.d.ts +1 -0
  310. package/lib/typescript/rum/eventMappers/actionEventMapper.d.ts.map +1 -0
  311. package/lib/typescript/rum/eventMappers/errorEventMapper.d.ts +3 -0
  312. package/lib/typescript/rum/eventMappers/errorEventMapper.d.ts.map +1 -0
  313. package/lib/typescript/rum/eventMappers/resourceEventMapper.d.ts +1 -0
  314. package/lib/typescript/rum/eventMappers/resourceEventMapper.d.ts.map +1 -0
  315. package/lib/typescript/rum/instrumentation/DdRumErrorTracking.d.ts +1 -0
  316. package/lib/typescript/rum/instrumentation/DdRumErrorTracking.d.ts.map +1 -0
  317. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +1 -0
  318. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -0
  319. package/lib/typescript/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.d.ts +2 -0
  320. package/lib/typescript/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.d.ts.map +1 -0
  321. package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts +1 -0
  322. package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts.map +1 -0
  323. package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts +1 -0
  324. package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts.map +1 -0
  325. package/lib/typescript/rum/instrumentation/interactionTracking/ShallowObjectEqualityChecker.d.ts +1 -0
  326. package/lib/typescript/rum/instrumentation/interactionTracking/ShallowObjectEqualityChecker.d.ts.map +1 -0
  327. package/lib/typescript/rum/instrumentation/interactionTracking/getJsxRuntime.d.ts +2 -1
  328. package/lib/typescript/rum/instrumentation/interactionTracking/getJsxRuntime.d.ts.map +1 -0
  329. package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts +1 -0
  330. package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +1 -0
  331. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts +1 -0
  332. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/TracingIdentifier.d.ts.map +1 -0
  333. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts +1 -0
  334. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts.map +1 -0
  335. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +1 -0
  336. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -0
  337. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.d.ts +1 -0
  338. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/firstPartyHosts.d.ts.map +1 -0
  339. package/lib/typescript/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.d.ts +1 -0
  340. package/lib/typescript/rum/instrumentation/resourceTracking/graphql/graphqlHeaders.d.ts.map +1 -0
  341. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.d.ts +1 -0
  342. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.d.ts.map +1 -0
  343. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.d.ts +1 -0
  344. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.d.ts.map +1 -0
  345. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.d.ts +1 -0
  346. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.d.ts.map +1 -0
  347. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/URLHostParser.d.ts +1 -0
  348. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/URLHostParser.d.ts.map +1 -0
  349. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts +1 -0
  350. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -0
  351. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/responseSize.d.ts +1 -0
  352. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/responseSize.d.ts.map +1 -0
  353. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.d.ts +1 -0
  354. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RequestProxy.d.ts.map +1 -0
  355. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts +1 -0
  356. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/interfaces/RumResource.d.ts.map +1 -0
  357. package/lib/typescript/rum/types.d.ts +1 -0
  358. package/lib/typescript/rum/types.d.ts.map +1 -0
  359. package/lib/typescript/sdk/AttributesSingleton/AttributesSingleton.d.ts +1 -0
  360. package/lib/typescript/sdk/AttributesSingleton/AttributesSingleton.d.ts.map +1 -0
  361. package/lib/typescript/sdk/AttributesSingleton/types.d.ts +1 -0
  362. package/lib/typescript/sdk/AttributesSingleton/types.d.ts.map +1 -0
  363. package/lib/typescript/sdk/DatadogProvider/Buffer/BoundedBuffer.d.ts +1 -0
  364. package/lib/typescript/sdk/DatadogProvider/Buffer/BoundedBuffer.d.ts.map +1 -0
  365. package/lib/typescript/sdk/DatadogProvider/Buffer/BufferSingleton.d.ts +1 -0
  366. package/lib/typescript/sdk/DatadogProvider/Buffer/BufferSingleton.d.ts.map +1 -0
  367. package/lib/typescript/sdk/DatadogProvider/Buffer/DatadogBuffer.d.ts +1 -0
  368. package/lib/typescript/sdk/DatadogProvider/Buffer/DatadogBuffer.d.ts.map +1 -0
  369. package/lib/typescript/sdk/DatadogProvider/Buffer/PassThroughBuffer.d.ts +1 -0
  370. package/lib/typescript/sdk/DatadogProvider/Buffer/PassThroughBuffer.d.ts.map +1 -0
  371. package/lib/typescript/sdk/DatadogProvider/Buffer/bufferNativeCall.d.ts +1 -0
  372. package/lib/typescript/sdk/DatadogProvider/Buffer/bufferNativeCall.d.ts.map +1 -0
  373. package/lib/typescript/sdk/DatadogProvider/DatadogProvider.d.ts +1 -0
  374. package/lib/typescript/sdk/DatadogProvider/DatadogProvider.d.ts.map +1 -0
  375. package/lib/typescript/sdk/DdSdk.d.ts +1 -0
  376. package/lib/typescript/sdk/DdSdk.d.ts.map +1 -0
  377. package/lib/typescript/sdk/EventMappers/EventMapper.d.ts +1 -0
  378. package/lib/typescript/sdk/EventMappers/EventMapper.d.ts.map +1 -0
  379. package/lib/typescript/sdk/EventMappers/utils/deepClone.d.ts +1 -0
  380. package/lib/typescript/sdk/EventMappers/utils/deepClone.d.ts.map +1 -0
  381. package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts +1 -0
  382. package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts.map +1 -0
  383. package/lib/typescript/sdk/GlobalState/GlobalState.d.ts +1 -0
  384. package/lib/typescript/sdk/GlobalState/GlobalState.d.ts.map +1 -0
  385. package/lib/typescript/sdk/UserInfoSingleton/UserInfoSingleton.d.ts +1 -0
  386. package/lib/typescript/sdk/UserInfoSingleton/UserInfoSingleton.d.ts.map +1 -0
  387. package/lib/typescript/sdk/UserInfoSingleton/types.d.ts +1 -0
  388. package/lib/typescript/sdk/UserInfoSingleton/types.d.ts.map +1 -0
  389. package/lib/typescript/specs/NativeDdLogs.d.ts +1 -0
  390. package/lib/typescript/specs/NativeDdLogs.d.ts.map +1 -0
  391. package/lib/typescript/specs/NativeDdRum.d.ts +3 -1
  392. package/lib/typescript/specs/NativeDdRum.d.ts.map +1 -0
  393. package/lib/typescript/specs/NativeDdSdk.d.ts +1 -0
  394. package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -0
  395. package/lib/typescript/specs/NativeDdTrace.d.ts +1 -0
  396. package/lib/typescript/specs/NativeDdTrace.d.ts.map +1 -0
  397. package/lib/typescript/trace/DdTrace.d.ts +1 -0
  398. package/lib/typescript/trace/DdTrace.d.ts.map +1 -0
  399. package/lib/typescript/types.d.ts +1 -0
  400. package/lib/typescript/types.d.ts.map +1 -0
  401. package/lib/typescript/utils/Timer.d.ts +1 -0
  402. package/lib/typescript/utils/Timer.d.ts.map +1 -0
  403. package/lib/typescript/utils/argsUtils.d.ts +1 -0
  404. package/lib/typescript/utils/argsUtils.d.ts.map +1 -0
  405. package/lib/typescript/utils/errorUtils.d.ts +1 -0
  406. package/lib/typescript/utils/errorUtils.d.ts.map +1 -0
  407. package/lib/typescript/utils/jsUtils.d.ts +1 -0
  408. package/lib/typescript/utils/jsUtils.d.ts.map +1 -0
  409. package/lib/typescript/utils/longTasksUtils.d.ts +1 -0
  410. package/lib/typescript/utils/longTasksUtils.d.ts.map +1 -0
  411. package/lib/typescript/utils/time-provider/DefaultTimeProvider.d.ts +1 -0
  412. package/lib/typescript/utils/time-provider/DefaultTimeProvider.d.ts.map +1 -0
  413. package/lib/typescript/utils/time-provider/TimeProvider.d.ts +1 -0
  414. package/lib/typescript/utils/time-provider/TimeProvider.d.ts.map +1 -0
  415. package/lib/typescript/version.d.ts +2 -1
  416. package/lib/typescript/version.d.ts.map +1 -0
  417. package/package.json +3 -3
  418. package/src/__tests__/DdSdkReactNative.test.tsx +2 -1
  419. package/src/__tests__/rum/instrumentation/DdRumErrorTracking.test.tsx +32 -16
  420. package/src/__tests__/rum/instrumentation/DdRumUserInteractionTracking.test.tsx +17 -15
  421. package/src/logs/DdLogs.ts +25 -8
  422. package/src/logs/__tests__/DdLogs.test.ts +122 -0
  423. package/src/logs/types.ts +5 -1
  424. package/src/nativeModulesTypes.ts +3 -1
  425. package/src/rum/DdAttributes.ts +20 -0
  426. package/src/rum/DdRum.ts +11 -6
  427. package/src/rum/__tests__/DdRum.test.ts +40 -4
  428. package/src/rum/eventMappers/errorEventMapper.ts +2 -0
  429. package/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx +33 -10
  430. package/src/rum/instrumentation/interactionTracking/getJsxRuntime.ts +10 -3
  431. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +1 -1
  432. package/src/specs/NativeDdRum.ts +3 -1
  433. package/src/version.ts +1 -1
  434. package/android/src/main/kotlin/com/datadog/reactnative/VitalFrameCallback.kt +0 -41
@@ -19,12 +19,12 @@ 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', '~> 2.13.0'
23
- s.dependency 'DatadogLogs', '~> 2.13.0'
24
- s.dependency 'DatadogTrace', '~> 2.13.0'
25
- s.dependency 'DatadogRUM', '~> 2.13.0'
26
- s.dependency 'DatadogCrashReporting', '~> 2.13.0'
27
- s.dependency 'DatadogWebViewTracking', '~> 2.13.0'
22
+ s.dependency 'DatadogCore', '~> 2.14.1'
23
+ s.dependency 'DatadogLogs', '~> 2.14.1'
24
+ s.dependency 'DatadogTrace', '~> 2.14.1'
25
+ s.dependency 'DatadogRUM', '~> 2.14.1'
26
+ s.dependency 'DatadogCrashReporting', '~> 2.14.1'
27
+ s.dependency 'DatadogWebViewTracking', '~> 2.14.1'
28
28
 
29
29
  s.test_spec 'Tests' do |test_spec|
30
30
  test_spec.source_files = 'ios/Tests/**/*.{swift,json}'
@@ -205,6 +205,7 @@ dependencies {
205
205
  testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1"
206
206
  testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0"
207
207
  testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
208
+
208
209
  unmock 'org.robolectric:android-all:4.4_r1-robolectric-r2'
209
210
  }
210
211
 
@@ -219,11 +219,17 @@ class DdRumImplementation(private val datadog: DatadogWrapper = DatadogSDKWrappe
219
219
  stacktrace: String,
220
220
  context: ReadableMap,
221
221
  timestampMs: Double,
222
+ fingerprint: String,
222
223
  promise: Promise
223
224
  ) {
224
225
  val attributes = context.toHashMap().toMutableMap().apply {
225
226
  put(RumAttributes.INTERNAL_TIMESTAMP, timestampMs.toLong())
226
227
  }
228
+
229
+ if (fingerprint.isNotEmpty()) {
230
+ attributes[RumAttributes.ERROR_FINGERPRINT] = fingerprint
231
+ }
232
+
227
233
  datadog.getRumMonitor().addErrorWithStacktrace(
228
234
  message = message,
229
235
  source = source.asErrorSource(),
@@ -8,10 +8,10 @@ package com.datadog.reactnative
8
8
 
9
9
  import android.content.Context
10
10
  import android.util.Log
11
- import android.view.Choreographer
12
11
  import com.datadog.android.privacy.TrackingConsent
13
12
  import com.datadog.android.rum.configuration.VitalsUpdateFrequency
14
13
  import com.datadog.android.rum.RumPerformanceMetric
14
+ import com.facebook.react.bridge.LifecycleEventListener
15
15
  import com.facebook.react.bridge.Promise
16
16
  import com.facebook.react.bridge.ReactApplicationContext
17
17
  import com.facebook.react.bridge.ReadableMap
@@ -21,12 +21,13 @@ import java.util.concurrent.atomic.AtomicBoolean
21
21
 
22
22
  /** The entry point to initialize Datadog's features. */
23
23
  class DdSdkImplementation(
24
- reactContext: ReactApplicationContext,
25
- private val datadog: DatadogWrapper = DatadogSDKWrapper()
24
+ private val reactContext: ReactApplicationContext,
25
+ private val datadog: DatadogWrapper = DatadogSDKWrapper(),
26
+ private val uiThreadExecutor: UiThreadExecutor = ReactUiThreadExecutor()
26
27
  ) {
27
28
  internal val appContext: Context = reactContext.applicationContext
28
- internal val reactContext: ReactApplicationContext = reactContext
29
29
  internal val initialized = AtomicBoolean(false)
30
+ private var frameRateProvider: FrameRateProvider? = null
30
31
 
31
32
  // region DdSdk
32
33
 
@@ -39,7 +40,23 @@ class DdSdkImplementation(
39
40
 
40
41
  val nativeInitialization = DdSdkNativeInitialization(appContext, datadog)
41
42
  nativeInitialization.initialize(ddSdkConfiguration)
42
- monitorJsRefreshRate(ddSdkConfiguration)
43
+
44
+ this.frameRateProvider = createFrameRateProvider(ddSdkConfiguration)
45
+
46
+ reactContext.addLifecycleEventListener(object : LifecycleEventListener {
47
+ override fun onHostResume() {
48
+ frameRateProvider?.start()
49
+ }
50
+
51
+ override fun onHostPause() {
52
+ frameRateProvider?.stop()
53
+ }
54
+
55
+ override fun onHostDestroy() {
56
+ frameRateProvider?.stop()
57
+ }
58
+ })
59
+
43
60
  initialized.set(true)
44
61
 
45
62
  promise.resolve(null)
@@ -150,26 +167,16 @@ class DdSdkImplementation(
150
167
  }
151
168
  }
152
169
 
153
- private fun handlePostFrameCallbackError(e: IllegalStateException) {
154
- datadog.telemetryError(e.message ?: MONITOR_JS_ERROR_MESSAGE, e)
155
- }
156
-
157
- private fun monitorJsRefreshRate(ddSdkConfiguration: DdSdkConfiguration) {
158
- val frameTimeCallback = buildFrameTimeCallback(ddSdkConfiguration)
159
- if (frameTimeCallback != null) {
160
- reactContext.runOnJSQueueThread {
161
- val vitalFrameCallback =
162
- VitalFrameCallback(frameTimeCallback, ::handlePostFrameCallbackError) {
163
- initialized.get()
164
- }
165
- try {
166
- Choreographer.getInstance().postFrameCallback(vitalFrameCallback)
167
- } catch (e: IllegalStateException) {
168
- // This should never happen as the React Native thread always has a Looper
169
- handlePostFrameCallbackError(e)
170
- }
171
- }
170
+ private fun createFrameRateProvider(
171
+ ddSdkConfiguration: DdSdkConfiguration
172
+ ): FrameRateProvider? {
173
+ val frameTimeCallback = buildFrameTimeCallback(ddSdkConfiguration) ?: return null
174
+ val frameRateProvider = FrameRateProvider(frameTimeCallback, uiThreadExecutor)
175
+ reactContext.runOnJSQueueThread {
176
+ frameRateProvider.start()
172
177
  }
178
+
179
+ return frameRateProvider
173
180
  }
174
181
 
175
182
  private fun buildFrameTimeCallback(
@@ -0,0 +1,63 @@
1
+ /*
2
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
+ * Copyright 2016-Present Datadog, Inc.
5
+ */
6
+
7
+ package com.datadog.reactnative
8
+
9
+ import com.facebook.react.modules.core.ChoreographerCompat
10
+
11
+ internal class FrameRateProvider(
12
+ reactFrameRateCallback: ((Double) -> Unit),
13
+ uiThreadExecutor: UiThreadExecutor
14
+ ) {
15
+ private val frameCallback: FpsFrameCallback = FpsFrameCallback(
16
+ reactFrameRateCallback,
17
+ uiThreadExecutor
18
+ )
19
+
20
+ fun start() {
21
+ frameCallback.reset()
22
+ frameCallback.start()
23
+ }
24
+
25
+ fun stop() {
26
+ frameCallback.stop()
27
+ }
28
+ }
29
+
30
+ internal class FpsFrameCallback(
31
+ private val reactFrameRateCallback: ((Double) -> Unit),
32
+ private val uiThreadExecutor: UiThreadExecutor
33
+ ) : ChoreographerCompat.FrameCallback() {
34
+
35
+ private var choreographer: ChoreographerCompat? = null
36
+ private var lastFrameTime = -1L
37
+
38
+ override fun doFrame(time: Long) {
39
+ if (lastFrameTime != -1L) {
40
+ reactFrameRateCallback((time - lastFrameTime).toDouble())
41
+ }
42
+ lastFrameTime = time
43
+ choreographer?.postFrameCallback(this)
44
+ }
45
+
46
+ fun start() {
47
+ uiThreadExecutor.runOnUiThread {
48
+ choreographer = ChoreographerCompat.getInstance()
49
+ choreographer?.postFrameCallback(this@FpsFrameCallback)
50
+ }
51
+ }
52
+
53
+ fun stop() {
54
+ uiThreadExecutor.runOnUiThread {
55
+ choreographer = ChoreographerCompat.getInstance()
56
+ choreographer?.removeFrameCallback(this@FpsFrameCallback)
57
+ }
58
+ }
59
+
60
+ fun reset() {
61
+ lastFrameTime = -1L
62
+ }
63
+ }
@@ -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 = "2.4.1"
10
+ internal const val SDK_VERSION = "2.4.2"
@@ -0,0 +1,25 @@
1
+ /*
2
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
+ * Copyright 2016-Present Datadog, Inc.
5
+ */
6
+
7
+ package com.datadog.reactnative
8
+
9
+ import com.facebook.react.bridge.UiThreadUtil
10
+
11
+ /**
12
+ * Simple UI Thread Executor. By default it is based on [UiThreadUtil.runOnUiThread].
13
+ */
14
+ interface UiThreadExecutor {
15
+ /**
16
+ * Runs the given runnable on the UI Thread.
17
+ */
18
+ fun runOnUiThread(runnable: Runnable)
19
+ }
20
+
21
+ internal class ReactUiThreadExecutor : UiThreadExecutor {
22
+ override fun runOnUiThread(runnable: Runnable) {
23
+ UiThreadUtil.runOnUiThread(runnable)
24
+ }
25
+ }
@@ -175,9 +175,18 @@ class DdRum(
175
175
  stacktrace: String,
176
176
  context: ReadableMap,
177
177
  timestampMs: Double,
178
+ fingerprint: String,
178
179
  promise: Promise
179
180
  ) {
180
- implementation.addError(message, source, stacktrace, context, timestampMs, promise)
181
+ implementation.addError(
182
+ message,
183
+ source,
184
+ stacktrace,
185
+ context,
186
+ timestampMs,
187
+ fingerprint,
188
+ promise
189
+ )
181
190
  }
182
191
 
183
192
  /**
@@ -169,9 +169,18 @@ class DdRum(
169
169
  stacktrace: String,
170
170
  context: ReadableMap,
171
171
  timestampMs: Double,
172
+ fingerprint: String,
172
173
  promise: Promise
173
174
  ) {
174
- implementation.addError(message, source, stacktrace, context, timestampMs, promise)
175
+ implementation.addError(
176
+ message,
177
+ source,
178
+ stacktrace,
179
+ context,
180
+ timestampMs,
181
+ fingerprint,
182
+ promise
183
+ )
175
184
  }
176
185
 
177
186
  /**
@@ -381,6 +381,7 @@ internal class DdRumTest {
381
381
  stackTrace,
382
382
  fakeContext.toReadableMap(),
383
383
  fakeTimestamp,
384
+ "",
384
385
  mockPromise
385
386
  )
386
387
 
@@ -388,6 +389,33 @@ internal class DdRumTest {
388
389
  verify(mockRumMonitor).addErrorWithStacktrace(message, source, stackTrace, updatedContext)
389
390
  }
390
391
 
392
+ @Test
393
+ fun `M call addError with custom fingerprint W addError() with fingerprint`(
394
+ @StringForgery message: String,
395
+ @Forgery source: RumErrorSource,
396
+ @StringForgery stackTrace: String
397
+ ) {
398
+ // Given
399
+ val updatedContext = fakeContext.toReadableMap().toHashMap().toMutableMap().apply {
400
+ put(RumAttributes.INTERNAL_TIMESTAMP, fakeTimestamp.toLong())
401
+ }
402
+
403
+ // When
404
+ testedDdRum.addError(
405
+ message,
406
+ source.name,
407
+ stackTrace,
408
+ fakeContext.toReadableMap(),
409
+ fakeTimestamp,
410
+ "custom-error-fingerprint",
411
+ mockPromise
412
+ )
413
+
414
+ // Then
415
+ updatedContext["_dd.error.fingerprint"] = "custom-error-fingerprint"
416
+ verify(mockRumMonitor).addErrorWithStacktrace(message, source, stackTrace, updatedContext)
417
+ }
418
+
391
419
  @Test
392
420
  fun `M call addError W addError() with invalid source`(
393
421
  @StringForgery message: String,
@@ -406,6 +434,7 @@ internal class DdRumTest {
406
434
  stackTrace,
407
435
  fakeContext.toReadableMap(),
408
436
  fakeTimestamp,
437
+ "",
409
438
  mockPromise
410
439
  )
411
440
 
@@ -7,6 +7,7 @@
7
7
  package com.datadog.reactnative
8
8
 
9
9
  import android.content.pm.PackageInfo
10
+ import android.os.Looper
10
11
  import android.util.Log
11
12
  import android.view.Choreographer
12
13
  import com.datadog.android.DatadogSite
@@ -28,6 +29,7 @@ import com.datadog.android.trace.TraceConfiguration
28
29
  import com.datadog.android.trace.TracingHeaderType
29
30
  import com.datadog.tools.unit.GenericAssert.Companion.assertThat
30
31
  import com.datadog.tools.unit.MockRumMonitor
32
+ import com.datadog.tools.unit.TestUiThreadExecutor
31
33
  import com.datadog.tools.unit.forge.BaseConfigurator
32
34
  import com.datadog.tools.unit.setStaticValue
33
35
  import com.datadog.tools.unit.toReadableArray
@@ -36,6 +38,7 @@ import com.datadog.tools.unit.toReadableMap
36
38
  import com.facebook.react.bridge.Promise
37
39
  import com.facebook.react.bridge.ReactApplicationContext
38
40
  import com.facebook.react.bridge.ReadableMap
41
+ import com.facebook.react.modules.core.ChoreographerCompat
39
42
  import fr.xgouchet.elmyr.Forge
40
43
  import fr.xgouchet.elmyr.annotation.AdvancedForgery
41
44
  import fr.xgouchet.elmyr.annotation.BoolForgery
@@ -78,6 +81,13 @@ import org.mockito.kotlin.verifyNoInteractions
78
81
  import org.mockito.kotlin.whenever
79
82
  import org.mockito.quality.Strictness
80
83
 
84
+ fun mockChoreographerCompatInstance(mock: ChoreographerCompat = mock()) {
85
+ ChoreographerCompat::class.java.setStaticValue(
86
+ "sInstance",
87
+ mock
88
+ )
89
+ }
90
+
81
91
  fun mockChoreographerInstance(mock: Choreographer = mock()) {
82
92
  Choreographer::class.java.setStaticValue(
83
93
  "sThreadInstance",
@@ -96,7 +106,6 @@ fun mockChoreographerInstance(mock: Choreographer = mock()) {
96
106
  @MockitoSettings(strictness = Strictness.LENIENT)
97
107
  @ForgeConfiguration(value = BaseConfigurator::class)
98
108
  internal class DdSdkTest {
99
-
100
109
  lateinit var testedBridgeSdk: DdSdkImplementation
101
110
 
102
111
  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -126,13 +135,24 @@ internal class DdSdkTest {
126
135
  @Mock
127
136
  lateinit var mockChoreographer: Choreographer
128
137
 
138
+ @Mock
139
+ lateinit var mockChoreographerCompat: ChoreographerCompat
140
+
129
141
  @BeforeEach
130
142
  fun `set up`() {
143
+ val mockLooper = mock<Looper>()
144
+ whenever(mockLooper.thread) doReturn Thread.currentThread()
145
+ Looper::class.java.setStaticValue("sMainLooper", mockLooper)
146
+
131
147
  whenever(mockDatadog.getRumMonitor()) doReturn mockRumMonitor
132
148
  whenever(mockRumMonitor._getInternal()) doReturn mockRumInternalProxy
133
149
 
134
150
  doNothing().whenever(mockChoreographer).postFrameCallback(any())
151
+ doNothing().whenever(mockChoreographerCompat).postFrameCallback(any())
152
+
135
153
  mockChoreographerInstance(mockChoreographer)
154
+ mockChoreographerCompatInstance(mockChoreographerCompat)
155
+
136
156
  whenever(mockReactContext.applicationContext) doReturn mockContext
137
157
  whenever(mockContext.packageName) doReturn "packageName"
138
158
  whenever(
@@ -145,7 +165,7 @@ internal class DdSdkTest {
145
165
  answer.getArgument<Runnable>(0).run()
146
166
  true
147
167
  }
148
- testedBridgeSdk = DdSdkImplementation(mockReactContext, mockDatadog)
168
+ testedBridgeSdk = DdSdkImplementation(mockReactContext, mockDatadog, TestUiThreadExecutor())
149
169
 
150
170
  DatadogSDKWrapperStorage.setSdkCore(null)
151
171
  DatadogSDKWrapperStorage.onInitializedListeners.clear()
@@ -1561,9 +1581,9 @@ internal class DdSdkTest {
1561
1581
  .hasField("featureConfiguration") {
1562
1582
  it.hasFieldEqualTo("vitalsMonitorUpdateFrequency", VitalsUpdateFrequency.RARE)
1563
1583
  }
1564
- argumentCaptor<Choreographer.FrameCallback> {
1565
- verify(mockChoreographer).postFrameCallback(capture())
1566
- assertThat(firstValue).isInstanceOf(VitalFrameCallback::class.java)
1584
+ argumentCaptor<ChoreographerCompat.FrameCallback> {
1585
+ verify(mockChoreographerCompat).postFrameCallback(capture())
1586
+ assertThat(firstValue).isInstanceOf(FpsFrameCallback::class.java)
1567
1587
  }
1568
1588
  }
1569
1589
 
@@ -1572,7 +1592,7 @@ internal class DdSdkTest {
1572
1592
  @Forgery configuration: DdSdkConfiguration
1573
1593
  ) {
1574
1594
  // Given
1575
- doThrow(IllegalStateException()).whenever(mockChoreographer).postFrameCallback(any())
1595
+ doThrow(IllegalStateException()).whenever(mockChoreographerCompat).postFrameCallback(any())
1576
1596
  val bridgeConfiguration = configuration.copy(
1577
1597
  vitalsUpdateFrequency = "NEVER",
1578
1598
  longTaskThresholdMs = 0.0
@@ -1600,7 +1620,7 @@ internal class DdSdkTest {
1600
1620
  .hasField("featureConfiguration") {
1601
1621
  it.hasFieldEqualTo("vitalsMonitorUpdateFrequency", VitalsUpdateFrequency.NEVER)
1602
1622
  }
1603
- verifyNoInteractions(mockChoreographer)
1623
+ verifyNoInteractions(mockChoreographerCompat)
1604
1624
  }
1605
1625
 
1606
1626
  @Test
@@ -1640,9 +1660,9 @@ internal class DdSdkTest {
1640
1660
  .hasField("featureConfiguration") {
1641
1661
  it.hasFieldEqualTo("vitalsMonitorUpdateFrequency", VitalsUpdateFrequency.AVERAGE)
1642
1662
  }
1643
- argumentCaptor<Choreographer.FrameCallback> {
1644
- verify(mockChoreographer).postFrameCallback(capture())
1645
- assertThat(firstValue).isInstanceOf(VitalFrameCallback::class.java)
1663
+ argumentCaptor<ChoreographerCompat.FrameCallback> {
1664
+ verify(mockChoreographerCompat).postFrameCallback(capture())
1665
+ assertThat(firstValue).isInstanceOf(FpsFrameCallback::class.java)
1646
1666
 
1647
1667
  // When
1648
1668
  firstValue.doFrame(timestampNs)
@@ -1678,8 +1698,8 @@ internal class DdSdkTest {
1678
1698
  testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
1679
1699
 
1680
1700
  // Then
1681
- argumentCaptor<Choreographer.FrameCallback> {
1682
- verify(mockChoreographer).postFrameCallback(capture())
1701
+ argumentCaptor<ChoreographerCompat.FrameCallback> {
1702
+ verify(mockChoreographerCompat).postFrameCallback(capture())
1683
1703
 
1684
1704
  // When
1685
1705
  firstValue.doFrame(timestampNs)
@@ -1715,8 +1735,8 @@ internal class DdSdkTest {
1715
1735
  testedBridgeSdk.initialize(bridgeConfiguration.toReadableJavaOnlyMap(), mockPromise)
1716
1736
 
1717
1737
  // Then
1718
- argumentCaptor<Choreographer.FrameCallback> {
1719
- verify(mockChoreographer).postFrameCallback(capture())
1738
+ argumentCaptor<ChoreographerCompat.FrameCallback> {
1739
+ verify(mockChoreographerCompat).postFrameCallback(capture())
1720
1740
 
1721
1741
  // When
1722
1742
  firstValue.doFrame(timestampNs)
@@ -0,0 +1,16 @@
1
+ /*
2
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
+ * Copyright 2016-Present Datadog, Inc.
5
+ */
6
+
7
+ package com.datadog.tools.unit
8
+
9
+ import com.datadog.reactnative.UiThreadExecutor
10
+
11
+ internal class TestUiThreadExecutor : UiThreadExecutor {
12
+ override fun runOnUiThread(runnable: Runnable) {
13
+ // Run immediately in the same thread for tests
14
+ runnable.run()
15
+ }
16
+ }
@@ -268,10 +268,8 @@ private def runShellCommand(
268
268
  }
269
269
 
270
270
  private def getServiceName(variant) {
271
- if (project.hasProperty("datadog") && project.datadog.hasProperty("serviceName")) {
272
- if (project.datadog.serviceName) {
273
- return project.datadog.serviceName
274
- }
271
+ if (project.hasProperty("datadog") && project.datadog.serviceName) {
272
+ return project.datadog.serviceName
275
273
  }
276
274
  return variant.applicationId
277
275
  }
@@ -283,4 +281,4 @@ private def getVersionName(variant) {
283
281
  }
284
282
 
285
283
  return variant.versionName
286
- }
284
+ }
@@ -93,10 +93,11 @@ RCT_REMAP_METHOD(addError, withMessage:(NSString*)message
93
93
  withStacktrace:(NSString*)stacktrace
94
94
  withContext:(NSDictionary*)context
95
95
  withTimestampms:(double)timestampMs
96
+ withFingerprint:(NSString*)fingerprint
96
97
  withResolver:(RCTPromiseResolveBlock)resolve
97
98
  withRejecter:(RCTPromiseRejectBlock)reject)
98
99
  {
99
- [self addError:message source:source stacktrace:stacktrace context:context timestampMs:timestampMs resolve:resolve reject:reject];
100
+ [self addError:message source:source stacktrace:stacktrace context:context timestampMs:timestampMs fingerprint: fingerprint resolve:resolve reject:reject];
100
101
  }
101
102
 
102
103
  RCT_REMAP_METHOD(addTiming, withName:(NSString*)name
@@ -156,8 +157,8 @@ RCT_REMAP_METHOD(getCurrentSessionId,
156
157
  [self.ddRumImplementation addActionWithType:type name:name context:context timestampMs:timestampMs resolve:resolve reject:reject];
157
158
  }
158
159
 
159
- - (void)addError:(NSString *)message source:(NSString *)source stacktrace:(NSString *)stacktrace context:(NSDictionary *)context timestampMs:(double)timestampMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
160
- [self.ddRumImplementation addErrorWithMessage:message source:source stacktrace:stacktrace context:context timestampMs:timestampMs resolve:resolve reject:reject];
160
+ - (void)addError:(NSString *)message source:(NSString *)source stacktrace:(NSString *)stacktrace context:(NSDictionary *)context timestampMs:(double)timestampMs fingerprint:(NSString *)fingerprint resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
161
+ [self.ddRumImplementation addErrorWithMessage:message source:source stacktrace:stacktrace context:context timestampMs:timestampMs fingerprint:fingerprint resolve:resolve reject:reject];
161
162
  }
162
163
 
163
164
  - (void)addFeatureFlagEvaluation:(NSString *)name value:(NSDictionary *)value resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
@@ -65,6 +65,7 @@ private extension RUMMethod {
65
65
  @objc
66
66
  public class DdRumImplementation: NSObject {
67
67
  internal static let timestampKey = "_dd.timestamp"
68
+ internal static let fingerprintKey = "_dd.error.fingerprint"
68
69
  internal static let resourceTimingsKey = "_dd.resource_timings"
69
70
 
70
71
  internal static let fetchTimingKey = "fetch"
@@ -156,8 +157,20 @@ public class DdRumImplementation: NSObject {
156
157
  }
157
158
 
158
159
  @objc
159
- public func addError(message: String, source: String, stacktrace: String, context: NSDictionary, timestampMs: Double, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
160
- nativeRUM.addError(message: message, type: nil, stack: stacktrace, source: RUMErrorSource(from: source), attributes: attributes(from: context, with: timestampMs), file: nil, line: nil)
160
+ public func addError(message: String, source: String, stacktrace: String, context: NSDictionary, timestampMs: Double, fingerprint: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
161
+
162
+ func addErrorWithContext(errorContext: NSDictionary) -> Void {
163
+ nativeRUM.addError(message: message, type: nil, stack: stacktrace, source: RUMErrorSource(from: source), attributes: attributes(from: errorContext, with: timestampMs), file: nil, line: nil)
164
+ }
165
+
166
+ if !fingerprint.isEmpty {
167
+ let updatedContext = NSMutableDictionary(dictionary: context)
168
+ updatedContext[Self.fingerprintKey] = fingerprint
169
+ addErrorWithContext(errorContext: updatedContext)
170
+ } else {
171
+ addErrorWithContext(errorContext: context)
172
+ }
173
+
161
174
  resolve(nil)
162
175
  }
163
176
 
@@ -7,4 +7,4 @@
7
7
  import Foundation
8
8
 
9
9
  // This is automatically updated by the update-version.sh script
10
- let SdkVersion = "2.4.1"
10
+ let SdkVersion = "2.4.2"