@dynatrace/react-native-plugin 2.323.1 → 2.325.1

package/lib/core/configuration/ManualStartupConfiguration.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManualStartupConfiguration = void 0;
-const LogLevel_1 = require("../logging/LogLevel");
+const LogLevelUtil_1 = require("../logging/LogLevelUtil");
 const ConfigurationDefaults_1 = require("./ConfigurationDefaults");
 const ConfigurationPreset_1 = require("./ConfigurationPreset");
 class ManualStartupConfiguration {
-    constructor(beaconUrl, applicationId, reportCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, bundleName) {
+    constructor(beaconUrl, applicationId, reportCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, bundleName, bundleVersion) {
         this.reportCrash = ConfigurationDefaults_1.DEFAULT_REPORT_CRASH;
         this.userOptIn = ConfigurationDefaults_1.DEFAULT_USER_OPT_IN;
         if (!applicationId || !beaconUrl) {
@@ -38,11 +38,14 @@ class ManualStartupConfiguration {
         if (bundleName != null) {
             this.bundleName = bundleName;
         }
+        if (bundleVersion != null) {
+            this.bundleVersion = bundleVersion;
+        }
     }
     toString() {
         let configurationString = `{Startup: Manual Start, applicationId: ${this.applicationId}, beaconUrl: ${this.beaconUrl},` +
             ` reportCrash: ${this.reportCrash}, errorHandler: ${this.errorHandler}, reportFatalErrorAsCrash: ${this.reportFatalErrorAsCrash},` +
-            ` lifecycleUpdate: ${this.lifecycleUpdate}, userOptIn: ${this.userOptIn}, actionNamePrivacy: ${this.actionNamePrivacy}, logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
+            ` lifecycleUpdate: ${this.lifecycleUpdate}, userOptIn: ${this.userOptIn}, actionNamePrivacy: ${this.actionNamePrivacy}, logLevel: ${(0, LogLevelUtil_1.LogLevelToString)(this.logLevel)}`;
         if (this.bundleName !== undefined) {
             configurationString += `, bundleName: ${this.bundleName}`;
         }

package/lib/core/interface/IWebRequestTiming.js

@@ -1 +1,2 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/core/logging/LogLevel.js

@@ -1,17 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevelToString = exports.LogLevel = void 0;
+exports.LogLevel = void 0;
 var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["Debug"] = 0] = "Debug";
     LogLevel[LogLevel["Info"] = 1] = "Info";
 })(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
-const LogLevelToString = (level) => {
-    if (level === LogLevel.Debug) {
-        return 'Debug';
-    }
-    else {
-        return 'Info';
-    }
-};
-exports.LogLevelToString = LogLevelToString;

package/lib/core/logging/LogLevelUtil.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogLevelToString = void 0;
+const LogLevel_1 = require("./LogLevel");
+const LogLevelToString = (level) => {
+    if (level === LogLevel_1.LogLevel.Debug) {
+        return 'Debug';
+    }
+    else {
+        return 'Info';
+    }
+};
+exports.LogLevelToString = LogLevelToString;

package/lib/next/Dynatrace.js

@@ -42,8 +42,7 @@ class DynatraceImpl {
         const eventTimestamp = new EventTimestamp_1.EventTimestamp(this.timestampProvider);
         const event = Object.assign(Object.assign({}, (0, EventCreator_1.createCrashEvent)(crash.name, crash.message, crash.stack, isFatal)), eventTimestamp.getEventTimeInfo());
         if (isApiReported) {
-            event["characteristics.is_api_reported"] =
-                true;
+            (0, EventModifierUtil_1.addIsApiReported)(event);
             event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
@@ -53,8 +52,7 @@ class DynatraceImpl {
         const eventTimestamp = new EventTimestamp_1.EventTimestamp(this.timestampProvider);
         const event = Object.assign(Object.assign({}, (0, EventCreator_1.createErrorCodeEvent)(errorName, errorCode)), eventTimestamp.getEventTimeInfo());
         if (isApiReported) {
-            event["characteristics.is_api_reported"] =
-                true;
+            (0, EventModifierUtil_1.addIsApiReported)(event);
             event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
@@ -64,37 +62,49 @@ class DynatraceImpl {
         const eventTimestamp = new EventTimestamp_1.EventTimestamp(this.timestampProvider);
         const event = Object.assign(Object.assign({}, (0, EventCreator_1.createErrorEvent)(error.name, error.message, error.stack)), eventTimestamp.getEventTimeInfo());
         if (isApiReported) {
-            event["characteristics.is_api_reported"] =
-                true;
+            (0, EventModifierUtil_1.addIsApiReported)(event);
             event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
     }
     sendExceptionEvent(error, fields) {
-        const fieldsCheck = !fields ? null : fields;
-        this.logger.debug(`sendExceptionEvent(${JSON.stringify(error)}, ${JSON.stringify(fieldsCheck)})`);
+        this.logger.debug(`sendExceptionEvent(${JSON.stringify(error)}, ${JSON.stringify(fields)})`);
         const event = Object.assign({}, (0, EventCreator_1.createErrorEvent)(error.name, error.message, error.stack));
-        let eventValidated = SendEventValidation_1.SendEventValidation.modifyEvent(fieldsCheck);
+        let eventValidated = null;
+        if (fields) {
+            eventValidated = Object.assign({}, SendEventValidation_1.SendEventValidation.modifyEvent(fields));
+        }
         eventValidated = Object.assign(Object.assign({}, event), eventValidated);
-        eventValidated["characteristics.is_api_reported"] = true;
+        (0, EventModifierUtil_1.addIsApiReported)(eventValidated);
         EventPipeline_1.EventPipeline.insertEvent(eventValidated);
     }
-    sendEvent(properties, context) {
-        this.logger.debug(`sendEvent(${JSON.stringify(properties, context)})`);
+    sendEvent(properties) {
+        this.logger.debug(`sendEvent(${JSON.stringify(properties)})`);
         const eventValidated = SendEventValidation_1.SendEventValidation.modifyEvent(properties);
-        if (eventValidated != null && (0, EventModifierUtil_1.containEventProperties)(eventValidated)) {
-            eventValidated["characteristics.has_event_properties"] = true;
+        if (eventValidated !== null) {
+            (0, EventModifierUtil_1.flagEventProperties)(eventValidated);
+            (0, EventModifierUtil_1.addIsApiReported)(eventValidated);
+            EventPipeline_1.EventPipeline.insertEvent(eventValidated);
         }
-        EventPipeline_1.EventPipeline.insertEvent(eventValidated, context);
     }
     sendSessionPropertyEvent(properties) {
         this.logger.debug(`sendSessionPropertyEvent(${JSON.stringify(properties)})`);
         const eventValidated = SendEventValidation_1.SendSessionPropertyEventValidation.modifyEvent(properties);
-        if (eventValidated != null &&
-            (0, EventModifierUtil_1.containSessionProperties)(eventValidated)) {
-            eventValidated["characteristics.has_session_properties"] = true;
+        if (eventValidated !== null) {
+            if ((0, EventModifierUtil_1.containSessionProperties)(eventValidated)) {
+                eventValidated["characteristics.has_session_properties"] = true;
+            }
+            (0, EventModifierUtil_1.addIsApiReported)(eventValidated);
+            EventPipeline_1.EventPipeline.insertEvent(eventValidated);
+        }
+    }
+    sendHttpRequestEvent(httpRequestEventBuilder) {
+        const sanitizedEvent = httpRequestEventBuilder.build();
+        this.logger.debug(`sendHttpRequestEvent(${JSON.stringify(sanitizedEvent)})`);
+        if (sanitizedEvent !== null) {
+            (0, EventModifierUtil_1.flagEventProperties)(sanitizedEvent);
+            EventPipeline_1.EventPipeline.insertEvent(sanitizedEvent);
         }
-        EventPipeline_1.EventPipeline.insertEvent(eventValidated);
     }
 }
 exports.Dynatrace = new DynatraceImpl(TimestampProvider_1.defaultTimestampProvider);

package/lib/next/appstart/AppStartObserver.js

@@ -22,7 +22,7 @@ class AppStartObserverImpl {
                 this.logger.debug(`emitter(${JSON.stringify(data)}})`);
                 const appStartEvent = (0, EventCreator_1.createAppStartEvent)(data);
                 if (appStartEvent != null) {
-                    EventPipeline_1.EventPipeline.insertEvent(Object.assign({}, appStartEvent), {});
+                    EventPipeline_1.EventPipeline.insertEvent(Object.assign({}, appStartEvent));
                 }
                 else {
                     this.logger.debug(`emitter(${JSON.stringify(data)}}): App Start event ignored!`);

package/lib/next/events/EventCreator.js

@@ -26,7 +26,8 @@ const createErrorCodeEvent = (errorName, errorCode) => {
         'error.is_fatal': false,
     };
     if (errorName != null) {
-        event["name"] = errorName;
+        event["error.name"] = errorName;
+        event["error.has_custom_name"] = true;
     }
     if (errorCode != null) {
         event["error.code"] = errorCode;

package/lib/next/events/EventPipeline.js

@@ -20,19 +20,27 @@ class EventPipelineImpl {
             ValueRestrictionModifier_1.ValueRestrictionModifier,
         ];
     }
-    insertEvent(event, context) {
+    insertEvent(event) {
         this.logger.debug(`insertEvent(${JSON.stringify(event)})`);
-        this.getEventModifierChain().forEach((modifier) => {
+        let isDiscarded = false;
+        for (const modifier of this.getEventModifierChain()) {
             try {
-                event = modifier.modifyEvent(event, context);
+                const eventRv = modifier.modifyEvent(event);
+                if (eventRv == null) {
+                    isDiscarded = true;
+                    break;
+                }
+                else {
+                    event = eventRv;
+                }
             }
-            catch (error) {
+            catch (_a) {
                 if (event != null) {
                     event["dt.support.api.has_enrich_exception"] = true;
                 }
             }
-        });
-        if (event != null) {
+        }
+        if (event != null && !isDiscarded) {
             this.logger.debug(`forwardEvent(${JSON.stringify(event)})`);
             if (event["characteristics.has_app_start"] === true) {
                 DynatraceBridge_1.DynatraceNative.forwardAppStartEvent(event, EventSpecContstants_1.ALL_APP_START_KEYS);

package/lib/next/events/HttpRequestEventBuilder.js

@@ -0,0 +1,196 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
+const SendEventValidation_1 = require("./modifier/SendEventValidation");
+const TimestampProvider_1 = require("../provider/TimestampProvider");
+const logger = new ConsoleLogger_1.ConsoleLogger('Dynatrace');
+class HttpRequestEventBuilder {
+    constructor(url, requestMethod) {
+        this.url = url;
+        this.requestMethod = requestMethod;
+        this.duration = 0;
+        this.rawEventProperties = {};
+        this.hasDroppedTraceparent = false;
+        this.hasDroppedCustomProperties = false;
+        this.hasNfnValues = false;
+        this.triedToOverwriteDuration = false;
+        this.requestMethod =
+            requestMethod.toUpperCase();
+    }
+    withDuration(duration) {
+        this.duration = duration;
+        this.triedToOverwriteDuration = true;
+        return this;
+    }
+    withStatusCode(statusCode) {
+        this.statusCode = statusCode;
+        return this;
+    }
+    withReasonPhrase(reasonPhrase) {
+        this.reasonPhrase = reasonPhrase;
+        return this;
+    }
+    withError(error) {
+        this.error = error;
+        return this;
+    }
+    withBytesSent(bytesSent) {
+        this.bytesSent = bytesSent;
+        return this;
+    }
+    withBytesReceived(bytesReceived) {
+        this.bytesReceived = bytesReceived;
+        return this;
+    }
+    withTraceparentHeader(traceparentHeader) {
+        this.traceparentHeader = traceparentHeader;
+        return this;
+    }
+    addEventProperty(key, value) {
+        this.rawEventProperties[key] = value;
+        return this;
+    }
+    build() {
+        if (!this.hasValidMandatoryAttriutes()) {
+            logger.debug('HttpRequestEventBuilder dropped invalid event');
+            return null;
+        }
+        this.sanitizeDuration();
+        this.sanitizeStatusCode();
+        this.sanitizeReasonPhrase();
+        this.sanitizeBytesReceived();
+        this.sanitizeBytesSent();
+        const parsedTraceparentHeader = this.traceparentHeader &&
+            this.parseTraceparent(this.traceparentHeader);
+        this.hasDroppedTraceparent =
+            !!this.traceparentHeader && !parsedTraceparentHeader;
+        const hasFailedRequest = this.isStatusCodeError() || !!this.error;
+        const filteredEventProperties = Object.fromEntries(Object.entries(this.rawEventProperties).filter(this.isEventPropertyKey, this));
+        const sanitizedEventProperties = SendEventValidation_1.SendEventValidation.modifyEvent(filteredEventProperties);
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sanitizedEventProperties), { ["url.full"]: this.url, ["network.protocol.name"]: 'http', ["http.request.method"]: this.requestMethod, ["duration"]: this.duration, ["start_time"]: TimestampProvider_1.defaultTimestampProvider.getCurrentTimestamp() - this.duration }), (this.triedToOverwriteDuration && {
+            ["dt.support.api.overridden_fields"]: [
+                'duration',
+            ],
+        })), this.includeIfDefined("http.response.status_code", this.statusCode)), this.includeIfDefined("http.response.reason_phrase", this.reasonPhrase)), this.includeIfDefined("request.bytes_sent", this.bytesSent)), this.includeIfDefined("request.bytes_received", this.bytesReceived)), { ["characteristics.has_request"]: true, ["characteristics.is_api_reported"]: true }), this.includeIfTrue("characteristics.has_failed_request", hasFailedRequest)), this.includeIfTrue("characteristics.has_error", hasFailedRequest)), (this.error !== undefined && Object.assign({ ["characteristics.has_exception"]: true, ["exception.type"]: this.error.name, ["exception.message"]: this.error.message }, this.includeIfDefined("exception.stack_trace", this.error.stack)))), (parsedTraceparentHeader && {
+            ["trace.id"]: parsedTraceparentHeader.traceId,
+            ["span.id"]: parsedTraceparentHeader.spanId,
+        })), (this.hasDroppedTraceparent && {
+            ["request.trace_context_hint"]: 'invalid_header',
+        })), this.includeIfTrue("dt.support.api.has_dropped_custom_properties", this.hasDroppedCustomProperties)), this.includeIfTrue("dt.support.has_nfn_values", this.hasNfnValues));
+    }
+    hasValidMandatoryAttriutes() {
+        let isValid = true;
+        if (this.isInvalidUrl(this.url)) {
+            logger.debug(`HttpRequestEventBuilder: dropped event since given URL is malformed: ${this.url}`);
+            isValid = false;
+        }
+        if (!HttpRequestEventBuilder.allowedRequestMethods.includes(this.requestMethod)) {
+            logger.debug(`HttpRequestEventBuilder: dropped event since given Request Method is invalid: ${this.requestMethod}`);
+            isValid = false;
+        }
+        return isValid;
+    }
+    isInvalidUrl(url) {
+        try {
+            if (!url.match(/^(https?):\/\/[^\s/$.?#-][^\s]*$/i)) {
+                return true;
+            }
+            new URL(url);
+            return false;
+        }
+        catch (_a) {
+            return true;
+        }
+    }
+    sanitizeStatusCode() {
+        if (this.statusCode == undefined && this.error === undefined) {
+            this.statusCode = 0;
+        }
+        if (this.statusCode && this.statusCode < 0) {
+            logger.debug('HttpRequestEventBuilder: overriding invalid Status Code with 0');
+            this.statusCode = 0;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    sanitizeReasonPhrase() {
+        if (this.reasonPhrase &&
+            this.reasonPhrase.length >
+                HttpRequestEventBuilder.maxReasonPhraseLength) {
+            logger.debug(`HttpRequestEventBuilder: trimming too long Reason Phrase to a length of ${HttpRequestEventBuilder.maxReasonPhraseLength}`);
+            this.reasonPhrase = this.reasonPhrase.slice(0, HttpRequestEventBuilder.maxReasonPhraseLength);
+        }
+    }
+    sanitizeDuration() {
+        this.hasNfnValues || (this.hasNfnValues = !Number.isFinite(this.duration));
+        if (!Number.isFinite(this.duration) || this.duration < 0) {
+            logger.debug('HttpRequestEventBuilder: overriding invalid Duration with 0');
+            this.duration = 0;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    sanitizeBytesSent() {
+        if (this.bytesSent && this.bytesSent < 0) {
+            logger.debug(`HttpRequestEventBuilder: dropping invalid value for Bytes Sent: ${this.bytesSent}`);
+            this.bytesSent = undefined;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    sanitizeBytesReceived() {
+        if (this.bytesReceived && this.bytesReceived < 0) {
+            logger.debug(`HttpRequestEventBuilder: dropping invalid value for Bytes Received: ${this.bytesReceived}`);
+            this.bytesReceived = undefined;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    isStatusCodeError() {
+        return (this.statusCode && 400 <= this.statusCode && this.statusCode <= 599);
+    }
+    isEventPropertyKey([key, _]) {
+        if (key.startsWith("event_properties")) {
+            return true;
+        }
+        logger.debug(`HttpRequestEventBuilder: dropped event property '$key' as it did not start with prefix ${"event_properties"}`);
+        this.hasDroppedCustomProperties = true;
+        return false;
+    }
+    includeIfDefined(key, value) {
+        return value !== undefined ? { [key]: value } : {};
+    }
+    includeIfTrue(key, value) {
+        return value === true ? { [key]: value } : {};
+    }
+    parseTraceparent(header) {
+        const traceparentRegex = /^00-([0-9a-f]{32})-([0-9a-f]{16})-0[01]$/;
+        const match = header.match(traceparentRegex);
+        if (!match) {
+            logger.debug("The provided traceparent header does not match the format: '00-<trace-id-32-HEXDIG>-<parent-id-16-HEXDIG>-<trace-flags-2-HEXDIG>'");
+            return null;
+        }
+        const [, traceId, spanId] = match;
+        if (this.allZeros(traceId)) {
+            logger.debug('Trace ID in traceparent header must not be all zeros');
+            return null;
+        }
+        if (this.allZeros(spanId)) {
+            logger.debug('Parent ID in traceparent header must not be all zeros');
+            return null;
+        }
+        return { traceId, spanId };
+    }
+    allZeros(str) {
+        return /^0*$/.test(str);
+    }
+}
+exports.default = HttpRequestEventBuilder;
+HttpRequestEventBuilder.allowedRequestMethods = [
+    'GET',
+    'HEAD',
+    'POST',
+    'PUT',
+    'DELETE',
+    'CONNECT',
+    'OPTIONS',
+    'TRACE',
+    'PATCH',
+];
+HttpRequestEventBuilder.maxReasonPhraseLength = 5000;

package/lib/next/events/IHttpRequestEventBuilder.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/next/events/ViewInfoCreator.js

@@ -8,7 +8,7 @@ const ASCII_CODE_A = 65;
 const NUMERICAL_CHARACTER_COUNT = 10;
 const OFFSET_A = ASCII_CODE_A - NUMERICAL_CHARACTER_COUNT;
 const createViewInfo = (name) => ({
-    ["view.id"]: createRandomHexString(VIEW_ID_LENGTH),
+    ["view.instance_id"]: createRandomHexString(VIEW_ID_LENGTH),
     ["view.name"]: name,
 });
 exports.createViewInfo = createViewInfo;

package/lib/next/events/modifier/BaseDataEventModifier.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDataEventModifier = void 0;
 const ConfigurationHandler_1 = require("../../../core/configuration/ConfigurationHandler");
 const ConsoleLogger_1 = require("../../../core/logging/ConsoleLogger");
+const EventModifierUtil_1 = require("./EventModifierUtil");
 class BaseDataEventModifier {
     constructor(viewInfo) {
         this.viewInfo = viewInfo;
@@ -25,6 +26,11 @@ class BaseDataEventModifier {
             event["react_native.bundle.version"] =
                 bundleVersion;
         }
+        const reactNativeVersion = (0, EventModifierUtil_1.getReactNativeVersion)();
+        if (reactNativeVersion) {
+            event["react_native.version"] =
+                reactNativeVersion;
+        }
         return event;
     }
 }

package/lib/next/events/modifier/EventModifierUtil.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containEventPropertiesInArray = exports.containEventProperties = exports.containSessionProperties = exports.trimStringValuesInObject = exports.trimString = exports.isObject = exports.flattenAdditionalData = void 0;
+exports.getReactNativeVersion = exports.containEventPropertiesInArray = exports.addIsApiReported = exports.flagEventProperties = exports.containEventProperties = exports.containSessionProperties = exports.trimStringValuesInObject = exports.trimString = exports.isObject = exports.flattenAdditionalData = void 0;
+const ConsoleLogger_1 = require("../../../core/logging/ConsoleLogger");
 const MAX_STRING_LENGTH_FOR_VALUES = 5000;
+const logger = new ConsoleLogger_1.ConsoleLogger('EventModifierUtil');
 const flattenAdditionalData = (obj, parent, res = {}) => {
     for (const key in obj) {
         const propName = parent != null ? parent + '.' + key : key;
@@ -60,6 +62,19 @@ const containEventProperties = (jsonData) => {
     return false;
 };
 exports.containEventProperties = containEventProperties;
+const flagEventProperties = (event) => {
+    if (event !== null && (0, exports.containEventProperties)(event)) {
+        event["characteristics.has_event_properties"] =
+            true;
+    }
+};
+exports.flagEventProperties = flagEventProperties;
+const addIsApiReported = (event) => {
+    if (event !== null) {
+        event["characteristics.is_api_reported"] = true;
+    }
+};
+exports.addIsApiReported = addIsApiReported;
 const containEventPropertiesInArray = (eventEntries) => {
     for (const [key, value] of eventEntries) {
         if (key.startsWith(`${"event_properties"}.`)) {
@@ -69,6 +84,24 @@ const containEventPropertiesInArray = (eventEntries) => {
     return false;
 };
 exports.containEventPropertiesInArray = containEventPropertiesInArray;
+const getReactNativeVersion = () => {
+    const candidates = [
+        () => require('react-native').ReactNativeVersion,
+        () => require('react-native/Libraries/Core/ReactNativeVersion').version,
+    ];
+    for (const get of candidates) {
+        try {
+            const v = get();
+            if (v)
+                return toVersionString(v);
+        }
+        catch (_a) { }
+    }
+    logger.debug('Unable to determine React Native version');
+    return undefined;
+};
+exports.getReactNativeVersion = getReactNativeVersion;
+const toVersionString = (v) => `${v.major}.${v.minor}.${v.patch}${v.prerelease ? `-${v.prerelease}` : ''}`;
 const trimStringValuesInArray = (arrayData) => {
     arrayData.forEach((value, index, array) => {
         array[index] = trimStringValue(value);

package/lib/next/events/modifier/ModifyEventValidation.js

@@ -26,17 +26,30 @@ class ModifyEventValidation {
         if (this.customEventModifierChain.length > 0) {
             const eventCopy = Object.assign({}, event);
             let exceptionOccured = false;
-            this.customEventModifierChain.forEach((modifier) => {
+            let isDiscarded = false;
+            for (const modifier of this.customEventModifierChain) {
                 try {
-                    event = modifier.modifyEvent(event);
+                    const eventRv = modifier.modifyEvent(event);
+                    if (eventRv === null) {
+                        isDiscarded = true;
+                        break;
+                    }
+                    else {
+                        event = eventRv;
+                    }
                 }
-                catch (error) {
+                catch (_a) {
                     if (event != null) {
                         exceptionOccured = true;
                     }
                 }
-            });
-            event = this.sanitizeUserEnrichedEvent(eventCopy, event, exceptionOccured);
+            }
+            if (!isDiscarded) {
+                event = this.sanitizeUserEnrichedEvent(eventCopy, event, exceptionOccured);
+            }
+            else {
+                return null;
+            }
         }
         return event;
     }

package/lib/next/events/modifier/SendEventValidation.js

@@ -23,18 +23,17 @@ class SendEventValidationImpl {
         }
         const timeNow = this.timestampProvider.getCurrentTimestamp();
         const eventCopy = Object.entries(event).slice();
-        const filteredEvent = eventCopy
-            .filter(this.isKeyNameAllowed, this)
-            .filter(this.isFieldTypeAllowed, this);
+        const filteredEvent = eventCopy.filter(this.isKeyNameAllowed, this);
         const limitedEntries = new EventLimitation_1.EventLimitation().limitEventEntries(filteredEvent);
         const sizedEntries = new EventLimitation_1.EventLimitation().limitEventProperties(limitedEntries);
-        this.applyOverriddenKeys(sizedEntries);
         if (sizedEntries.length < eventCopy.length) {
             sizedEntries.push([
                 "dt.support.api.has_dropped_custom_properties",
                 true,
             ]);
         }
+        this.sanitizeDuration(sizedEntries);
+        this.applyOverriddenKeys(sizedEntries);
         const jsonObject = Object.fromEntries(sizedEntries);
         if (jsonObject["duration"] !== undefined) {
             jsonObject["start_time"] =
@@ -60,13 +59,27 @@ class SendEventValidationImpl {
             ]);
         }
     }
-    isFieldTypeAllowed(entry) {
-        const [key, value] = entry;
-        if (key === "duration" ||
-            key === "start_time") {
-            return typeof value === 'number' && isFinite(value) && value >= 0;
+    sanitizeDuration(event) {
+        for (const entry of event) {
+            const [key, value] = entry;
+            if (key === "duration") {
+                if (typeof value !== 'number' ||
+                    !isFinite(value) ||
+                    value < 0) {
+                    entry[1] = 0;
+                    event.push([
+                        "dt.support.api.has_dropped_custom_properties",
+                        true,
+                    ]);
+                }
+                if (typeof value === 'number' && !isFinite(value)) {
+                    event.push([
+                        "dt.support.has_nfn_values",
+                        true,
+                    ]);
+                }
+            }
         }
-        return true;
     }
     isKeyNameAllowed(entry) {
         const [key] = entry;

package/lib/next/events/spec/EventSpecContstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ALL_APP_START_KEYS = exports.MODIFY_EVENT_WHITELIST_NAMESPACE = exports.MODIFY_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_FIELDS = exports.SEND_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_NAMESPACES = exports.SEND_EVENT_WHITELIST_NAMESPACES = exports.AllCharacteristicsKeys = exports.KEY_NAME_REGEX = exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = exports.MAX_CUSTOM_EVENT_KEY_LENGTH = exports.MAX_CUSTOM_EVENT_FIELDS = void 0;
-const SPECIFICATION_VERSION = '0.21';
+const SPECIFICATION_VERSION = '0.22';
 exports.MAX_CUSTOM_EVENT_FIELDS = 50;
 exports.MAX_CUSTOM_EVENT_KEY_LENGTH = 100;
 exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = 5000;
@@ -41,6 +41,7 @@ exports.SEND_EVENT_WHITELIST_FIELDS = [
 exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_FIELDS = exports.SEND_EVENT_WHITELIST_FIELDS;
 exports.MODIFY_EVENT_WHITELIST_FIELDS = [
     "exception.stack_trace",
+    "url.full",
 ];
 exports.MODIFY_EVENT_WHITELIST_NAMESPACE = [
     "session_properties",