@dynatrace/react-native-plugin 2.321.1 → 2.323.1

package/lib/next/Dynatrace.js

@@ -44,6 +44,7 @@ class DynatraceImpl {
         if (isApiReported) {
             event["characteristics.is_api_reported"] =
                 true;
+            event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
     }
@@ -54,6 +55,7 @@ class DynatraceImpl {
         if (isApiReported) {
             event["characteristics.is_api_reported"] =
                 true;
+            event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
     }
@@ -64,6 +66,7 @@ class DynatraceImpl {
         if (isApiReported) {
             event["characteristics.is_api_reported"] =
                 true;
+            event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
     }

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.20';
+const SPECIFICATION_VERSION = '0.21';
 exports.MAX_CUSTOM_EVENT_FIELDS = 50;
 exports.MAX_CUSTOM_EVENT_KEY_LENGTH = 100;
 exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = 5000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.321.1",
+  "version": "2.323.1",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "typings/react-native-dynatrace.d.ts",
@@ -46,7 +46,7 @@
   "author": "Dynatrace",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@babel/runtime": "^7.28.3",
+    "@babel/runtime": "^7.28.4",
     "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
@@ -78,7 +78,7 @@
     "@testing-library/react-native": "^13.2.0",
     "@types/jest": "^30.0.0",
     "@types/jscodeshift": "^17.3.0",
-    "@types/node": "^18.19.71",
+    "@types/node": "^18.19.123",
     "@types/plist": "^3.0.5",
     "@types/react": "^19.1.8",
     "@types/semver": "^7.7.0",
@@ -101,6 +101,7 @@
     "jest-mock": "^30.0.2",
     "npm-check-updates": "^18.0.1",
     "prettier": "^2.6.1",
+    "react-native-gesture-handler": "^2.28.0",
     "shelljs": "^0.10.0",
     "ts-jest": "^29.4.0",
     "typescript": "^4.7.4",
@@ -154,7 +155,8 @@
     "lib/next/events/modifier/*.js",
     "lib/next/events/spec/*.js",
     "lib/next/provider/*.js",
-    "src/lib/core/interface/NativeDynatraceBridge.ts"
+    "src/lib/core/interface/NativeDynatraceBridge.ts",
+    "src/instrumentation/jsx/IDynatraceProperties.ts"
   ],
   "codegenConfig": {
     "name": "DynatraceBridgeSpec",

package/react-native-dynatrace.podspec

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

package/scripts/Ios.js

@@ -186,7 +186,7 @@ const createNewPListIfRequired = (parsedPList, configProps, pathToPList) => {
     const configIncludingFlavor = configProps + getAdditionalInternalPluginKeys() + updatedExcludedStr(configProps);
     if (isPropertyCountEqual(parsedPList, configIncludingFlavor) && comparePListAndConfig(parsedPList, configIncludingFlavor)) {
         Logger_1.default.logMessageSync('Not generating a new plist as the current plist and ' +
-            '   dynatrace.config.js iOS properties are identical!', Logger_1.default.INFO);
+            'dynatrace.config.js iOS properties are identical!', Logger_1.default.INFO);
     }
     else {
         Logger_1.default.logMessageSync('Generating a new plist as the current plist ' +

package/scripts/Logger.js

@@ -41,19 +41,23 @@ const logMessageSync = (_message, _logLevel, _onlyConsole = false) => {
     catch (e) {
     }
     let logString;
+    let prefix = '';
     if (_logLevel === INFO) {
         logString = '#INFO  ';
+        prefix = _prefix.info;
     }
     else if (_logLevel === WARNING) {
         logString = '#WARN  ';
+        prefix = _prefix.warning;
     }
     else if (_logLevel === ERROR) {
         logString = '#ERROR ';
+        prefix = _prefix.error;
     }
     else {
         logString = '#NONE  ';
     }
-    const outputString = logString + '[' + currentDate() + ']: ' + _message;
+    const outputString = logString + '[' + currentDate() + ']: ' + prefix + _message;
     console.log(outputString);
     if (!_onlyConsole) {
         fs.appendFileSync(PathsConstants_1.default.getCurrentLogPath(), outputString + '\r\n');
@@ -67,10 +71,25 @@ const currentDate = () => {
     const localISOTime = (new Date(Date.now() - tzoffset)).toISOString().slice(0, -5);
     return localISOTime.replace('T', ' ');
 };
+const noPrefix = {
+    info: '',
+    warning: '',
+    error: '',
+};
+let _prefix = noPrefix;
 exports.default = {
     ERROR,
     INFO,
     WARNING,
+    withPrefix(prefix, callback) {
+        try {
+            _prefix = Object.assign(Object.assign({}, _prefix), prefix);
+            return callback();
+        }
+        finally {
+            _prefix = noPrefix;
+        }
+    },
     closeLogFile,
     logMessageSync,
     logErrorSync,

package/scripts/core/InstrumentCall.js

@@ -6,14 +6,42 @@ 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 = () => {
-    Logger_1.default.logMessageSync('Starting instrumentation of React Native application ..', Logger_1.default.INFO);
-    (0, InstrumentUtil_1.showVersionOfPlugin)();
+    if (process.argv.includes('--help')) {
+        Logger_1.default.logMessageSync(`
+        Usage: npx instrumentDynatrace [options]
+
+        Options:
+            --help                          Show this help message and exit.
+            config="/custom/path/to/dynatrace.config.js"
+                                            Specify a custom path to the Dynatrace configuration file.
+                                            Default: ${PathsConstants_1.default.getConfigFilePath()}
+            gradle="/custom/path/to/build.gradle(.kts)"
+                                            Specify a custom path to the top level build.gradle file of your android project.
+                                            Default: ${PathsConstants_1.default.getAndroidGradleFile(PathsConstants_1.default.getAndroidFolder())}
+            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")}
+                                            in that order
+
+        Examples:
+            npx instrumentDynatrace
+            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"
+        `, 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)());
     let pathToConfig = PathsConstants_1.default.getConfigFilePath();
     let pathToGradle = PathsConstants_1.default.getAndroidGradleFile(PathsConstants_1.default.getAndroidFolder());
     const pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile(PathsConstants_1.default.getAndroidFolder());
@@ -30,69 +58,69 @@ const instrumentCommand = () => {
     if (argv.isCustomConfigurationPathSet()) {
         pathToConfig = argv.getCustomConfigurationPath();
     }
-    if (argv.isCustomGradlePathSet()) {
-        pathToGradle = argv.getCustomGradlePath();
-        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);
-    }
-    else {
-        iosAvailable = (0, InstrumentUtil_1.isPlatformAvailable)(PathsConstants_1.default.getIOSFolder(), Platform_1.Platform.IOS);
-    }
+    Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' }, () => {
+        if (argv.isCustomGradlePathSet()) {
+            pathToGradle = argv.getCustomGradlePath();
+            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);
+        }
+        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);
     if (iosAvailable || androidAvailable) {
         try {
-            Logger_1.default.logMessageSync('Trying to read configuration file: ' + pathToConfig, Logger_1.default.INFO);
+            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);
-                    android.instrumentAndroidPlatform(pathToGradle, false);
-                    android.writeGradleConfig(configAgent.android);
-                    android.ensureRuntimeScriptApplied(pathToAppGradle);
+                    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.ensureRuntimeScriptApplied(pathToAppGradle);
+                    });
                     android.copyGradleConfigFile(pathToGradle);
+                    Logger_1.default.logMessageSync('  ✅ Finished Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
                 }
                 catch (e) {
                     if (e instanceof Error) {
-                        Logger_1.default.logMessageSync(e.message, Logger_1.default.ERROR);
+                        Logger_1.default.logMessageSync('  ❌ Android Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
                     }
                 }
-                finally {
-                    Logger_1.default.logMessageSync('Finished Android Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                }
             }
             if (iosAvailable) {
                 try {
-                    Logger_1.default.logMessageSync('Starting iOS Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                    Ios_1.default.modifyPListFile(pathToPList, configAgent.ios, false);
+                    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(e.message, Logger_1.default.ERROR);
+                        Logger_1.default.logMessageSync('  ❌ iOS Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
                     }
                 }
-                finally {
-                    Logger_1.default.logMessageSync('Finished iOS Instrumentation with Dynatrace!', Logger_1.default.INFO);
-                }
             }
             (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(e.message, Logger_1.default.ERROR);
+                Logger_1.default.logMessageSync('❌ Instrumentation failed: ' + e.message, Logger_1.default.ERROR);
             }
         }
     }
     else {
-        Logger_1.default.logMessageSync('Both Android and iOS Folder are not available - Skip instrumentation.', Logger_1.default.WARNING);
+        Logger_1.default.logMessageSync('⚠️  Both Android and iOS Folder are not available - Skip instrumentation.', Logger_1.default.WARNING);
     }
-    Logger_1.default.logMessageSync('Finished instrumentation of React Native application ..', Logger_1.default.INFO);
     Logger_1.default.closeLogFile();
 };
 exports.instrumentCommand = instrumentCommand;

package/scripts/core/LineOffsetAnalyzeCall.js

@@ -16,6 +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");
 class LineOffsetAnalyzer {
     constructor(options) {
         this.rootDir = (0, path_1.resolve)(options.projectRoot);
@@ -32,26 +33,26 @@ class LineOffsetAnalyzer {
             try {
                 const buildExists = yield FileOperationHelper_1.default.checkIfFileExists(this.instrumentedDir);
                 if (!buildExists) {
-                    yield this.log(`❌ Build directory not found at: ${this.instrumentedDir}`);
-                    yield this.log('🛠️ Please run the instrumentation step first!');
-                    console.error('🚫 Build directory missing. Make and instrument the project first.');
+                    yield this.log(`❌ Build directory not found at: ${this.instrumentedDir}`, true);
+                    yield this.log('🛠️ Please run the instrumentation step first!', true);
+                    console.error('🚫 Build directory missing. Make and instrument the project first.', true);
                     process.exit(1);
                 }
                 yield fs.writeFile(this.logFile, '');
                 const instrumentedFiles = (yield FileOperationHelper_1.default.getAllFiles(this.log, this.instrumentedDir))
                     .filter((filePath) => filePath.endsWith(InstrumentUtil_1.INSTRUMENTED_FILE_EXTENSION));
                 const mappings = {};
-                yield this.log(`🔍 Found ${instrumentedFiles.length} instrumented files`);
+                yield this.log(`🔍 Found ${instrumentedFiles.length} instrumented files`, true);
                 for (const instrRelPath of instrumentedFiles) {
                     const baseRelPath = instrRelPath.slice(0, -InstrumentUtil_1.INSTRUMENTED_FILE_EXTENSION.length);
                     const origPath = (0, path_1.join)(this.rootDir, baseRelPath);
                     const instrPath = (0, path_1.join)(this.instrumentedDir, instrRelPath);
                     const origExists = yield FileOperationHelper_1.default.checkIfFileExists(origPath);
                     if (!origExists) {
-                        yield this.log(`⚠️ Original file not found for: ${baseRelPath}`);
+                        yield this.log(`⚠️ Original file not found for: ${baseRelPath}`, true);
                         continue;
                     }
-                    yield this.log(`📄 Comparing: ${baseRelPath}`);
+                    yield this.log(`📄 Comparing: ${baseRelPath}`, true);
                     const [originalContent, instrumentedContent] = yield Promise.all([
                         FileOperationHelper_1.default.readTextFromFile(origPath),
                         FileOperationHelper_1.default.readTextFromFile(instrPath),
@@ -59,10 +60,10 @@ class LineOffsetAnalyzer {
                     const offsets = this.computeLineOffsets(originalContent, instrumentedContent);
                     if (offsets.length > 0) {
                         mappings[baseRelPath] = offsets;
-                        yield this.log(`✅ Offsets found for ${baseRelPath}: ${offsets.length} entries`);
+                        yield this.log(`✅ Offsets found for ${baseRelPath}: ${offsets.length} entries`, true);
                     }
                     else {
-                        yield this.log(`ℹ️ No offsets needed for ${baseRelPath}`);
+                        yield this.log(`ℹ️ No offsets needed for ${baseRelPath}`, true);
                     }
                 }
                 const finalOutput = {
@@ -74,7 +75,7 @@ class LineOffsetAnalyzer {
                     },
                 };
                 yield fs.writeFile(this.outputFile, JSON.stringify(finalOutput, null, 2));
-                yield this.log(`✅ Line offsets written to ${this.outputFile}`);
+                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();
@@ -117,22 +118,24 @@ class LineOffsetAnalyzer {
                     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}`);
+                    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}`);
+                    yield this.log(`⚠️ Failed to load or parse source map at ${mapPath}: ${err.message}`, true);
                 }
             }
             if (!foundAny) {
-                yield this.log('❌ No valid source map found in any of the expected locations.');
+                yield this.log('❌ No valid source map found in any of the expected locations.', true);
             }
             return null;
         });
     }
-    log(msg) {
+    log(msg, logOnScreen = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            Logger_1.default.logMessageSync(msg, Logger_1.default.INFO);
+            if (ReactOptions_1.reactOptions && ReactOptions_1.reactOptions.react.debug && logOnScreen) {
+                Logger_1.default.logMessageSync(msg, Logger_1.default.INFO);
+            }
             yield fs.appendFile(this.logFile, msg + '\n');
         });
     }
@@ -143,7 +146,7 @@ class LineOffsetAnalyzer {
         let offset = 0;
         let lastRecordedOffset = null;
         const offsets = [];
-        this.log('🔍 Diff result:');
+        this.log('🔍 Diff result:', true);
         for (const part of diffs) {
             const lines = part.value.split('\n').slice(0, -1);
             if (part.added) {

package/scripts/util/ReactOptions.js

@@ -0,0 +1,21 @@
+"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;
+}

package/scripts/util/SourceMapUtil.js

@@ -8,11 +8,11 @@ const FileOperationHelper_1 = require("../FileOperationHelper");
 exports.SOURCE_MAP_BACKUP_FILE = 'getSourceMapInfoOrig.js';
 exports.SOURCE_MAP_FILE = 'getSourceMapInfo.js';
 const patchMetroSourceMap = () => {
-    Logger_1.default.logMessageSync('Patching SourceMap generation of Metro .. ', Logger_1.default.INFO);
+    Logger_1.default.logMessageSync('⏳ Patching SourceMap generation of Metro .. ', Logger_1.default.INFO);
     const origSourceMapPath = (0, path_1.join)(PathsConstants_1.default.getMetroSouceMapPath(), exports.SOURCE_MAP_BACKUP_FILE);
     try {
         FileOperationHelper_1.default.checkIfFileExistsSync(origSourceMapPath);
-        Logger_1.default.logMessageSync('Patching of SourceMap already happened!', Logger_1.default.INFO);
+        Logger_1.default.logMessageSync('  ℹ️  Patching of SourceMap already happened!', Logger_1.default.INFO);
     }
     catch (e) {
         try {
@@ -20,10 +20,10 @@ const patchMetroSourceMap = () => {
             FileOperationHelper_1.default.checkIfFileExistsSync(currentSourceMapPath);
             FileOperationHelper_1.default.renameFileSync(currentSourceMapPath, origSourceMapPath);
             FileOperationHelper_1.default.copyFileSync(PathsConstants_1.default.getOurSourceMapFile(), currentSourceMapPath);
-            Logger_1.default.logMessageSync('Patching of SourceMap successful!', Logger_1.default.INFO);
+            Logger_1.default.logMessageSync('  ✅ Patching of SourceMap successful!', Logger_1.default.INFO);
         }
         catch (e) {
-            Logger_1.default.logMessageSync('Patching of SourceMap generation failed!', Logger_1.default.ERROR);
+            Logger_1.default.logMessageSync('  ❌ Patching of SourceMap generation failed!', Logger_1.default.ERROR);
         }
     }
 };

package/src/instrumentation/jsx/IDynatraceProperties.ts

@@ -0,0 +1,15 @@
+/**
+ * Interface which is containing the additional properties available for instrumentation.
+ */
+export interface IDynatraceProperties {
+    /**
+     * This string is changing the name of the action. So it is possible to override the action naming.
+     */
+    dtActionName?: string;
+
+    /**
+     * If true is passed the auto instrumentation will skip the action creation. We allow both string
+     * and boolean.
+     */
+    dtActionIgnore?: boolean | 'true' | 'false';
+}

package/typings/react-native-dynatrace.d.ts

@@ -1,3 +1,6 @@
+import 'react'
+import { IDynatraceProperties } from '../src/instrumentation/jsx/IDynatraceProperties';
+
 /**
 * react-native-dynatrace.d.ts
 *
@@ -1717,4 +1720,10 @@ export declare class ConfigurationBuilder {
      * @see https://www.npmjs.com/package/@dynatrace/react-native-plugin#plugin-startup
      */
 	public buildConfiguration(): IConfiguration;
+}
+
+declare module 'react' {
+    namespace JSX {
+		interface IntrinsicAttributes extends IDynatraceProperties {}
+	}
 }

package/instrumentation/jsx/components/Touchable.js

@@ -1,151 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TouchableHelper = void 0;
-const ConfigurationHandler_1 = require("../../../lib/core/configuration/ConfigurationHandler");
-const IDynatraceProperties_1 = require("../IDynatraceProperties");
-const TypesUtil_1 = require("../../model/TypesUtil");
-const TouchableHelper = (Dynatrace, Logger) => ({
-    attachOnPress(longPress, props, children, type) {
-        const origFunction = longPress && this._isLongPress(props)
-            ? props.onLongPress
-            : props.onPress;
-        const nameOfAction = this._findActionName(props, children);
-        const wrappedFunction = (event) => {
-            if (nameOfAction == null) {
-                Logger.debug('Skipping creation of action as no name was found!');
-                if (origFunction != null) {
-                    return origFunction(event);
-                }
-            }
-            else if (origFunction != null &&
-                origFunction._dtWrapped !== undefined &&
-                origFunction._dtWrapped === true) {
-                Logger.debug(`Skip wrapping of ${nameOfAction} onPress as it is already wrapped!`);
-                return origFunction(event);
-            }
-            else if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
-                Logger.info('React Native plugin has not been started yet! Touch will not be reported!');
-                if (origFunction != null) {
-                    return origFunction(event);
-                }
-            }
-            else {
-                let finalNameOfAction = nameOfAction;
-                if (!(0, IDynatraceProperties_1.isDynatraceNaming)(props) &&
-                    ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled()) {
-                    finalNameOfAction = (0, TypesUtil_1.getNameForType)(type);
-                }
-                const action = Dynatrace.enterAutoAction(`Touch on ${finalNameOfAction}`);
-                if (origFunction != null) {
-                    let isSyncError = true;
-                    try {
-                        const returnValue = origFunction(event);
-                        if (_isPromise(returnValue)) {
-                            isSyncError = false;
-                            return Promise.resolve(returnValue).finally(() => {
-                                action.leaveAction();
-                            });
-                        }
-                        else {
-                            action.leaveAction();
-                        }
-                        isSyncError = false;
-                    }
-                    finally {
-                        if (isSyncError) {
-                            action.leaveAction();
-                        }
-                    }
-                }
-                else {
-                    action.leaveAction();
-                }
-            }
-        };
-        wrappedFunction._dtWrapped = true;
-        return wrappedFunction;
-    },
-    _findActionName(props, children) {
-        if ((0, IDynatraceProperties_1.isDynatraceNaming)(props)) {
-            return props.dtActionName;
-        }
-        else if (this._isPropsButton(props) && props.title != null) {
-            return props.title;
-        }
-        else if (props.accessibilityLabel != null) {
-            return props.accessibilityLabel;
-        }
-        else if (children != null && children.length > 0) {
-            if (children.length === 1 && typeof children[0] === 'string') {
-                return children[0];
-            }
-            else {
-                return this._walkChildrenToFindText(children);
-            }
-        }
-        else if (props.children != null) {
-            if (typeof props.children === 'string') {
-                return props.children;
-            }
-            else {
-                return this._walkChildrenToFindText(props.children);
-            }
-        }
-        return null;
-    },
-    _isPropsButton: (props) => props.title != null,
-    _isImageButton: (props) => props.source != null,
-    _isLongPress: (props) => props.onLongPress != null,
-    _isImageURISourceType: (source) => source.uri != null,
-    _isIconButton: (element) => {
-        const type = element.type;
-        return type != null && type.name === 'Icon';
-    },
-    _walkTreeToFindText(element) {
-        if (element == null || element.props == null) {
-            return null;
-        }
-        else if (this._isImageButton(element.props)) {
-            if (this._isImageURISourceType(element.props.source)) {
-                return 'Image Button: ' + element.props.source.uri;
-            }
-            else {
-                return 'Image Button';
-            }
-        }
-        else if (this._isIconButton(element) && element.props.name != null) {
-            return 'Icon Button: ' + element.props.name;
-        }
-        return this._walkChildrenToFindText(element.props.children);
-    },
-    _walkChildrenToFindText(children) {
-        if (typeof children === 'string') {
-            return children;
-        }
-        else if (Array.isArray(children)) {
-            for (const child of children) {
-                if (this._isReactElement(child)) {
-                    const name = this._walkTreeToFindText(child);
-                    if (name != null) {
-                        return name;
-                    }
-                }
-                else if (typeof child === 'string') {
-                    return child;
-                }
-                else if (Array.isArray(child)) {
-                    return this._walkChildrenToFindText(child);
-                }
-            }
-            return null;
-        }
-        else {
-            return this._walkTreeToFindText(children);
-        }
-    },
-    _isReactElement: (node) => node != null && node.props != null,
-});
-exports.TouchableHelper = TouchableHelper;
-const _isPromise = (object) => object != null &&
-    typeof object.then === 'function' &&
-    typeof object.catch === 'function';