@dynatrace/react-native-plugin 2.333.1 → 2.335.1

package/scripts/Android.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRuntimeScriptApplied = exports.copyGradleConfigFile = exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_RUNTIME_SCRIPT = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE = void 0;
+exports.ensureRuntimeScriptApplied = exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_RUNTIME_SCRIPT = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE = void 0;
 const path_1 = require("path");
 const Logger_1 = require("./Logger");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
 const GRADLE_CONFIG_IDENTIFIER = '// AUTO - INSERTED';
 exports.GRADLE_DYNATRACE_FILE = `apply from: "./${PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE}"`;
+const LEGACY_GRADLE_DYNATRACE_NODE_MODULES = 'node_modules/@dynatrace/react-native-plugin/files/dynatrace.gradle';
 const GRADLE_BUILDSCRIPT_IDENTIFIER = 'buildscript';
 exports.GRADLE_APPLY_BUILDSCRIPT = 'apply from: "../node_modules/@dynatrace/react-native-plugin/files/plugin.gradle", to: buildscript';
 const GRADLE_REACT_NATIVE_PLUGIN = 'apply plugin: "com.facebook.react.rootproject"';
@@ -31,78 +32,91 @@ const removeOldDynatraceClasspath = (gradleFileContent) => {
     }
     return gradleFileContentLines.join('\n');
 };
