@datadog/mobile-react-native 3.5.4 → 3.6.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 (142) hide show
  1. package/README.md +10 -0
  2. package/android/build.gradle +14 -1
  3. package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +23 -4
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +3 -2
  5. package/android/src/main/kotlin/com/datadog/reactnative/HeatmapActionHandler.kt +121 -0
  6. package/android/src/main/kotlin/com/datadog/reactnative/HeatmapTouchResolver.kt +108 -0
  7. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  8. package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +19 -2
  9. package/android/src/newarch/kotlin/com/datadog/reactnative/DdSdk.kt +1 -1
  10. package/android/src/oldarch/kotlin/com/datadog/reactnative/HeatmapViewResolverFactory.kt +38 -0
  11. package/android/src/oldarch65/kotlin/com/datadog/reactnative/HeatmapViewResolverFactory.kt +20 -0
  12. package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdRum.kt +15 -2
  13. package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +482 -0
  14. package/android/src/test/kotlin/com/datadog/reactnative/HeatmapTouchResolverTest.kt +529 -0
  15. package/datadog-configuration.schema.json +4 -0
  16. package/ios/Sources/DdSdk.mm +2 -0
  17. package/ios/Sources/DdSdkImplementation.swift +0 -1
  18. package/ios/Sources/SdkVersion.swift +1 -1
  19. package/lib/commonjs/DdSdkReactNative.js +3 -1
  20. package/lib/commonjs/DdSdkReactNative.js.map +1 -1
  21. package/lib/commonjs/config/FileBasedConfiguration.js +1 -0
  22. package/lib/commonjs/config/FileBasedConfiguration.js.map +1 -1
  23. package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js +1 -0
  24. package/lib/commonjs/config/async/AutoInstrumentationConfiguration.js.map +1 -1
  25. package/lib/commonjs/config/features/RumConfiguration.js +4 -0
  26. package/lib/commonjs/config/features/RumConfiguration.js.map +1 -1
  27. package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +27 -13
  28. package/lib/commonjs/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
  29. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +270 -0
  30. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -0
  31. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +38 -72
  32. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  33. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js +33 -0
  34. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js.map +1 -0
  35. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +39 -0
  36. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -0
  37. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.js +4 -4
  38. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -0
  39. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/internalDevResourceBlocklist.js +0 -18
  40. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.js.map +1 -0
  41. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js +109 -0
  42. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js.map +1 -0
  43. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.js +0 -9
  44. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.js.map +1 -0
  45. package/lib/commonjs/version.js +1 -1
  46. package/lib/module/DdSdkReactNative.js +3 -1
  47. package/lib/module/DdSdkReactNative.js.map +1 -1
  48. package/lib/module/config/FileBasedConfiguration.js +1 -0
  49. package/lib/module/config/FileBasedConfiguration.js.map +1 -1
  50. package/lib/module/config/async/AutoInstrumentationConfiguration.js +1 -0
  51. package/lib/module/config/async/AutoInstrumentationConfiguration.js.map +1 -1
  52. package/lib/module/config/features/RumConfiguration.js +4 -0
  53. package/lib/module/config/features/RumConfiguration.js.map +1 -1
  54. package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js +27 -13
  55. package/lib/module/rum/instrumentation/resourceTracking/DdRumResourceTracking.js.map +1 -1
  56. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js +263 -0
  57. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.js.map +1 -0
  58. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +38 -72
  59. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  60. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js +25 -0
  61. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.js.map +1 -0
  62. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js +32 -0
  63. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.js.map +1 -0
  64. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.js +4 -4
  65. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.js.map +1 -0
  66. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/internalDevResourceBlocklist.js +0 -18
  67. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.js.map +1 -0
  68. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js +101 -0
  69. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.js.map +1 -0
  70. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.js +0 -9
  71. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.js.map +1 -0
  72. package/lib/module/version.js +1 -1
  73. package/lib/typescript/DdSdkReactNative.d.ts.map +1 -1
  74. package/lib/typescript/config/FileBasedConfiguration.d.ts.map +1 -1
  75. package/lib/typescript/config/FileBasedConfiguration.type.d.ts +1 -0
  76. package/lib/typescript/config/FileBasedConfiguration.type.d.ts.map +1 -1
  77. package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts +2 -0
  78. package/lib/typescript/config/async/AutoInstrumentationConfiguration.d.ts.map +1 -1
  79. package/lib/typescript/config/features/RumConfiguration.d.ts +2 -0
  80. package/lib/typescript/config/features/RumConfiguration.d.ts.map +1 -1
  81. package/lib/typescript/config/features/RumConfiguration.type.d.ts +7 -0
  82. package/lib/typescript/config/features/RumConfiguration.type.d.ts.map +1 -1
  83. package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts +3 -2
  84. package/lib/typescript/rum/instrumentation/resourceTracking/DdRumResourceTracking.d.ts.map +1 -1
  85. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.d.ts +29 -0
  86. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.d.ts.map +1 -0
  87. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts +1 -1
  88. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
  89. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.d.ts +8 -0
  90. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.d.ts.map +1 -0
  91. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts +20 -0
  92. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.d.ts.map +1 -0
  93. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.d.ts +2 -2
  94. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.d.ts.map +1 -0
  95. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.d.ts +3 -0
  96. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.d.ts.map +1 -0
  97. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.d.ts +18 -0
  98. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.d.ts.map +1 -0
  99. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.d.ts +0 -6
  100. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.d.ts.map +1 -0
  101. package/lib/typescript/version.d.ts +1 -1
  102. package/package.json +11 -2
  103. package/src/DdSdkReactNative.tsx +5 -1
  104. package/src/__tests__/DdSdkReactNative.test.tsx +5 -2
  105. package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +3 -0
  106. package/src/config/FileBasedConfiguration.ts +2 -0
  107. package/src/config/FileBasedConfiguration.type.ts +1 -0
  108. package/src/config/__tests__/FileBasedConfiguration.test.ts +3 -0
  109. package/src/config/__tests__/__fixtures__/configuration-all-fields.json +1 -0
  110. package/src/config/async/AutoInstrumentationConfiguration.ts +5 -0
  111. package/src/config/features/RumConfiguration.ts +4 -0
  112. package/src/config/features/RumConfiguration.type.ts +8 -0
  113. package/src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx +38 -13
  114. package/src/rum/instrumentation/resourceTracking/__tests__/DdRumResourceTracking.test.ts +101 -0
  115. package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts +316 -0
  116. package/src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/__tests__/FetchProxy.test.ts +393 -0
  117. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/ResourceReporter.test.ts +1 -1
  118. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/__tests__/internalDevResourceBlocklist.test.ts +1 -1
  119. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +49 -115
  120. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +1 -1
  121. package/src/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.ts +25 -0
  122. package/src/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts +54 -0
  123. package/src/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/ResourceReporter.ts +5 -5
  124. package/src/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/internalDevResourceBlocklist.ts +1 -17
  125. package/src/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.ts +106 -0
  126. package/src/rum/instrumentation/resourceTracking/requestProxy/{XHRProxy/DatadogRumResource → common}/resourceTiming.ts +0 -18
  127. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +1 -0
  128. package/src/version.ts +1 -1
  129. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +0 -1
  130. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js.map +0 -1
  131. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js.map +0 -1
  132. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.js.map +0 -1
  133. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.js.map +0 -1
  134. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.js.map +0 -1
  135. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/ResourceReporter.d.ts.map +0 -1
  136. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.d.ts +0 -7
  137. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/internalDevResourceBlocklist.d.ts.map +0 -1
  138. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/DatadogRumResource/resourceTiming.d.ts.map +0 -1
  139. /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdFlags.kt +0 -0
  140. /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdLogs.kt +0 -0
  141. /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdSdk.kt +0 -0
  142. /package/android/src/{oldarch → oldarchCommon}/kotlin/com/datadog/reactnative/DdTrace.kt +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"RumConfiguration.type.d.ts","sourceRoot":"","sources":["../../../../src/config/features/RumConfiguration.type.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEtD;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC;;OAEG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAE7C;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAE3C;;OAEG;IACH,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IAEnC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAErC;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjD;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;CACjD;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,GACvD,uBAAuB,CAAC"}
