@dynatrace/react-native-plugin 2.301.1 → 2.303.1

package/README.md

@@ -24,15 +24,15 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 * For Android users:
   * SDK version 21+
   * Gradle version 6.1.1+ ([How to update?](#updating-to-gradle-6))
-  * Android Gradle plugin version 4.0+
+  * Android Gradle plugin version 7.0+
   * Java 11
 * For iOS users: Minimum iOS 12
 
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* Android Agent: 8.301.1.1004
-* iOS Agent: 8.301.1.1008
+* Android Agent: 8.303.2.1014
+* iOS Agent: 8.303.1.1004
 
 ## Quick Setup
 
@@ -138,6 +138,21 @@ const config = {
 module.exports = mergeConfig(defaultConfig, config);
 ```
 
+#### For Expo
+
+```js
+const {getDefaultConfig} = require('expo/metro-config');
+const config = getDefaultConfig(__dirname);
+
+config.transformer.babelTransformerPath = require.resolve(
+  '@dynatrace/react-native-plugin/lib/dynatrace-transformer',
+);
+
+config.reporter = require('@dynatrace/react-native-plugin/lib/dynatrace-reporter');
+
+module.exports = config;
+```
+
 #### For React Native v0.59 or newer
 
 ```js
@@ -159,6 +174,8 @@ Define a mobile app in Dynatrace and open the Mobile app instrumentation setting
 
 > **Note**: Define the components that you want to see lifecycle instrumented ([example](#lifecycle)). This is important as you will only see Application startup and Touches out of the box.
 
+> **Note for Expo**: If you are using expo make sure to use the upstreamTransformer property in the `dynatrace.config.js` file: `upstreamTransformer: require.resolve('@expo/metro-config/babel-transformer')`
+
 For more details about the configuration, see [Advanced topics](#structure-of-the-dynatracejs-file).
 
 ## 4. Update Babel Configuration
@@ -174,11 +191,13 @@ The required changes for the versions above can be found [here](#react-automatic
 
 ## 5. Build and run your app
 
-1. Execute [`npx instrumentDynatrace`](#npx-instrumentdynatrace) or `react-native instrument-dynatrace` in the root of your React Native project. This will configure both Android and iOS projects with the settings from `dynatrace.config.js`. You can use the same [custom arguments](#customizing-paths-for-configuration) as mentioned above.
+1. Only for Expo: If using expo make sure that your project is containing a "android" and/or "ios" folder. This can be done by using `npx expo prebuild`.
+
+2. Execute [`npx instrumentDynatrace`](#npx-instrumentdynatrace) or `react-native instrument-dynatrace` in the root of your React Native project. This will configure both Android and iOS projects with the settings from `dynatrace.config.js`. You can use the same [custom arguments](#customizing-paths-for-configuration) as mentioned above.
 
-2. Use `react-native run-android` or `react-native run-ios` to rebuild and run your app. Specify custom paths via [custom arguments.](#customizing-paths-for-configuration).
+1. Use `react-native run-android` or `react-native run-ios` to rebuild and run your app. Specify custom paths via [custom arguments.](#customizing-paths-for-configuration).
 
-3. **Attention:** Whenever you change your configuration in dynatrace.config.js please use `react-native start --reset-cache` option. Metro caches all files and a configuration change might lead to a different situation. Not resetting the cache might result in an mixture of old and new configuration.
+4. **Attention:** Whenever you change your configuration in dynatrace.config.js please use `react-native start --reset-cache` option. Metro caches all files and a configuration change might lead to a different situation. Not resetting the cache might result in an mixture of old and new configuration.
 
 # Advanced topics
 
@@ -1160,15 +1179,18 @@ module.exports = {
 Using `babel-preset-expo`:
 
 ```js
-module.exports = {
-  presets: [
-    ['babel-preset-expo',
-      {
-        jsxRuntime: 'automatic',
-        jsxImportSource: '@dynatrace/react-native-plugin',
-      },
+module.exports = function (api) {
+  api.cache(true);
+  return {
+    presets: [
+      ['babel-preset-expo',
+        {
+          jsxRuntime: 'automatic',
+          jsxImportSource: '@dynatrace/react-native-plugin',
+        },
+      ],
     ],
-  ],
+  };
 };
 ```
 
@@ -1438,11 +1460,17 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.301.1
+2.303.1
+* Updated Android (8.303.2.1014) & iOS Agent (8.303.1.1004)
+* Android Gradle Plugin version requirement raised to 7.0+
+* Fixed warnings for jsx runtime when using expo
+
+2.301.2
 * Updated Android (8.301.1.1004) & iOS Agent (8.301.1.1008)
 * Fix iOS crashes to not report on session after crash
 * RectButton check/logic updated
 * Improved startup log line
+* Updated crash type for [manually reported iOS crashes](#manually-report-a-crash) using `reportCrashWithException`
 
 2.299.1
 * Updated Android (8.299.1.1004) & iOS Agent (8.299.1.1003)

package/android/build.gradle

@@ -70,7 +70,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.dynatrace.agent:agent-android:8.301.1.1004'
+	implementation 'com.dynatrace.agent:agent-android:8.303.2.1014'
     implementation "com.facebook.react:react-native:${safeExtGet('reactNative', '+')}"
 }
   

package/files/plugin.gradle

@@ -1,3 +1,3 @@
 dependencies {
-	classpath 'com.dynatrace.tools.android:gradle-plugin:8.301.1.1004'
+	classpath 'com.dynatrace.tools.android:gradle-plugin:8.303.2.1014'
 }

package/ios/DynatraceRNBridge.mm

@@ -177,7 +177,7 @@ RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)erro
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
         if(isRealError){
-            [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformCustom crashName:errorName reason:errorReason stacktrace:stacktrace]; 
+            [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformJavaScript crashName:errorName reason:errorReason stacktrace:stacktrace]; 
         }else{
             [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformCustom crashName:errorName reason:errorReason stacktrace:stacktrace];
         }

package/lib/CreateElement.js

@@ -10,7 +10,8 @@ const createElement = (type, props, ...children) => {
             return _createElement(Component_1.DynatraceFnWrapper, {}, _createElement(type, props, ...children));
         }
         else if (type._dtInfo.type === Types_1.Types.ClassComponent &&
-            type.prototype !== undefined && type.prototype.isReactComponent !== undefined) {
+            type.prototype !== undefined &&
+            type.prototype.isReactComponent !== undefined) {
             return _createElement(Component_1.DynatraceClassWrapper, {}, _createElement(type, props, ...children));
         }
         else {

package/lib/community/gesture-handler/Touchables.InstrInfo.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.instrumentationInfo = void 0;
 exports.instrumentationInfo = [];
 exports.instrumentationInfo.push({
-    old: { module: 'react-native-gesture-handler', reference: 'TouchableHighlight' },
+    old: {
+        module: 'react-native-gesture-handler',
+        reference: 'TouchableHighlight',
+    },
     new: {
         module: '@dynatrace/react-native-plugin/lib/community/gesture-handler/',
         reference: 'TouchableHighlight',
@@ -11,7 +14,10 @@ exports.instrumentationInfo.push({
     },
 });
 exports.instrumentationInfo.push({
-    old: { module: 'react-native-gesture-handler', reference: 'TouchableOpacity' },
+    old: {
+        module: 'react-native-gesture-handler',
+        reference: 'TouchableOpacity',
+    },
     new: {
         module: '@dynatrace/react-native-plugin/lib/community/gesture-handler/',
         reference: 'TouchableOpacity',
@@ -19,7 +25,10 @@ exports.instrumentationInfo.push({
     },
 });
 exports.instrumentationInfo.push({
-    old: { module: 'react-native-gesture-handler', reference: 'TouchableNativeFeedback' },
+    old: {
+        module: 'react-native-gesture-handler',
+        reference: 'TouchableNativeFeedback',
+    },
     new: {
         module: '@dynatrace/react-native-plugin/lib/community/gesture-handler/',
         reference: 'TouchableNativeFeedback',
@@ -27,7 +36,10 @@ exports.instrumentationInfo.push({
     },
 });
 exports.instrumentationInfo.push({
-    old: { module: 'react-native-gesture-handler', reference: 'TouchableWithoutFeedback' },
+    old: {
+        module: 'react-native-gesture-handler',
+        reference: 'TouchableWithoutFeedback',
+    },
     new: {
         module: '@dynatrace/react-native-plugin/lib/community/gesture-handler/',
         reference: 'TouchableWithoutFeedback',

package/lib/community/gesture-handler/Touchables.js

@@ -20,14 +20,16 @@ if (gestureHandler !== undefined) {
     if (typeof gestureHandler.TouchableNativeFeedback !== 'object') {
         exports.TouchableNativeFeedback = (_c = class TouchableNativeFeedback extends (gestureHandler.TouchableNativeFeedback) {
             },
-            _c._dtInfo = { type: Types_1.Types.TouchableNativeFeedbackGestureHandler },
+            _c._dtInfo = {
+                type: Types_1.Types.TouchableNativeFeedbackGestureHandler,
+            },
             _c);
     }
     if (typeof gestureHandler.TouchableWithoutFeedback === 'object') {
         exports.TouchableWithoutFeedback = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableWithoutFeedbackGestureHandler } }, gestureHandler.TouchableWithoutFeedback);
     }
     if (typeof gestureHandler.RectButton !== 'object') {
-        exports.RectButton = (_d = class RectButton extends (gestureHandler.RectButton) {
+        exports.RectButton = (_d = class RectButton extends gestureHandler.RectButton {
             },
             _d._dtInfo = { type: Types_1.Types.RectButtonGestureHandler },
             _d);

package/lib/instrumentor/base/Dynatrace.js

@@ -45,7 +45,8 @@ exports.Dynatrace = {
     }),
     withMonitoring: (Component, name) => {
         if (Component !== undefined) {
-            if (Component.prototype !== undefined && Component.prototype.isReactComponent !== undefined) {
+            if (Component.prototype !== undefined &&
+                Component.prototype.isReactComponent !== undefined) {
                 Component._dtInfo = {
                     type: Types_1.Types.ClassComponent,
                     name,
@@ -65,7 +66,10 @@ exports.Dynatrace = {
         if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
             let key;
             if (ConfigurationHandler_1.ConfigurationHandler.getBundleName() != null) {
-                key = ConfigurationHandler_1.ConfigurationHandler.getBundleName() + '_' + DynatraceInternal_1.DynatraceInternal.getCounter();
+                key =
+                    ConfigurationHandler_1.ConfigurationHandler.getBundleName() +
+                        '_' +
+                        DynatraceInternal_1.DynatraceInternal.getCounter();
             }
             else {
                 key = 'DEFAULT_' + DynatraceInternal_1.DynatraceInternal.getCounter();
@@ -89,7 +93,10 @@ exports.Dynatrace = {
         if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
             let key;
             if (ConfigurationHandler_1.ConfigurationHandler.getBundleName() != null) {
-                key = ConfigurationHandler_1.ConfigurationHandler.getBundleName() + '_' + DynatraceInternal_1.DynatraceInternal.getCounter();
+                key =
+                    ConfigurationHandler_1.ConfigurationHandler.getBundleName() +
+                        '_' +
+                        DynatraceInternal_1.DynatraceInternal.getCounter();
             }
             else {
                 key = 'DEFAULT_' + DynatraceInternal_1.DynatraceInternal.getCounter();

package/lib/instrumentor/base/DynatraceBridge.js

@@ -4,5 +4,9 @@ exports.DynatraceNative = void 0;
 const react_native_1 = require("react-native");
 const isTurboModuleEnabled = globalThis.__turboModuleProxy != null;
 exports.DynatraceNative = isTurboModuleEnabled
-    ? react_native_1.TurboModuleRegistry.get('DynatraceBridge') !== undefined ? react_native_1.TurboModuleRegistry.get('DynatraceBridge') : {}
-    : react_native_1.NativeModules.DynatraceBridge !== undefined ? react_native_1.NativeModules.DynatraceBridge : {};
+    ? react_native_1.TurboModuleRegistry.get('DynatraceBridge') !== undefined
+        ? react_native_1.TurboModuleRegistry.get('DynatraceBridge')
+        : {}
+    : react_native_1.NativeModules.DynatraceBridge !== undefined
+        ? react_native_1.NativeModules.DynatraceBridge
+        : {};

package/lib/instrumentor/base/DynatraceRootAction.js

@@ -19,7 +19,10 @@ class DynatraceRootAction extends DynatraceAction_1.DynatraceAction {
         }
         let childKey;
         if (ConfigurationHandler_1.ConfigurationHandler.getBundleName() != null) {
-            childKey = ConfigurationHandler_1.ConfigurationHandler.getBundleName() + '_' + DynatraceInternal_1.DynatraceInternal.getCounter();
+            childKey =
+                ConfigurationHandler_1.ConfigurationHandler.getBundleName() +
+                    '_' +
+                    DynatraceInternal_1.DynatraceInternal.getCounter();
         }
         else {
             childKey = 'DEFAULT_' + DynatraceInternal_1.DynatraceInternal.getCounter();

package/lib/instrumentor/base/DynatraceWebRequestTiming.js

@@ -10,7 +10,8 @@ class DynatraceWebRequestTiming {
         this.url = url;
     }
     startWebRequestTiming() {
-        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) && !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url)) {
+        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) &&
+            !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url)) {
             DynatraceBridge_1.DynatraceNative.startWebRequestTiming(this.requestTag, this.url);
         }
         else {
@@ -21,8 +22,10 @@ class DynatraceWebRequestTiming {
         this.stopWebRequestTimingWithSize(responseCode, responseMessage, -1, -1);
     }
     stopWebRequestTimingWithSize(responseCode, responseMessage, requestSize, responseSize) {
-        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) && !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url) &&
-            responseCode != null && !StringUtils_1.StringUtils.isStringNullOrUndefined(responseMessage)) {
+        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) &&
+            !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url) &&
+            responseCode != null &&
+            !StringUtils_1.StringUtils.isStringNullOrUndefined(responseMessage)) {
             DynatraceBridge_1.DynatraceNative.stopWebRequestTimingWithSize(this.requestTag, this.url, responseCode, responseMessage, requestSize, responseSize);
         }
         else {

package/lib/instrumentor/base/ElementHelper.js

@@ -13,12 +13,15 @@ const instrumentCreateElement = (reactModule) => {
     if (reactModule != null && reactModule.createElement != null) {
         const reactCreateElement = reactModule.createElement;
         reactModule.createElement = (type, props, ...children) => {
-            if (type != null && type._dtInfo != null && !(0, exports.isDtActionIgnore)(props)) {
+            if (type != null &&
+                type._dtInfo != null &&
+                !(0, exports.isDtActionIgnore)(props)) {
                 if (type._dtInfo.type === Types_1.Types.FunctionalComponent) {
                     return reactCreateElement(Component_1.DynatraceFnWrapper, {}, reactCreateElement(type, props, ...children));
                 }
                 else if (type._dtInfo.type === Types_1.Types.ClassComponent &&
-                    type.prototype !== undefined && type.prototype.isReactComponent !== undefined) {
+                    type.prototype !== undefined &&
+                    type.prototype.isReactComponent !== undefined) {
                     return reactCreateElement(Component_1.DynatraceClassWrapper, {}, reactCreateElement(type, props, ...children));
                 }
                 else {
@@ -32,10 +35,12 @@ const instrumentCreateElement = (reactModule) => {
 exports.instrumentCreateElement = instrumentCreateElement;
 const modifyElement = (type, props, ...children) => {
     if (props != null) {
-        if (type._dtInfo.type === Types_1.Types.RefreshControl && props.onRefresh != null) {
+        if (type._dtInfo.type === Types_1.Types.RefreshControl &&
+            props.onRefresh != null) {
             (0, RefreshControl_1.RefreshControlHelper)(Dynatrace_1.Dynatrace).attachOnRefresh(props);
         }
-        else if (type._dtInfo.type === Types_1.Types.Switch && props.onValueChange != null) {
+        else if (type._dtInfo.type === Types_1.Types.Switch &&
+            props.onValueChange != null) {
             (0, Switch_1.SwitchHelper)(Dynatrace_1.Dynatrace).attachOnValueChange(props);
         }
         else if (type._dtInfo.type === Types_1.Types.Button ||
@@ -49,7 +54,8 @@ const modifyElement = (type, props, ...children) => {
                 props.onLongPress = (0, Touchable_1.TouchableHelper)(Dynatrace_1.Dynatrace, Logger_1.Logger).attachOnPress(true, props, children);
             }
         }
-        else if (props.onValueChange != null && type._dtInfo.type === Types_1.Types.Picker) {
+        else if (props.onValueChange != null &&
+            type._dtInfo.type === Types_1.Types.Picker) {
             (0, Picker_1.PickerHelper)(Dynatrace_1.Dynatrace).attachOnValueChange(props);
         }
     }

package/lib/instrumentor/base/ErrorHandler.js

@@ -30,7 +30,7 @@ const _reportErrorToDynatrace = (exception, isFatal, oldHandler) => {
             if (isFatal === undefined) {
                 isFatal = false;
             }
-            DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), adjustedReason(exception.message), exception.stack != null ? exception.stack : "", _isReportFatalErrorAsCrash);
+            DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), adjustedReason(exception.message), exception.stack != null ? exception.stack : '', _isReportFatalErrorAsCrash);
             Logger_1.Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception}, ${isFatal})`);
         }
     }

package/lib/instrumentor/base/Logger.js

@@ -5,7 +5,8 @@ const ConfigurationHandler_1 = require("./configuration/ConfigurationHandler");
 const LOG_PREFIX = 'DYNATRACE: ';
 exports.Logger = {
     logDebug: (message) => {
-        if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable() && ConfigurationHandler_1.ConfigurationHandler.isDebugEnabled()) {
+        if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable() &&
+            ConfigurationHandler_1.ConfigurationHandler.isDebugEnabled()) {
             console.log(LOG_PREFIX + message);
         }
     },

package/lib/instrumentor/base/Picker.js

@@ -13,8 +13,9 @@ const PickerHelper = (Dynatrace) => ({
             pickerProps.onValueChange = (itemValue, itemNumber) => {
                 const value = _getPickerItemValue(itemNumber, itemValue, pickerProps.children);
                 if (value !== undefined) {
-                    const finalNameOfAction = nameOfAction == null ?
-                        `Picked Value: ${value}` : `Picker ${nameOfAction} Picked Value: ${value}`;
+                    const finalNameOfAction = nameOfAction == null
+                        ? `Picked Value: ${value}`
+                        : `Picker ${nameOfAction} Picked Value: ${value}`;
                     const action = Dynatrace.enterAutoAction(finalNameOfAction);
                     try {
                         origOnValueChange(itemValue, itemNumber);
@@ -39,10 +40,10 @@ const _findActionName = (pickerProps) => {
     return null;
 };
 const _getPickerItemValue = (index, value, children) => {
-    if (children != null
-        && index >= 0
-        && children.length > index
-        && isPickerItemProps(children[index].props)) {
+    if (children != null &&
+        index >= 0 &&
+        children.length > index &&
+        isPickerItemProps(children[index].props)) {
         return children[index].props.label;
     }
     return value;

package/lib/instrumentor/base/RefreshControl.js

@@ -11,7 +11,9 @@ const RefreshControlHelper = (Dynatrace) => ({
         const nameOfAction = _findActionName(refreshControlProps);
         if (origOnRefresh != null) {
             refreshControlProps.onRefresh = () => {
-                const finalNameOfAction = nameOfAction == null ? 'Swipe to Refesh' : `Swipe to Refesh ${nameOfAction}`;
+                const finalNameOfAction = nameOfAction == null
+                    ? 'Swipe to Refesh'
+                    : `Swipe to Refesh ${nameOfAction}`;
                 const action = Dynatrace.enterAutoAction(finalNameOfAction);
                 try {
                     if (origOnRefresh != null) {

package/lib/instrumentor/base/Switch.js

@@ -52,6 +52,6 @@ const _findActionName = (switchProps) => {
     }
     return null;
 };
-const _isPromise = (object) => object != null
-    && typeof object.then === 'function'
-    && typeof object.catch === 'function';
+const _isPromise = (object) => object != null &&
+    typeof object.then === 'function' &&
+    typeof object.catch === 'function';

package/lib/instrumentor/base/Touchable.js

@@ -17,8 +17,9 @@ const TouchableHelper = (Dynatrace, Logger) => ({
                     return origFunction(event);
                 }
             }
-            else if (origFunction != null && origFunction._dtWrapped !== undefined
-                && origFunction._dtWrapped === true) {
+            else if (origFunction != null &&
+                origFunction._dtWrapped !== undefined &&
+                origFunction._dtWrapped === true) {
                 Logger.logDebug(`TouchableHelper: Skip wrapping of ${nameOfAction} onPress as it is already wrapped!`);
                 return origFunction(event);
             }
@@ -30,7 +31,8 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             }
             else {
                 let finalNameOfAction = nameOfAction;
-                if (!(0, IDynatraceProperties_1.isDynatraceNaming)(props) && ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled()) {
+                if (!(0, IDynatraceProperties_1.isDynatraceNaming)(props) &&
+                    ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled()) {
                     finalNameOfAction = isButton ? 'Button' : 'Touchable';
                 }
                 const action = Dynatrace.enterAutoAction(`Touch on ${finalNameOfAction}`);
@@ -74,8 +76,7 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             return props.accessibilityLabel;
         }
         else if (children != null && children.length > 0) {
-            if (children.length === 1 &&
-                typeof children[0] === 'string') {
+            if (children.length === 1 && typeof children[0] === 'string') {
                 return children[0];
             }
             else {
@@ -145,6 +146,6 @@ const TouchableHelper = (Dynatrace, Logger) => ({
     _isReactElement: (node) => node != null && node.props != null,
 });
 exports.TouchableHelper = TouchableHelper;
-const _isPromise = (object) => object != null
-    && typeof object.then === 'function'
-    && typeof object.catch === 'function';
+const _isPromise = (object) => object != null &&
+    typeof object.then === 'function' &&
+    typeof object.catch === 'function';

package/lib/instrumentor/base/configuration/Configuration.js

@@ -19,16 +19,17 @@ class Configuration {
     toString() {
         let configurationString;
         const isAutoStart = this.beaconUrl === '' && this.applicationId === '';
-        configurationString = `{Startup: ${isAutoStart ? 'Auto' : 'Manual'} Start`
-            + (isAutoStart ? '' : `, applicationId: ${this.applicationId}`)
-            + (isAutoStart ? '' : `, beaconUrl: ${this.beaconUrl}`)
-            + `, reportCrash: ${this.reportCrash}`
-            + `, errorHandler: ${this.errorHandler}`
-            + `, reportFatalErrorAsCrash: ${this.reportFatalErrorAsCrash}`
-            + `, lifecycleUpdate: ${this.lifecycleUpdate}`
-            + (isAutoStart ? '' : `, userOptIn: ${this.userOptIn}`)
-            + `, actionNamePrivacy: ${this.actionNamePrivacy}`
-            + `, logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
+        configurationString =
+            `{Startup: ${isAutoStart ? 'Auto' : 'Manual'} Start` +
+                (isAutoStart ? '' : `, applicationId: ${this.applicationId}`) +
+                (isAutoStart ? '' : `, beaconUrl: ${this.beaconUrl}`) +
+                `, reportCrash: ${this.reportCrash}` +
+                `, errorHandler: ${this.errorHandler}` +
+                `, reportFatalErrorAsCrash: ${this.reportFatalErrorAsCrash}` +
+                `, lifecycleUpdate: ${this.lifecycleUpdate}` +
+                (isAutoStart ? '' : `, userOptIn: ${this.userOptIn}`) +
+                `, actionNamePrivacy: ${this.actionNamePrivacy}` +
+                `, logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
         if (this.bundleName !== undefined) {
             configurationString += `, bundleName: ${this.bundleName}`;
         }

package/lib/instrumentor/base/configuration/ConfigurationPreset.js

@@ -29,4 +29,3 @@ class ConfigurationPreset {
     }
 }
 exports.ConfigurationPreset = ConfigurationPreset;
-;

package/lib/instrumentor/base/configuration/IConfiguration.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

package/lib/instrumentor/base/configuration/ManualStartupConfiguration.js

@@ -40,9 +40,9 @@ class ManualStartupConfiguration {
         }
     }
     toString() {
-        let configurationString = `{Startup: Manual Start, applicationId: ${this.applicationId}, beaconUrl: ${this.beaconUrl},`
-            + ` reportCrash: ${this.reportCrash}, errorHandler: ${this.errorHandler}, reportFatalErrorAsCrash: ${this.reportFatalErrorAsCrash},`
-            + ` lifecycleUpdate: ${this.lifecycleUpdate}, userOptIn: ${this.userOptIn}, actionNamePrivacy: ${this.actionNamePrivacy}, logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
+        let configurationString = `{Startup: Manual Start, applicationId: ${this.applicationId}, beaconUrl: ${this.beaconUrl},` +
+            ` reportCrash: ${this.reportCrash}, errorHandler: ${this.errorHandler}, reportFatalErrorAsCrash: ${this.reportFatalErrorAsCrash},` +
+            ` lifecycleUpdate: ${this.lifecycleUpdate}, userOptIn: ${this.userOptIn}, actionNamePrivacy: ${this.actionNamePrivacy}, logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
         if (this.bundleName !== undefined) {
             configurationString += `, bundleName: ${this.bundleName}`;
         }

package/lib/instrumentor/base/interface/IDynatraceProperties.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDynatraceIgnored = exports.isDynatraceNaming = void 0;
 const isDynatraceNaming = (properties) => properties.dtActionName !== undefined;
 exports.isDynatraceNaming = isDynatraceNaming;
-const isDynatraceIgnored = (properties) => properties.dtActionIgnore !== undefined
-    && properties.dtActionIgnore === true
-    || properties.dtActionIgnore === 'true';
+const isDynatraceIgnored = (properties) => (properties.dtActionIgnore !== undefined &&
+    properties.dtActionIgnore === true) ||
+    properties.dtActionIgnore === 'true';
 exports.isDynatraceIgnored = isDynatraceIgnored;

package/lib/instrumentor/model/Types.js

@@ -21,17 +21,16 @@ var Types;
     Types[Types["RefreshControl"] = 15] = "RefreshControl";
     Types[Types["Switch"] = 16] = "Switch";
 })(Types = exports.Types || (exports.Types = {}));
-const isTypeReactNativeTouchable = (type) => type === Types.TouchableHighlight
-    || type === Types.TouchableNativeFeedback
-    || type === Types.TouchableOpacity
-    || type === Types.TouchableWithoutFeedback;
+const isTypeReactNativeTouchable = (type) => type === Types.TouchableHighlight ||
+    type === Types.TouchableNativeFeedback ||
+    type === Types.TouchableOpacity ||
+    type === Types.TouchableWithoutFeedback;
 exports.isTypeReactNativeTouchable = isTypeReactNativeTouchable;
-const isTypeGestureHandlerTouchable = (type) => type === Types.TouchableHighlightGestureHandler
-    || type === Types.TouchableNativeFeedbackGestureHandler
-    || type === Types.TouchableOpacityGestureHandler
-    || type === Types.TouchableWithoutFeedbackGestureHandler
-    || type === Types.RectButtonGestureHandler;
+const isTypeGestureHandlerTouchable = (type) => type === Types.TouchableHighlightGestureHandler ||
+    type === Types.TouchableNativeFeedbackGestureHandler ||
+    type === Types.TouchableOpacityGestureHandler ||
+    type === Types.TouchableWithoutFeedbackGestureHandler ||
+    type === Types.RectButtonGestureHandler;
 exports.isTypeGestureHandlerTouchable = isTypeGestureHandlerTouchable;
-const isTypeTouchable = (type) => (0, exports.isTypeGestureHandlerTouchable)(type)
-    || (0, exports.isTypeReactNativeTouchable)(type);
+const isTypeTouchable = (type) => (0, exports.isTypeGestureHandlerTouchable)(type) || (0, exports.isTypeReactNativeTouchable)(type);
 exports.isTypeTouchable = isTypeTouchable;

package/lib/jsx-dev-runtime.js

@@ -18,19 +18,37 @@ try {
     }
     if (_jsxDevRuntime != null) {
         const jsxDEV = (...args) => {
-            if (args[0] !== undefined && args[0]._dtInfo !== undefined && !(0, ElementHelper_1.isDtActionIgnore)(args[1])) {
+            if (args[0] !== undefined &&
+                args[0]._dtInfo !== undefined &&
+                !(0, ElementHelper_1.isDtActionIgnore)(args[1])) {
                 if (args[0]._dtInfo.type === Types_1.Types.FunctionalComponent) {
-                    const wrapperProps = { children: [] };
-                    wrapperProps.dtActionName = (args[1] !== undefined &&
-                        args[1].dtActionName !== undefined) ? args[1].dtActionName : args[0]._dtInfo.name;
-                    wrapperProps.children.push(_jsxDevRuntime.jsxDEV(args[0], args[1], ...args));
-                    return _jsxDevRuntime.jsxDEV(Component_1.DynatraceFnWrapper, wrapperProps);
+                    const wrapperProps = {
+                        children: _jsxDevRuntime.jsxDEV(...args),
+                    };
+                    wrapperProps.dtActionName =
+                        args[1] !== undefined &&
+                            args[1].dtActionName !== undefined
+                            ? args[1].dtActionName
+                            : args[0]._dtInfo.name;
+                    if (args[2] !== undefined) {
+                        return _jsxDevRuntime.jsxDEV(Component_1.DynatraceFnWrapper, wrapperProps, args[2] + '_dt');
+                    }
+                    else {
+                        return _jsxDevRuntime.jsxDEV(Component_1.DynatraceFnWrapper, wrapperProps);
+                    }
                 }
                 else if (args[0]._dtInfo.type === Types_1.Types.ClassComponent &&
-                    args[0].prototype !== undefined && args[0].prototype.isReactComponent !== undefined) {
-                    const wrapperProps = { children: [] };
-                    wrapperProps.children.push(_jsxDevRuntime.jsxDEV(args[0], args[1], ...args));
-                    return _jsxDevRuntime.jsxDEV(Component_1.DynatraceClassWrapper, wrapperProps);
+                    args[0].prototype !== undefined &&
+                    args[0].prototype.isReactComponent !== undefined) {
+                    const wrapperProps = {
+                        children: _jsxDevRuntime.jsxDEV(...args),
+                    };
+                    if (args[2] !== undefined) {
+                        return _jsxDevRuntime.jsxDEV(Component_1.DynatraceClassWrapper, wrapperProps, args[2] + '_dt');
+                    }
+                    else {
+                        return _jsxDevRuntime.jsxDEV(Component_1.DynatraceClassWrapper, wrapperProps);
+                    }
                 }
                 if (Array.isArray(args[1].children)) {
                     (0, ElementHelper_1.modifyElement)(args[0], args[1], ...args[1].children);