@datadog/mobile-react-native 2.6.2 → 2.6.4

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 (119) hide show
  1. package/DatadogSDKReactNative.podspec +6 -6
  2. package/android/build.gradle +4 -4
  3. package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +12 -0
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkBridgeExt.kt +3 -0
  5. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +1 -2
  6. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +26 -5
  7. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  8. package/android/src/newarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
  9. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdRum.kt +10 -0
  10. package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +11 -0
  11. package/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +9 -0
  12. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkBridgeExtTest.kt +14 -7
  13. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +1 -0
  14. package/ios/Sources/DdRum.mm +11 -0
  15. package/ios/Sources/DdRumImplementation.swift +7 -0
  16. package/ios/Sources/DdSdk.h +5 -3
  17. package/ios/Sources/DdSdk.mm +5 -1
  18. package/ios/Sources/DdSdkImplementation.swift +2 -2
  19. package/ios/Sources/DdSdkNativeInitialization.swift +11 -6
  20. package/ios/Sources/SdkVersion.swift +1 -1
  21. package/jest/mock.js +3 -0
  22. package/lib/commonjs/DdSdkReactNativeConfiguration.js +2 -1
  23. package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
  24. package/lib/commonjs/nativeModulesTypes.js +2 -1
  25. package/lib/commonjs/nativeModulesTypes.js.map +1 -1
  26. package/lib/commonjs/rum/DdRum.js +25 -2
  27. package/lib/commonjs/rum/DdRum.js.map +1 -1
  28. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +2 -2
  29. package/lib/commonjs/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  30. package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +2 -2
  31. package/lib/commonjs/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
  32. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +6 -4
  33. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  34. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +31 -12
  35. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  36. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +9 -8
  37. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  38. package/lib/commonjs/rum/types.js.map +1 -1
  39. package/lib/commonjs/specs/NativeDdRum.js.map +1 -1
  40. package/lib/commonjs/specs/NativeDdSdk.js.map +1 -1
  41. package/lib/commonjs/types.js +2 -1
  42. package/lib/commonjs/types.js.map +1 -1
  43. package/lib/commonjs/utils/Timer.js +2 -2
  44. package/lib/commonjs/utils/Timer.js.map +1 -1
  45. package/lib/commonjs/version.js +1 -1
  46. package/lib/module/DdSdkReactNativeConfiguration.js +2 -1
  47. package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
  48. package/lib/module/index.js +0 -1
  49. package/lib/module/index.js.map +1 -1
  50. package/lib/module/nativeModulesTypes.js +2 -1
  51. package/lib/module/nativeModulesTypes.js.map +1 -1
  52. package/lib/module/rum/DdRum.js +25 -2
  53. package/lib/module/rum/DdRum.js.map +1 -1
  54. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js +1 -1
  55. package/lib/module/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.js.map +1 -1
  56. package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js +1 -1
  57. package/lib/module/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.js.map +1 -1
  58. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js +6 -4
  59. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.js.map +1 -1
  60. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js +30 -11
  61. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.js.map +1 -1
  62. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +8 -6
  63. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  64. package/lib/module/rum/types.js.map +1 -1
  65. package/lib/module/specs/NativeDdRum.js.map +1 -1
  66. package/lib/module/specs/NativeDdSdk.js.map +1 -1
  67. package/lib/module/types.js +2 -1
  68. package/lib/module/types.js.map +1 -1
  69. package/lib/module/utils/Timer.js +1 -1
  70. package/lib/module/utils/Timer.js.map +1 -1
  71. package/lib/module/version.js +1 -1
  72. package/lib/typescript/index.d.ts +2 -1
  73. package/lib/typescript/index.d.ts.map +1 -1
  74. package/lib/typescript/rum/DdRum.d.ts +4 -0
  75. package/lib/typescript/rum/DdRum.d.ts.map +1 -1
  76. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +1 -1
  77. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
  78. package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts +1 -1
  79. package/lib/typescript/rum/instrumentation/interactionTracking/EventsInterceptor.d.ts.map +1 -1
  80. package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts +2 -2
  81. package/lib/typescript/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.d.ts.map +1 -1
  82. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts +4 -2
  83. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.d.ts.map +1 -1
  84. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts +3 -2
  85. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.d.ts.map +1 -1
  86. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
  87. package/lib/typescript/rum/types.d.ts +6 -0
  88. package/lib/typescript/rum/types.d.ts.map +1 -1
  89. package/lib/typescript/specs/NativeDdRum.d.ts +6 -0
  90. package/lib/typescript/specs/NativeDdRum.d.ts.map +1 -1
  91. package/lib/typescript/specs/NativeDdSdk.d.ts +6 -0
  92. package/lib/typescript/specs/NativeDdSdk.d.ts.map +1 -1
  93. package/lib/typescript/utils/Timer.d.ts +1 -1
  94. package/lib/typescript/utils/Timer.d.ts.map +1 -1
  95. package/lib/typescript/version.d.ts +1 -1
  96. package/package.json +2 -2
  97. package/src/DdSdkReactNativeConfiguration.tsx +1 -1
  98. package/src/__tests__/mock.test.ts +2 -1
  99. package/src/index.tsx +2 -1
  100. package/src/nativeModulesTypes.ts +1 -1
  101. package/src/rum/DdRum.ts +46 -3
  102. package/src/rum/__mocks__/MockTimeProvider.ts +1 -1
  103. package/src/rum/__tests__/DdRum.test.ts +17 -0
  104. package/src/rum/__tests__/DdRumTimeProvider.test.ts +1 -1
  105. package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +1 -1
  106. package/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx +2 -2
  107. package/src/rum/instrumentation/interactionTracking/EventsInterceptor.tsx +1 -1
  108. package/src/rum/instrumentation/interactionTracking/NoOpEventsInterceptor.tsx +2 -2
  109. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracing.tsx +10 -4
  110. package/src/rum/instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders.ts +42 -15
  111. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +8 -6
  112. package/src/rum/types.ts +7 -0
  113. package/src/specs/NativeDdRum.ts +7 -0
  114. package/src/specs/NativeDdSdk.ts +7 -0
  115. package/src/types.tsx +1 -1
  116. package/src/utils/Timer.ts +1 -1
  117. package/src/utils/__tests__/TimeProvider.test.tsx +1 -1
  118. package/src/utils/__tests__/Timer.test.ts +1 -1
  119. package/src/version.ts +1 -1
