@dynatrace/react-native-plugin 2.339.1 → 2.341.1

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

@@ -5,6 +5,7 @@ const ConsoleLogger_1 = require("../../../core/logging/ConsoleLogger");
 const LogMessages_1 = require("../../../core/logging/LogMessages");
 const EventSpecContstants_1 = require("../spec/EventSpecContstants");
 const EventModifierUtil_1 = require("./EventModifierUtil");
+const JsonUtils_1 = require("../../../core/util/JsonUtils");
 class ModifyEventValidation {
     constructor() {
         this.customEventModifierChain = [];
@@ -23,35 +24,15 @@ class ModifyEventValidation {
         return false;
     }
     modifyEvent(event) {
-        if (this.customEventModifierChain.length > 0) {
-            const eventCopy = Object.assign({}, event);
-            let exceptionOccured = false;
-            let isDiscarded = false;
-            for (const modifier of this.customEventModifierChain) {
-                try {
-                    const eventRv = modifier.modifyEvent(event);
-                    if (!eventRv) {
-                        isDiscarded = true;
-                        break;
-                    }
-                    else {
-                        event = eventRv;
-                    }
-                }
-                catch (_a) {
-                    if (event != null) {
-                        exceptionOccured = true;
-                    }
-                }
-            }
-            if (!isDiscarded) {
-                event = this.sanitizeUserEnrichedEvent(eventCopy, event, exceptionOccured);
-            }
-            else {
-                return null;
-            }
+        if (this.customEventModifierChain.length === 0) {
+            return event;
         }
-        return event;
+        const eventCopy = Object.assign({}, event);
+        const modifiedEventResult = this.applyCustomModifiers(event);
+        if (modifiedEventResult.isDiscarded) {
+            return null;
+        }
+        return this.sanitizeUserEnrichedEvent(eventCopy, modifiedEventResult.event, modifiedEventResult.exceptionOccured);
     }
     isCustomPropertiesAllowed(key, hasSessionPropertyCharacteristics) {
         if (hasSessionPropertyCharacteristics) {
@@ -155,32 +136,15 @@ class ModifyEventValidation {
                 validEntries.push([prop, value]);
                 continue;
             }
-            if (!this.isCustomPropertiesAllowed(prop, originalJSONEvent["characteristics.has_session_properties"] === true)) {
+            const validationResult = this.validateModifiedEntry(prop, value, originalValue, originalJSONEvent, overriddenKeys);
+            if (validationResult.entry !== undefined) {
+                validEntries.push(validationResult.entry);
+            }
+            if (validationResult.droppedCustomProperties) {
                 droppedCustomProperties = true;
-                continue;
             }
-            const isNewlyAdded = typeof originalValue === 'undefined';
-            const isForbiddenKey = this.isKeyNameForbidden(prop, isNewlyAdded);
-            if (isForbiddenKey) {
-                if (!isNewlyAdded) {
-                    validEntries.push([prop, originalValue]);
-                }
+            if (validationResult.droppedProperties) {
                 droppedProperties = true;
-                continue;
-            }
-            if (!isNewlyAdded && !overriddenKeys.includes(prop)) {
-                overriddenKeys.push(prop);
-            }
-            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) {
@@ -241,6 +205,43 @@ class ModifyEventValidation {
             return entries;
         }, resultEntries);
     }
+    validateModifiedEntry(prop, value, originalValue, originalJSONEvent, overriddenKeys) {
+        if (!this.isCustomPropertiesAllowed(prop, originalJSONEvent["characteristics.has_session_properties"] === true)) {
+            return {
+                droppedCustomProperties: true,
+                droppedProperties: false,
+            };
+        }
+        const isNewlyAdded = originalValue === undefined;
+        const isForbiddenKey = this.isKeyNameForbidden(prop, isNewlyAdded);
+        if (isForbiddenKey) {
+            return {
+                entry: isNewlyAdded ? undefined : [prop, originalValue],
+                droppedCustomProperties: false,
+                droppedProperties: true,
+            };
+        }
+        if (!isNewlyAdded && !overriddenKeys.includes(prop)) {
+            overriddenKeys.push(prop);
+        }
+        if (!isNewlyAdded &&
+            EventSpecContstants_1.MODIFY_EVENT_WHITELIST_STRING_FIELDS.includes(prop)) {
+            const maximumLength = Math.max(JsonUtils_1.JsonUtils.stringify(originalJSONEvent[prop]).length, EventSpecContstants_1.MAX_CUSTOM_EVENT_VALUE_LENGTH);
+            return {
+                entry: [
+                    prop,
+                    (0, EventModifierUtil_1.trimString)(prop, JsonUtils_1.JsonUtils.stringify(value), maximumLength),
+                ],
+                droppedCustomProperties: false,
+                droppedProperties: false,
+            };
+        }
+        return {
+            entry: [prop, value],
+            droppedCustomProperties: false,
+            droppedProperties: false,
+        };
+    }
     validateAddedEntries(addedEntries) {
         const validEntries = [];
         let droppedProperties = false;
@@ -274,6 +275,33 @@ class ModifyEventValidation {
         }
         return validEntries;
     }
+    applyCustomModifiers(event) {
+        let currentEvent = event;
+        let exceptionOccured = false;
+        for (const modifier of this.customEventModifierChain) {
+            try {
+                const eventRv = modifier.modifyEvent(currentEvent);
+                if (!eventRv) {
+                    return {
+                        event: currentEvent,
+                        exceptionOccured,
+                        isDiscarded: true,
+                    };
+                }
+                currentEvent = eventRv;
+            }
+            catch (_a) {
+                if (currentEvent != null) {
+                    exceptionOccured = true;
+                }
+            }
+        }
+        return {
+            event: currentEvent,
+            exceptionOccured,
+            isDiscarded: false,
+        };
+    }
     enforcePropertyLimit(entries) {
         const result = [];
         let propertyCount = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.339.1",
+  "version": "2.341.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,7 +26,7 @@
     "test": "jest --runInBand",
     "test:coverage": "jest --runInBand --coverage",
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand",
-    "test:local": "npm run lint && node runner.js test",
+    "test:local": "node cleanMacFiles.js && 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.mjs",
@@ -49,11 +49,11 @@
   "author": "Dynatrace",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@babel/runtime": "^7.29.7",
+    "@babel/runtime": "^8.0.0",
     "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
-    "semver": "^7.8.3"
+    "semver": "^7.8.5"
   },
   "homepage": "https://www.dynatrace.com/",
   "peerDependencies": {
@@ -68,7 +68,8 @@
     },
     "ast-types": "npm:ast-types-x",
     "flow-parser": "0.160",
-    "tmp": ">=0.2.6"
+    "tmp": ">=0.2.6",
+    "ws": "^7.5.11"
   },
   "devDependencies": {
     "@babel/plugin-transform-class-properties": "^7.27.1",

package/react-native-dynatrace.podspec

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

package/scripts/Config.js

@@ -46,7 +46,7 @@ exports.defaultConfig = {
 const readConfigDefault = () => {
     const customArguments = (0, CustomArgumentUtil_1.readCustomArguments)();
     const configPath = customArguments.isCustomConfigurationPathSet()
-        ? path.join(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath())
+        ? path.resolve(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath())
         : PathsConstants_1.default.getConfigFilePath();
     return (0, exports.readConfig)(configPath);
 };
@@ -80,8 +80,12 @@ exports.checkConfiguration = checkConfiguration;
 const createNewConfiguration = (pathToDynatraceConfig) => __awaiter(void 0, void 0, void 0, function* () {
     const defaultConfigContent = yield FileOperationHelper_1.default.readTextFromFile(PathsConstants_1.default.getDefaultConfig());
     yield FileOperationHelper_1.default.writeTextToFile(pathToDynatraceConfig, defaultConfigContent);
-    Logger_1.default.logMessageSync('Created dynatrace.config.js - Please insert your configuration and update the file!', Logger_1.default.INFO);
+    logConfigCreatedMessage();
 });
+const logConfigCreatedMessage = () => {
+    const message = 'Created dynatrace.config.js - Please insert your configuration and update the file!';
+    Logger_1.default.logMessageSync(message, Logger_1.default.INFO);
+};
 const patchMalformedConfiguration = (pathToDynatraceConfig) => {
     const configContent = FileOperationHelper_1.default.readTextFromFileSync(pathToDynatraceConfig);
     if (configContent.indexOf('\u200B') !== -1) {

package/scripts/DebugFlag.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDebugEnabled = void 0;
+const PathsConstants_1 = require("./PathsConstants");
+let cached;
+const isDebugEnabled = () => {
+    var _a;
+    if (cached === undefined) {
+        try {
+            const { readConfig } = require('./Config');
+            cached = ((_a = readConfig(PathsConstants_1.default.getConfigFilePath()).react) === null || _a === void 0 ? void 0 : _a.debug) === true;
+        }
+        catch (_b) {
+            cached = false;
+        }
+    }
+    return cached;
+};
+exports.isDebugEnabled = isDebugEnabled;

package/scripts/FileOperationHelper.js

@@ -71,49 +71,25 @@ const mkdirSyncRecursive = (directory) => {
         }
     }
 };
-const deleteDirectory = (dir) => new Promise((resolve, reject) => {
-    fs.access(dir, (err) => {
-        if (err) {
-            return reject(err);
-        }
-        fs.readdir(dir, (err, files) => {
-            if (err) {
-                return reject(err);
-            }
-            Promise.all(files.map((file) => deleteFile(path.join(dir, file)))).then(() => {
-                fs.rmdir(dir, (err) => {
-                    if (err) {
-                        return reject(err);
-                    }
-                    resolve();
-                });
-            }).catch(reject);
-        });
-    });
+const deleteDirectory = (dir) => __awaiter(void 0, void 0, void 0, function* () {
+    yield fsPromise.access(dir);
+    const files = yield fsPromise.readdir(dir);
+    yield Promise.all(files.map((file) => deleteFile(path.join(dir, file))));
+    yield fsPromise.rmdir(dir);
 });
 const deleteDirectorySync = (dir) => {
     fs.accessSync(dir);
     const files = fs.readdirSync(dir);
-    files.map((file) => deleteFileSync(path.join(dir, file)));
+    files.forEach((file) => deleteFileSync(path.join(dir, file)));
     fs.rmdirSync(dir);
 };
-const deleteFile = (filePath) => new Promise((resolve, reject) => {
-    fs.lstat(filePath, (err, stats) => {
-        if (err) {
-            return reject(err);
-        }
-        if (stats.isDirectory()) {
-            resolve(deleteDirectory(filePath));
-        }
-        else {
-            fs.unlink(filePath, (err) => {
-                if (err) {
-                    return reject(err);
-                }
-                resolve();
-            });
-        }
-    });
+const deleteFile = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    const stats = yield fsPromise.lstat(filePath);
+    if (stats.isDirectory()) {
+        yield deleteDirectory(filePath);
+        return;
+    }
+    yield fsPromise.unlink(filePath);
 });
 const deleteFileSync = (filePath) => {
     const stats = fs.lstatSync(filePath);
@@ -157,7 +133,7 @@ const copyDirectory = (from, to) => {
         }
     });
 };
-const allowedRootFolders = ['src', 'node_modules'];
+const allowedRootFolders = new Set(['src', 'node_modules']);
 const getAllFiles = (log, dir, base = '', isRoot = false) => __awaiter(void 0, void 0, void 0, function* () {
     const entries = yield fsPromise.readdir(dir);
     let files = [];
@@ -166,7 +142,7 @@ const getAllFiles = (log, dir, base = '', isRoot = false) => __awaiter(void 0, v
         const relPath = path.join(base, entry);
         const stat = yield fsPromise.stat(fullPath);
         if (stat.isDirectory()) {
-            if (isRoot && !allowedRootFolders.includes(entry)) {
+            if (isRoot && !allowedRootFolders.has(entry)) {
                 yield log(`🔸 Skipping folder: ${entry}`);
                 continue;
             }

package/scripts/Logger.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const nodePath = require("path");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
-const Config_1 = require("./Config");
+const DebugFlag_1 = require("./DebugFlag");
 const ERROR = 0;
 const INFO = 1;
 const WARNING = 2;
@@ -26,8 +26,7 @@ const closeLogFile = () => {
         .catch(errorHandling);
 };
 const logErrorSync = (_message) => {
-    const config = (0, Config_1.readConfig)(PathsConstants_1.default.getConfigFilePath());
-    if (config.react !== undefined && config.react.debug) {
+    if ((0, DebugFlag_1.isDebugEnabled)()) {
         logMessageSync(_message, ERROR, true);
     }
 };

package/scripts/core/InstrumentCall.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.instrumentCommand = void 0;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const Logger_1 = require("../Logger");
 const Config_1 = require("../Config");
 const android = require("../Android");
 const PathsConstants_1 = require("../PathsConstants");
-const nodePath = require("path");
 const Ios_1 = require("../Ios");
 const InstrumentUtil_1 = require("../util/InstrumentUtil");
 const CustomArgumentUtil_1 = require("../util/CustomArgumentUtil");
 const Platform_1 = require("../api/model/Platform");
 const SourceMapUtil_1 = require("../util/SourceMapUtil");
-const instrumentCommand = () => {
-    if (process.argv.includes('--help')) {
-        Logger_1.default.logMessageSync(`
+const platformLogPrefix = { info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' };
+const logHelpMessage = () => {
+    const iOSDefaultPath = (0, node_path_1.join)(PathsConstants_1.default.getIOSFolder(), '<appName>', 'Info.plist');
+    const iOSSupportingDefaultPath = (0, node_path_1.join)(PathsConstants_1.default.getIOSFolder(), '<appName>', 'Supporting', 'Info.plist');
+    Logger_1.default.logMessageSync(`
         Usage: npx instrumentDynatrace [options]
 
         Options:
@@ -28,8 +29,8 @@ const instrumentCommand = () => {
             plist="/custom/path/to/Info.plist"
                                             Specify a custom path to the Info.plist file of your ios project.
                                             Default: Extracts <appName> from app.json and then tries
-                                            ${nodePath.join(PathsConstants_1.default.getIOSFolder(), "<appName>", 'Info.plist')}
-                                            and ${nodePath.join(PathsConstants_1.default.getIOSFolder(), "<appName>", "Supporting", "Info.plist")}
+                                            ${iOSDefaultPath}
+                                            and ${iOSSupportingDefaultPath}
                                             in that order
 
         Examples:
@@ -38,94 +39,114 @@ const instrumentCommand = () => {
             npx instrumentDynatrace gradle="/custom/path/to/build.gradle"
             npx instrumentDynatrace plist="/custom/path/to/Info.plist"
         `, Logger_1.default.INFO);
+};
+const persistCustomArguments = (argv) => {
+    if (argv.isEmpty()) {
+        (0, CustomArgumentUtil_1.clearCustomArguments)();
         return;
     }
-    Logger_1.default.logMessageSync('⏳ Starting instrumentation of React Native application ..', Logger_1.default.INFO);
-    Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ' }, () => (0, InstrumentUtil_1.showVersionOfPlugin)());
+    (0, CustomArgumentUtil_1.writeCustomArguments)(argv);
+};
+const resolveInstrumentationPaths = (argv) => {
     let pathToConfig = PathsConstants_1.default.getConfigFilePath();
     let pathToGradle = PathsConstants_1.default.getAndroidGradleFile(PathsConstants_1.default.getAndroidFolder());
     let pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile(PathsConstants_1.default.getAndroidFolder());
-    let androidAvailable = true;
     let pathToPList;
-    let iosAvailable = true;
-    const argv = (0, CustomArgumentUtil_1.parseCommandLine)(process.argv.slice(2));
-    if (argv.isEmpty()) {
-        (0, CustomArgumentUtil_1.clearCustomArguments)();
-    }
-    else {
-        (0, CustomArgumentUtil_1.writeCustomArguments)(argv);
-    }
     if (argv.isCustomConfigurationPathSet()) {
         pathToConfig = argv.getCustomConfigurationPath();
     }
-    Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' }, () => {
-        if (argv.isCustomGradlePathSet()) {
-            pathToGradle = argv.getCustomGradlePath();
-            if (!/build\.gradle(\.kts)?$/.test(pathToGradle)) {
-                throw new Error(`--gradle must point to build.gradle or build.gradle.kts file, got ${pathToGradle}`);
-            }
-            const androidFolder = nodePath.dirname(pathToGradle);
-            pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile(androidFolder);
-            androidAvailable = (0, InstrumentUtil_1.isPlatformAvailable)(pathToGradle, Platform_1.Platform.Android);
-        }
-        else {
-            androidAvailable = (0, InstrumentUtil_1.isPlatformAvailable)(PathsConstants_1.default.getAndroidFolder(), Platform_1.Platform.Android);
-        }
-        if (argv.isCustomPlistPathSet()) {
-            pathToPList = (0, path_1.resolve)(argv.getCustomPlistPath());
-            iosAvailable = (0, InstrumentUtil_1.isPlatformAvailable)(pathToPList, Platform_1.Platform.IOS);
+    if (argv.isCustomGradlePathSet()) {
+        pathToGradle = argv.getCustomGradlePath();
+        if (!/build\.gradle(\.kts)?$/.test(pathToGradle)) {
+            throw new Error(`--gradle must point to build.gradle or build.gradle.kts file, got ${pathToGradle}`);
         }
-        else {
-            iosAvailable = (0, InstrumentUtil_1.isPlatformAvailable)(PathsConstants_1.default.getIOSFolder(), Platform_1.Platform.IOS);
-        }
-    });
-    pathToConfig = (0, path_1.resolve)(pathToConfig);
-    pathToGradle = (0, path_1.resolve)(pathToGradle);
-    pathToAppGradle = (0, path_1.resolve)(pathToAppGradle);
-    if (iosAvailable || androidAvailable) {
-        try {
-            Logger_1.default.logMessageSync('⏳ Trying to read configuration file: ' + pathToConfig, Logger_1.default.INFO);
-            const configAgent = (0, Config_1.readConfig)(pathToConfig);
-            if (androidAvailable) {
-                try {
-                    Logger_1.default.logMessageSync('⏳ Starting Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                    Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' }, () => {
-                        android.instrumentAndroidPlatform(pathToGradle, false);
-                        android.writeGradleConfig(configAgent.android, pathToGradle);
-                        android.ensureRuntimeScriptApplied(pathToAppGradle);
-                    });
-                    Logger_1.default.logMessageSync('  ✅ Finished Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                }
-                catch (e) {
-                    if (e instanceof Error) {
-                        Logger_1.default.logMessageSync('  ❌ Android Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
-                    }
-                }
-            }
-            if (iosAvailable) {
-                try {
-                    Logger_1.default.logMessageSync('⏳ Starting iOS Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                    Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' }, () => Ios_1.default.modifyPListFile(pathToPList, configAgent.ios, false));
-                    Logger_1.default.logMessageSync('  ✅ Finished iOS Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                }
-                catch (e) {
-                    if (e instanceof Error) {
-                        Logger_1.default.logMessageSync('  ❌ iOS Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
-                    }
-                }
-            }
-            (0, SourceMapUtil_1.patchMetroSourceMap)();
-            Logger_1.default.logMessageSync('🎉 Finished instrumentation of React Native application ..', Logger_1.default.INFO);
+        pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile((0, node_path_1.dirname)(pathToGradle));
+    }
+    if (argv.isCustomPlistPathSet()) {
+        pathToPList = argv.getCustomPlistPath();
+    }
+    return {
+        pathToConfig: (0, node_path_1.resolve)(pathToConfig),
+        pathToGradle: (0, node_path_1.resolve)(pathToGradle),
+        pathToAppGradle: (0, node_path_1.resolve)(pathToAppGradle),
+        pathToPList: pathToPList ? (0, node_path_1.resolve)(pathToPList) : undefined,
+    };
+};
+const detectPlatformAvailability = (argv, paths) => {
+    const androidAvailable = argv.isCustomGradlePathSet()
+        ? (0, InstrumentUtil_1.isPlatformAvailable)(paths.pathToGradle, Platform_1.Platform.Android)
+        : (0, InstrumentUtil_1.isPlatformAvailable)(PathsConstants_1.default.getAndroidFolder(), Platform_1.Platform.Android);
+    const iosAvailable = argv.isCustomPlistPathSet()
+        ? (0, InstrumentUtil_1.isPlatformAvailable)(paths.pathToPList, Platform_1.Platform.IOS)
+        : (0, InstrumentUtil_1.isPlatformAvailable)(PathsConstants_1.default.getIOSFolder(), Platform_1.Platform.IOS);
+    return { androidAvailable, iosAvailable };
+};
+const instrumentAndroidIfAvailable = (androidAvailable, pathToGradle, pathToAppGradle, androidConfig) => {
+    if (!androidAvailable) {
+        return;
+    }
+    try {
+        Logger_1.default.logMessageSync('⏳ Starting Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
+        Logger_1.default.withPrefix(platformLogPrefix, () => {
+            android.instrumentAndroidPlatform(pathToGradle, false);
+            android.writeGradleConfig(androidConfig, pathToGradle);
+            android.ensureRuntimeScriptApplied(pathToAppGradle);
+        });
+        Logger_1.default.logMessageSync('  ✅ Finished Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            Logger_1.default.logMessageSync('  ❌ Android Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
         }
-        catch (e) {
-            if (e instanceof Error) {
-                Logger_1.default.logMessageSync('❌ Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
-            }
+    }
+};
+const instrumentIosIfAvailable = (iosAvailable, pathToPList, iosConfig) => {
+    if (!iosAvailable) {
+        return;
+    }
+    try {
+        Logger_1.default.logMessageSync('⏳ Starting iOS Instrumentation with Dynatrace!', Logger_1.default.INFO);
+        Logger_1.default.withPrefix(platformLogPrefix, () => Ios_1.default.modifyPListFile(pathToPList, iosConfig, false));
+        Logger_1.default.logMessageSync('  ✅ Finished iOS Instrumentation with Dynatrace!', Logger_1.default.INFO);
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            Logger_1.default.logMessageSync('  ❌ iOS Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
         }
     }
-    else {
+};
+const runPlatformInstrumentation = (paths, availability) => {
+    if (!availability.iosAvailable && !availability.androidAvailable) {
         Logger_1.default.logMessageSync('⚠️  Both Android and iOS Folder are not available - Skip instrumentation.', Logger_1.default.WARNING);
+        return;
     }
+    try {
+        Logger_1.default.logMessageSync('⏳ Trying to read configuration file: ' + paths.pathToConfig, Logger_1.default.INFO);
+        const configAgent = (0, Config_1.readConfig)(paths.pathToConfig);
+        instrumentAndroidIfAvailable(availability.androidAvailable, paths.pathToGradle, paths.pathToAppGradle, configAgent.android);
+        instrumentIosIfAvailable(availability.iosAvailable, paths.pathToPList, configAgent.ios);
+        (0, SourceMapUtil_1.patchMetroSourceMap)();
+        Logger_1.default.logMessageSync('🎉 Finished instrumentation of React Native application ..', Logger_1.default.INFO);
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            Logger_1.default.logMessageSync('❌ Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
+        }
+    }
+};
+const instrumentCommand = () => {
+    const commandArgs = process.argv;
+    if (commandArgs.includes('--help')) {
+        logHelpMessage();
+        return;
+    }
+    Logger_1.default.logMessageSync('⏳ Starting instrumentation of React Native application ..', Logger_1.default.INFO);
+    Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ' }, () => (0, InstrumentUtil_1.showVersionOfPlugin)());
+    const argv = (0, CustomArgumentUtil_1.parseCommandLine)(commandArgs.slice(2));
+    persistCustomArguments(argv);
+    const instrumentationPaths = resolveInstrumentationPaths(argv);
+    const availability = Logger_1.default.withPrefix(platformLogPrefix, () => detectPlatformAvailability(argv, instrumentationPaths));
+    runPlatformInstrumentation(instrumentationPaths, availability);
     Logger_1.default.closeLogFile();
 };
 exports.instrumentCommand = instrumentCommand;

package/scripts/util/CustomArgumentUtil.js

@@ -10,17 +10,19 @@ exports.PROCESS_CUSTOM_ARGUMENT_NAME = 'dtCustomArguments';
 const parseCommandLine = (inputArgs) => {
     const parsedArgs = new CustomArgumentsBuilderImpl_1.CustomArgumentsBuilderImpl();
     inputArgs.forEach((entry) => {
-        const parts = entry.split('=');
-        if (parts.length === 2) {
-            switch (parts[0]) {
+        const eqIndex = entry.indexOf('=');
+        if (eqIndex !== -1) {
+            const key = entry.slice(0, eqIndex);
+            const value = entry.slice(eqIndex + 1);
+            switch (key) {
                 case "gradle":
-                    parsedArgs.withGradleArgument(parts[1]);
+                    parsedArgs.withGradleArgument(value);
                     break;
                 case "config":
-                    parsedArgs.withConfigurationArgument(parts[1]);
+                    parsedArgs.withConfigurationArgument(value);
                     break;
                 case "plist":
-                    parsedArgs.withPlistArgument(parts[1]);
+                    parsedArgs.withPlistArgument(value);
                     break;
             }
         }