@dynatrace/react-native-plugin 2.327.1 → 2.329.1

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModifyEventValidation = void 0;
 const ConsoleLogger_1 = require("../../../core/logging/ConsoleLogger");
 const EventSpecContstants_1 = require("../spec/EventSpecContstants");
-const EventLimitation_1 = require("./EventLimitation");
 const EventModifierUtil_1 = require("./EventModifierUtil");
 class ModifyEventValidation {
     constructor() {
@@ -53,29 +52,31 @@ class ModifyEventValidation {
         }
         return event;
     }
-    isPropertiesAllowed(key, hasSessionPropertyCharacteristics) {
+    isCustomPropertiesAllowed(key, hasSessionPropertyCharacteristics) {
         if (hasSessionPropertyCharacteristics) {
             if (key.startsWith(`${"event_properties"}.`)) {
                 this.logger.debug(`isPropertiesAllowed(): Filtering key ${key} as usage of event properties is not allowed!`);
-                return true;
+                return false;
             }
         }
         else {
             if (key.startsWith(`${"session_properties"}.`)) {
                 this.logger.debug(`isPropertiesAllowed(): Filtering key ${key} as usage of session properties is not allowed!`);
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
-    isKeyNameForbidden(key) {
+    isKeyNameForbidden(key, isAdded = false) {
         for (const namespace of EventSpecContstants_1.MODIFY_EVENT_WHITELIST_NAMESPACE) {
             if (key.startsWith(`${namespace}.`)) {
                 return false;
             }
         }
-        if (EventSpecContstants_1.MODIFY_EVENT_WHITELIST_FIELDS.includes(key)) {
-            return false;
+        if (!isAdded) {
+            if (EventSpecContstants_1.MODIFY_EVENT_WHITELIST_FIELDS.includes(key)) {
+                return false;
+            }
         }
         this.logger.debug(`isKeyNameForbidden(): Filtering key ${key} as this field is reserved and must not be overridden!`);
         return true;
@@ -98,22 +99,16 @@ class ModifyEventValidation {
         const restoredEntries = this.restoreRemovedEntries(Object.entries(originalEvent), userEnrichedEvent, overriddenKeys);
         const validAndRestoredEntries = validEntries.concat(restoredEntries);
         const { baseEntries, addedEntries } = this.determineAddedEntries(originalEvent, validAndRestoredEntries);
-        const limitedEntries = new EventLimitation_1.EventLimitation().limitEventEntries(addedEntries);
+        const limitedAddedEntries = this.validateAddedEntries(addedEntries);
         if (originalEvent["characteristics.has_event_properties"] === undefined &&
-            (0, EventModifierUtil_1.containEventPropertiesInArray)(limitedEntries)) {
-            limitedEntries.push([
+            (0, EventModifierUtil_1.containEventPropertiesInArray)(limitedAddedEntries)) {
+            limitedAddedEntries.push([
                 "characteristics.has_event_properties",
                 true,
             ]);
         }
-        const finalEntries = baseEntries.concat(limitedEntries);
-        const sizedEntries = new EventLimitation_1.EventLimitation().limitEventProperties(finalEntries);
-        if (sizedEntries.length < userEnrichedEventEntries.length) {
-            sizedEntries.push([
-                "dt.support.api.has_dropped_custom_properties",
-                true,
-            ]);
-        }
+        const finalEntries = baseEntries.concat(limitedAddedEntries);
+        const sizedEntries = this.enforcePropertyLimit(finalEntries);
         if (Array.isArray(overriddenKeys) && overriddenKeys.length > 0) {
             sizedEntries.push([
                 "dt.support.api.overridden_fields",
@@ -128,31 +123,70 @@ class ModifyEventValidation {
         }
         return Object.fromEntries(sizedEntries);
     }
+    determineChangedContent(modifiedJSONEventEntries, originalJSONEvent) {
+        const changedEntries = [];
+        for (const [prop, value] of modifiedJSONEventEntries) {
+            const originalValue = originalJSONEvent[prop];
+            if (this.isModified(originalValue, value)) {
+                changedEntries.push([prop, value]);
+                continue;
+            }
+        }
+        return changedEntries;
+    }
     determineValidEntries(userEnrichedEntries, originalJSONEvent, overriddenKeys) {
-        const newEntries = [];
+        const validEntries = [];
+        let droppedCustomProperties = false;
+        let droppedProperties = false;
         for (const [prop, value] of userEnrichedEntries) {
             const originalValue = originalJSONEvent[prop];
             if (!this.isModified(originalValue, value)) {
-                newEntries.push([prop, value]);
+                validEntries.push([prop, value]);
                 continue;
             }
-            if (this.isPropertiesAllowed(prop, originalJSONEvent["characteristics.has_session_properties"] === true)) {
+            if (!this.isCustomPropertiesAllowed(prop, originalJSONEvent["characteristics.has_session_properties"] === true)) {
+                droppedCustomProperties = true;
                 continue;
             }
             const isNewlyAdded = typeof originalValue === 'undefined';
-            const isForbiddenKey = this.isKeyNameForbidden(prop);
+            const isForbiddenKey = this.isKeyNameForbidden(prop, isNewlyAdded);
             if (isForbiddenKey) {
                 if (!isNewlyAdded) {
-                    newEntries.push([prop, originalValue]);
+                    validEntries.push([prop, originalValue]);
+                }
+                else {
+                    droppedProperties = true;
                 }
                 continue;
             }
             if (!isNewlyAdded && !overriddenKeys.includes(prop)) {
                 overriddenKeys.push(prop);
             }
-            newEntries.push([prop, value]);
+            if (!isNewlyAdded &&
+                EventSpecContstants_1.MODIFY_EVENT_WHITELIST_STRING_FIELDS.includes(prop)) {
+                const maximumLength = Math.max(originalJSONEvent[prop].toString().length, EventSpecContstants_1.MAX_CUSTOM_EVENT_VALUE_LENGTH);
+                validEntries.push([
+                    prop,
+                    (0, EventModifierUtil_1.trimString)(prop, value.toString(), maximumLength),
+                ]);
+            }
+            else {
+                validEntries.push([prop, value]);
+            }
+        }
+        if (droppedCustomProperties) {
+            validEntries.push([
+                "dt.support.api.has_dropped_custom_properties",
+                true,
+            ]);
         }
-        return newEntries;
+        if (droppedProperties) {
+            validEntries.push([
+                "dt.support.api.has_dropped_properties",
+                true,
+            ]);
+        }
+        return validEntries;
     }
     isModified(oldValue, newValue) {
         if (Array.isArray(oldValue)) {
@@ -198,5 +232,63 @@ class ModifyEventValidation {
             return entries;
         }, resultEntries);
     }
+    validateAddedEntries(addedEntries) {
+        const validEntries = [];
+        let droppedProperties = false;
+        let droppedCustomProperties = false;
+        for (const entry of addedEntries) {
+            if (!(0, EventModifierUtil_1.isNotObject)(entry) ||
+                !(0, EventModifierUtil_1.doesNotExceedKeySize)(entry) ||
+                !(0, EventModifierUtil_1.isKeySyntaxAllowed)(entry)) {
+                if ((0, EventModifierUtil_1.isKeyCustomProperty)(entry[0])) {
+                    droppedCustomProperties = true;
+                }
+                else {
+                    droppedProperties = true;
+                }
+                continue;
+            }
+            (0, EventModifierUtil_1.restrictingValueSize)(entry);
+            validEntries.push(entry);
+        }
+        if (droppedCustomProperties) {
+            validEntries.push([
+                "dt.support.api.has_dropped_custom_properties",
+                true,
+            ]);
+        }
+        if (droppedProperties) {
+            validEntries.push([
+                "dt.support.api.has_dropped_properties",
+                true,
+            ]);
+        }
+        return validEntries;
+    }
+    enforcePropertyLimit(entries) {
+        const result = [];
+        let propertyCount = 0;
+        let droppedCustomProperties = false;
+        entries.sort((a, b) => a[0].localeCompare(b[0]));
+        for (const [key, value] of entries) {
+            if ((0, EventModifierUtil_1.isKeyCustomProperty)(key)) {
+                propertyCount++;
+                if (propertyCount > EventSpecContstants_1.MAX_CUSTOM_EVENT_FIELDS) {
+                    this.logger.debug(`enforcePropertyLimit(): Dropped ${key} because overall ` +
+                        `property limit (${EventSpecContstants_1.MAX_CUSTOM_EVENT_FIELDS}) is reached!`);
+                    droppedCustomProperties = true;
+                    continue;
+                }
+            }
+            result.push([key, value]);
+        }
+        if (droppedCustomProperties) {
+            result.push([
+                "dt.support.api.has_dropped_custom_properties",
+                true,
+            ]);
+        }
+        return result;
+    }
 }
 exports.ModifyEventValidation = ModifyEventValidation;

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

@@ -5,13 +5,13 @@ const ConsoleLogger_1 = require("../../../core/logging/ConsoleLogger");
 const TimestampProvider_1 = require("../../provider/TimestampProvider");
 const EventTimestamp_1 = require("../EventTimestamp");
 const EventSpecContstants_1 = require("../spec/EventSpecContstants");
-const EventLimitation_1 = require("./EventLimitation");
+const EventModifierUtil_1 = require("./EventModifierUtil");
 class SendEventValidationImpl {
     constructor(timestampProvider, namespaceWhitelist, fieldWhitelist, loggerName) {
         this.logger = new ConsoleLogger_1.ConsoleLogger(loggerName);
         this.timestampProvider = timestampProvider;
-        this.fieldWhitelist = fieldWhitelist;
         this.namespaceWhitelist = namespaceWhitelist;
+        this.fieldWhitelist = fieldWhitelist;
     }
     modifyEvent(event) {
         this.logger.debug(`modifyEvent(${JSON.stringify(event)})`);
@@ -22,19 +22,10 @@ class SendEventValidationImpl {
             return Object.assign({}, new EventTimestamp_1.EventTimestamp(this.timestampProvider).getEventTimeInfo());
         }
         const timeNow = this.timestampProvider.getCurrentTimestamp();
-        const eventCopy = Object.entries(event).slice();
-        const filteredEvent = eventCopy.filter(this.isKeyNameAllowed, this);
-        const limitedEntries = new EventLimitation_1.EventLimitation().limitEventEntries(filteredEvent);
-        const sizedEntries = new EventLimitation_1.EventLimitation().limitEventProperties(limitedEntries);
-        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);
+        const filteredEvent = this.checkEventEntries(Object.entries(event).slice());
+        this.sanitizeDuration(filteredEvent);
+        this.applyOverriddenKeys(filteredEvent);
+        const jsonObject = Object.fromEntries(filteredEvent);
         if (jsonObject["duration"] !== undefined) {
             jsonObject["start_time"] =
                 timeNow - jsonObject["duration"];
@@ -47,7 +38,7 @@ class SendEventValidationImpl {
     }
     applyOverriddenKeys(eventEntries) {
         const overriddenKeys = [];
-        for (const [key, value] of eventEntries) {
+        for (const [key] of eventEntries) {
             if (this.fieldWhitelist.includes(key)) {
                 overriddenKeys.push(key);
             }
@@ -68,18 +59,58 @@ class SendEventValidationImpl {
                     value < 0) {
                     entry[1] = 0;
                     event.push([
-                        "dt.support.api.has_dropped_custom_properties",
+                        "dt.support.api.has_dropped_properties",
                         true,
                     ]);
+                    break;
                 }
-                if (typeof value === 'number' && !isFinite(value)) {
-                    event.push([
-                        "dt.support.has_nfn_values",
-                        true,
-                    ]);
+            }
+        }
+    }
+    checkEventEntries(allEntries) {
+        const fieldEntries = allEntries.slice();
+        fieldEntries.sort((a, b) => a[0].localeCompare(b[0]));
+        const validEntries = [];
+        let droppedProperties = false;
+        let droppedCustomProperties = false;
+        let amountOfCustomProperties = 0;
+        fieldEntries.forEach((entry) => {
+            if (!this.isKeyNameAllowed(entry) ||
+                !(0, EventModifierUtil_1.isNotObject)(entry) ||
+                !(0, EventModifierUtil_1.doesNotExceedKeySize)(entry) ||
+                !(0, EventModifierUtil_1.isKeySyntaxAllowed)(entry)) {
+                if ((0, EventModifierUtil_1.isKeyCustomProperty)(entry[0])) {
+                    droppedCustomProperties = true;
+                }
+                else {
+                    droppedProperties = true;
                 }
+                return;
             }
+            if ((0, EventModifierUtil_1.isKeyCustomProperty)(entry[0])) {
+                amountOfCustomProperties++;
+                if (amountOfCustomProperties > EventSpecContstants_1.MAX_CUSTOM_EVENT_FIELDS) {
+                    this.logger.debug(`limitEventProperties(): Dropped ${entry[0]} because overall property limit is reached!`);
+                    droppedCustomProperties = true;
+                    return;
+                }
+            }
+            (0, EventModifierUtil_1.restrictingValueSize)(entry);
+            validEntries.push(entry);
+        });
+        if (droppedCustomProperties) {
+            validEntries.push([
+                "dt.support.api.has_dropped_custom_properties",
+                true,
+            ]);
+        }
+        if (droppedProperties) {
+            validEntries.push([
+                "dt.support.api.has_dropped_properties",
+                true,
+            ]);
         }
+        return validEntries;
     }
     isKeyNameAllowed(entry) {
         const [key] = entry;

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StringLengthEventModifier = void 0;
+const ConsoleLogger_1 = require("../../../core/logging/ConsoleLogger");
+const EventSpecContstants_1 = require("../spec/EventSpecContstants");
+const EventModifierUtil_1 = require("./EventModifierUtil");
+class StringLengthEventModifier {
+    constructor() {
+        this.logger = new ConsoleLogger_1.ConsoleLogger('StringLengthEventModifier');
+    }
+    modifyEvent(event) {
+        if (event == null) {
+            this.logger.debug(`modifyEvent(${JSON.stringify(event)}): Event is null!`);
+            return event;
+        }
+        if (event["characteristics.is_api_reported"] ===
+            true) {
+            this.trimStringValuesInObject(event);
+        }
+        else {
+            this.trimStringValuesInObject(event, EventSpecContstants_1.EVENT_WHITELIST_SIZE);
+        }
+        return event;
+    }
+    trimStringValuesInObject(jsonData, keyWhitelist = []) {
+        for (const key in jsonData) {
+            if (!keyWhitelist.includes(key) &&
+                Object.prototype.hasOwnProperty.call(jsonData, key)) {
+                jsonData[key] = this.trimStringValue(key, jsonData[key]);
+            }
+        }
+        return jsonData;
+    }
+    trimStringValuesInArray(key, arrayData) {
+        arrayData.forEach((value, index, array) => {
+            array[index] = this.trimStringValue(key, value);
+        });
+        return arrayData;
+    }
+    trimStringValue(key, data) {
+        if (typeof data === 'string') {
+            return (0, EventModifierUtil_1.trimString)(key, data, EventSpecContstants_1.MAX_CUSTOM_EVENT_VALUE_LENGTH);
+        }
+        else if (Array.isArray(data)) {
+            return this.trimStringValuesInArray(key, data);
+        }
+        else if ((0, EventModifierUtil_1.isObject)(data)) {
+            return this.trimStringValuesInObject(data);
+        }
+        return data;
+    }
+}
+exports.StringLengthEventModifier = StringLengthEventModifier;

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.22';
+exports.ALL_APP_START_KEYS = exports.EVENT_WHITELIST_SIZE = exports.MODIFY_EVENT_WHITELIST_NAMESPACE = exports.MODIFY_EVENT_WHITELIST_STRING_FIELDS = 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.23';
 exports.MAX_CUSTOM_EVENT_FIELDS = 50;
 exports.MAX_CUSTOM_EVENT_KEY_LENGTH = 100;
 exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = 5000;
@@ -43,10 +43,17 @@ exports.MODIFY_EVENT_WHITELIST_FIELDS = [
     "exception.stack_trace",
     "url.full",
 ];
+exports.MODIFY_EVENT_WHITELIST_STRING_FIELDS = [
+    "exception.stack_trace",
+    "url.full",
+];
 exports.MODIFY_EVENT_WHITELIST_NAMESPACE = [
     "session_properties",
     "event_properties",
 ];
+exports.EVENT_WHITELIST_SIZE = [
+    "exception.stack_trace",
+];
 const appStartKeyMap = {
     ["app_start.react_native.content_appeared"]: null,
     ["app_start.react_native.download.end_time"]: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.327.1",
+  "version": "2.329.1",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "types.d.ts",
@@ -26,8 +26,9 @@
     "test": "jest --runInBand",
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand",
     "test:local": "npm run lint && node runner.js test",
+    "test:examples": "node tests/jsdoc_examples/RunJestTest.js",
     "tsc:local": "tsc -p tsconfig.local.json",
-    "tsc:types": "tsc -p tsconfig.types.json && rollup -c rollup.config.types.js",
+    "tsc:types": "tsc -p tsconfig.types.json && rollup -c rollup.config.types.mjs",
     "tsc": "tsc",
     "tsc:prod": "tsc -p tsconfig.release.json",
     "lint": "eslint --cache src/**/*.ts --ignore-pattern .gitignore",
@@ -47,7 +48,7 @@
   "author": "Dynatrace",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@babel/runtime": "^7.28.4",
+    "@babel/runtime": "^7.28.6",
     "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
@@ -76,6 +77,8 @@
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
     "@react-native/babel-preset": "^0.80.1",
+    "@react-navigation/core": "^7.13.0",
+    "@react-navigation/drawer": "^7.7.2",
     "@testing-library/react-native": "^13.2.0",
     "@types/jest": "^30.0.0",
     "@types/jscodeshift": "^17.3.0",
@@ -157,7 +160,9 @@
     "lib/metro/*.js",
     "lib/next/*.js",
     "lib/next/appstart/*.js",
+    "lib/next/configuration/*.js",
     "lib/next/events/*.js",
+    "lib/next/events/interface/*.js",
     "lib/next/events/modifier/*.js",
     "lib/next/events/spec/*.js",
     "lib/next/provider/*.js",

package/public.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequestEventBuilder = exports.DynatraceWebRequestTiming = exports.UserPrivacyOptions = exports.LogLevel = exports.Platform = exports.ConfigurationBuilder = exports.ManualStartupConfiguration = exports.DataCollectionLevel = exports.Dynatrace = void 0;
+exports.ExceptionEventData = exports.SessionPropertyEventData = exports.EventData = exports.HttpRequestEventData = exports.DynatraceWebRequestTiming = exports.UserPrivacyOptions = exports.LogLevel = exports.Platform = exports.ConfigurationBuilder = exports.ManualStartupConfiguration = exports.DataCollectionLevel = exports.Dynatrace = void 0;
 var Dynatrace_1 = require("./lib/core/Dynatrace");
 Object.defineProperty(exports, "Dynatrace", { enumerable: true, get: function () { return Dynatrace_1.Dynatrace; } });
 var DataCollectionLevel_1 = require("./lib/core/model/DataCollectionLevel");
@@ -17,6 +17,12 @@ var UserPrivacyOptions_1 = require("./lib/core/UserPrivacyOptions");
 Object.defineProperty(exports, "UserPrivacyOptions", { enumerable: true, get: function () { return UserPrivacyOptions_1.UserPrivacyOptions; } });
 var DynatraceWebRequestTiming_1 = require("./lib/core/DynatraceWebRequestTiming");
 Object.defineProperty(exports, "DynatraceWebRequestTiming", { enumerable: true, get: function () { return DynatraceWebRequestTiming_1.DynatraceWebRequestTiming; } });
-var HttpRequestEventBuilder_1 = require("./lib/next/events/HttpRequestEventBuilder");
-Object.defineProperty(exports, "HttpRequestEventBuilder", { enumerable: true, get: function () { return HttpRequestEventBuilder_1.default; } });
+var HttpRequestEventData_1 = require("./lib/next/events/HttpRequestEventData");
+Object.defineProperty(exports, "HttpRequestEventData", { enumerable: true, get: function () { return HttpRequestEventData_1.default; } });
+var EventData_1 = require("./lib/next/events/EventData");
+Object.defineProperty(exports, "EventData", { enumerable: true, get: function () { return EventData_1.default; } });
+var SessionPropertyEventData_1 = require("./lib/next/events/SessionPropertyEventData");
+Object.defineProperty(exports, "SessionPropertyEventData", { enumerable: true, get: function () { return SessionPropertyEventData_1.default; } });
+var ExceptionEventData_1 = require("./lib/next/events/ExceptionEventData");
+Object.defineProperty(exports, "ExceptionEventData", { enumerable: true, get: function () { return ExceptionEventData_1.default; } });
 require("./react-augmentation");

package/react-native-dynatrace.podspec

@@ -111,7 +111,7 @@ Pod::Spec.new do |s|
   #
   
   s.dependency "React"
-  s.dependency 'Dynatrace', '~> 8.327.1.1020'
+  s.dependency 'Dynatrace', '~> 8.329.1.1017'
 
   # Allows for better compatibility for older and newer versions
   if defined?(install_modules_dependencies)

package/scripts/Config.js

@@ -31,8 +31,12 @@ exports.defaultConfig = {
             instrument: (filename) => true,
             actionNamePrivacy: false,
         },
-        custom: {
-            reactnavigation: false,
+        navigation: {
+            enabled: true,
+        },
+        sourcemap: {
+            enabled: true,
+            androidSourcemapLocation: 'app/build/generated/sourcemaps/react/release/index.android.bundle.map',
         },
     },
 };

package/scripts/LineOffsetAnalyze.js

@@ -14,13 +14,10 @@ module.exports = (() => {
         }
         return acc;
     }, {});
-    const isProd = parsedArgs.env === 'prod';
     const options = {
-        isProd,
         projectRoot: parsedArgs.projectRoot || PathsConstants_1.default.getApplicationPath(),
         buildPath: parsedArgs.buildPath || PathsConstants_1.default.getBuildPath(),
-        androidSourcemapPath: parsedArgs.androidSourcemapPath || '',
-        iosSourcemapPath: parsedArgs.iosSourcemapPath || '',
+        sourcemapPath: parsedArgs.sourcemapPath,
         appBundleInfo: Object.assign(Object.assign({}, (0, GetValuesFromPackage_1.getHostAppBundleInfo)(PathsConstants_1.default.getPackageJsonFile())), { pluginVersion: (_b = (_a = (0, GetValuesFromPackage_1.getHostAppBundleInfo)(PathsConstants_1.default.getInternalPackageJsonFile(), true)) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : '0' }),
     };
     const analyzer = new LineOffsetAnalyzeCall_1.LineOffsetAnalyzer(options);

package/scripts/core/LineOffsetAnalyzeCall.js

@@ -17,6 +17,10 @@ const Logger_1 = require("../Logger");
 const InstrumentUtil_1 = require("../util/InstrumentUtil");
 const FileOperationHelper_1 = require("../../scripts/FileOperationHelper");
 const ReactOptions_1 = require("../util/ReactOptions");
+const config = require("../../scripts/Config");
+const CustomArgumentUtil_1 = require("../../scripts/util/CustomArgumentUtil");
+const PathsConstants_1 = require("../../scripts/PathsConstants");
+const customArguments = (0, CustomArgumentUtil_1.readCustomArguments)();
 class LineOffsetAnalyzer {
     constructor(options) {
         this.rootDir = (0, path_1.resolve)(options.projectRoot);
@@ -24,11 +28,10 @@ class LineOffsetAnalyzer {
         this.outputFile = (0, path_1.resolve)(this.instrumentedDir, 'line-offsets.json');
         this.logFile = (0, path_1.resolve)(this.instrumentedDir, 'debug.log');
         this.appBundleInfo = options.appBundleInfo;
-        this.isProd = options.isProd;
-        this.androidSourcemapPath = options.androidSourcemapPath;
-        this.iosSourcemapPath = options.iosSourcemapPath;
+        this.sourcemapPath = options.sourcemapPath;
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const buildExists = yield FileOperationHelper_1.default.checkIfFileExists(this.instrumentedDir);
@@ -76,23 +79,30 @@ class LineOffsetAnalyzer {
                 };
                 yield fs.writeFile(this.outputFile, JSON.stringify(finalOutput, null, 2));
                 yield this.log(`✅ Line offsets written to ${this.outputFile}`, true);
-                if (this.isProd) {
-                    yield this.log('🔧 Patching source map with all offset data...');
-                    const loadedMap = yield this.loadSourceMap();
-                    if (loadedMap) {
-                        const { map, path: originalMapPath } = loadedMap;
-                        map.x_dynatrace_offset = mappings;
-                        const backupPath = originalMapPath + '.bak';
-                        const serilalisedPath = originalMapPath + '.serialised';
-                        yield fs.copyFile(originalMapPath, backupPath);
-                        yield this.log(`💾 Backup created: ${backupPath}`);
-                        yield fs.writeFile(originalMapPath, JSON.stringify(map));
-                        yield fs.writeFile(serilalisedPath, JSON.stringify(map, null, 2));
-                        yield this.log(`📝 Patched source map written to: ${originalMapPath}`);
-                    }
-                    else {
-                        yield this.log('⚠️ No source map found — skipping patching step');
-                    }
+                let reactOptions;
+                if (customArguments.isCustomConfigurationPathSet()) {
+                    reactOptions = config.readConfig((0, path_1.join)(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath()));
+                }
+                else {
+                    reactOptions = config.readConfig((0, path_1.join)(PathsConstants_1.default.getConfigFilePath()));
+                }
+                if (!this.sourcemapPath && !reactOptions.react.sourcemap.enabled) {
+                    const message = 'ℹ️ Automatic sourcemap patching disabled. Skipping sourcemap patching.';
+                    yield this.log(message);
+                    console.info(message);
+                    return;
+                }
+                const loadedMap = yield this.loadSourceMap((_a = this.sourcemapPath) !== null && _a !== void 0 ? _a : reactOptions.react.sourcemap.androidSourcemapLocation);
+                if (loadedMap) {
+                    const { map, path: originalMapPath } = loadedMap;
+                    map.x_dynatrace_offset = mappings;
+                    const backupPath = originalMapPath + '.bak';
+                    const serilalisedPath = originalMapPath + '.serialised';
+                    yield fs.copyFile(originalMapPath, backupPath);
+                    yield this.log(`💾 Backup created: ${backupPath}`);
+                    yield fs.writeFile(originalMapPath, JSON.stringify(map));
+                    yield fs.writeFile(serilalisedPath, JSON.stringify(map, null, 2));
+                    yield this.log(`📝 Patched source map written to: ${originalMapPath}`);
                 }
             }
             catch (err) {
@@ -100,35 +110,18 @@ class LineOffsetAnalyzer {
             }
         });
     }
-    loadSourceMap() {
+    loadSourceMap(mapPath) {
         return __awaiter(this, void 0, void 0, function* () {
-            const processValue = process.cwd();
-            const possiblePaths = [
-                (0, path_1.join)(processValue, 'app/build/generated/sourcemaps/react/release/index.android.bundle.map'),
-                (0, path_1.join)(this.androidSourcemapPath),
-                (0, path_1.join)(this.iosSourcemapPath),
-            ];
-            let foundAny = false;
-            for (const mapPath of possiblePaths) {
-                try {
-                    const exists = yield FileOperationHelper_1.default.checkIfFileExists(mapPath);
-                    if (!exists) {
-                        continue;
-                    }
-                    foundAny = true;
-                    const content = yield fs.readFile(mapPath, 'utf-8');
-                    const parsed = JSON.parse(content);
-                    yield this.log(`🗺️ Found and parsed source map at: ${mapPath}`, true);
-                    return { map: parsed, path: mapPath };
-                }
-                catch (err) {
-                    yield this.log(`⚠️ Failed to load or parse source map at ${mapPath}: ${err.message}`, true);
-                }
+            try {
+                const content = yield fs.readFile(mapPath, 'utf-8');
+                const parsed = JSON.parse(content);
+                yield this.log(`🗺️ Found and parsed source map at: ${mapPath}`, true);
+                return { map: parsed, path: mapPath };
             }
-            if (!foundAny) {
-                yield this.log('❌ No valid source map found in any of the expected locations.', true);
+            catch (err) {
+                yield this.log(`⚠️ Failed to load or parse source map at ${mapPath}: ${err.message} - skipping patching step`, true);
+                return null;
             }
-            return null;
         });
     }
     log(msg, logOnScreen = false) {