@@ -28,6 +28,7 @@ export const TRACE_ID_HEADER_KEY = 'x-datadog-trace-id';
28
28
  export const PARENT_ID_HEADER_KEY = 'x-datadog-parent-id';
29
29
  export const TAGS_HEADER_KEY = 'x-datadog-tags';
30
30
  export const DD_TRACE_ID_TAG = '_dd.p.tid';
31
+ export const DD_RUM_SESSION_ID_TAG = '_dd.p.rsid';
31
32
 
32
33
  /**
33
34
  * OTel headers
@@ -69,17 +70,30 @@ export const getTracingHeadersFromAttributes = (
69
70
  value: tracingAttributes.spanId.toString(
70
71
  TracingIdFormat.decimal
71
72
  )
72
- },
73
- {
73
+ }
74
+ );
75
+ if (tracingAttributes.rumSessionId) {
76
+ headers.push({
77
+ header: TAGS_HEADER_KEY,
78
+ value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(
79
+ TracingIdFormat.paddedHighHex
80
+ )},${DD_RUM_SESSION_ID_TAG}=${
81
+ tracingAttributes.rumSessionId
82
+ }`
83
+ });
84
+ } else {
85
+ headers.push({
74
86
  header: TAGS_HEADER_KEY,
75
87
  value: `${DD_TRACE_ID_TAG}=${tracingAttributes.traceId.toString(
76
88
  TracingIdFormat.paddedHighHex
77
89
  )}`
78
- }
79
- );
90
+ });
91
+ }
80
92
  break;
81
93
  }
82
94
  case PropagatorType.TRACECONTEXT: {
95
+ const isSampled =
96
+ tracingAttributes.samplingPriorityHeader === '1';
83
97
  headers.push(
84
98
  {
85
99
  header: TRACECONTEXT_HEADER_KEY,
@@ -87,16 +101,15 @@ export const getTracingHeadersFromAttributes = (
87
101
  version: '00',
88
102
  traceId: tracingAttributes.traceId,
89
103
  parentId: tracingAttributes.spanId,
90
- isSampled:
91
- tracingAttributes.samplingPriorityHeader === '1'
104
+ isSampled: isSampled
92
105
  })
93
106
  },
94
107
  {
95
108
  header: TRACESTATE_HEADER_KEY,
96
109
  value: generateTraceStateHeader({
97
110
  parentId: tracingAttributes.spanId,
98
- isSampled:
99
- tracingAttributes.samplingPriorityHeader === '1'
111
+ isSampled: isSampled,
112
+ rumSessionId: tracingAttributes.rumSessionId
100
113
  })
101
114
  }
102
115
  );
@@ -143,7 +156,8 @@ export const getTracingHeadersFromAttributes = (
143
156
  export const getTracingContext = (
144
157
  url: string,
145
158
  tracingSamplingRate: number,
146
- firstPartyHosts: FirstPartyHost[]
159
+ firstPartyHosts: FirstPartyHost[],
160
+ rumSessionId: string | null
147
161
  ): DatadogTracingContext => {
148
162
  const hostname = URLHostParser(url);
149
163
  const firstPartyHostsRegexMap = firstPartyHostsRegexMapBuilder(
@@ -152,7 +166,8 @@ export const getTracingContext = (
152
166
  const tracingAttributes = getTracingAttributes({
153
167
  hostname,
154
168
  firstPartyHostsRegexMap,
155
- tracingSamplingRate
169
+ tracingSamplingRate,
170
+ rumSessionId
156
171
  });
157
172
 
158
173
  return getTracingContextForAttributes(
@@ -163,10 +178,15 @@ export const getTracingContext = (
163
178
 
164
179
  export const getTracingContextForPropagators = (
165
180
  propagators: PropagatorType[],
166
- tracingSamplingRate: number
181
+ tracingSamplingRate: number,
182
+ rumSessionId: string | null
167
183
  ): DatadogTracingContext => {
168
184
  return getTracingContextForAttributes(
169
- generateTracingAttributesWithSampling(tracingSamplingRate, propagators),
185
+ generateTracingAttributesWithSampling(
186
+ tracingSamplingRate,
187
+ propagators,
188
+ rumSessionId
189
+ ),
170
190
  tracingSamplingRate
171
191
  );
172
192
  };
@@ -221,16 +241,23 @@ const generateTraceContextHeader = ({
221
241
 
222
242
  const generateTraceStateHeader = ({
223
243
  parentId,
224
- isSampled
244
+ isSampled,
245
+ rumSessionId
225
246
  }: {
226
247
  parentId: SpanId;
227
248
  isSampled: boolean;
249
+ rumSessionId: string | null;
228
250
  }) => {
229
251
  const sampled = `s:${isSampled ? '1' : '0'}`;
230
252
  const origin = 'o:rum';
231
253
  const parent = `p:${parentId.toString(TracingIdFormat.paddedHex)}`;
232
-
233
- return `dd=${sampled};${origin};${parent}`;
254
+ const baseHeaderValue = `dd=${sampled};${origin};${parent}`;
255
+ if (rumSessionId) {
256
+ const session = `t.rsid:${rumSessionId}`;
257
+ return `${baseHeaderValue};${session}`;
258
+ } else {
259
+ return baseHeaderValue;
260
+ }
234
261
  };
235
262
 
236
263
  const generateB3Header = ({
@@ -4,7 +4,8 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
- import Timer from '../../../../../utils/Timer';
7
+ import { Timer } from '../../../../../utils/Timer';
8
+ import { DdRum } from '../../../../DdRum';
8
9
  import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
9
10
  import type { DdRumResourceTracingAttributes } from '../../distributedTracing/distributedTracing';
10
11
  import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
@@ -91,7 +92,7 @@ const proxyOpen = (
91
92
  const firstPartyHostsRegexMap = context.firstPartyHostsRegexMap;
92
93
  const tracingSamplingRate = context.tracingSamplingRate;
93
94
 
94
- xhrType.prototype.open = function (
95
+ xhrType.prototype.open = function open(
95
96
  this: DdRumXhr,
96
97
  method: string,
97
98
  url: string
@@ -108,7 +109,8 @@ const proxyOpen = (
108
109
  tracingAttributes: getTracingAttributes({
109
110
  hostname,
110
111
  firstPartyHostsRegexMap,
111
- tracingSamplingRate
112
+ tracingSamplingRate,
113
+ rumSessionId: DdRum.getCachedSessionId()
112
114
  })
113
115
  };
114
116
  // eslint-disable-next-line prefer-rest-params
@@ -120,7 +122,7 @@ const proxySend = (providers: XHRProxyProviders): void => {
120
122
  const xhrType = providers.xhrType;
121
123
  const originalXhrSend = xhrType.prototype.send;
122
124
 
123
- xhrType.prototype.send = function (this: DdRumXhr) {
125
+ xhrType.prototype.send = function send(this: DdRumXhr) {
124
126
  if (this._datadog_xhr) {
125
127
  // keep track of start time
126
128
  this._datadog_xhr.timer.start();
@@ -147,7 +149,7 @@ const proxyOnReadyStateChange = (
147
149
  const xhrType = providers.xhrType;
148
150
  const originalOnreadystatechange = xhrProxy.onreadystatechange;
149
151
 
150
- xhrProxy.onreadystatechange = function () {
152
+ xhrProxy.onreadystatechange = function onreadystatechange() {
151
153
  if (xhrProxy.readyState === xhrType.DONE) {
152
154
  if (!xhrProxy._datadog_xhr.reported) {
153
155
  reportXhr(xhrProxy, providers.resourceReporter);
@@ -204,7 +206,7 @@ const proxySetRequestHeader = (providers: XHRProxyProviders): void => {
204
206
  const xhrType = providers.xhrType;
205
207
  const originalXhrSetRequestHeader = xhrType.prototype.setRequestHeader;
206
208
 
207
- xhrType.prototype.setRequestHeader = function (
209
+ xhrType.prototype.setRequestHeader = function sendRequestHeader(
208
210
  this: DdRumXhr,
209
211
  header: string,
210
212
  value: string
package/src/rum/types.ts CHANGED
@@ -146,6 +146,13 @@ export type DdRumType = {
146
146
  */
