@dynatrace/react-native-plugin 2.341.1 → 2.345.1

package/lib/next/navigation/useNavigationTracking.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useNavigationTracking = void 0;
+const react_1 = require("react");
+const react_native_1 = require("react-native");
+const NavigationTracker_1 = require("./NavigationTracker");
+const rootStateOf = (container) => container.getRootState();
+const useNavigationTracking = (navigationRef) => {
+    const appStateRef = (0, react_1.useRef)(react_native_1.AppState.currentState);
+    const unsubscribeRef = (0, react_1.useRef)(null);
+    const containerRef = (0, react_1.useRef)(null);
+    (0, react_1.useEffect)(() => {
+        var _a;
+        const container = navigationRef.current;
+        if (container === containerRef.current) {
+            return;
+        }
+        (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
+        unsubscribeRef.current = null;
+        containerRef.current = container;
+        if (!container) {
+            return;
+        }
+        unsubscribeRef.current = container.addListener('state', () => {
+            (0, NavigationTracker_1.reportScreenChange)((0, NavigationTracker_1.buildPathFromState)(rootStateOf(container)));
+        });
+        (0, NavigationTracker_1.reportScreenChange)((0, NavigationTracker_1.buildPathFromState)(rootStateOf(container)));
+    });
+    (0, react_1.useEffect)(() => {
+        return () => {
+            var _a;
+            (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
+            unsubscribeRef.current = null;
+            containerRef.current = null;
+        };
+    }, []);
+    (0, react_1.useEffect)(() => {
+        const subscription = react_native_1.AppState.addEventListener('change', (nextAppState) => {
+            const prevAppState = appStateRef.current;
+            appStateRef.current = nextAppState;
+            if (nextAppState !== 'active' && prevAppState === 'active') {
+                (0, NavigationTracker_1.reportScreenBackground)();
+            }
+            else if (nextAppState === 'active' &&
+                prevAppState !== 'active') {
+                (0, NavigationTracker_1.reportScreenResume)();
+            }
+        });
+        return () => {
+            subscription.remove();
+        };
+    }, []);
+};
+exports.useNavigationTracking = useNavigationTracking;

package/lib/next/userAction/NullUserAction.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NullUserAction = void 0;
+class NullUserAction {
+    getCustomName() {
+        return '';
+    }
+    isCompleteAutomatically() {
+        return false;
+    }
+    setCompleteAutomatically(enabled) { }
+    complete() { }
+    addEventProperty(key, value) { }
+}
+exports.NullUserAction = NullUserAction;

package/lib/next/userAction/UserActionConfiguration.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserActionConfiguration = void 0;
+class UserActionConfiguration {
+    constructor(customName, completeAutomatically = false) {
+        this.customName = customName;
+        this.completeAutomatically = completeAutomatically;
+    }
+}
+exports.UserActionConfiguration = UserActionConfiguration;

package/lib/next/userAction/UserActionImpl.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserActionImpl = void 0;
+const DynatraceBridge_1 = require("../../core/DynatraceBridge");
+const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
+const LogMessages_1 = require("../../core/logging/LogMessages");
+const Utils_1 = require("../util/Utils");
+const randomActionId = () => (0, Utils_1.randomHex)(16);
+class UserActionImpl {
+    constructor(configuration) {
+        this.completed = false;
+        this.logger = new ConsoleLogger_1.ConsoleLogger('UserAction');
+        this.customName = configuration.customName;
+        this.completeAutomatically = configuration.completeAutomatically;
+        this.actionId = randomActionId();
+        DynatraceBridge_1.DynatraceNative.createUserAction(this.actionId, this.customName, this.completeAutomatically, null);
+        this.logger.debug(LogMessages_1.LogMessage.USER_ACTION_CREATED, {
+            customName: this.customName,
+            completeAutomatically: this.completeAutomatically,
+            actionId: this.actionId,
+        });
+    }
+    getCustomName() {
+        return this.customName;
+    }
+    isCompleteAutomatically() {
+        return this.completeAutomatically;
+    }
+    setCompleteAutomatically(enabled) {
+        if (this.completed) {
+            return;
+        }
+        this.logger.debug(LogMessages_1.LogMessage.USER_ACTION_SET_COMPLETE_AUTOMATICALLY, {
+            enabled,
+            customName: this.customName,
+        });
+        this.completeAutomatically = enabled;
+        DynatraceBridge_1.DynatraceNative.setCompleteUserActionAutomatically(this.actionId, enabled);
+    }
+    complete() {
+        if (this.completed) {
+            return;
+        }
+        this.completed = true;
+        this.logger.debug(LogMessages_1.LogMessage.USER_ACTION_COMPLETE, {
+            customName: this.customName,
+        });
+        DynatraceBridge_1.DynatraceNative.completeUserAction(this.actionId);
+    }
+    addEventProperty(key, value) {
+        if (this.completed) {
+            return;
+        }
+        this.logger.debug(LogMessages_1.LogMessage.USER_ACTION_ADD_EVENT_PROPERTY, {
+            key,
+            value: String(value),
+            customName: this.customName,
+        });
+        if (typeof value === 'string') {
+            DynatraceBridge_1.DynatraceNative.addEventStringPropertyToUserAction(this.actionId, key, value);
+        }
+        else if (typeof value === 'number') {
+            DynatraceBridge_1.DynatraceNative.addEventDoublePropertyToUserAction(this.actionId, key, value);
+        }
+        else {
+            DynatraceBridge_1.DynatraceNative.addEventBooleanPropertyToUserAction(this.actionId, key, value);
+        }
+    }
+}
+exports.UserActionImpl = UserActionImpl;

package/lib/next/util/TraceContextUtils.js

@@ -4,6 +4,7 @@ exports.trimTraceState = exports.generateTracestate = exports.generateTraceparen
 const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
 const LogMessages_1 = require("../../core/logging/LogMessages");
 const ConfigurationHandler_1 = require("../../core/configuration/ConfigurationHandler");
+const Utils_1 = require("./Utils");
 const logger = new ConsoleLogger_1.ConsoleLogger('TraceContextUtils');
 const parseTraceparent = (traceparent) => {
     const traceparentRegex = /^[0-9a-f]{2}-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})$/i;
@@ -26,27 +27,18 @@ const parseTraceparent = (traceparent) => {
 exports.parseTraceparent = parseTraceparent;
 const allZeros = (str) => /^0*$/.test(str);
 const generateTraceparentHeader = () => {
-    let traceId = randomHex(32);
+    let traceId = (0, Utils_1.randomHex)(32);
     if (/^0+$/.test(traceId)) {
         traceId = '1' + traceId.slice(1);
     }
-    let spanId = randomHex(16);
+    let spanId = (0, Utils_1.randomHex)(16);
     if (/^0+$/.test(spanId)) {
         spanId = '1' + spanId.slice(1);
     }
     return `00-${traceId}-${spanId}-01`;
 };
 exports.generateTraceparentHeader = generateTraceparentHeader;
-const randomHex = (length) => {
-    let hex = '';
-    while (hex.length < length) {
-        hex += Math.floor(Math.random() * 0xffffffff)
-            .toString(16)
-            .padStart(8, '0');
-    }
-    return hex.slice(0, length);
-};
-const generateTracestate = (parentId, existingTracestate) => {
+const generateTracestate = (parentId, traceparentFromDynatrace, existingTracestate) => {
     const instanceId = ConfigurationHandler_1.ConfigurationHandler.getInstanceId();
     const sessionId = ConfigurationHandler_1.ConfigurationHandler.getSessionId();
     const applicationId = ConfigurationHandler_1.ConfigurationHandler.getApplicationId();
@@ -55,10 +47,12 @@ const generateTracestate = (parentId, existingTracestate) => {
         !(instanceId && sessionId && applicationId && tracestateKeyPrefix)) {
         return undefined;
     }
-    const version = 1;
     const originMarker = 'dtr';
+    const version = 2;
     const capture = 0;
-    let tracestate = `${tracestateKeyPrefix}@${originMarker}=${version};${parentId};${capture};${formatApplicationId(applicationId)};${instanceId};${sessionId}`;
+    const formattedApplicationId = formatApplicationId(applicationId);
+    const tpSource = traceparentFromDynatrace ? 1 : 2;
+    let tracestate = `${tracestateKeyPrefix}@${originMarker}=${version};${parentId};${capture};${formattedApplicationId};${instanceId};${sessionId};${tpSource}`;
     if (typeof existingTracestate === 'string' && existingTracestate.trim()) {
         tracestate += `,${existingTracestate}`;
     }

package/lib/next/util/Utils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomHex = void 0;
+const randomHex = (length) => {
+    let hex = '';
+    while (hex.length < length) {
+        hex += Math.floor(Math.random() * 0xffffffff)
+            .toString(16)
+            .padStart(8, '0');
+    }
+    return hex.slice(0, length);
+};
+exports.randomHex = randomHex;

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.341.1",
+  "version": "2.345.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",
   "bin": {
     "instrumentDynatrace": "scripts/Instrument.js",
-    "configDynatrace": "scripts/CheckConfig.js",
-    "lineOffsetDynatrace": "scripts/LineOffsetAnalyze.js"
+    "configDynatrace": "scripts/CheckConfig.js"
   },
   "keywords": [
     "react-native",
@@ -22,6 +21,7 @@
     "plugin": "./command/command.js"
   },
   "scripts": {
+    "postinstall": "node ./scripts/Install.js",
     "uninstall": "node ./scripts/Uninstall.js",
     "test": "jest --runInBand",
     "test:coverage": "jest --runInBand --coverage",
@@ -50,7 +50,6 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@babel/runtime": "^8.0.0",
-    "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
     "semver": "^7.8.5"
@@ -58,18 +57,13 @@
   "homepage": "https://www.dynatrace.com/",
   "peerDependencies": {
     "@babel/core": ">=7.4.4",
-    "diff": "^8.0.2",
     "react": ">=16.11.0",
     "react-native": ">=0.62.0"
   },
   "overrides": {
-    "jscodeshift": {
-      "ast-types": "npm:ast-types-x"
-    },
-    "ast-types": "npm:ast-types-x",
-    "flow-parser": "0.160",
-    "tmp": ">=0.2.6",
-    "ws": "^7.5.11"
+    "ws": "^8.21.1",
+    "js-yaml": "^5.2.2",
+    "brace-expansion": "5.0.9"
   },
   "devDependencies": {
     "@babel/plugin-transform-class-properties": "^7.27.1",
@@ -77,6 +71,7 @@
     "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
     "@babel/plugin-transform-optional-chaining": "^7.27.1",
     "@babel/preset-env": "^7.27.2",
+    "@babel/preset-flow": "^7.27.1",
     "@babel/preset-react": "^7.27.1",
     "@react-native-picker/picker": "^2.11.4",
     "@react-native/babel-preset": "^0.80.1",
@@ -84,7 +79,6 @@
     "@react-navigation/drawer": "^7.7.2",
     "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^30.0.0",
-    "@types/jscodeshift": "^17.3.0",
     "@types/micromatch": "^4.0.10",
     "@types/node": "^18.19.123",
     "@types/plist": "^3.0.5",
@@ -95,7 +89,6 @@
     "@typescript-eslint/eslint-plugin": "^8.56.0",
     "@typescript-eslint/parser": "^8.56.0",
     "compressing": "^1.10.3",
-    "diff": "^8.0.2",
     "eslint": "^9.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.32.0",
@@ -129,6 +122,7 @@
     "index.js",
     "public.js",
     "internal.js",
+    "internal.d.ts",
     "react-augmentation.js",
     "README.md",
     "LICENSE.md",
@@ -154,8 +148,6 @@
     "instrumentation/libs/react-native/*.js",
     "instrumentation/libs/react-native/Touchables.jsx",
     "instrumentation/model/*.js",
-    "instrumentation/parser/*.js",
-    "instrumentation/DynatraceInstrumentation.js",
     "instrumentation/BabelPluginDynatrace.js",
     "lib/*.js",
     "lib/core/*.js",
@@ -165,7 +157,6 @@
     "lib/core/model/*.js",
     "lib/core/util/*.js",
     "lib/core/*.js",
-    "lib/metro/*.js",
     "lib/next/*.js",
     "lib/next/appstart/*.js",
     "lib/next/configuration/*.js",
@@ -175,7 +166,8 @@
     "lib/next/events/spec/*.js",
     "lib/next/util/*.js",
     "lib/next/provider/*.js",
-    "lib/features/ui-interaction/*.js",
+    "lib/next/userAction/*.js",
+    "lib/next/navigation/*.js",
     "src/lib/core/interface/NativeDynatraceBridge.ts",
     "types.d.ts"
   ],

package/public.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.useNavigationTracking = exports.UserActionConfiguration = 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");
@@ -25,4 +25,8 @@ var SessionPropertyEventData_1 = require("./lib/next/events/SessionPropertyEvent
 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; } });
+var UserActionConfiguration_1 = require("./lib/next/userAction/UserActionConfiguration");
+Object.defineProperty(exports, "UserActionConfiguration", { enumerable: true, get: function () { return UserActionConfiguration_1.UserActionConfiguration; } });
+var useNavigationTracking_1 = require("./lib/next/navigation/useNavigationTracking");
+Object.defineProperty(exports, "useNavigationTracking", { enumerable: true, get: function () { return useNavigationTracking_1.useNavigationTracking; } });
 require("./react-augmentation");

package/react-native-dynatrace.podspec

@@ -12,10 +12,17 @@ Pod::Spec.new do |s|
   s.version       = package['version']
   s.summary       = package['description'] 
   s.homepage      = package['homepage'] 
-  s.ios.deployment_target = "12.0"
-  s.tvos.deployment_target = "12.0"
+  s.ios.deployment_target = "15.0"
+  s.tvos.deployment_target = "15.0"
   s.source_files  = ["ios/*.{h,mm}"]
 
+  # Build-time off-switch for screenshot self-monitoring (replay metrics), passed at `pod install`:
+  #   DYNATRACE_REPLAY_METRICS_ENABLED=0 pod install
+  # Defaults to enabled; when set to 0 the monitor is compiled out (DynatraceRNBridge.mm #if guard).
+  if ENV['DYNATRACE_REPLAY_METRICS_ENABLED'] == '0'
+    s.prefix_header_contents = '#define DTX_REPLAY_METRICS_ENABLED 0'
+  end
+
   s.license = { :type => 'Commercial', :text => 'https://github.com/Dynatrace/dem-license/blob/main/LICENSE.md'} 
 
   # ---  License  ----------------------------------------------------------- #
@@ -111,7 +118,7 @@ Pod::Spec.new do |s|
   #
   
   s.dependency "React"
-  s.dependency 'Dynatrace', '~> 8.341.1.1010'
+  s.dependency 'Dynatrace', '~> 8.345.1.1003'
 
   # Allows for better compatibility for older and newer versions
   if defined?(install_modules_dependencies)

package/scripts/Android.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRuntimeScriptApplied = exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_RUNTIME_SCRIPT_KTS = exports.GRADLE_APPLY_RUNTIME_SCRIPT = exports.GRADLE_APPLY_BUILDSCRIPT_KTS = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE_KTS = exports.GRADLE_DYNATRACE_FILE = void 0;
+exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_BUILDSCRIPT_KTS = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE_KTS = exports.GRADLE_DYNATRACE_FILE = void 0;
 const path_1 = require("path");
 const Logger_1 = require("./Logger");
 const FileOperationHelper_1 = require("./FileOperationHelper");
@@ -14,19 +14,15 @@ const GRADLE_BUILDSCRIPT_IDENTIFIER = 'buildscript';
 exports.GRADLE_APPLY_BUILDSCRIPT = 'apply from: "../node_modules/@dynatrace/react-native-plugin/files/plugin.gradle", to: buildscript';
 exports.GRADLE_APPLY_BUILDSCRIPT_KTS = 'apply(from = "../node_modules/@dynatrace/react-native-plugin/files/plugin.gradle", to = buildscript)';
 const GRADLE_REACT_NATIVE_PLUGIN = 'apply plugin: "com.facebook.react.rootproject"';
-exports.GRADLE_APPLY_RUNTIME_SCRIPT = 'apply from: "../../node_modules/@dynatrace/react-native-plugin/files/plugin-runtime.gradle"';
-exports.GRADLE_APPLY_RUNTIME_SCRIPT_KTS = 'apply(from = "../../node_modules/@dynatrace/react-native-plugin/files/plugin-runtime.gradle")';
 const isKotlinDslGradleFile = (pathToGradle) => pathToGradle.endsWith('.gradle.kts');
 const getGradleStatements = (pathToGradle) => isKotlinDslGradleFile(pathToGradle)
     ? {
         applyBuildscript: exports.GRADLE_APPLY_BUILDSCRIPT_KTS,
         dynatraceFile: exports.GRADLE_DYNATRACE_FILE_KTS,
-        runtimeScript: exports.GRADLE_APPLY_RUNTIME_SCRIPT_KTS,
     }
     : {
         applyBuildscript: exports.GRADLE_APPLY_BUILDSCRIPT,
         dynatraceFile: exports.GRADLE_DYNATRACE_FILE,
-        runtimeScript: exports.GRADLE_APPLY_RUNTIME_SCRIPT,
     };
 const instrumentAndroidPlatform = (pathToGradle, remove) => {
     const path = FileOperationHelper_1.default.checkIfFileExistsSync(pathToGradle);
@@ -165,18 +161,3 @@ const removeOldGradleConfig = (gradleFileContent) => {
     gradleFileContentLines.splice(gradleConfigIndex[0] + 1, gradleConfigIndex[1] - (gradleConfigIndex[0] + 1));
     return gradleFileContentLines;
 };
-const ensureRuntimeScriptApplied = (pathToGradle) => {
-    const gradleContent = FileOperationHelper_1.default.readTextFromFileSync(pathToGradle);
-    const gradleLines = gradleContent.split('\n');
-    const { runtimeScript } = getGradleStatements(pathToGradle);
-    const alreadyApplied = gradleLines.some((line) => line.includes('plugin-runtime.gradle'));
-    if (!alreadyApplied) {
-        gradleLines.push(runtimeScript);
-        FileOperationHelper_1.default.writeTextToFileSync(pathToGradle, gradleLines.join('\n'));
-        Logger_1.default.logMessageSync(`Added runtime script to ${pathToGradle}`, Logger_1.default.INFO);
-    }
-    else {
-        Logger_1.default.logMessageSync(`Runtime script already present in ${pathToGradle}`, Logger_1.default.INFO);
-    }
-};
-exports.ensureRuntimeScriptApplied = ensureRuntimeScriptApplied;

package/scripts/Config.js

@@ -12,6 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkConfiguration = exports.addDefaultConfigs = exports.readConfig = exports.readConfigDefault = exports.defaultConfig = exports.ERROR_CONFIG_NOT_AVAILABLE = void 0;
 const path = require("node:path");
+const node_fs_1 = require("node:fs");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const Logger_1 = require("./Logger");
 const PathsConstants_1 = require("./PathsConstants");
@@ -37,17 +38,23 @@ exports.defaultConfig = {
             enabled: true,
         },
         userInteraction: true,
-        sourcemap: {
-            enabled: true,
-            androidSourcemapLocation: 'app/build/generated/sourcemaps/react/release/index.android.bundle.map',
-        },
     },
 };
 const readConfigDefault = () => {
     const customArguments = (0, CustomArgumentUtil_1.readCustomArguments)();
-    const configPath = customArguments.isCustomConfigurationPathSet()
-        ? path.resolve(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath())
-        : PathsConstants_1.default.getConfigFilePath();
+    let configPath;
+    if (customArguments.isCustomConfigurationPathSet()) {
+        configPath = path.resolve(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath());
+    }
+    else {
+        const envConfig = process.env.DYNATRACE_CONFIG;
+        if (envConfig === undefined || envConfig.trim() === '') {
+            configPath = PathsConstants_1.default.getConfigFilePath();
+        }
+        else {
+            configPath = path.resolve(PathsConstants_1.default.getApplicationPath(), envConfig.trim());
+        }
+    }
     return (0, exports.readConfig)(configPath);
 };
 exports.readConfigDefault = readConfigDefault;
@@ -87,6 +94,9 @@ const logConfigCreatedMessage = () => {
     Logger_1.default.logMessageSync(message, Logger_1.default.INFO);
 };
 const patchMalformedConfiguration = (pathToDynatraceConfig) => {
+    if (!(0, node_fs_1.existsSync)(pathToDynatraceConfig)) {
+        return;
+    }
     const configContent = FileOperationHelper_1.default.readTextFromFileSync(pathToDynatraceConfig);
     if (configContent.indexOf('\u200B') !== -1) {
         FileOperationHelper_1.default.writeTextToFileSync(pathToDynatraceConfig, configContent.split('\u200B').join(''));

package/scripts/Deprecations.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEPRECATIONS = exports.readInstalledPackageVersion = void 0;
+const node_path_1 = require("node:path");
+const FileOperationHelper_1 = require("./FileOperationHelper");
+const PathsConstants_1 = require("./PathsConstants");
+const readInstalledPackageVersion = (packageName) => {
+    var _a;
+    try {
+        const raw = FileOperationHelper_1.default.readTextFromFileSync((0, node_path_1.join)(PathsConstants_1.default.getApplicationPath(), 'node_modules', packageName, 'package.json'));
+        return (_a = JSON.parse(raw).version) !== null && _a !== void 0 ? _a : null;
+    }
+    catch (_b) {
+        return null;
+    }
+};
+exports.readInstalledPackageVersion = readInstalledPackageVersion;
+exports.DEPRECATIONS = [];

package/scripts/Install.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const DeprecationReport_1 = require("./util/DeprecationReport");
+const Logger_1 = require("./Logger");
+module.exports = (() => {
+    try {
+        (0, DeprecationReport_1.showDeprecationWarnings)();
+        Logger_1.default.closeLogFile();
+    }
+    catch (_a) {
+    }
+})();

package/scripts/PathsConstants.js

@@ -30,10 +30,6 @@ exports.default = {
     getPackageJsonFile() {
         return (0, node_path_1.join)(this.getApplicationPath(), 'package.json');
     },
-    getMetroSouceMapPath() {
-        return (0, node_path_1.join)(this.getApplicationPath(), 'node_modules', 'metro', 'src', 'DeltaBundler', 'Serializers', 'helpers');
-    },
-    getOurSourceMapFile: () => (0, node_path_1.join)(getPluginPath(), 'lib', 'metro', 'getSourceMapInfo.js'),
     getInternalPackageJsonFile: () => (0, node_path_1.join)(getPluginPath(), 'package.json'),
     getDefaultConfig: () => (0, node_path_1.join)(getPluginPath(), PATH_FILES, 'default.config.js'),
     getBuildPath: () => (0, node_path_1.join)(getPluginPath(), 'build'),

package/scripts/Uninstall.js

@@ -16,20 +16,6 @@ const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
 const android = require("./Android");
 const Ios_1 = require("./Ios");
-const removePatchMetroSourceMap = () => __awaiter(void 0, void 0, void 0, function* () {
-    Logger_1.default.logMessageSync('Undo Patching SourceMap generation of Metro .. ', Logger_1.default.INFO);
-    try {
-        const currentSourceMapPath = nodePath.join(PathsConstants_1.default.getMetroSouceMapPath(), 'getSourceMapInfo.js');
-        const origSourceMapPath = nodePath.join(PathsConstants_1.default.getMetroSouceMapPath(), 'getSourceMapInfoOrig.js');
-        yield FileOperationHelper_1.default.checkIfFileExists(origSourceMapPath);
-        yield FileOperationHelper_1.default.deleteFile(currentSourceMapPath);
-        yield FileOperationHelper_1.default.renameFile(origSourceMapPath, currentSourceMapPath);
-        Logger_1.default.logMessageSync('Removed patch for SourceMap generation of Metro!', Logger_1.default.INFO);
-    }
-    catch (e) {
-        Logger_1.default.logMessageSync('Removing of patch for SourceMap generation failed!', Logger_1.default.ERROR);
-    }
-});
 const removeGradleModification = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const path = yield FileOperationHelper_1.default.checkIfFileExists(nodePath.join(PathsConstants_1.default.getAndroidFolder(), 'build.gradle'));
@@ -48,7 +34,6 @@ const removePListModification = () => __awaiter(void 0, void 0, void 0, function
     }
 });
 module.exports = (() => __awaiter(void 0, void 0, void 0, function* () {
-    yield removePatchMetroSourceMap();
     yield removeGradleModification();
     yield removePListModification();
 }))();

package/scripts/core/InstrumentCall.js

@@ -8,9 +8,9 @@ const android = require("../Android");
 const PathsConstants_1 = require("../PathsConstants");
 const Ios_1 = require("../Ios");
 const InstrumentUtil_1 = require("../util/InstrumentUtil");
+const DeprecationReport_1 = require("../util/DeprecationReport");
 const CustomArgumentUtil_1 = require("../util/CustomArgumentUtil");
 const Platform_1 = require("../api/model/Platform");
-const SourceMapUtil_1 = require("../util/SourceMapUtil");
 const platformLogPrefix = { info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' };
 const logHelpMessage = () => {
     const iOSDefaultPath = (0, node_path_1.join)(PathsConstants_1.default.getIOSFolder(), '<appName>', 'Info.plist');
@@ -20,6 +20,10 @@ const logHelpMessage = () => {
 
         Options:
             --help                          Show this help message and exit.
+            --reset                         Clear any previously-persisted custom config path and
+                                            revert the Metro/Babel transformer to the default
+                                            dynatrace.config.js lookup. Use this if you previously
+                                            ran with config="..." and want to go back to the default.
             config="/custom/path/to/dynatrace.config.js"
                                             Specify a custom path to the Dynatrace configuration file.
                                             Default: ${PathsConstants_1.default.getConfigFilePath()}
@@ -38,14 +42,13 @@ const logHelpMessage = () => {
             npx instrumentDynatrace config="/custom/path/to/dynatrace.config.js"
             npx instrumentDynatrace gradle="/custom/path/to/build.gradle"
             npx instrumentDynatrace plist="/custom/path/to/Info.plist"
+            npx instrumentDynatrace --reset
         `, Logger_1.default.INFO);
 };
 const persistCustomArguments = (argv) => {
-    if (argv.isEmpty()) {
-        (0, CustomArgumentUtil_1.clearCustomArguments)();
-        return;
+    if (!argv.isEmpty()) {
+        (0, CustomArgumentUtil_1.writeCustomArguments)(argv);
     }
-    (0, CustomArgumentUtil_1.writeCustomArguments)(argv);
 };
 const resolveInstrumentationPaths = (argv) => {
     let pathToConfig = PathsConstants_1.default.getConfigFilePath();
@@ -90,7 +93,6 @@ const instrumentAndroidIfAvailable = (androidAvailable, pathToGradle, pathToAppG
         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);
     }
@@ -125,7 +127,6 @@ const runPlatformInstrumentation = (paths, availability) => {
         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) {
@@ -140,8 +141,14 @@ const instrumentCommand = () => {
         logHelpMessage();
         return;
     }
+    if (commandArgs.includes('--reset')) {
+        (0, CustomArgumentUtil_1.clearCustomArguments)();
+        Logger_1.default.logMessageSync('✅ Custom config path cleared. Metro/Babel transformer will use dynatrace.config.js.', Logger_1.default.INFO);
+        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, DeprecationReport_1.showDeprecationWarnings)();
     const argv = (0, CustomArgumentUtil_1.parseCommandLine)(commandArgs.slice(2));
     persistCustomArguments(argv);
     const instrumentationPaths = resolveInstrumentationPaths(argv);

package/scripts/util/DeprecationReport.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.showDeprecationWarnings = void 0;
+const Logger_1 = require("../Logger");
+const Deprecations_1 = require("../Deprecations");
+const formatEntry = (entry) => `⚠️  Deprecation [${entry.id}]: ${entry.description}\n` +
+    `    Deprecated since: plugin v${entry.deprecatedSince}\n` +
+    `    Removal planned:  plugin v${entry.removalVersion}\n` +
+    `    Migration: ${entry.migration}`;
+const showDeprecationWarnings = () => {
+    for (const entry of Deprecations_1.DEPRECATIONS) {
+        let applicable;
+        try {
+            applicable = entry.isApplicable();
+        }
+        catch (_a) {
+            applicable = false;
+        }
+        if (applicable) {
+            Logger_1.default.logMessageSync(formatEntry(entry), Logger_1.default.WARNING);
+        }
+    }
+};
+exports.showDeprecationWarnings = showDeprecationWarnings;