-const changeReactNativeBuildGradleFile = (pathToGradle, remove) => {
-    const gradleFileContent = FileOperationHelper_1.default.readTextFromFileSync(pathToGradle);
-    const modifiedFileContent = removeOldDynatraceClasspath(gradleFileContent);
-    const gradleFileContentLines = modifiedFileContent.split('\n');
-    let gradlePluginFileIndex = -1;
-    let gradleDynatraceFileIndex = -1;
-    for (let i = 0; i < gradleFileContentLines.length && (gradleDynatraceFileIndex === -1 || gradlePluginFileIndex === -1); i++) {
-        if (gradleFileContentLines[i].indexOf('plugin.gradle') > -1) {
-            gradlePluginFileIndex = i;
+const findGradleLineIndices = (lines) => {
+    let pluginFileIndex = -1;
+    let dynatraceFileIndex = -1;
+    for (let i = 0; i < lines.length && (dynatraceFileIndex === -1 || pluginFileIndex === -1); i++) {
+        if (lines[i].indexOf('plugin.gradle') > -1) {
+            pluginFileIndex = i;
         }
-        else if (gradleFileContentLines[i].indexOf(PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE) > -1) {
-            gradleDynatraceFileIndex = i;
+        else if (lines[i].indexOf(PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE) > -1) {
+            dynatraceFileIndex = i;
         }
     }
+    return { pluginFileIndex, dynatraceFileIndex };
+};
+const removeDynatraceFromGradle = (lines, indices, pathToGradle) => {
     let modified = false;
-    if (remove) {
-        if (gradlePluginFileIndex !== -1) {
-            gradleFileContentLines.splice(gradlePluginFileIndex, 1);
-            modified = true;
-        }
-        if (gradleDynatraceFileIndex !== -1) {
-            gradleFileContentLines.splice(gradleDynatraceFileIndex - (modified ? 1 : 0), 1);
-            modified = true;
-        }
-        if (modified) {
-            Logger_1.default.logMessageSync('Removed Dynatrace modifications from build.gradle: ' + pathToGradle, Logger_1.default.INFO);
+    if (indices.pluginFileIndex !== -1) {
+        lines.splice(indices.pluginFileIndex, 1);
+        modified = true;
+    }
+    if (indices.dynatraceFileIndex !== -1) {
+        lines.splice(indices.dynatraceFileIndex - (modified ? 1 : 0), 1);
+        modified = true;
+    }
+    if (modified) {
+        Logger_1.default.logMessageSync('Removed Dynatrace modifications from build.gradle: ' + pathToGradle, Logger_1.default.INFO);
+    }
+    return modified;
+};
+const addDynatraceToGradle = (lines, indices, pathToGradle) => {
+    let modified = false;
+    if (indices.dynatraceFileIndex !== -1 &&
+        lines[indices.dynatraceFileIndex].includes(LEGACY_GRADLE_DYNATRACE_NODE_MODULES)) {
+        lines[indices.dynatraceFileIndex] = exports.GRADLE_DYNATRACE_FILE;
+        Logger_1.default.logMessageSync('Migrated old node_modules dynatrace.gradle path to local path in build.gradle', Logger_1.default.INFO);
+        modified = true;
+    }
+    if (indices.pluginFileIndex === -1) {
+        const buildscriptIndex = lines.findIndex((line) => line.startsWith(GRADLE_BUILDSCRIPT_IDENTIFIER));
+        if (buildscriptIndex === -1) {
+            throw new Error('Could not find Buildscript block in build.gradle.');
         }
+        lines.splice(buildscriptIndex + 1, 0, exports.GRADLE_APPLY_BUILDSCRIPT);
+        modified = true;
+    }
+    if (indices.dynatraceFileIndex === -1) {
+        const pluginLineIndex = lines.findIndex((line) => line.includes(GRADLE_REACT_NATIVE_PLUGIN));
+        lines.splice(pluginLineIndex !== -1 ? pluginLineIndex : lines.length, 0, exports.GRADLE_DYNATRACE_FILE);
+        modified = true;
+    }
+    if (modified) {
+        Logger_1.default.logMessageSync('Added Dynatrace plugin.gradle to the build.gradle: ' + pathToGradle, Logger_1.default.INFO);
     }
     else {
-        if (gradlePluginFileIndex === -1) {
-            let gradleFileReactIndex = -1;
-            for (let i = 0; i < gradleFileContentLines.length; i++) {
-                if (gradleFileContentLines[i].startsWith(GRADLE_BUILDSCRIPT_IDENTIFIER)) {
-                    gradleFileReactIndex = i;
-                    break;
-                }
-            }
-            if (gradleFileReactIndex === -1) {
-                throw new Error('Could not find Buildscript block in build.gradle.');
-            }
-            gradleFileContentLines.splice(gradleFileReactIndex + 1, 0, exports.GRADLE_APPLY_BUILDSCRIPT);
-            modified = true;
-        }
-        if (gradleDynatraceFileIndex === -1) {
-            let pluginLineIndex = -1;
-            for (let i = 0; i < gradleFileContentLines.length; i++) {
-                if (gradleFileContentLines[i].includes(GRADLE_REACT_NATIVE_PLUGIN)) {
-                    pluginLineIndex = i;
-                    break;
-                }
-            }
-            gradleFileContentLines.splice(pluginLineIndex !== -1 ? pluginLineIndex : gradleFileContentLines.length, 0, exports.GRADLE_DYNATRACE_FILE);
-            modified = true;
-        }
-        if (modified) {
-            Logger_1.default.logMessageSync('Added Dynatrace plugin.gradle to the build.gradle: ' + pathToGradle, Logger_1.default.INFO);
-        }
-        else {
-            Logger_1.default.logMessageSync('Dynatrace plugin & agent already added to build.gradle', Logger_1.default.INFO);
-        }
+        Logger_1.default.logMessageSync('Dynatrace plugin & agent already added to build.gradle', Logger_1.default.INFO);
     }
+    return modified;
+};
+const changeReactNativeBuildGradleFile = (pathToGradle, remove) => {
+    const gradleFileContent = FileOperationHelper_1.default.readTextFromFileSync(pathToGradle);
+    const modifiedFileContent = removeOldDynatraceClasspath(gradleFileContent);
+    const gradleFileContentLines = modifiedFileContent.split('\n');
+    const indices = findGradleLineIndices(gradleFileContentLines);
+    const modified = remove
+        ? removeDynatraceFromGradle(gradleFileContentLines, indices, pathToGradle)
+        : addDynatraceToGradle(gradleFileContentLines, indices, pathToGradle);
     if (modified) {
         const fullGradleFile = gradleFileContentLines.join('\n');
         FileOperationHelper_1.default.writeTextToFileSync(pathToGradle, fullGradleFile);
     }
 };
-const writeGradleConfig = (androidConfig) => {
+const writeGradleConfig = (androidConfig, pathToGradle) => {
     if (androidConfig === undefined || androidConfig.config === undefined) {
         Logger_1.default.logMessageSync("Can't write configuration of Android agent because it is missing!", Logger_1.default.WARNING);
         return;
     }
-    const gradleFileContent = FileOperationHelper_1.default.readTextFromFileSync(PathsConstants_1.default.getDynatraceGradleFile());
+    const gradleDirectory = (0, path_1.dirname)(pathToGradle);
+    const targetPath = (0, path_1.join)(gradleDirectory, PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE);
+    let gradleFileContent;
+    try {
+        FileOperationHelper_1.default.checkIfFileExistsSync(targetPath);
+        gradleFileContent = FileOperationHelper_1.default.readTextFromFileSync(targetPath);
+    }
+    catch (_a) {
+        gradleFileContent = FileOperationHelper_1.default.readTextFromFileSync(PathsConstants_1.default.getDynatraceGradleFile());
+    }
     const gradleFileContentLines = removeOldGradleConfig(gradleFileContent);
     let gradleFileIndex = -1;
     for (let i = 0; i < gradleFileContentLines.length; i++) {
@@ -113,15 +127,14 @@ const writeGradleConfig = (androidConfig) => {
     }
     gradleFileContentLines.splice(gradleFileIndex + 1, 0, androidConfig.config);
     const fullGradleFile = gradleFileContentLines.join('\n');
-    FileOperationHelper_1.default.writeTextToFileSync(PathsConstants_1.default.getDynatraceGradleFile(), fullGradleFile);
+    if (fullGradleFile === gradleFileContent) {
+        Logger_1.default.logMessageSync(`Configuration in ${PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE} is already up to date`, Logger_1.default.INFO);
+        return;
+    }
+    FileOperationHelper_1.default.writeTextToFileSync(targetPath, fullGradleFile);
     Logger_1.default.logMessageSync(`Replaced old configuration with current configuration in ${PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE}`, Logger_1.default.INFO);
 };
 exports.writeGradleConfig = writeGradleConfig;
-const copyGradleConfigFile = (pathToGradle) => {
-    const gradleDirectory = (0, path_1.dirname)(pathToGradle);
-    FileOperationHelper_1.default.copyFileSync(PathsConstants_1.default.getDynatraceGradleFile(), (0, path_1.join)(gradleDirectory, PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE));
-};
-exports.copyGradleConfigFile = copyGradleConfigFile;
 const removeOldGradleConfig = (gradleFileContent) => {
     const gradleFileContentLines = gradleFileContent.split('\n');
     const gradleConfigIndex = [];

package/scripts/Config.js

@@ -10,10 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkConfiguration = exports.addDefaultConfigs = exports.readConfig = exports.defaultConfig = exports.ERROR_CONFIG_NOT_AVAILABLE = void 0;
+exports.checkConfiguration = exports.addDefaultConfigs = exports.readConfig = exports.readConfigDefault = exports.defaultConfig = exports.ERROR_CONFIG_NOT_AVAILABLE = void 0;
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const Logger_1 = require("./Logger");
 const PathsConstants_1 = require("./PathsConstants");
+const CustomArgumentUtil_1 = require("./util/CustomArgumentUtil");
+const path = require("path");
 exports.ERROR_CONFIG_NOT_AVAILABLE = '-1';
 exports.defaultConfig = {
     react: {
@@ -41,6 +43,14 @@ exports.defaultConfig = {
         },
     },
 };
+const readConfigDefault = () => {
+    const customArguments = (0, CustomArgumentUtil_1.readCustomArguments)();
+    const configPath = customArguments.isCustomConfigurationPathSet()
+        ? path.join(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath())
+        : PathsConstants_1.default.getConfigFilePath();
+    return (0, exports.readConfig)(configPath);
+};
+exports.readConfigDefault = readConfigDefault;
 const readConfig = (pathToConfig) => {
     patchMalformedConfiguration(pathToConfig);
     const readConfig = require(pathToConfig);

package/scripts/core/InstrumentCall.js

@@ -85,10 +85,9 @@ const instrumentCommand = () => {
                     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);
+                        android.writeGradleConfig(configAgent.android, pathToGradle);
                         android.ensureRuntimeScriptApplied(pathToAppGradle);
                     });
-                    android.copyGradleConfigFile(pathToGradle);
                     Logger_1.default.logMessageSync('  ✅ Finished Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
                 }
                 catch (e) {

package/scripts/core/LineOffsetAnalyzeCall.js

@@ -16,11 +16,7 @@ const diff_1 = require("diff");
 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)();
+const Config_1 = require("../../scripts/Config");
 class LineOffsetAnalyzer {
     constructor(options) {
         this.rootDir = (0, path_1.resolve)(options.projectRoot);
@@ -29,10 +25,15 @@ class LineOffsetAnalyzer {
         this.logFile = (0, path_1.resolve)(this.instrumentedDir, 'debug.log');
         this.appBundleInfo = options.appBundleInfo;
         this.sourcemapPath = options.sourcemapPath;
+        this.reactOptions = (0, Config_1.readConfigDefault)();
     }
     run() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.reactOptions.react.useLegacyJscodeshift) {
+                console.info('ℹ️ Skipping line offset analysis since this it not needed anymore for the new babel architecture.');
+                return;
+            }
             try {
                 const buildExists = yield FileOperationHelper_1.default.checkIfFileExists(this.instrumentedDir);
                 if (!buildExists) {
@@ -79,20 +80,13 @@ class LineOffsetAnalyzer {
                 };
                 yield fs.writeFile(this.outputFile, JSON.stringify(finalOutput, null, 2));
                 yield this.log(`✅ Line offsets written to ${this.outputFile}`, true);
-                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) {
+                if (!this.sourcemapPath && !this.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);
+                const loadedMap = yield this.loadSourceMap((_a = this.sourcemapPath) !== null && _a !== void 0 ? _a : this.reactOptions.react.sourcemap.androidSourcemapLocation);
                 if (loadedMap) {
                     const { map, path: originalMapPath } = loadedMap;
                     map.x_dynatrace_offset = mappings;
@@ -126,7 +120,7 @@ class LineOffsetAnalyzer {
     }
     log(msg, logOnScreen = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (ReactOptions_1.reactOptions && ReactOptions_1.reactOptions.react.debug && logOnScreen) {
+            if (this.reactOptions && this.reactOptions.react.debug && logOnScreen) {
                 Logger_1.default.logMessageSync(msg, Logger_1.default.INFO);
             }
             yield fs.appendFile(this.logFile, msg + '\n');

package/scripts/util/ReactOptions.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactOptions = void 0;
-const nodePath = require("path");
-const PathsConstants_1 = require("../../scripts/PathsConstants");
-const CustomArgumentUtil_1 = require("../util/CustomArgumentUtil");
-const config = require("../../scripts/Config");
-const customArguments = (0, CustomArgumentUtil_1.readCustomArguments)();
-let reactOptions;
-exports.reactOptions = reactOptions;
-try {
-    if (customArguments.isCustomConfigurationPathSet()) {
-        exports.reactOptions = reactOptions = config.readConfig(nodePath.join(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath()));
-    }
-    else {
-        exports.reactOptions = reactOptions = config.readConfig(nodePath.join(PathsConstants_1.default.getConfigFilePath()));
-    }
-}
-catch (_a) {
-    exports.reactOptions = reactOptions = undefined;
-}