147
147
  addTiming(name: string): Promise<void>;
148
148
 
149
+ /**
150
+ * Adds the loading time of the view to the active view.
151
+ * It is calculated as the difference between the current time and the start time of the view.
152
+ * @param overwrite: If true, overwrites the previously calculated view loading time.
153
+ */
154
+ addViewLoadingTime(overwrite: boolean): Promise<void>;
155
+
149
156
  /**
150
157
  * Stops the current RUM Session.
151
158
  */
@@ -136,6 +136,13 @@ export interface Spec extends TurboModule {
136
136
  */
137
137
  addTiming(name: string): Promise<void>;
138
138
 
139
+ /**
140
+ * Adds the loading time of the view to the active view.
141
+ * It is calculated as the difference between the current time and the start time of the view.
142
+ * @param overwrite: If true, overwrites the previously calculated view loading time.
143
+ */
144
+ addViewLoadingTime(overwrite: boolean): Promise<void>;
145
+
139
146
  /**
140
147
  * Stops the current RUM Session.
141
148
  */
@@ -62,6 +62,13 @@ export interface Spec extends TurboModule {
62
62
  * Clears all data that has not already been sent to Datadog servers
63
63
  */
64
64
  clearAllData(): Promise<void>;
65
+
66
+ /**
67
+ * Required definitions, because of:
68
+ * https://github.com/react-native-community/RNNewArchitectureLibraries/tree/feat/swift-event-emitter?tab=readme-ov-file#codegen-update-codegen-specs)
69
+ */
70
+ addListener: (eventType: string) => void;
71
+ removeListeners: (count: number) => void;
65
72
  }
66
73
 
67
74
  // eslint-disable-next-line import/no-default-export
package/src/types.tsx CHANGED
@@ -63,7 +63,7 @@ export class DdSdkConfiguration {
63
63
  readonly appHangThreshold: number | undefined,
64
64
  readonly resourceTracingSamplingRate: number | undefined,
65
65
  readonly trackWatchdogTerminations: boolean | undefined,
66
- readonly batchProcessingLevel: BatchProcessingLevel
66
+ readonly batchProcessingLevel: BatchProcessingLevel // eslint-disable-next-line no-empty-function
67
67
  ) {}
68
68
  }
69
69
 
@@ -14,7 +14,7 @@ const STOP_LABEL = '__stop';
14
14
  * Simple timer which records time ticks. Shouldn't be re-used once stopped.
15
15
  * All timestamps/durations returned are in milliseconds.
16
16
  */
17
- export default class Timer {
17
+ export class Timer {
18
18
  private timeProvider: TimeProvider;
19
19
  private times: Record<string, Timestamp> = {};
20
20
 
@@ -4,7 +4,7 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
- import MockTimeProvider from '../../rum/__mocks__/MockTimeProvider';
7
+ import { MockTimeProvider } from '../../rum/__mocks__/MockTimeProvider';
8
8
  import { DefaultTimeProvider } from '../time-provider/DefaultTimeProvider';
9
9
 
10
10
  function mockDateNow(value: number) {
@@ -4,7 +4,7 @@
4
4
  * Copyright 2016-Present Datadog, Inc.
5
5
  */
6
6
 
7
- import Timer from '../Timer';
7
+ import { Timer } from '../Timer';
8
8
 
9
9
  function randomInt(): number {
10
10
  return Math.floor(Math.random() * 65536) + 512;
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // generated by genversion
2
- export const version = '2.6.2';
2
+ export const version = '2.6.4';