@datadog/mobile-react-native 3.1.1 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/DatadogSDKReactNative.podspec +7 -7
  2. package/android/build.gradle +22 -7
  3. package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +20 -43
  4. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +1 -0
  5. package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +5 -0
  6. package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
  7. package/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt +18 -125
  8. package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +54 -0
  9. package/ios/Sources/AnyEncodable.swift +16 -83
  10. package/ios/Sources/Attributes.swift +5 -0
  11. package/ios/Sources/DdLogsImplementation.swift +13 -3
  12. package/ios/Sources/DdRumImplementation.swift +2 -1
  13. package/ios/Sources/DdSdkNativeInitialization.swift +8 -1
  14. package/ios/Sources/RUMMonitorInternalProtocol.swift +8 -1
  15. package/ios/Sources/SdkVersion.swift +1 -1
  16. package/lib/commonjs/logs/DdLogs.js +14 -44
  17. package/lib/commonjs/logs/DdLogs.js.map +1 -1
  18. package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
  19. package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
  20. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
  21. package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  22. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js +3 -1
  23. package/lib/commonjs/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
  24. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +1 -0
  25. package/lib/commonjs/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  26. package/lib/commonjs/trace/DdTrace.js +1 -1
  27. package/lib/commonjs/trace/DdTrace.js.map +1 -1
  28. package/lib/commonjs/version.js +1 -1
  29. package/lib/module/logs/DdLogs.js +15 -45
  30. package/lib/module/logs/DdLogs.js.map +1 -1
  31. package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
  32. package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
  33. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
  34. package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
  35. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js +2 -0
  36. package/lib/module/rum/instrumentation/resourceTracking/distributedTracing/headers.js.map +1 -1
  37. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js +2 -1
  38. package/lib/module/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.js.map +1 -1
  39. package/lib/module/trace/DdTrace.js +1 -1
  40. package/lib/module/trace/DdTrace.js.map +1 -1
  41. package/lib/module/version.js +1 -1
  42. package/lib/typescript/logs/DdLogs.d.ts +0 -5
  43. package/lib/typescript/logs/DdLogs.d.ts.map +1 -1
  44. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +9 -0
  45. package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
  46. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts +2 -0
  47. package/lib/typescript/rum/instrumentation/resourceTracking/distributedTracing/headers.d.ts.map +1 -1
  48. package/lib/typescript/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.d.ts.map +1 -1
  49. package/lib/typescript/trace/DdTrace.d.ts.map +1 -1
  50. package/lib/typescript/version.d.ts +1 -1
  51. package/package.json +2 -2
  52. package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +89 -0
  53. package/src/logs/DdLogs.ts +25 -58
  54. package/src/logs/__tests__/DdLogs.test.ts +2 -21
  55. package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +3 -3
  56. package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +25 -3
  57. package/src/rum/instrumentation/resourceTracking/distributedTracing/headers.ts +2 -0
  58. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/XHRProxy.ts +10 -1
  59. package/src/rum/instrumentation/resourceTracking/requestProxy/XHRProxy/__tests__/XHRProxy.test.ts +54 -1
  60. package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +13 -0
  61. package/src/trace/DdTrace.ts +1 -4
  62. package/src/version.ts +1 -1
