@datadog/mobile-react-native 2.1.1 → 2.3.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.
- package/DatadogSDKReactNative.podspec +8 -7
- package/android/build.gradle +5 -4
- package/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +2 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt +11 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +5 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt +3 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +64 -1
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +164 -4
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkImplementation.kt +6 -354
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +351 -0
- package/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt +5 -3
- package/android/src/main/kotlin/com/datadog/reactnative/DdTraceImplementation.kt +10 -0
- package/android/src/main/kotlin/com/datadog/reactnative/JSONFileReader.kt +20 -0
- package/android/src/main/kotlin/com/datadog/reactnative/ProxyAuthenticator.kt +4 -1
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +10 -0
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt +3 -2
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdRum.kt +5 -2
- package/android/src/oldarch/kotlin/com/datadog/reactnative/DdSdk.kt +3 -2
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkConfigurationTest.kt +196 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkNativeInitializationTest.kt +181 -0
- package/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +12 -271
- package/android/src/test/kotlin/com/datadog/reactnative/DdTraceTest.kt +10 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +28 -1
- package/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt +24 -0
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/ActionEventForgeryFactory.kt +1 -1
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt +9 -1
- package/android/src/test/kotlin/com/datadog/tools/unit/forge/ResourceEventForgeryFactory.kt +1 -1
- package/android/src/test/resources/input/complete-configuration.json +48 -0
- package/android/src/test/resources/input/malformed-configuration.json +5 -0
- package/android/src/test/resources/input/minimal-configuration.json +8 -0
- package/datadog-configuration.gradle +57 -0
- package/datadog-configuration.schema.json +200 -0
- package/ios/Sources/DatadogSDKWrapper.swift +22 -19
- package/ios/Sources/DdLogsImplementation.swift +14 -0
- package/ios/Sources/DdSdk.h +2 -0
- package/ios/Sources/DdSdk.mm +6 -1
- package/ios/Sources/DdSdkConfiguration.swift +47 -56
- package/ios/Sources/DdSdkImplementation.swift +10 -279
- package/ios/Sources/DdSdkNativeInitialization.swift +218 -0
- package/ios/Sources/DdTraceImplementation.swift +3 -1
- package/ios/Sources/GlobalState.swift +1 -1
- package/ios/Sources/JSONFileReader.swift +28 -0
- package/ios/Sources/RNDdSdkConfiguration.swift +227 -9
- package/ios/Sources/SdkVersion.swift +10 -0
- package/lib/commonjs/DdSdkReactNative.js +24 -66
- package/lib/commonjs/DdSdkReactNative.js.map +1 -1
- package/lib/commonjs/DdSdkReactNativeConfiguration.js +24 -4
- package/lib/commonjs/DdSdkReactNativeConfiguration.js.map +1 -1
- package/lib/commonjs/ProxyConfiguration.js +15 -2
- package/lib/commonjs/ProxyConfiguration.js.map +1 -1
- package/lib/commonjs/index.js +8 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/nativeModulesTypes.js +2 -2
- package/lib/commonjs/nativeModulesTypes.js.map +1 -1
- package/lib/commonjs/sdk/DatadogProvider/DatadogProvider.js.map +1 -1
- package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js +214 -0
- package/lib/commonjs/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -0
- package/lib/commonjs/types.js +10 -2
- package/lib/commonjs/types.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/commonjs/version.js.map +1 -1
- package/lib/module/DdSdkReactNative.js +23 -65
- package/lib/module/DdSdkReactNative.js.map +1 -1
- package/lib/module/DdSdkReactNativeConfiguration.js +22 -4
- package/lib/module/DdSdkReactNativeConfiguration.js.map +1 -1
- package/lib/module/ProxyConfiguration.js +15 -2
- package/lib/module/ProxyConfiguration.js.map +1 -1
- package/lib/module/index.js +2 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/nativeModulesTypes.js +2 -2
- package/lib/module/nativeModulesTypes.js.map +1 -1
- package/lib/module/sdk/DatadogProvider/DatadogProvider.js.map +1 -1
- package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js +197 -0
- package/lib/module/sdk/FileBasedConfiguration/FileBasedConfiguration.js.map +1 -0
- package/lib/module/types.js +10 -2
- package/lib/module/types.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/module/version.js.map +1 -1
- package/lib/typescript/DdSdkReactNative.d.ts +0 -9
- package/lib/typescript/DdSdkReactNativeConfiguration.d.ts +43 -3
- package/lib/typescript/ProxyConfiguration.d.ts +4 -12
- package/lib/typescript/index.d.ts +2 -1
- package/lib/typescript/nativeModulesTypes.d.ts +2 -2
- package/lib/typescript/sdk/DatadogProvider/DatadogProvider.d.ts +2 -1
- package/lib/typescript/sdk/FileBasedConfiguration/FileBasedConfiguration.d.ts +31 -0
- package/lib/typescript/types.d.ts +29 -3
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +7 -4
- package/src/DdSdkReactNative.tsx +58 -101
- package/src/DdSdkReactNativeConfiguration.tsx +26 -7
- package/src/ProxyConfiguration.tsx +17 -3
- package/src/__tests__/DdSdkReactNative.test.tsx +134 -112
- package/src/__tests__/DdSdkReactNativeConfiguration.test.ts +19 -10
- package/src/__tests__/mock.test.ts +0 -9
- package/src/index.tsx +2 -0
- package/src/nativeModulesTypes.ts +1 -1
- package/src/sdk/DatadogProvider/DatadogProvider.tsx +3 -1
- package/src/sdk/DatadogProvider/__tests__/initialization.test.tsx +12 -5
- package/src/sdk/DatadogProvider/__tests__/initializationModes.test.tsx +1 -2
- package/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts +235 -0
- package/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts +245 -0
- package/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json +22 -0
- package/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/malformed-configuration.json +5 -0
- package/src/types.tsx +21 -2
- package/src/version.ts +1 -1
|
@@ -8,7 +8,7 @@ import { NativeModules } from 'react-native';
|
|
|
8
8
|
|
|
9
9
|
import { DdSdkReactNativeConfiguration } from '../DdSdkReactNativeConfiguration';
|
|
10
10
|
import { DdSdkReactNative } from '../DdSdkReactNative';
|
|
11
|
-
import { ProxyType } from '../ProxyConfiguration';
|
|
11
|
+
import { ProxyConfiguration, ProxyType } from '../ProxyConfiguration';
|
|
12
12
|
import { SdkVerbosity } from '../SdkVerbosity';
|
|
13
13
|
import { TrackingConsent } from '../TrackingConsent';
|
|
14
14
|
import { DdLogs } from '../logs/DdLogs';
|
|
@@ -106,12 +106,15 @@ describe('DdSdkReactNative', () => {
|
|
|
106
106
|
expect(ddSdkConfiguration.trackingConsent).toBe(
|
|
107
107
|
TrackingConsent.GRANTED
|
|
108
108
|
);
|
|
109
|
-
expect(ddSdkConfiguration.
|
|
109
|
+
expect(ddSdkConfiguration.nativeInteractionTracking).toBe(false);
|
|
110
|
+
expect(ddSdkConfiguration.nativeViewTracking).toBe(false);
|
|
111
|
+
expect(ddSdkConfiguration.firstPartyHosts).toEqual([]);
|
|
112
|
+
expect(ddSdkConfiguration.bundleLogsWithRum).toBe(true);
|
|
113
|
+
expect(ddSdkConfiguration.bundleLogsWithTraces).toBe(true);
|
|
114
|
+
|
|
115
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
110
116
|
'_dd.source': 'react-native',
|
|
111
|
-
'_dd.sdk_version': sdkVersion
|
|
112
|
-
'_dd.native_view_tracking': false,
|
|
113
|
-
'_dd.native_interaction_tracking': false,
|
|
114
|
-
'_dd.first_party_hosts': []
|
|
117
|
+
'_dd.sdk_version': sdkVersion
|
|
115
118
|
});
|
|
116
119
|
});
|
|
117
120
|
|
|
@@ -143,12 +146,9 @@ describe('DdSdkReactNative', () => {
|
|
|
143
146
|
expect(ddSdkConfiguration.trackingConsent).toBe(
|
|
144
147
|
TrackingConsent.GRANTED
|
|
145
148
|
);
|
|
146
|
-
expect(ddSdkConfiguration.
|
|
149
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
147
150
|
'_dd.source': 'react-native',
|
|
148
|
-
'_dd.sdk_version': sdkVersion
|
|
149
|
-
'_dd.native_view_tracking': false,
|
|
150
|
-
'_dd.native_interaction_tracking': false,
|
|
151
|
-
'_dd.first_party_hosts': []
|
|
151
|
+
'_dd.sdk_version': sdkVersion
|
|
152
152
|
});
|
|
153
153
|
|
|
154
154
|
expect(DdSdkReactNative['wasInitialized']).toBe(false);
|
|
@@ -188,12 +188,9 @@ describe('DdSdkReactNative', () => {
|
|
|
188
188
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
189
189
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
190
190
|
expect(ddSdkConfiguration.trackingConsent).toBe(fakeConsent);
|
|
191
|
-
expect(ddSdkConfiguration.
|
|
191
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
192
192
|
'_dd.source': 'react-native',
|
|
193
|
-
'_dd.sdk_version': sdkVersion
|
|
194
|
-
'_dd.native_view_tracking': false,
|
|
195
|
-
'_dd.native_interaction_tracking': false,
|
|
196
|
-
'_dd.first_party_hosts': []
|
|
193
|
+
'_dd.sdk_version': sdkVersion
|
|
197
194
|
});
|
|
198
195
|
});
|
|
199
196
|
|
|
@@ -223,17 +220,18 @@ describe('DdSdkReactNative', () => {
|
|
|
223
220
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
224
221
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
225
222
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
226
|
-
expect(ddSdkConfiguration.
|
|
223
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
227
224
|
'_dd.source': 'react-native',
|
|
228
|
-
'_dd.sdk_version': sdkVersion
|
|
229
|
-
'_dd.native_view_tracking': false,
|
|
230
|
-
'_dd.native_interaction_tracking': false,
|
|
231
|
-
'_dd.first_party_hosts': []
|
|
225
|
+
'_dd.sdk_version': sdkVersion
|
|
232
226
|
});
|
|
233
227
|
});
|
|
234
228
|
|
|
235
229
|
it('logs a warning when initialize { with socks proxy config + proxy credentials }', async () => {
|
|
236
230
|
// GIVEN
|
|
231
|
+
const spyConsoleWarn = jest
|
|
232
|
+
.spyOn(console, 'warn')
|
|
233
|
+
.mockImplementation();
|
|
234
|
+
|
|
237
235
|
const fakeAppId = '1';
|
|
238
236
|
const fakeClientToken = '2';
|
|
239
237
|
const fakeEnvName = 'env';
|
|
@@ -251,18 +249,15 @@ describe('DdSdkReactNative', () => {
|
|
|
251
249
|
false,
|
|
252
250
|
false
|
|
253
251
|
);
|
|
254
|
-
configuration.proxyConfig =
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
252
|
+
configuration.proxyConfig = new ProxyConfiguration(
|
|
253
|
+
proxyType,
|
|
254
|
+
proxyAddress,
|
|
255
|
+
proxyPort,
|
|
256
|
+
proxyUsername,
|
|
257
|
+
proxyPassword
|
|
258
|
+
);
|
|
261
259
|
|
|
262
260
|
NativeModules.DdSdk.initialize.mockResolvedValue(null);
|
|
263
|
-
const spyConsoleWarn = jest
|
|
264
|
-
.spyOn(console, 'warn')
|
|
265
|
-
.mockImplementation();
|
|
266
261
|
|
|
267
262
|
try {
|
|
268
263
|
// WHEN
|
|
@@ -277,15 +272,16 @@ describe('DdSdkReactNative', () => {
|
|
|
277
272
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
278
273
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
279
274
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
280
|
-
expect(ddSdkConfiguration.
|
|
275
|
+
expect(ddSdkConfiguration.proxyConfig).toEqual({
|
|
276
|
+
type: proxyType,
|
|
277
|
+
address: proxyAddress,
|
|
278
|
+
port: proxyPort
|
|
279
|
+
});
|
|
280
|
+
expect(
|
|
281
|
+
ddSdkConfiguration.additionalConfiguration
|
|
282
|
+
).toStrictEqual({
|
|
281
283
|
'_dd.source': 'react-native',
|
|
282
|
-
'_dd.sdk_version': sdkVersion
|
|
283
|
-
'_dd.native_view_tracking': false,
|
|
284
|
-
'_dd.native_interaction_tracking': false,
|
|
285
|
-
'_dd.proxy.type': proxyType,
|
|
286
|
-
'_dd.proxy.address': proxyAddress,
|
|
287
|
-
'_dd.proxy.port': proxyPort,
|
|
288
|
-
'_dd.first_party_hosts': []
|
|
284
|
+
'_dd.sdk_version': sdkVersion
|
|
289
285
|
});
|
|
290
286
|
expect(spyConsoleWarn).toHaveBeenCalledTimes(1);
|
|
291
287
|
} finally {
|
|
@@ -361,6 +357,48 @@ describe('DdSdkReactNative', () => {
|
|
|
361
357
|
);
|
|
362
358
|
});
|
|
363
359
|
|
|
360
|
+
it('initializes with bundleLogsWithRum false when it is specified', async () => {
|
|
361
|
+
// GIVEN
|
|
362
|
+
const fakeAppId = '1';
|
|
363
|
+
const fakeClientToken = '2';
|
|
364
|
+
const fakeEnvName = 'env';
|
|
365
|
+
const configuration = new DdSdkReactNativeConfiguration(
|
|
366
|
+
fakeClientToken,
|
|
367
|
+
fakeEnvName,
|
|
368
|
+
fakeAppId
|
|
369
|
+
);
|
|
370
|
+
configuration.bundleLogsWithRum = false;
|
|
371
|
+
|
|
372
|
+
// WHEN
|
|
373
|
+
await DdSdkReactNative.initialize(configuration);
|
|
374
|
+
|
|
375
|
+
// THEN
|
|
376
|
+
const ddSdkConfiguration = NativeModules.DdSdk.initialize.mock
|
|
377
|
+
.calls[0][0] as DdSdkConfiguration;
|
|
378
|
+
expect(ddSdkConfiguration.bundleLogsWithRum).toBe(false);
|
|
379
|
+
});
|
|
380
|
+
|
|
381
|
+
it('initializes with bundleLogsWithTraces false when it is specified', async () => {
|
|
382
|
+
// GIVEN
|
|
383
|
+
const fakeAppId = '1';
|
|
384
|
+
const fakeClientToken = '2';
|
|
385
|
+
const fakeEnvName = 'env';
|
|
386
|
+
const configuration = new DdSdkReactNativeConfiguration(
|
|
387
|
+
fakeClientToken,
|
|
388
|
+
fakeEnvName,
|
|
389
|
+
fakeAppId
|
|
390
|
+
);
|
|
391
|
+
configuration.bundleLogsWithTraces = false;
|
|
392
|
+
|
|
393
|
+
// WHEN
|
|
394
|
+
await DdSdkReactNative.initialize(configuration);
|
|
395
|
+
|
|
396
|
+
// THEN
|
|
397
|
+
const ddSdkConfiguration = NativeModules.DdSdk.initialize.mock
|
|
398
|
+
.calls[0][0] as DdSdkConfiguration;
|
|
399
|
+
expect(ddSdkConfiguration.bundleLogsWithTraces).toBe(false);
|
|
400
|
+
});
|
|
401
|
+
|
|
364
402
|
it('initializes with the version when a version is specified', async () => {
|
|
365
403
|
// GIVEN
|
|
366
404
|
const fakeAppId = '1';
|
|
@@ -379,9 +417,9 @@ describe('DdSdkReactNative', () => {
|
|
|
379
417
|
// THEN
|
|
380
418
|
const ddSdkConfiguration = NativeModules.DdSdk.initialize.mock
|
|
381
419
|
.calls[0][0] as DdSdkConfiguration;
|
|
382
|
-
expect(
|
|
383
|
-
'
|
|
384
|
-
);
|
|
420
|
+
expect(
|
|
421
|
+
ddSdkConfiguration.additionalConfiguration['_dd.version']
|
|
422
|
+
).toBe('2.0.0');
|
|
385
423
|
});
|
|
386
424
|
|
|
387
425
|
it('initialized with a version suffix when a version suffix is specified', async () => {
|
|
@@ -403,10 +441,10 @@ describe('DdSdkReactNative', () => {
|
|
|
403
441
|
const ddSdkConfiguration = NativeModules.DdSdk.initialize.mock
|
|
404
442
|
.calls[0][0] as DdSdkConfiguration;
|
|
405
443
|
expect(
|
|
406
|
-
ddSdkConfiguration.
|
|
444
|
+
ddSdkConfiguration.additionalConfiguration['_dd.version']
|
|
407
445
|
).toBeUndefined();
|
|
408
446
|
expect(
|
|
409
|
-
ddSdkConfiguration.
|
|
447
|
+
ddSdkConfiguration.additionalConfiguration['_dd.version_suffix']
|
|
410
448
|
).toBe('-codepush-3');
|
|
411
449
|
});
|
|
412
450
|
|
|
@@ -429,11 +467,11 @@ describe('DdSdkReactNative', () => {
|
|
|
429
467
|
// THEN
|
|
430
468
|
const ddSdkConfiguration = NativeModules.DdSdk.initialize.mock
|
|
431
469
|
.calls[0][0] as DdSdkConfiguration;
|
|
432
|
-
expect(ddSdkConfiguration.additionalConfig['_dd.version']).toBe(
|
|
433
|
-
'2.0.0-codepush-3'
|
|
434
|
-
);
|
|
435
470
|
expect(
|
|
436
|
-
ddSdkConfiguration.
|
|
471
|
+
ddSdkConfiguration.additionalConfiguration['_dd.version']
|
|
472
|
+
).toBe('2.0.0-codepush-3');
|
|
473
|
+
expect(
|
|
474
|
+
ddSdkConfiguration.additionalConfiguration['_dd.version_suffix']
|
|
437
475
|
).toBeUndefined();
|
|
438
476
|
});
|
|
439
477
|
});
|
|
@@ -463,12 +501,9 @@ describe('DdSdkReactNative', () => {
|
|
|
463
501
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
464
502
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
465
503
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
466
|
-
expect(ddSdkConfiguration.
|
|
504
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
467
505
|
'_dd.source': 'react-native',
|
|
468
|
-
'_dd.sdk_version': sdkVersion
|
|
469
|
-
'_dd.native_view_tracking': false,
|
|
470
|
-
'_dd.native_interaction_tracking': false,
|
|
471
|
-
'_dd.first_party_hosts': []
|
|
506
|
+
'_dd.sdk_version': sdkVersion
|
|
472
507
|
});
|
|
473
508
|
expect(
|
|
474
509
|
DdRumUserInteractionTracking.startTracking
|
|
@@ -508,21 +543,19 @@ describe('DdSdkReactNative', () => {
|
|
|
508
543
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
509
544
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
510
545
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
511
|
-
expect(ddSdkConfiguration.
|
|
546
|
+
expect(ddSdkConfiguration.firstPartyHosts).toEqual([
|
|
547
|
+
{
|
|
548
|
+
match: 'api.example.com',
|
|
549
|
+
propagatorTypes: ['datadog', 'tracecontext']
|
|
550
|
+
},
|
|
551
|
+
{
|
|
552
|
+
match: 'something.fr',
|
|
553
|
+
propagatorTypes: ['datadog']
|
|
554
|
+
}
|
|
555
|
+
]);
|
|
556
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
512
557
|
'_dd.source': 'react-native',
|
|
513
|
-
'_dd.sdk_version': sdkVersion
|
|
514
|
-
'_dd.native_view_tracking': false,
|
|
515
|
-
'_dd.native_interaction_tracking': false,
|
|
516
|
-
'_dd.first_party_hosts': [
|
|
517
|
-
{
|
|
518
|
-
match: 'api.example.com',
|
|
519
|
-
propagatorTypes: ['datadog', 'tracecontext']
|
|
520
|
-
},
|
|
521
|
-
{
|
|
522
|
-
match: 'something.fr',
|
|
523
|
-
propagatorTypes: ['datadog']
|
|
524
|
-
}
|
|
525
|
-
]
|
|
558
|
+
'_dd.sdk_version': sdkVersion
|
|
526
559
|
});
|
|
527
560
|
expect(DdRumResourceTracking.startTracking).toHaveBeenCalledTimes(
|
|
528
561
|
1
|
|
@@ -569,12 +602,9 @@ describe('DdSdkReactNative', () => {
|
|
|
569
602
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
570
603
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
571
604
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
572
|
-
expect(ddSdkConfiguration.
|
|
605
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
573
606
|
'_dd.source': 'react-native',
|
|
574
|
-
'_dd.sdk_version': sdkVersion
|
|
575
|
-
'_dd.native_view_tracking': false,
|
|
576
|
-
'_dd.native_interaction_tracking': false,
|
|
577
|
-
'_dd.first_party_hosts': []
|
|
607
|
+
'_dd.sdk_version': sdkVersion
|
|
578
608
|
});
|
|
579
609
|
expect(DdRumErrorTracking.startTracking).toHaveBeenCalledTimes(1);
|
|
580
610
|
});
|
|
@@ -770,13 +800,10 @@ describe('DdSdkReactNative', () => {
|
|
|
770
800
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
771
801
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
772
802
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
773
|
-
expect(ddSdkConfiguration.
|
|
803
|
+
expect(ddSdkConfiguration.serviceName).toBe(fakeServiceName);
|
|
804
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
774
805
|
'_dd.source': 'react-native',
|
|
775
|
-
'_dd.sdk_version': sdkVersion
|
|
776
|
-
'_dd.service_name': fakeServiceName,
|
|
777
|
-
'_dd.native_view_tracking': false,
|
|
778
|
-
'_dd.native_interaction_tracking': false,
|
|
779
|
-
'_dd.first_party_hosts': []
|
|
806
|
+
'_dd.sdk_version': sdkVersion
|
|
780
807
|
});
|
|
781
808
|
expect(DdRumErrorTracking.startTracking).toHaveBeenCalledTimes(1);
|
|
782
809
|
});
|
|
@@ -808,13 +835,10 @@ describe('DdSdkReactNative', () => {
|
|
|
808
835
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
809
836
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
810
837
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
811
|
-
expect(ddSdkConfiguration.
|
|
838
|
+
expect(ddSdkConfiguration.verbosity).toBe(SdkVerbosity.DEBUG);
|
|
839
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
812
840
|
'_dd.source': 'react-native',
|
|
813
|
-
'_dd.sdk_version': sdkVersion
|
|
814
|
-
'_dd.sdk_verbosity': SdkVerbosity.DEBUG,
|
|
815
|
-
'_dd.native_view_tracking': false,
|
|
816
|
-
'_dd.native_interaction_tracking': false,
|
|
817
|
-
'_dd.first_party_hosts': []
|
|
841
|
+
'_dd.sdk_version': sdkVersion
|
|
818
842
|
});
|
|
819
843
|
expect(DdRumErrorTracking.startTracking).toHaveBeenCalledTimes(1);
|
|
820
844
|
});
|
|
@@ -846,12 +870,10 @@ describe('DdSdkReactNative', () => {
|
|
|
846
870
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
847
871
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
848
872
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
849
|
-
expect(ddSdkConfiguration.
|
|
873
|
+
expect(ddSdkConfiguration.nativeViewTracking).toBe(true);
|
|
874
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
850
875
|
'_dd.source': 'react-native',
|
|
851
|
-
'_dd.sdk_version': sdkVersion
|
|
852
|
-
'_dd.native_view_tracking': true,
|
|
853
|
-
'_dd.native_interaction_tracking': false,
|
|
854
|
-
'_dd.first_party_hosts': []
|
|
876
|
+
'_dd.sdk_version': sdkVersion
|
|
855
877
|
});
|
|
856
878
|
expect(DdRumErrorTracking.startTracking).toHaveBeenCalledTimes(1);
|
|
857
879
|
});
|
|
@@ -883,12 +905,10 @@ describe('DdSdkReactNative', () => {
|
|
|
883
905
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
884
906
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
885
907
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
886
|
-
expect(ddSdkConfiguration.
|
|
908
|
+
expect(ddSdkConfiguration.nativeInteractionTracking).toBe(true);
|
|
909
|
+
expect(ddSdkConfiguration.additionalConfiguration).toStrictEqual({
|
|
887
910
|
'_dd.source': 'react-native',
|
|
888
|
-
'_dd.sdk_version': sdkVersion
|
|
889
|
-
'_dd.native_view_tracking': false,
|
|
890
|
-
'_dd.native_interaction_tracking': true,
|
|
891
|
-
'_dd.first_party_hosts': []
|
|
911
|
+
'_dd.sdk_version': sdkVersion
|
|
892
912
|
});
|
|
893
913
|
expect(DdRumErrorTracking.startTracking).toHaveBeenCalledTimes(1);
|
|
894
914
|
});
|
|
@@ -1085,15 +1105,16 @@ describe('DdSdkReactNative', () => {
|
|
|
1085
1105
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
1086
1106
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
1087
1107
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
1088
|
-
expect(ddSdkConfiguration.
|
|
1108
|
+
expect(ddSdkConfiguration.proxyConfig).toStrictEqual({
|
|
1109
|
+
type: proxyType,
|
|
1110
|
+
address: proxyAddress,
|
|
1111
|
+
port: proxyPort
|
|
1112
|
+
});
|
|
1113
|
+
expect(
|
|
1114
|
+
ddSdkConfiguration.additionalConfiguration
|
|
1115
|
+
).toStrictEqual({
|
|
1089
1116
|
'_dd.source': 'react-native',
|
|
1090
|
-
'_dd.sdk_version': sdkVersion
|
|
1091
|
-
'_dd.native_view_tracking': false,
|
|
1092
|
-
'_dd.native_interaction_tracking': false,
|
|
1093
|
-
'_dd.proxy.type': proxyType,
|
|
1094
|
-
'_dd.proxy.address': proxyAddress,
|
|
1095
|
-
'_dd.proxy.port': proxyPort,
|
|
1096
|
-
'_dd.first_party_hosts': []
|
|
1117
|
+
'_dd.sdk_version': sdkVersion
|
|
1097
1118
|
});
|
|
1098
1119
|
});
|
|
1099
1120
|
}
|
|
@@ -1144,17 +1165,18 @@ describe('DdSdkReactNative', () => {
|
|
|
1144
1165
|
expect(ddSdkConfiguration.clientToken).toBe(fakeClientToken);
|
|
1145
1166
|
expect(ddSdkConfiguration.applicationId).toBe(fakeAppId);
|
|
1146
1167
|
expect(ddSdkConfiguration.env).toBe(fakeEnvName);
|
|
1147
|
-
expect(ddSdkConfiguration.
|
|
1168
|
+
expect(ddSdkConfiguration.proxyConfig).toStrictEqual({
|
|
1169
|
+
type: proxyType,
|
|
1170
|
+
address: proxyAddress,
|
|
1171
|
+
port: proxyPort,
|
|
1172
|
+
username: proxyUsername,
|
|
1173
|
+
password: proxyPassword
|
|
1174
|
+
});
|
|
1175
|
+
expect(
|
|
1176
|
+
ddSdkConfiguration.additionalConfiguration
|
|
1177
|
+
).toStrictEqual({
|
|
1148
1178
|
'_dd.source': 'react-native',
|
|
1149
|
-
'_dd.sdk_version': sdkVersion
|
|
1150
|
-
'_dd.native_view_tracking': false,
|
|
1151
|
-
'_dd.native_interaction_tracking': false,
|
|
1152
|
-
'_dd.proxy.type': proxyType,
|
|
1153
|
-
'_dd.proxy.address': proxyAddress,
|
|
1154
|
-
'_dd.proxy.port': proxyPort,
|
|
1155
|
-
'_dd.proxy.username': proxyUsername,
|
|
1156
|
-
'_dd.proxy.password': proxyPassword,
|
|
1157
|
-
'_dd.first_party_hosts': []
|
|
1179
|
+
'_dd.sdk_version': sdkVersion
|
|
1158
1180
|
});
|
|
1159
1181
|
});
|
|
1160
1182
|
}
|
|
@@ -32,9 +32,11 @@ describe('DdSdkReactNativeConfiguration', () => {
|
|
|
32
32
|
).toMatchInlineSnapshot(`
|
|
33
33
|
DdSdkReactNativeConfiguration {
|
|
34
34
|
"actionEventMapper": null,
|
|
35
|
-
"
|
|
35
|
+
"additionalConfiguration": {},
|
|
36
36
|
"applicationId": "fake-app-id",
|
|
37
37
|
"batchSize": "MEDIUM",
|
|
38
|
+
"bundleLogsWithRum": true,
|
|
39
|
+
"bundleLogsWithTraces": true,
|
|
38
40
|
"clientToken": "fake-client-token",
|
|
39
41
|
"customEndpoints": {},
|
|
40
42
|
"env": "fake-env",
|
|
@@ -95,11 +97,12 @@ describe('DdSdkReactNativeConfiguration', () => {
|
|
|
95
97
|
'api.com',
|
|
96
98
|
443
|
|
97
99
|
),
|
|
98
|
-
|
|
99
100
|
serviceName: 'com.test.app',
|
|
100
101
|
version: '1.4.5',
|
|
101
102
|
versionSuffix: 'codepush-3',
|
|
102
|
-
|
|
103
|
+
additionalConfiguration: {
|
|
104
|
+
additionalField: 'fake-value'
|
|
105
|
+
},
|
|
103
106
|
trackingConsent: TrackingConsent.PENDING,
|
|
104
107
|
nativeCrashReportEnabled: true,
|
|
105
108
|
nativeLongTaskThresholdMs: 345,
|
|
@@ -112,18 +115,22 @@ describe('DdSdkReactNativeConfiguration', () => {
|
|
|
112
115
|
rum: 'https://rum.example.com/',
|
|
113
116
|
logs: 'https://logs.example.com/',
|
|
114
117
|
trace: 'https://trace.example.com/'
|
|
115
|
-
}
|
|
118
|
+
},
|
|
119
|
+
bundleLogsWithRum: true,
|
|
120
|
+
bundleLogsWithTraces: true
|
|
116
121
|
}
|
|
117
122
|
)
|
|
118
123
|
).toMatchInlineSnapshot(`
|
|
119
124
|
DdSdkReactNativeConfiguration {
|
|
120
125
|
"actionEventMapper": [Function],
|
|
121
126
|
"actionNameAttribute": "testID",
|
|
122
|
-
"
|
|
127
|
+
"additionalConfiguration": {
|
|
123
128
|
"additionalField": "fake-value",
|
|
124
129
|
},
|
|
125
130
|
"applicationId": "fake-app-id",
|
|
126
131
|
"batchSize": "LARGE",
|
|
132
|
+
"bundleLogsWithRum": true,
|
|
133
|
+
"bundleLogsWithTraces": true,
|
|
127
134
|
"clientToken": "fake-client-token",
|
|
128
135
|
"customEndpoints": {
|
|
129
136
|
"logs": "https://logs.example.com/",
|
|
@@ -143,10 +150,8 @@ describe('DdSdkReactNativeConfiguration', () => {
|
|
|
143
150
|
"nativeViewTracking": true,
|
|
144
151
|
"proxyConfig": ProxyConfiguration {
|
|
145
152
|
"address": "api.com",
|
|
146
|
-
"password": undefined,
|
|
147
153
|
"port": 443,
|
|
148
154
|
"type": "https",
|
|
149
|
-
"username": undefined,
|
|
150
155
|
},
|
|
151
156
|
"resourceEventMapper": [Function],
|
|
152
157
|
"resourceTracingSamplingRate": 100,
|
|
@@ -189,21 +194,25 @@ describe('DdSdkReactNativeConfiguration', () => {
|
|
|
189
194
|
serviceName: '',
|
|
190
195
|
version: '',
|
|
191
196
|
versionSuffix: '',
|
|
192
|
-
|
|
197
|
+
additionalConfiguration: {},
|
|
193
198
|
nativeCrashReportEnabled: false,
|
|
194
199
|
nativeLongTaskThresholdMs: false,
|
|
195
200
|
longTaskThresholdMs: false,
|
|
196
201
|
trackFrustrations: false,
|
|
197
202
|
trackBackgroundEvents: false,
|
|
198
|
-
customEndpoints: {}
|
|
203
|
+
customEndpoints: {},
|
|
204
|
+
bundleLogsWithRum: false,
|
|
205
|
+
bundleLogsWithTraces: false
|
|
199
206
|
}
|
|
200
207
|
)
|
|
201
208
|
).toMatchInlineSnapshot(`
|
|
202
209
|
DdSdkReactNativeConfiguration {
|
|
203
210
|
"actionEventMapper": null,
|
|
204
|
-
"
|
|
211
|
+
"additionalConfiguration": {},
|
|
205
212
|
"applicationId": "",
|
|
206
213
|
"batchSize": "MEDIUM",
|
|
214
|
+
"bundleLogsWithRum": false,
|
|
215
|
+
"bundleLogsWithTraces": false,
|
|
207
216
|
"clientToken": "",
|
|
208
217
|
"customEndpoints": {},
|
|
209
218
|
"env": "",
|
|
@@ -43,17 +43,8 @@ const privateProperties = {
|
|
|
43
43
|
DdSdkReactNative: [
|
|
44
44
|
'DD_SOURCE_KEY',
|
|
45
45
|
'DD_SDK_VERSION',
|
|
46
|
-
'DD_SERVICE_NAME',
|
|
47
|
-
'DD_SDK_VERBOSITY_KEY',
|
|
48
|
-
'DD_NATIVE_VIEW_TRACKING_KEY',
|
|
49
|
-
'DD_NATIVE_INTERACTION_TRACKING_KEY',
|
|
50
46
|
'DD_VERSION',
|
|
51
47
|
'DD_VERSION_SUFFIX',
|
|
52
|
-
'DD_PROXY_TYPE_KEY',
|
|
53
|
-
'DD_PROXY_ADDRESS_KEY',
|
|
54
|
-
'DD_PROXY_PORT_KEY',
|
|
55
|
-
'DD_PROXY_USERNAME_KEY',
|
|
56
|
-
'DD_PROXY_PASSWORD_KEY',
|
|
57
48
|
'wasInitialized',
|
|
58
49
|
'wasAutoInstrumented',
|
|
59
50
|
'initializeNativeSDK',
|
package/src/index.tsx
CHANGED
|
@@ -26,11 +26,13 @@ import {
|
|
|
26
26
|
} from './rum/instrumentation/resourceTracking/graphql/graphqlHeaders';
|
|
27
27
|
import { RumActionType, ErrorSource, PropagatorType } from './rum/types';
|
|
28
28
|
import { DatadogProvider } from './sdk/DatadogProvider/DatadogProvider';
|
|
29
|
+
import { FileBasedConfiguration } from './sdk/FileBasedConfiguration/FileBasedConfiguration';
|
|
29
30
|
import { DdTrace } from './trace/DdTrace';
|
|
30
31
|
|
|
31
32
|
export {
|
|
32
33
|
DatadogProvider,
|
|
33
34
|
DatadogProviderConfiguration,
|
|
35
|
+
FileBasedConfiguration,
|
|
34
36
|
InitializationMode,
|
|
35
37
|
DdLogs,
|
|
36
38
|
DdTrace,
|
|
@@ -17,6 +17,7 @@ import type {
|
|
|
17
17
|
import { DdSdkReactNative } from '../../DdSdkReactNative';
|
|
18
18
|
import { InternalLog } from '../../InternalLog';
|
|
19
19
|
import { SdkVerbosity } from '../../SdkVerbosity';
|
|
20
|
+
import type { FileBasedConfiguration } from '../FileBasedConfiguration/FileBasedConfiguration';
|
|
20
21
|
|
|
21
22
|
let isInitialized = false;
|
|
22
23
|
|
|
@@ -28,7 +29,8 @@ type Props = PropsWithChildren<{
|
|
|
28
29
|
*/
|
|
29
30
|
configuration:
|
|
30
31
|
| DatadogProviderConfiguration
|
|
31
|
-
| AutoInstrumentationConfiguration
|
|
32
|
+
| AutoInstrumentationConfiguration
|
|
33
|
+
| FileBasedConfiguration;
|
|
32
34
|
/**
|
|
33
35
|
* Callback to be run once the SDK starts sending events.
|
|
34
36
|
*/
|
|
@@ -57,17 +57,18 @@ describe('DatadogProvider', () => {
|
|
|
57
57
|
// We remove the sdk version from the configuration as it would require to update this snapshot
|
|
58
58
|
const receivedConfiguration =
|
|
59
59
|
NativeModules.DdSdk.initialize.mock.calls[0][0];
|
|
60
|
-
delete receivedConfiguration.
|
|
60
|
+
delete receivedConfiguration.additionalConfiguration[
|
|
61
|
+
'_dd.sdk_version'
|
|
62
|
+
];
|
|
61
63
|
expect(receivedConfiguration).toMatchInlineSnapshot(`
|
|
62
64
|
DdSdkConfiguration {
|
|
63
|
-
"
|
|
64
|
-
"_dd.first_party_hosts": [],
|
|
65
|
-
"_dd.native_interaction_tracking": false,
|
|
66
|
-
"_dd.native_view_tracking": false,
|
|
65
|
+
"additionalConfiguration": {
|
|
67
66
|
"_dd.source": "react-native",
|
|
68
67
|
},
|
|
69
68
|
"applicationId": "fakeApplicationId",
|
|
70
69
|
"batchSize": "MEDIUM",
|
|
70
|
+
"bundleLogsWithRum": true,
|
|
71
|
+
"bundleLogsWithTraces": true,
|
|
71
72
|
"clientToken": "fakeToken",
|
|
72
73
|
"configurationForTelemetry": {
|
|
73
74
|
"initializationType": "SYNC",
|
|
@@ -79,16 +80,22 @@ describe('DatadogProvider', () => {
|
|
|
79
80
|
},
|
|
80
81
|
"customEndpoints": {},
|
|
81
82
|
"env": "fakeEnv",
|
|
83
|
+
"firstPartyHosts": [],
|
|
82
84
|
"longTaskThresholdMs": 0,
|
|
83
85
|
"nativeCrashReportEnabled": false,
|
|
86
|
+
"nativeInteractionTracking": false,
|
|
84
87
|
"nativeLongTaskThresholdMs": 200,
|
|
88
|
+
"nativeViewTracking": false,
|
|
89
|
+
"proxyConfig": undefined,
|
|
85
90
|
"sampleRate": 100,
|
|
91
|
+
"serviceName": undefined,
|
|
86
92
|
"site": "US1",
|
|
87
93
|
"telemetrySampleRate": 20,
|
|
88
94
|
"trackBackgroundEvents": false,
|
|
89
95
|
"trackFrustrations": true,
|
|
90
96
|
"trackingConsent": "granted",
|
|
91
97
|
"uploadFrequency": "AVERAGE",
|
|
98
|
+
"verbosity": undefined,
|
|
92
99
|
"vitalsUpdateFrequency": "AVERAGE",
|
|
93
100
|
}
|
|
94
101
|
`);
|
|
@@ -169,8 +169,7 @@ describe('DatadogProvider', () => {
|
|
|
169
169
|
|
|
170
170
|
expect(NativeModules.DdSdk.initialize).toHaveBeenCalledTimes(1);
|
|
171
171
|
expect(
|
|
172
|
-
NativeModules.DdSdk.initialize.mock.calls[0][0]
|
|
173
|
-
.additionalConfig['_dd.first_party_hosts']
|
|
172
|
+
NativeModules.DdSdk.initialize.mock.calls[0][0].firstPartyHosts
|
|
174
173
|
).toEqual([
|
|
175
174
|
{
|
|
176
175
|
match: 'api.com',
|