Changes from PR comments

Author: sbarrio

example-new-architecture/App.tsx

@@ -8,7 +8,6 @@ import {
   RumActionType,
   DdLogs,
   DdTrace,
-  RumConfiguration,
   TrackingConsent,
 } from '@datadog/mobile-react-native';
 import React from 'react';

packages/core/datadog-configuration.schema.json

@@ -214,8 +214,7 @@
                         "nativeLongTaskThresholdMs": {
                             "description": "The threshold for native long tasks reporting in milliseconds. Set to a number to enable reporting or `false` to disable.",
                             "type": [
-                                "integer",
-                                "boolean"
+                                "integer"
                             ]
                         },
                         "sessionSampleRate": {

packages/core/ios/Sources/RNDdSdkConfiguration.swift

@@ -352,7 +352,6 @@ extension Dictionary where Key == String, Value == AnyObject {
             let nativeLongTaskThresholdMs: Double? = {
                 if let v = nativeLongTaskRaw as? Double { return v }
                 if let v = nativeLongTaskRaw as? Int { return Double(v) }
-                if let v = nativeLongTaskRaw as? Bool, v == false { return 0.0 }
                 return nil
             }()
 

packages/core/src/DdSdkReactNative.tsx

@@ -433,8 +433,8 @@ export class DdSdkReactNative {
             );
 
             const nativeLongTaskThresholdMs =
-                configuration.rumConfiguration?.nativeLongTaskThresholdMs ||
-                false;
+                configuration.rumConfiguration?.nativeLongTaskThresholdMs ??
+                RUM_DEFAULTS.nativeLongTaskThresholdMs;
             rumConfiguration.nativeLongTaskThresholdMs = adaptLongTaskThreshold(
                 nativeLongTaskThresholdMs
             );

packages/core/src/__tests__/DdSdkReactNative.test.tsx

@@ -1106,7 +1106,7 @@ describe('DdSdkReactNative', () => {
                 false,
                 true
             );
-            configuration.rumConfiguration.nativeLongTaskThresholdMs = false;
+            configuration.rumConfiguration.nativeLongTaskThresholdMs = 0;
             configuration.rumConfiguration.longTaskThresholdMs = false;
 
             NativeModules.DdSdk.initialize.mockResolvedValue(null);

packages/core/src/__tests__/DdSdkReactNativeConfiguration.test.ts

@@ -251,7 +251,7 @@ describe('DdSdkReactNativeConfiguration', () => {
                             trackResources: false,
                             resourceTraceSampleRate: 0,
                             nativeCrashReportEnabled: false,
-                            nativeLongTaskThresholdMs: false,
+                            nativeLongTaskThresholdMs: 0,
                             actionNameAttribute: ''
                         },
                         logsConfiguration: {}
@@ -312,7 +312,7 @@ describe('DdSdkReactNativeConfiguration', () => {
                     "longTaskThresholdMs": false,
                     "nativeCrashReportEnabled": false,
                     "nativeInteractionTracking": false,
-                    "nativeLongTaskThresholdMs": false,
+                    "nativeLongTaskThresholdMs": 0,
                     "nativeViewTracking": false,
                     "resourceEventMapper": null,
                     "resourceTraceSampleRate": 0,

packages/core/src/config/FileBasedConfiguration.ts

@@ -57,7 +57,15 @@ export class FileBasedConfiguration extends DatadogProviderConfiguration {
             ...rest
         } = jsonConfiguration;
 
-        // TODO: Handle undefined clientToken, env or trackingConsent
+        if (
+            clientToken === undefined ||
+            env === undefined ||
+            trackingConsent === undefined
+        ) {
+            console.warn(
+                'DATADOG: Warning - Malformed json configuration file - `clientToken`, `env` and `trackingConsent` are mandatory Core SDK properties.'
+            );
+        }
 
         // Configure Core SDK
         const coreConfiguration = removeUndefinedEntries(rest);
@@ -86,7 +94,7 @@ export class FileBasedConfiguration extends DatadogProviderConfiguration {
                     params?.actionEventMapper ?? RUM_DEFAULTS.actionEventMapper;
             } else {
                 console.warn(
-                    'DATADOG: Warning - Malformed RUM File Configuration - `applicationId` is undefined'
+                    'DATADOG: Warning - Malformed RUM File Configuration - `applicationId` is undefined.'
                 );
                 this.rumConfiguration = undefined;
             }
@@ -132,17 +140,6 @@ export const getJSONConfiguration = (
 ): JsonConfiguration => {
     const configuration = resolveJSONConfiguration(userSpecifiedConfiguration);
 
-    if (
-        configuration.clientToken === undefined ||
-        configuration.env === undefined ||
-        (configuration.rumConfiguration !== undefined &&
-            configuration.rumConfiguration.applicationId === undefined)
-    ) {
-        console.warn(
-            'DATADOG: Warning: Malformed json configuration file - clientToken and env are mandatory Core SDK properties. ApplicationId is mandatory to enable RUM.'
-        );
-    }
-
     return {
         additionalConfiguration: configuration.additionalConfiguration,
         clientToken: configuration.clientToken,

packages/core/src/config/FileBasedConfiguration.type.ts

@@ -42,7 +42,7 @@ export interface JsonConfiguration extends CoreConfigurationOptions {
         initialResourceThreshold?: number;
         trackMemoryWarnings?: boolean;
         nativeCrashReportEnabled?: boolean;
-        nativeLongTaskThresholdMs?: number | false;
+        nativeLongTaskThresholdMs?: number;
         nativeViewTracking?: boolean;
         nativeInteractionTracking?: boolean;
         customEndpoint?: string;

packages/core/src/config/__tests__/FileBasedConfiguration.test.ts

@@ -7,8 +7,7 @@
 import { PropagatorType } from '../../rum/types';
 import {
     FileBasedConfiguration,
-    formatPropagatorType,
-    getJSONConfiguration
+    formatPropagatorType
 } from '../FileBasedConfiguration';
 
 import configurationAllFields from './__fixtures__/configuration-all-fields.json';
@@ -93,10 +92,17 @@ describe('FileBasedConfiguration', () => {
 
         it('prints a warning message when the configuration file cannot be parsed correctly', () => {
             const warnSpy = jest.spyOn(console, 'warn');
-            getJSONConfiguration(malformedConfiguration);
+            const config = new FileBasedConfiguration({
+                configuration: malformedConfiguration
+            });
 
+            expect(config).not.toBeUndefined();
+            expect(warnSpy).toHaveBeenCalledTimes(2);
+            expect(warnSpy).toHaveBeenCalledWith(
+                'DATADOG: Warning - Malformed json configuration file - `clientToken`, `env` and `trackingConsent` are mandatory Core SDK properties.'
+            );
             expect(warnSpy).toHaveBeenCalledWith(
-                'DATADOG: Warning: Malformed json configuration file - clientToken and env are mandatory Core SDK properties. ApplicationId is mandatory to enable RUM.'
+                'DATADOG: Warning - Malformed RUM File Configuration - `applicationId` is undefined.'
             );
         });
 
@@ -141,6 +147,7 @@ describe('FileBasedConfiguration', () => {
                   "clientToken": "fake-client-token",
                   "env": "fake-env",
                   "initializationMode": "SYNC",
+                  "logsConfiguration": undefined,
                   "proxyConfiguration": undefined,
                   "rumConfiguration": RumConfiguration {
                     "actionEventMapper": null,
@@ -214,6 +221,7 @@ describe('FileBasedConfiguration', () => {
                   "clientToken": "fake-client-token",
                   "env": "fake-env",
                   "initializationMode": "SYNC",
+                  "logsConfiguration": undefined,
                   "proxyConfiguration": undefined,
                   "rumConfiguration": RumConfiguration {
                     "actionEventMapper": null,
@@ -246,6 +254,7 @@ describe('FileBasedConfiguration', () => {
                   },
                   "service": undefined,
                   "site": "US1",
+                  "traceConfiguration": undefined,
                   "trackingConsent": "granted",
                   "uploadFrequency": "AVERAGE",
                   "verbosity": undefined,

packages/core/src/config/__tests__/__fixtures__/malformed-configuration.json

@@ -1,4 +1,4 @@
 {
     "clientToken": "clientToken",
-    "applicationId": "applicationId"
+    "rumConfiguration": {}
 }