@@ -13,7 +13,11 @@ import {
13
13
  import type { DdRumResourceTracingAttributes } from '../../distributedTracing/distributedTracingAttributes';
14
14
  import { getTracingHeadersFromAttributes } from '../../distributedTracing/distributedTracingHeaders';
15
15
  import { getTracingAttributes } from '../../distributedTracing/distributedTracing';
16
- import { BAGGAGE_HEADER_KEY } from '../../distributedTracing/headers';
16
+ import {
17
+ BAGGAGE_HEADER_KEY,
18
+ TRACKED_BY_HEADER_KEY,
19
+ TRACKED_BY_HEADER_VALUE
20
+ } from '../../distributedTracing/headers';
17
21
  import {
18
22
  DATADOG_GRAPH_QL_OPERATION_NAME_HEADER,
19
23
  DATADOG_GRAPH_QL_OPERATION_TYPE_HEADER,
@@ -161,6 +165,11 @@ const proxySend = (providers: XHRProxyProviders): void => {
161
165
  if (baggageHeader) {
162
166
  this.setRequestHeader(DATADOG_BAGGAGE_HEADER, baggageHeader);
163
167
  }
168
+
169
+ this.setRequestHeader(
170
+ TRACKED_BY_HEADER_KEY,
171
+ TRACKED_BY_HEADER_VALUE
172
+ );
164
173
  }
165
174
 
166
175
  proxyOnReadyStateChange(this, providers);
@@ -33,7 +33,9 @@ import {
33
33
  ORIGIN_HEADER_KEY,
34
34
  TRACESTATE_HEADER_KEY,
35
35
  TAGS_HEADER_KEY,
36
- BAGGAGE_HEADER_KEY
36
+ BAGGAGE_HEADER_KEY,
37
+ TRACKED_BY_HEADER_KEY,
38
+ TRACKED_BY_HEADER_VALUE
37
39
  } from '../../../distributedTracing/headers';
38
40
  import {
39
41
  DATADOG_GRAPH_QL_OPERATION_NAME_HEADER,
@@ -452,6 +454,57 @@ describe('XHRProxy', () => {
452
454
  );
453
455
  });
454
456
 
457
+ it('adds the x-datadog-tracked-by header for first party host requests', async () => {
458
+ // GIVEN
459
+ const method = 'GET';
460
+ const url = 'https://api.example.com/v2/user';
461
+ xhrProxy.onTrackingStart({
462
+ tracingSamplingRate: 100,
463
+ firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([
464
+ {
465
+ match: 'api.example.com',
466
+ propagatorTypes: [PropagatorType.DATADOG]
467
+ }
468
+ ])
469
+ });
470
+
471
+ // WHEN
472
+ const xhr = new XMLHttpRequestMock();
473
+ xhr.open(method, url);
474
+ xhr.send();
475
+ xhr.notifyResponseArrived();
476
+ xhr.complete(200, 'ok');
477
+ await flushPromises();
478
+
479
+ // THEN
480
+ expect(xhr.requestHeaders.get(TRACKED_BY_HEADER_KEY)).toBe(
481
+ TRACKED_BY_HEADER_VALUE
482
+ );
483
+ });
484
+
485
+ it('adds the x-datadog-tracked-by header for non-first party host requests', async () => {
486
+ // GIVEN
487
+ const method = 'GET';
488
+ const url = 'https://api.example.com/v2/user';
489
+ xhrProxy.onTrackingStart({
490
+ tracingSamplingRate: 100,
491
+ firstPartyHostsRegexMap: firstPartyHostsRegexMapBuilder([])
492
+ });
493
+
494
+ // WHEN
495
+ const xhr = new XMLHttpRequestMock();
496
+ xhr.open(method, url);
497
+ xhr.send();
498
+ xhr.notifyResponseArrived();
499
+ xhr.complete(200, 'ok');
500
+ await flushPromises();
501
+
502
+ // THEN
503
+ expect(xhr.requestHeaders.get(TRACKED_BY_HEADER_KEY)).toBe(
504
+ TRACKED_BY_HEADER_VALUE
505
+ );
506
+ });
507
+
455
508
  it('adds tracecontext request headers when the host is instrumented with tracecontext and request is sampled', async () => {
456
509
  // GIVEN
457
510
  const method = 'GET';
@@ -8,6 +8,7 @@ import { version as reactNativeVersion } from 'react-native/package.json';
8
8
  import { NativeModules } from 'react-native';
9
9
 
10
10
  import { InitializationMode } from '../../../config/types';
11
+ import { DdLogs } from '../../../logs/DdLogs';
11
12
  import { DdRum } from '../../../rum/DdRum';
12
13
  import { PropagatorType, RumActionType } from '../../../rum/types';
13
14
  import { DdTrace } from '../../../trace/DdTrace';
@@ -128,6 +129,10 @@ describe('DatadogProvider', () => {
128
129
 
129
130
  it('keeps events in the buffer then executes the buffer once initialization is done', async () => {
130
131
  // Given
132
+ await DdLogs.info('fake_info_log');
133
+ await DdLogs.debug('fake_debug_log');
134
+ await DdLogs.warn('fake_wanr_log');
135
+ await DdLogs.error('fake_error_log');
131
136
  NativeModules.DdTrace.startSpan.mockReturnValueOnce('good_span_id');
132
137
  (nowMock as any).mockReturnValue('good_timestamp');
133
138
  await DdRum.addAction(RumActionType.TAP, 'fakeAction');
@@ -138,6 +143,10 @@ describe('DatadogProvider', () => {
138
143
  (nowMock as any).mockReturnValue('bad_timestamp');
139
144
 
140
145
  // Then
146
+ expect(NativeModules.DdLogs.info).not.toHaveBeenCalled();
147
+ expect(NativeModules.DdLogs.debug).not.toHaveBeenCalled();
148
+ expect(NativeModules.DdLogs.warn).not.toHaveBeenCalled();
149
+ expect(NativeModules.DdLogs.error).not.toHaveBeenCalled();
141
150
  expect(NativeModules.DdRum.addAction).not.toHaveBeenCalled();
142
151
  expect(NativeModules.DdTrace.startSpan).not.toHaveBeenCalled();
143
152
  expect(NativeModules.DdTrace.finishSpan).not.toHaveBeenCalled();
@@ -148,6 +157,10 @@ describe('DatadogProvider', () => {
148
157
 
149
158
  // Then
150
159
  expect(NativeModules.DdSdk.initialize).toHaveBeenCalledTimes(1);
160
+ expect(NativeModules.DdLogs.info).toHaveBeenCalledTimes(1);
161
+ expect(NativeModules.DdLogs.debug).toHaveBeenCalledTimes(1);
162
+ expect(NativeModules.DdLogs.warn).toHaveBeenCalledTimes(1);
163
+ expect(NativeModules.DdLogs.error).toHaveBeenCalledTimes(1);
151
164
  expect(NativeModules.DdRum.addAction).toHaveBeenCalledTimes(1);
152
165
  expect(NativeModules.DdTrace.startSpan).toHaveBeenCalledTimes(1);
153
166
  expect(NativeModules.DdTrace.startSpan).toHaveBeenLastCalledWith(
@@ -37,10 +37,7 @@ class DdTraceWrapper implements DdTraceType {
37
37
  timestampMs
38
38
  )
39
39
  );
40
- InternalLog.log(
41
- `Starting span “${operation}” #${spanId}`,
42
- SdkVerbosity.DEBUG
43
- );
40
+ InternalLog.log(`Starting span “${operation}”`, SdkVerbosity.DEBUG);
44
41
  return spanId;
45
42
  };
46
43
 
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // generated by genversion
2
- export const version = '3.1.1';
2
+ export const version = '3.2.0';