1
+ {"version":3,"file":"RumConfiguration.type.d.ts","sourceRoot":"","sources":["../../../../src/config/features/RumConfiguration.type.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEtD;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC;;OAEG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAE7C;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAE3C;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IAEnC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAErC;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjD;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;CACjD;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,GACvD,uBAAuB,CAAC"}
@@ -5,16 +5,17 @@ import type { FirstPartyHost } from '../../types';
5
5
  */
6
6
  declare class RumResourceTracking {
7
7
  private _isTracking;
8
- private _requestProxy;
8
+ private _requestProxies;
9
9
  private _maxSampledTraceId;
10
10
  get isTracking(): boolean;
11
11
  get maxSampledTraceId(): BigInt.BigInteger;
12
12
  /**
13
13
  * Starts tracking resources and sends a RUM Resource event every time a network request is detected.
14
14
  */
15
- startTracking({ resourceTraceSampleRate, firstPartyHosts }: {
15
+ startTracking({ resourceTraceSampleRate, firstPartyHosts, trackFetchResources }: {
16
16
  resourceTraceSampleRate: number;
17
17
  firstPartyHosts: FirstPartyHost[];
18
+ trackFetchResources?: boolean;
18
19
  }): void;
19
20
  /**
20
21
  * Applies a new resource trace sample rate to the already-installed
@@ -1 +1 @@
1
- {"version":3,"file":"DdRumResourceTracking.d.ts","sourceRoot":"","sources":["../../../../../src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx"],"names":[],"mappings":"AAMA,OAAO,MAAM,MAAM,aAAa,CAAC;AAKjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAUlD;;GAEG;AACH,cAAM,mBAAmB;IACrB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,iBAAiB,IAAI,MAAM,CAAC,UAAU,CAEzC;IAED;;OAEG;IACH,aAAa,CAAC,EACV,uBAAuB,EACvB,eAAe,EAClB,EAAE;QACC,uBAAuB,EAAE,MAAM,CAAC;QAChC,eAAe,EAAE,cAAc,EAAE,CAAC;KACrC,GAAG,IAAI;IA6BR;;;;;;OAMG;IACH,qBAAqB,CAAC,EAClB,uBAAuB,EAC1B,EAAE;QACC,uBAAuB,EAAE,MAAM,CAAC;KACnC,GAAG,IAAI;IAeR,YAAY,IAAI,IAAI;CAUvB;AAED,eAAO,MAAM,qBAAqB,qBAGjC,CAAC"}
1
+ {"version":3,"file":"DdRumResourceTracking.d.ts","sourceRoot":"","sources":["../../../../../src/rum/instrumentation/resourceTracking/DdRumResourceTracking.tsx"],"names":[],"mappings":"AAMA,OAAO,MAAM,MAAM,aAAa,CAAC;AAKjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAWlD;;GAEG;AACH,cAAM,mBAAmB;IACrB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,iBAAiB,IAAI,MAAM,CAAC,UAAU,CAEzC;IAED;;OAEG;IACH,aAAa,CAAC,EACV,uBAAuB,EACvB,eAAe,EACf,mBAA2B,EAC9B,EAAE;QACC,uBAAuB,EAAE,MAAM,CAAC;QAChC,eAAe,EAAE,cAAc,EAAE,CAAC;QAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;KACjC,GAAG,IAAI;IAiDR;;;;;;OAMG;IACH,qBAAqB,CAAC,EAClB,uBAAuB,EAC1B,EAAE;QACC,uBAAuB,EAAE,MAAM,CAAC;KACnC,GAAG,IAAI;IAiBR,YAAY,IAAI,IAAI;CAUvB;AAED,eAAO,MAAM,qBAAqB,qBAGjC,CAAC"}
@@ -0,0 +1,29 @@
1
+ import { ResourceReporter } from '../common/ResourceReporter';
2
+ import type { RequestProxyOptions } from '../interfaces/RequestProxy';
3
+ import { RequestProxy } from '../interfaces/RequestProxy';
4
+ type FetchGlobal = {
5
+ fetch: typeof fetch;
6
+ };
7
+ interface FetchProxyProviders {
8
+ fetchGlobal: FetchGlobal;
9
+ headersType: typeof Headers;
10
+ resourceReporter: ResourceReporter;
11
+ }
12
+ /**
13
+ * Proxies global Fetch implementations.
14
+ */
15
+ export declare class FetchProxy extends RequestProxy {
16
+ private providers;
17
+ private context;
18
+ private originalFetch;
19
+ private installedFetch;
20
+ constructor(providers: FetchProxyProviders);
21
+ static createWithResourceReporter(): FetchProxy;
22
+ onTrackingStart: (context: RequestProxyOptions) => void;
23
+ onTrackingStop: () => void;
24
+ onTrackingUpdate: (options: {
25
+ tracingSamplingRate: number;
26
+ }) => void;
27
+ }
28
+ export {};
29
+ //# sourceMappingURL=FetchProxy.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FetchProxy.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/FetchProxy/FetchProxy.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,KAAK,WAAW,GAAG;IACf,KAAK,EAAE,OAAO,KAAK,CAAC;CACvB,CAAC;AAEF,UAAU,mBAAmB;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,OAAO,OAAO,CAAC;IAC5B,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;AAED;;GAEG;AACH,qBAAa,UAAW,SAAQ,YAAY;IAK5B,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,cAAc,CAA6B;gBAE/B,SAAS,EAAE,mBAAmB;IAIlD,MAAM,CAAC,0BAA0B;IAQjC,eAAe,YAAa,mBAAmB,UAmB7C;IAEF,cAAc,aAWZ;IAEF,gBAAgB,YAAa;QAAE,mBAAmB,EAAE,MAAM,CAAA;KAAE,UAK1D;CACL"}
@@ -1,6 +1,6 @@
1
+ import { ResourceReporter } from '../common/ResourceReporter';
1
2
  import type { RequestProxyOptions } from '../interfaces/RequestProxy';
2
3
  import { RequestProxy } from '../interfaces/RequestProxy';
3
- import { ResourceReporter } from './DatadogRumResource/ResourceReporter';
4
4
  interface XHRProxyProviders {
5
5
  xhrType: typeof XMLHttpRequest;
6
6
  resourceReporter: ResourceReporter;
@@ -1 +1 @@
1
- {"version":3,"file":"XHRProxy.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAyBzE,UAAU,iBAAiB;IACvB,OAAO,EAAE,OAAO,cAAc,CAAC;IAC/B,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,MAAM,CAAC,eAAe,CAAuC;IACrE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAuC;IACrE,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAmD;gBAEjF,SAAS,EAAE,iBAAiB;IAKxC,MAAM,CAAC,0BAA0B;IAOjC,eAAe,YAAa,mBAAmB,UAM7C;IAEF,cAAc,aAMZ;IAEF,gBAAgB,YAAa;QAAE,mBAAmB,EAAE,MAAM,CAAA;KAAE,UAK1D;CACL"}
1
+ {"version":3,"file":"XHRProxy.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAe1D,UAAU,iBAAiB;IACvB,OAAO,EAAE,OAAO,cAAc,CAAC;IAC/B,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,MAAM,CAAC,eAAe,CAAuC;IACrE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAuC;IACrE,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAmD;gBAEjF,SAAS,EAAE,iBAAiB;IAKxC,MAAM,CAAC,0BAA0B;IAOjC,eAAe,YAAa,mBAAmB,UAM7C;IAEF,cAAc,aAMZ;IAEF,gBAAgB,YAAa;QAAE,mBAAmB,EAAE,MAAM,CAAA;KAAE,UAK1D;CACL"}
@@ -0,0 +1,8 @@
1
+ /**
2
+ * Calls the original Fetch implementation while marking its synchronous work.
3
+ * XHR-backed Fetch implementations create and send their XMLHttpRequest before
4
+ * returning a Promise, so the XHR proxy can avoid reporting that request twice.
5
+ */
6
+ export declare const callOriginalFetch: <T>(callback: () => T) => T;
7
+ export declare const isRunningWithinFetchProxy: () => boolean;
8
+ //# sourceMappingURL=FetchProxyState.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FetchProxyState.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/common/FetchProxyState.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,6BAO7B,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAO,OAE5C,CAAC"}
@@ -0,0 +1,20 @@
1
+ import { Timer } from '../../../../../utils/Timer';
2
+ import type { DdRumResourceTracingAttributes } from '../../distributedTracing/distributedTracingAttributes';
3
+ import type { RequestProxyOptions } from '../interfaces/RequestProxy';
4
+ import type { DdRumResourceGraphqlAttributes } from '../interfaces/RumResource';
5
+ export interface RequestContext {
6
+ graphql: DdRumResourceGraphqlAttributes & {
7
+ trackErrors?: boolean;
8
+ };
9
+ method: string;
10
+ url: string;
11
+ timer: Timer;
12
+ tracingAttributes: DdRumResourceTracingAttributes;
13
+ baggageHeaderEntries: Set<string>;
14
+ }
15
+ export declare const createRequestContext: ({ method, url, options }: {
16
+ method: string;
17
+ url: string;
18
+ options: RequestProxyOptions;
19
+ }) => RequestContext;
20
+ //# sourceMappingURL=RequestContext.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/common/RequestContext.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAMnD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AAG5G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAEhF,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,8BAA8B,GAAG;QACtC,WAAW,CAAC,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,EAAE,8BAA8B,CAAC;IAClD,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACrC;AAED,eAAO,MAAM,oBAAoB;YAKrB,MAAM;SACT,MAAM;aACF,mBAAmB;MAC5B,cAgBH,CAAC"}
@@ -1,8 +1,8 @@
1
- import type { RUMResource } from '../../interfaces/RumResource';
1
+ import type { RUMResource } from '../interfaces/RumResource';
2
2
  type ResourceMapper = (resource: RUMResource) => RUMResource | null;
3
3
  export declare class ResourceReporter {
4
4
  private mappers;
5
- constructor(resourceMappers: ResourceMapper[]);
5
+ constructor(mappers: ResourceMapper[]);
6
6
  reportResource: (resource: RUMResource) => void;
7
7
  }
8
8
  export {};
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ResourceReporter.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/common/ResourceReporter.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI7D,KAAK,cAAc,GAAG,CAAC,QAAQ,EAAE,WAAW,KAAK,WAAW,GAAG,IAAI,CAAC;AAEpE,qBAAa,gBAAgB;IACzB,OAAO,CAAC,OAAO,CAAmB;gBAEtB,OAAO,EAAE,cAAc,EAAE;IAIrC,cAAc,aAAc,WAAW,UAWrC;CACL"}
@@ -0,0 +1,3 @@
1
+ import type { RUMResource } from '../interfaces/RumResource';
2
+ export declare const filterDevResource: (resource: RUMResource) => RUMResource | null;
3
+ //# sourceMappingURL=internalDevResourceBlocklist.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"internalDevResourceBlocklist.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/common/internalDevResourceBlocklist.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAe7D,eAAO,MAAM,iBAAiB,aAChB,WAAW,KACtB,WAAW,GAAG,IAShB,CAAC"}
@@ -0,0 +1,18 @@
1
+ import type { RequestContext } from './RequestContext';
2
+ export type ProcessedRequestHeader = {
3
+ type: 'drop';
4
+ } | {
5
+ type: 'send';
6
+ header: string;
7
+ value: string;
8
+ };
9
+ export declare const processRequestHeader: ({ context, header, value }: {
10
+ context: RequestContext;
11
+ header: string;
12
+ value: string;
13
+ }) => ProcessedRequestHeader;
14
+ export declare const getInstrumentationHeaders: (context: RequestContext) => {
15
+ header: string;
16
+ value: string;
17
+ }[];
18
+ //# sourceMappingURL=requestHeaders.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"requestHeaders.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/common/requestHeaders.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,MAAM,sBAAsB,GAC5B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD,eAAO,MAAM,oBAAoB;aAKpB,cAAc;YACf,MAAM;WACP,MAAM;MACb,sBAqCH,CAAC;AAEF,eAAO,MAAM,yBAAyB,YACzB,cAAc,KACxB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EA4BnC,CAAC"}
@@ -1,11 +1,5 @@
1
1
  interface Timing {
2
- /**
3
- * Time relative (absolute in case of iOS) to some point, in ns.
4
- */
5
2
  startTime: number;
6
- /**
7
- * Duration in ns.
8
- */
9
3
  duration: number;
10
4
  }
11
5
  interface ResourceTimings {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resourceTiming.d.ts","sourceRoot":"","sources":["../../../../../../../src/rum/instrumentation/resourceTracking/requestProxy/common/resourceTiming.ts"],"names":[],"mappings":"AAQA,UAAU,MAAM;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,eAAe;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,aAAa,CACzB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,GACxB,eAAe,CAcjB"}
@@ -1,2 +1,2 @@
1
- export declare const version = "3.5.4";
1
+ export declare const version = "3.6.0";
2
2
  //# sourceMappingURL=version.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datadog/mobile-react-native",
3
- "version": "3.5.4",
3
+ "version": "3.6.0",
4
4
  "description": "A client-side React Native module to interact with Datadog",
5
5
  "keywords": [
6
6
  "datadog",
@@ -113,11 +113,20 @@
113
113
  "jsSrcsDir": "./src/specs",
114
114
  "android": {
115
115
  "javaPackageName": "com.datadog.reactnative"
116
+ },
117
+ "ios": {
118
+ "modulesProvider": {
119
+ "DdFlags": "DdFlags",
120
+ "DdLogs": "DdLogs",
121
+ "DdRum": "DdRum",
122
+ "DdSdk": "DdSdk",
123
+ "DdTrace": "DdTrace"
124
+ }
116
125
  }
117
126
  },
118
127
  "dependencies": {
119
128
  "@datadog/flagging-core": "~2.0.1",
120
129
  "big-integer": "^1.6.52"
121
130
  },
122
- "gitHead": "c0afe3bf819756eab3dd9a32553ec49fae513105"
131
+ "gitHead": "398e96d73be0341493adbbf8f4e2d7e3ca9d584b"
123
132
  }
@@ -507,6 +507,9 @@ export class DdSdkReactNative {
507
507
  const trackResources =
508
508
  configuration.rumConfiguration?.trackResources ||
509
509
  RUM_DEFAULTS.trackResources;
510
+ const trackFetchResources =
511
+ configuration.rumConfiguration?.trackFetchResources ??
512
+ RUM_DEFAULTS.trackFetchResources;
510
513
  const trackErrors =
511
514
  configuration.rumConfiguration?.trackErrors ||
512
515
  RUM_DEFAULTS.trackErrors;
@@ -553,7 +556,8 @@ export class DdSdkReactNative {
553
556
  if (trackResources) {
554
557
  DdRumResourceTracking.startTracking({
555
558
  resourceTraceSampleRate,
556
- firstPartyHosts
559
+ firstPartyHosts,
560
+ trackFetchResources
557
561
  });
558
562
  }
559
563
 
@@ -614,7 +614,9 @@ describe('DdSdkReactNative', () => {
614
614
  configuration.rumConfiguration = new RumConfiguration(
615
615
  fakeAppId,
616
616
  false,
617
- true
617
+ true,
618
+ false,
619
+ { trackFetchResources: true }
618
620
  );
619
621
  configuration.rumConfiguration.resourceTraceSampleRate = 42;
620
622
  configuration.rumConfiguration.firstPartyHosts = [
@@ -676,7 +678,8 @@ describe('DdSdkReactNative', () => {
676
678
  match: 'something.fr',
677
679
  propagatorTypes: ['datadog']
678
680
  }
679
- ]
681
+ ],
682
+ trackFetchResources: true
680
683
  });
681
684
  });
682
685
 
@@ -73,6 +73,7 @@ describe('DdSdkReactNativeConfiguration', () => {
73
73
  "telemetrySampleRate": 20,
74
74
  "trackBackgroundEvents": false,
75
75
  "trackErrors": false,
76
+ "trackFetchResources": false,
76
77
  "trackFrustrations": true,
77
78
  "trackInteractions": false,
78
79
  "trackMemoryWarnings": true,
@@ -217,6 +218,7 @@ describe('DdSdkReactNativeConfiguration', () => {
217
218
  "telemetrySampleRate": 20,
218
219
  "trackBackgroundEvents": true,
219
220
  "trackErrors": true,
221
+ "trackFetchResources": false,
220
222
  "trackFrustrations": true,
221
223
  "trackInteractions": true,
222
224
  "trackMemoryWarnings": true,
@@ -320,6 +322,7 @@ describe('DdSdkReactNativeConfiguration', () => {
320
322
  "telemetrySampleRate": 0,
321
323
  "trackBackgroundEvents": false,
322
324
  "trackErrors": false,
325
+ "trackFetchResources": false,
323
326
  "trackFrustrations": false,
324
327
  "trackInteractions": false,
325
328
  "trackMemoryWarnings": false,
@@ -170,6 +170,8 @@ export const getJSONConfiguration = (
170
170
  trackInteractions:
171
171
  configuration.rumConfiguration.trackInteractions,
172
172
  trackResources: configuration.rumConfiguration.trackResources,
173
+ trackFetchResources:
174
+ configuration.rumConfiguration.trackFetchResources,
173
175
  trackErrors: configuration.rumConfiguration.trackErrors,
174
176
  nativeLongTaskThresholdMs:
175
177
  configuration.rumConfiguration.nativeLongTaskThresholdMs,
@@ -34,6 +34,7 @@ export interface JsonConfiguration extends CoreConfigurationOptions {
34
34
  useAccessibilityLabel?: boolean;
35
35
  trackInteractions?: boolean;
36
36
  trackResources?: boolean;
37
+ trackFetchResources?: boolean;
37
38
  trackErrors?: boolean;
38
39
  longTaskThresholdMs?: number;
39
40
  actionNameAttribute?: string;
@@ -67,6 +67,7 @@ describe('FileBasedConfiguration', () => {
67
67
  "telemetrySampleRate": 20,
68
68
  "trackBackgroundEvents": true,
69
69
  "trackErrors": true,
70
+ "trackFetchResources": true,
70
71
  "trackFrustrations": true,
71
72
  "trackInteractions": true,
72
73
  "trackMemoryWarnings": false,
@@ -179,6 +180,7 @@ describe('FileBasedConfiguration', () => {
179
180
  "telemetrySampleRate": 20,
180
181
  "trackBackgroundEvents": false,
181
182
  "trackErrors": true,
183
+ "trackFetchResources": false,
182
184
  "trackFrustrations": true,
183
185
  "trackInteractions": true,
184
186
  "trackMemoryWarnings": true,
@@ -243,6 +245,7 @@ describe('FileBasedConfiguration', () => {
243
245
  "telemetrySampleRate": 20,
244
246
  "trackBackgroundEvents": false,
245
247
  "trackErrors": false,
248
+ "trackFetchResources": false,
246
249
  "trackFrustrations": true,
247
250
  "trackInteractions": false,
248
251
  "trackMemoryWarnings": true,
@@ -10,6 +10,7 @@
10
10
  "useAccessibilityLabel": false,
11
11
  "trackInteractions": true,
12
12
  "trackResources": true,
13
+ "trackFetchResources": true,
13
14
  "trackErrors": true,
14
15
  "longTaskThresholdMs": 44,
15
16
  "trackNonFatalAnrs": true,
@@ -20,6 +20,7 @@ export type AutoInstrumentationConfiguration = {
20
20
  readonly rumConfiguration: {
21
21
  readonly trackInteractions: boolean;
22
22
  readonly trackResources: boolean;
23
+ readonly trackFetchResources?: boolean;
23
24
  readonly trackErrors: boolean;
24
25
  readonly useAccessibilityLabel?: boolean;
25
26
  readonly actionNameAttribute?: string;
@@ -45,6 +46,7 @@ export type AutoInstrumentationParameters = {
45
46
  readonly useAccessibilityLabel: boolean;
46
47
  readonly trackInteractions: boolean;
47
48
  readonly trackResources: boolean;
49
+ readonly trackFetchResources: boolean;
48
50
  readonly trackErrors: boolean;
49
51
  readonly actionNameAttribute?: string;
50
52
  readonly resourceTraceSampleRate?: number;
@@ -81,6 +83,9 @@ export const addDefaultValuesToAutoInstrumentationConfiguration = (
81
83
  trackResources:
82
84
  features.rumConfiguration.trackResources ??
83
85
  RUM_DEFAULTS.trackResources,
86
+ trackFetchResources:
87
+ features.rumConfiguration.trackFetchResources ??
88
+ RUM_DEFAULTS.trackFetchResources,
84
89
  trackErrors:
85
90
  features.rumConfiguration.trackErrors ??
86
91
  RUM_DEFAULTS.trackErrors,
@@ -33,6 +33,7 @@ const DEFAULTS = {
33
33
  telemetrySampleRate: 20.0,
34
34
  trackBackgroundEvents: false,
35
35
  trackErrors: false,
36
+ trackFetchResources: false,
36
37
  trackFrustrations: true,
37
38
  trackInteractions: false,
38
39
  trackMemoryWarnings: true,
@@ -103,6 +104,9 @@ export class RumConfiguration implements RumConfigurationType {
103
104
  // Track Background Events Enabled
104
105
  public trackBackgroundEvents: boolean = DEFAULTS.trackBackgroundEvents;
105
106
 
107
+ // Track native Fetch resources
108
+ public trackFetchResources: boolean = DEFAULTS.trackFetchResources;
109
+
106
110
  // Track Frustrations Enabled
107
111
  public trackFrustrations: boolean = DEFAULTS.trackFrustrations;
108
112
 
@@ -66,6 +66,14 @@ export interface RumConfigurationOptions {
66
66
  */
67
67
  errorEventMapper?: ErrorEventMapper | null;
68
68
 
69
+ /**
70
+ * Enables tracking of requests made with native Fetch implementations,
71
+ * such as the global Fetch installed by Expo.
72
+ *
73
+ * This option only takes effect when resource tracking is enabled.
74
+ */
75
+ trackFetchResources?: boolean;
76
+
69
77
  /**
70
78
  * List of backend hosts used to enable tracing.
71
79
  */
@@ -13,6 +13,7 @@ import type { FirstPartyHost } from '../../types';
13
13
 
14
14
  import { DistributedTracingSampling } from './distributedTracing/distributedTracingSampling';
15
15
  import { firstPartyHostsRegexMapBuilder } from './distributedTracing/firstPartyHosts';
16
+ import { FetchProxy } from './requestProxy/FetchProxy/FetchProxy';
16
17
  import { XHRProxy } from './requestProxy/XHRProxy/XHRProxy';
17
18
  import type { RequestProxy } from './requestProxy/interfaces/RequestProxy';
18
19
 
@@ -24,7 +25,7 @@ const RUM_RESOURCE_TRACKING_MODULE =
24
25
  */
25
26
  class RumResourceTracking {
26
27
  private _isTracking = false;
27
- private _requestProxy: RequestProxy | null = null;
28
+ private _requestProxies: RequestProxy[] = [];
28
29
  private _maxSampledTraceId: BigInt.BigInteger | null = null;
29
30
 
30
31
  get isTracking(): boolean {
@@ -40,33 +41,55 @@ class RumResourceTracking {
40
41
  */
41
42
  startTracking({
42
43
  resourceTraceSampleRate,
43
- firstPartyHosts
44
+ firstPartyHosts,
45
+ trackFetchResources = false
44
46
  }: {
45
47
  resourceTraceSampleRate: number;
46
48
  firstPartyHosts: FirstPartyHost[];
49
+ trackFetchResources?: boolean;
47
50
  }): void {
48
51
  // extra safety to avoid proxying the XHR class twice
49
52
  if (this._isTracking) {
50
53
  InternalLog.log(
51
- 'Datadog SDK is already tracking XHR resources',
54
+ 'Datadog SDK is already tracking resources',
52
55
  SdkVerbosity.WARN
53
56
  );
54
57
  return;
55
58
  }
56
59
 
57
- this._requestProxy = XHRProxy.createWithResourceReporter();
58
- this._requestProxy.onTrackingStart({
60
+ const requestProxyOptions = {
59
61
  tracingSamplingRate: resourceTraceSampleRate,
60
62
  firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder(
61
63
  firstPartyHosts
62
64
  )
63
- });
65
+ };
66
+
67
+ const xhrProxy = XHRProxy.createWithResourceReporter();
68
+ xhrProxy.onTrackingStart(requestProxyOptions);
69
+ this._requestProxies.push(xhrProxy);
64
70
 
65
71
  InternalLog.log(
66
72
  'Datadog SDK is tracking XHR resources',
67
73
  SdkVerbosity.INFO
68
74
  );
69
75
 
76
+ if (trackFetchResources) {
77
+ if (typeof globalThis.fetch !== 'function') {
78
+ InternalLog.log(
79
+ 'Datadog SDK did not install Fetch resource tracking because global Fetch is not available',
80
+ SdkVerbosity.INFO
81
+ );
82
+ } else {
83
+ const fetchProxy = FetchProxy.createWithResourceReporter();
84
+ fetchProxy.onTrackingStart(requestProxyOptions);
85
+ this._requestProxies.push(fetchProxy);
86
+ InternalLog.log(
87
+ 'Datadog SDK is tracking Fetch resources',
88
+ SdkVerbosity.INFO
89
+ );
90
+ }
91
+ }
92
+
70
93
  this._isTracking = true;
71
94
  DistributedTracingSampling.setResourceTraceSampleRate(
72
95
  resourceTraceSampleRate
@@ -85,11 +108,13 @@ class RumResourceTracking {
85
108
  }: {
86
109
  resourceTraceSampleRate: number;
87
110
  }): void {
88
- if (!this._isTracking || !this._requestProxy) {
111
+ if (!this._isTracking) {
89
112
  return;
90
113
  }
91
- this._requestProxy.onTrackingUpdate({
92
- tracingSamplingRate: resourceTraceSampleRate
114
+ this._requestProxies.forEach(requestProxy => {
115
+ requestProxy.onTrackingUpdate({
116
+ tracingSamplingRate: resourceTraceSampleRate
117
+ });
93
118
  });
94
119
  // Keep the distributed-tracing sampler's max-trace-id in sync; the
95
120
  // shouldSampleTrace path consults this for rates strictly between 0
@@ -102,10 +127,10 @@ class RumResourceTracking {
102
127
  stopTracking(): void {
103
128
  if (this._isTracking) {
104
129
  this._isTracking = false;
105
- if (this._requestProxy) {
106
- this._requestProxy.onTrackingStop();
107
- }
108
- this._requestProxy = null;
130
+ this._requestProxies.forEach(requestProxy =>
131
+ requestProxy.onTrackingStop()
132
+ );
133
+ this._requestProxies = [];
109
134
  this._maxSampledTraceId = null;
110
135
  }
111
136
  }
@@ -14,6 +14,7 @@ import { SAMPLING_PRIORITY_HEADER_KEY } from '../distributedTracing/headers';
14
14
  import { XMLHttpRequestMock } from './__utils__/XMLHttpRequestMock';
15
15
 
16
16
  const DdRum = NativeModules.DdRum;
17
+ const originalFetch = global.fetch;
17
18
 
18
19
  const flushPromises = () =>
19
20
  new Promise(jest.requireActual('timers').setImmediate);
@@ -26,7 +27,9 @@ beforeEach(() => {
26
27
  });
27
28
 
28
29
  afterEach(() => {
30
+ DdRumResourceTracking.stopTracking();
29
31
  global.XMLHttpRequest = undefined;
32
+ global.fetch = originalFetch;
30
33
  });
31
34
 
32
35
  const executeRequest = (url: string = 'https://api.example.com/v2/user') => {
@@ -92,6 +95,104 @@ describe('DdRumResourceTracking', () => {
92
95
  expect(DdRum.stopResource).not.toHaveBeenCalled();
93
96
  });
94
97
 
98
+ it('tracks Expo Fetch and XHR resources when Fetch tracking is enabled', async () => {
99
+ const fetchResponse = ({
100
+ status: 200,
101
+ headers: {
102
+ get: (header: string) =>
103
+ header.toLowerCase() === 'content-length' ? '12' : null
104
+ }
105
+ } as unknown) as Response;
106
+ const expoFetch = jest
107
+ .fn()
108
+ .mockResolvedValue(fetchResponse) as jest.MockedFunction<
109
+ typeof fetch
110
+ >;
111
+ global.fetch = expoFetch;
112
+ DdRumResourceTracking.startTracking({
113
+ resourceTraceSampleRate: 100,
114
+ firstPartyHosts: [],
115
+ trackFetchResources: true
116
+ });
117
+
118
+ executeRequest();
119
+ await global.fetch('https://api.example.com/v2/user');
120
+ await flushPromises();
121
+
122
+ expect(DdRum.startResource).toHaveBeenCalledTimes(2);
123
+ expect(DdRum.stopResource).toHaveBeenCalledTimes(2);
124
+ expect(DdRum.stopResource.mock.calls.map(call => call[2])).toEqual(
125
+ expect.arrayContaining(['xhr', 'fetch'])
126
+ );
127
+ expect(expoFetch).toHaveBeenCalledTimes(1);
128
+ });
129
+
130
+ it('tracks a native Fetch implementation without relying on an Expo marker', () => {
131
+ const fetchImplementation = jest.fn() as jest.MockedFunction<
132
+ typeof fetch
133
+ >;
134
+ global.fetch = fetchImplementation;
135
+
136
+ DdRumResourceTracking.startTracking({
137
+ resourceTraceSampleRate: 100,
138
+ firstPartyHosts: [],
139
+ trackFetchResources: true
140
+ });
141
+
142
+ expect(global.fetch).not.toBe(fetchImplementation);
143
+ });
144
+
145
+ it('does not wrap Expo Fetch when Fetch tracking is disabled', () => {
146
+ const expoFetch = jest.fn() as jest.MockedFunction<typeof fetch>;
147
+ global.fetch = expoFetch;
148
+
149
+ DdRumResourceTracking.startTracking({
150
+ resourceTraceSampleRate: 100,
151
+ firstPartyHosts: []
152
+ });
153
+
154
+ expect(global.fetch).toBe(expoFetch);
155
+ });
156
+
157
+ it('does not double report an XHR-backed Fetch and still tracks direct XHR', async () => {
158
+ const fetchResponse = ({
159
+ status: 200,
160
+ headers: { get: () => null }
161
+ } as unknown) as Response;
162
+ const xhrBackedFetch = jest.fn(
163
+ (input: RequestInfo | URL, init?: RequestInit) => {
164
+ const xhr = new XMLHttpRequestMock();
165
+ xhr.open(init?.method ?? 'GET', String(input));
166
+ new Headers(init?.headers).forEach((value, header) => {
167
+ xhr.setRequestHeader(header, value);
168
+ });
169
+ xhr.send();
170
+ xhr.notifyResponseArrived();
171
+ xhr.complete(200, 'ok');
172
+ return Promise.resolve(fetchResponse);
173
+ }
174
+ ) as jest.MockedFunction<typeof fetch>;
175
+ global.fetch = xhrBackedFetch;
176
+
177
+ DdRumResourceTracking.startTracking({
178
+ resourceTraceSampleRate: 100,
179
+ firstPartyHosts: [],
180
+ trackFetchResources: true
181
+ });
182
+
183
+ await global.fetch('https://api.example.com/fetch');
184
+ executeRequest('https://api.example.com/xhr');
185
+ await flushPromises();
186
+
187
+ expect(global.fetch).not.toBe(xhrBackedFetch);
188
+ expect(xhrBackedFetch).toHaveBeenCalledTimes(1);
189
+ expect(DdRum.startResource).toHaveBeenCalledTimes(2);
190
+ expect(DdRum.stopResource).toHaveBeenCalledTimes(2);
191
+ expect(DdRum.stopResource.mock.calls.map(call => call[2])).toEqual(
192
+ expect.arrayContaining(['fetch', 'xhr'])
193
+ );
194
+ });
195
+
95
196
  describe('updateTrackingContext', () => {
96
197
  beforeEach(() => {
97
198
  DdRumResourceTracking.stopTracking();