@dynatrace/react-native-plugin 2.287.2 → 2.289.1

package/README.md

@@ -15,6 +15,8 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
   * Reporting React Native errors
 * Manual instrumentation
   * Typescript bindings to add manual instrumentation
+* New React-Native architecture
+>**Note:** With iOS specifically, we noticed that there are some features that are not working the same as when using the current default architecture. You may experience issues with crash reporting being captured and web requests being linked to specific user actions. Per react native, [the new architecture is experimental](https://reactnative.dev/docs/the-new-architecture/landing-page#should-i-use-the-new-architecture-today). We will keep an eye on new updates and will continue to improve our support for the new architecture on both platforms.
 
 ## Requirements
 * React v16.8 or newer
@@ -29,8 +31,8 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* Android Agent: 8.287.1.1006
-* iOS Agent: 8.287.2.1009
+* Android Agent: 8.289.2.1007
+* iOS Agent: 8.289.1.1015
 
 ## Quick Setup
 
@@ -73,6 +75,7 @@ This agent versions are configured in this plugin:
   * [Agent debug logs](#native-oneagent-debug-logs)
 * [How does Dynatrace determine the user action name?](#how-does-dynatrace-determine-the-user-action-name)
   * [Using dtActionName](#using-dtactionname-to-change-the-name-of-the-action)
+* [How does Dynatrace automatically report crashes?](#how-does-dynatrace-automatically-report-crashes)
 * [React Automatic Runtime](#react-automatic-runtime)
 * [Using a second transformer besides the dynatrace transformer](#using-a-second-transformer-besides-the-dynatrace-transformer)
 * [Upgrading project to Gradle 6](#updating-to-gradle-6)
@@ -243,6 +246,8 @@ The manual startup of the plugin is triggered via the `start(configuration: ICon
 const configurationBuilder = new ConfigurationBuilder("beaconUrl", "applicationId");
 
 configurationBuilder.withCrashReporting(true)
+  .withErrorHandler(true)
+  .withReportFatalErrorAsCrash(true)
   .withLogLevel(LogLevel.Info)
   .withLifecycleUpdate(false)
   .withUserOptIn(false)
@@ -252,18 +257,20 @@ configurationBuilder.withCrashReporting(true)
 Dynatrace.start(configurationBuilder.buildConfiguration());
 ```
 
-**Info**: The values used in the function calls for the parameters are also their default value.
+**Info**: The value used in the function calls for the parameters is also their default value.
 
-| Property name    | Type   | Default     | Description                                       |
-|------------------|--------|-------------|---------------------------------------------------|
-|beaconUrl         |string  |undefined         |Identifies your environment within Dynatrace. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
-|applicationId     |string  |undefined         |Identifies your mobile app. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
-|reportCrash       |boolean |true         |Reports crashes.                  |
-|logLevel          |LogLevel|LogLevel.Info|Allows you to choose between `LogLevel.Info` and `LogLevel.Debug`. Debug returns more logs. This is especially important when something is not functioning correctly.|
-|lifecycleUpdate   |boolean |false        |Decide if you want to see update cycles on lifecycle actions as well. This is per default false as it creates a lot more actions.|
-|userOptIn        |boolean  |false        |Activates the privacy mode when set to `true`. User consent must be queried and set. The privacy settings for [data collection](#data-collection) and [crash reporting](#crash-reporting) can be changed via  OneAgent SDK for Mobile as described under Data privacy. The default value is `false`.|
-|actionNamePrivacy|boolean|false|Activates a privacy mode especially for Touchables and Buttons. Setting this option to true means that a name for the control will no longer be shown, e.g. "Touch on Button". When setting a dtActionName onto the component this setting will be ignored. 
-|bundleName|string|undefined|Should be used only if you have a multiple bundle setup where you load several .bundle files within your React Native application. Enter the name of your bundle. This should be unique in comparison to your other bundle names. This will ensure that actions coming from different bundles will not interfere with each other.
+| Property name           | Type   | Default     | Description                                       |
+|-------------------------|--------|-------------|---------------------------------------------------|
+|beaconUrl                |string  |undefined         |Identifies your environment within Dynatrace. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
+|applicationId            |string  |undefined         |Identifies your mobile app. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
+|reportCrash              |boolean |true         |Reports crashes.                  |
+|errorHandler             |boolean |true         |Enables the error/crash handler.  |
+|reportFatalErrorAsCrash  |boolean |true         |Reports an unhandled fatal error as a crash or an error. |
+|logLevel                 |LogLevel|LogLevel.Info|Allows you to choose between `LogLevel.Info` and `LogLevel.Debug`. Debug returns more logs. This is especially important when something is not functioning correctly.|
+|lifecycleUpdate          |boolean |false        |Decide if you want to see update cycles on lifecycle actions as well. This is per default false as it creates a lot more actions.|
+|userOptIn                |boolean |false        |Activates the privacy mode when set to `true`. User consent must be queried and set. The privacy settings for [data collection](#data-collection) and [crash reporting](#crash-reporting) can be changed via  OneAgent SDK for Mobile as described under Data privacy. The default value is `false`.|
+|actionNamePrivacy        |boolean |false        |Activates a privacy mode especially for Touchables and Buttons. Setting this option to true means that a name for the control will no longer be shown, e.g. "Touch on Button". When setting a dtActionName onto the component this setting will be ignored. 
+|bundleName               |string  |undefined    |Should be used only if you have a multiple bundle setup where you load several .bundle files within your React Native application. Enter the name of your bundle. This should be unique in comparison to your other bundle names. This will ensure that actions coming from different bundles will not interfere with each other.
 
 **Attention:** 
 * Keep in mind that configuration within the `dynatrace.config.js` file is the basis, even for manual startup. When we look at the lifecycleUpdate property: Per default if not used, it is false. If enabled (set to true) in `dynatrace.config.js` file, this will be also true if manual startup is used. You can still override this behavior by calling `ConfigurationBuilder.withLifecycleUpdate(false)`.
@@ -755,13 +762,15 @@ module.exports = {
 
 ### Manual Startup Counterparts
 
-Here is a list of all the counterparts for the options that can be used with a manual startup. Below the counterparts table you will find an example configuration block for both Android and iOS.
+Here is a list of all the counterparts for the options that can be used with a manual startup. Below in the counterparts table you will find an example configuration block for both Android and iOS.
 
 | Property Name | Default | Android | iOS | React |
 |---------------|------|---------|-------------|-------------|
 |beaconUrl|undefined|autoStart.beaconUrl|DTXBeaconURL| - |
 |applicationId|undefined|autoStart.applicationId|DTXApplicationId| - |
 |reportCrash|true|crashReporting|DTXCrashReportingEnabled| - |
+|errorHandler|true| - | - |errorHandler.enabled|
+|reportFatalErrorAsCrash|true| - | - |errorHandler.reportFatalErrorAsCrash|
 |logLevel|LogLevel.Info|debug.agentLogging|DTXLogLevel| debug |
 |lifecycleUpdate|false| - | - | lifecycle.includeUpdate |
 |userOptIn|false|userOptIn|DTXUserOptIn| - |
@@ -816,6 +825,25 @@ react: {
 
 This activates the debug mode. You will get more console output during instrumentation and at runtime.
 
+#### Error Handler
+
+```js
+react: {
+  errorHandler: {
+    enabled: true,
+    reportFatalErrorAsCrash: true,
+  },
+}
+```
+
+The `enabled` property activates our Error/Crash handler which will insert our handler into your React Native application. This is true per default. 
+
+The `reportFatalErrorAsCrash` property should be set to false if you are wanting to report a fatal/unhandled error as an error and NOT a crash. Setting this value to false will keep the current session open.
+
+**Note:**
+if `enabled` is set to false, the value of `reportFatalErrorAsCrash` is not be considered/used as our error handler will not be started.
+
+
 #### Autostart
 
 ```js
@@ -824,7 +852,7 @@ react: {
 }
 ```
 
-This activates the AutoStart mode, which will insert an auto start call in your React Native application. This is per default true. If you want to use a manual startup call, please have a look into the [manual startup section](#manual-oneagent-startup).
+This activates the AutoStart mode which will insert an auto start call in your React Native application. This is true per default. If you want to use a manual startup call, please have a look into the [manual startup section](#manual-oneagent-startup).
 
 #### Bundle Name
 
@@ -1040,6 +1068,19 @@ JavaScript:
 
 *Note:* [actionNamePrivacy](#plugin-startup) has no impact on using dtActionName. dtActionName will always be used.
 
+## How does Dynatrace automatically report crashes?
+ 
+In general, Dynatrace always closes the session when a crash occurs. Usually a crash is when the application gets fully terminated. In React Native, we also see fatal errors in the JavaScript part as a full crash even though the native application is still alive. When this happens we will end the session. This is due to visibility reasons and may change in the future. The automated crash reporting will be (automatically) put in place by the transformer at the very beginning of the application. Using a custom error handler afterwards will not interfere with our crash handler.
+
+**Note:** The behavior mentioned below occurs if an error contains a stacktrace or if the stacktrace is empty/missing.
+
+* Non fatal error: If the internal React Native crash handler shows the error is not fatal, we will report it as error.
+* Fatal error: If the error is considered as fatal by the React Native crash handler, it will be treated as crash.
+* Native crashes: If a crash appears solely on the native side and is not noticed by the internal React Native crash handler, it will be reported directly by the Android or iOS agent.
+  * Exception: Some JavaScript crashes will result in Native crashes. Therefore, they are filtered on the native side as normally the crash would be reported twice. On the JavaScript side, these crashes are already reported by us before they hit the native side resulting in no lost information.
+Additionally, you can use our crash and error reporting APIs which are available with [manual instrumentation](#manual-instrumentation).
+
+
 ## React Automatic Runtime
 
 React introduced with React v17.x, React v16.14.0, React v15.7.0, and React v14.10 the automatic runtime which changes the JSX transformation (https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html). 
@@ -1308,6 +1349,7 @@ To resolve problems with the plugin, first look at creating logs and identify wh
 ** The android configuration was not added to your project. Please refer to the [install the plugin](#install-the-plugin) section.
 * For Android, if you see an error like "Gradle sync failed: Could not find com.dynatrace.tools.android:gradle-plugin:8.223.1.1003.", please see the [MavenCentral](#mavenCentral) section for an example and more information.
 * When using NodeJS version `15+` and version `2.231.1` of our plugin you could encounter the following error: `npm ERR! Could not resolve dependency: npm ERR! peer react@"^16.0" from @react-native-community/picker@1.8.1`. Using the old deprecrated [Picker dependency](https://www.npmjs.com/package/@react-native-community/picker) was causing peer dependency issues so we updated the auto-instrumentation to use the [new Picker dependency.](https://www.npmjs.com/package/@react-native-picker/picker) If you are still using this `@react-native-community/picker`, you can manually instrument the picker without issue ([create custom actions](#create-custom-actions)).
+* To disable the error handler when using manual startup, you will need to use/migrate to the `ConfigurationBuilder` instead of the deprecated `ManualStartupConfiguration`. There is no option to disable the crash handler using `ManualStartupConfiguration`.
 
 ## Report a bug or open a support case
 
@@ -1320,9 +1362,19 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.287.2
+latest
+* Updated the way we report unhandled errors without a stacktrace
+
+2.289.1
+* Update Android (8.289.2.1007) & iOS Agent (8.289.1.1015)
+* Added option to disable error handler for auto and manual start
+* Updated touchable instrumentation for React Native v74
+
+2.287.3
 * Update Android (8.287.1.1006) & iOS Agent (8.287.2.1009)
 * Added request and response size to [manual web request tagging](#manual-web-request-tagging)
+* Improved logging of configuration at startup
+* Fixed dtActionName when using ActionNamePrivacy
 
 2.285.2
 * Fixed bridge module issue for older React Native versions (< 0.65.0)

package/android/build.gradle

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

package/android/src/main/java/com/dynatrace/android/agent/DynatraceRNBridgeImpl.java

@@ -161,12 +161,11 @@ public class DynatraceRNBridgeImpl {
         }
     }
 
-    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, boolean newSession, String platform){
+    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, String platform){
         if (this.shouldWorkOnAndroid(platform)) {
             Dynatrace.reportCrash(isRealError ? PlatformType.JAVA_SCRIPT : PlatformType.CUSTOM, errorName, reason, stacktrace);
-            if(newSession){
-                Dynatrace.createNewSession();
-            }     
+            // Generate new session like iOS to make sure the behavior is the same
+            Dynatrace.createNewSession();
         }
     }
 

package/android/src/new/java/com/dynatrace/android/agent/DynatraceRNBridge.java

@@ -71,12 +71,12 @@ public class DynatraceRNBridge extends NativeDynatraceBridgeSpec {
     }
 
     @Override
-    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, boolean newSession, String platform){
-        this.impl.reportCrash(errorName, reason, stacktrace, isRealError, newSession, platform);
+    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, String platform){
+        this.impl.reportCrash(errorName, reason, stacktrace, isRealError, platform);
     }
 
     @Override
-    public void storeCrash(String errorName, String reason, String stacktrace, String platform){
+    public void storeCrash(String errorName, String reason, String stacktrace){
         // Empty on Purpose
     }
 

package/android/src/old/java/com/dynatrace/android/agent/DynatraceRNBridge.java

@@ -73,12 +73,12 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, boolean newSession, String platform){
-        this.impl.reportCrash(errorName, reason, stacktrace, isRealError, newSession, platform);
+    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, String platform){
+        this.impl.reportCrash(errorName, reason, stacktrace, isRealError, platform);
     }
 
     @ReactMethod
-    public void storeCrash(String errorName, String reason, String stacktrace, String platform){
+    public void storeCrash(String errorName, String reason, String stacktrace){
         // Empty on Purpose
     }
 

package/files/default.config.js

@@ -10,6 +10,20 @@ module.exports = {
          */
         debug: true,
 
+        errorHandler: {
+            /**
+             * Error handler is enabled.
+             */
+            enabled: true,
+
+            /**
+             * If we catch an unhandled error (fatal) with our error handler, we will report it as a crash 
+             * when using the default value of true. If the value is set to false, we will report the fatal 
+             * error as an error and continue the session.
+             */
+            reportFatalErrorAsCrash: true,
+        },
+
         lifecycle: {
             /**
              * Decide if you want to see Update Cycles as well

package/files/plugin.gradle

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

package/ios/DynatraceRNBridge.mm

@@ -172,22 +172,22 @@ RCT_EXPORT_METHOD(reportError:(NSString *)errorName errorValue:(NSString *)error
     }
 }
 
-RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)errorReason stacktrace:(NSString *)stacktrace isRealError:(BOOL)isRealError newSession:(BOOL)newSession platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)errorReason stacktrace:(NSString *)stacktrace isRealError:(BOOL)isRealError platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
         if(isRealError){
-            [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformJavaScript crashName:errorName reason:errorReason stacktrace:stacktrace];
+            [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformCustom crashName:errorName reason:errorReason stacktrace:stacktrace]; 
         }else{
             [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformCustom crashName:errorName reason:errorReason stacktrace:stacktrace];
         }
         
-        // We ignore the newSession parameter and always end the session as the iOS agent has no troubles with this behavior
+        // Always end the session as the iOS agent has no troubles with this behavior
         [Dynatrace endVisit];
     }
 }
 
-RCT_EXPORT_METHOD(storeCrash:(NSString *)crashName reason:(NSString *)reason stacktrace:(NSString *)stacktrace newSession:(BOOL)newSession) {
+RCT_EXPORT_METHOD(storeCrash:(NSString *)crashName reason:(NSString *)reason stacktrace:(NSString *)stacktrace) {
     NSString* dirPath = [[[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] firstObject] path];
     dirPath = [dirPath stringByAppendingPathComponent:@"DTXExternalCrashes"];
     // Create the Application Support/DTXExternalCrashes directory if it does not exist
@@ -202,10 +202,7 @@ RCT_EXPORT_METHOD(storeCrash:(NSString *)crashName reason:(NSString *)reason sta
     // Store react native crash
     [[NSFileManager defaultManager] createFileAtPath:[dirPath stringByAppendingPathComponent:@"RNCrash.txt"] contents:[crashJson dataUsingEncoding:NSUTF8StringEncoding] attributes:nil];
 
-    // Create a new session if the app is in debug mode or reloadOnFatalError value is set to true where the crash is caught and the app is not forced to shutdown
-    if (newSession) {
-        [Dynatrace endVisit];
-    }
+    [Dynatrace endVisit];
 }
 
 RCT_EXPORT_METHOD(reportErrorInAction:(nonnull NSString *)key errorName:(NSString *)errorName errorCode:(nonnull NSNumber *)errorCode platform: (NSString *) platform)

package/lib/instrumentor/DynatraceInstrumentation.js

@@ -1 +1 @@
-"use strict";var o,n=require("@babel/runtime/helpers/interopRequireDefault"),r=n(require("@babel/runtime/helpers/toConsumableArray")),a=(Object.defineProperty(exports,"t",{value:!0}),exports.instrument=void 0,require("path")),c=require("jscodeshift"),i=require("jscodeshift/src/Collection"),e=require("../../scripts/FileOperationHelper"),t=require("../../scripts/PathsConstants"),u=require("../react-native/Touchables.InstrInfo"),l=require("../react-native/RefreshControl.InstrInfo"),f=require("../react-native/Switch.InstrInfo"),s=require("../community/gesture-handler/Touchables.InstrInfo"),v=require("../community/Picker.InstrInfo"),d=require("./parser/Babel"),p=require("./model/Types"),m=(!function(n){n[n.i=-1]="Filtered",n[n.u=0]="Normal",n[n.o=1]="ReactNative",n[n.l=2]="React"}(o=o||{}),[]),y=(m.push.apply(m,(0,r.default)(u.instrumentationInfo)),m.push.apply(m,(0,r.default)(l.instrumentationInfo)),m.push.apply(m,(0,r.default)(f.instrumentationInfo)),m.push.apply(m,(0,r.default)(s.instrumentationInfo)),m.push.apply(m,(0,r.default)(v.instrumentationInfo)),["AppRegistry","renderApplication","setUpErrorHandling"]),instrument=function(n,r,e){r=P(r);var t=M(r);if(t!==o.i){var i=!1,u=N(r,n);if(t===o.l)T(u),i=!0;else if(t===o.o)r.endsWith("AppRegistry.js")?void 0!==e&&e.autoStart&&(U(u),i=!0):r.endsWith("renderApplication.js")?(q(u),i=!0):r.endsWith("setUpErrorHandling.js")&&(B(u,e.autoStart),i=!0);else{var t=w(r,e);if(e.custom.reactnavigation&&g(r,u))i=!0;else{if(!t.input&&!t.lifecycle)return null!=e&&e.debug&&console.log("Dynatrace - Filtered All: ".concat(r)),I(r),n;t.lifecycle&&q(u)&&(i=!0),t.input&&m.forEach(function(n){n=G(u,n);u=n.root,i=i||n.v})}}i?(n=u.toSource({quote:"single"}),H(n,r)):I(r),null!=e&&e.debug&&i&&console.log("Dynatrace - Modified Filename: "+r)}else r.includes(a.join("@dynatrace","react-native-plugin"))&&r.endsWith(a.join("lib","instrumentor","base","configuration","ConfigurationPreset.js"))&&void 0!==e&&(t=N(r,n),void 0!==e.lifecycle&&h(t,"getLifecycleUpdate",e.lifecycle.includeUpdate),void 0!==e.debug&&h(t,"getLogLevel",e.debug?0:1),void 0!==e.bundleName&&h(t,"getBundleName",e.bundleName),void 0!==e.input&&void 0!==e.input.actionNamePrivacy&&h(t,"getActionNamePrivacy",e.input.actionNamePrivacy),e.autoStart&&h(t,"isAutoStartupEnabled",e.autoStart),n=t.toSource({quote:"single"}),H(n,r));return n},g=(exports.instrument=instrument,function(n,r){return!!b(n,r)&&(r.find(c.ImportDeclaration).at(0).insertBefore("import { registerListener } from '@dynatrace/react-native-plugin/lib/react-navigation/ReactNavigation';"),!0)}),b=function(n,r){var e=!1;return n.includes("react-navigation")&&n.includes("NavigationContainer.tsx")&&r.find(c.VariableDeclarator).forEach(function(n){e||null==n.value||null==n.value.id||"refContainer"!==n.value.id.name||null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.type&&"VariableDeclaration"===n.parent.value.type&&(n.parent.insertAfter("registerListener(refContainer);"),e=!0)}),e},q=function(n){var r=n.findJSXElements(),t=!1;return 0<r.length&&(n.find(c.FunctionDeclaration).forEach(function(n){var r,e=(0,i.fromPaths)([n]);0<e.findJSXElements().length&&null!=n&&null!=n.value&&null!=n.value.id&&n.value.id.name&&(r=e.find(c.ClassDeclaration),e=e.find(c.ClassExpression),0===r.length)&&0===e.length&&(A(n,p.Types.FunctionalComponent,n.value.id.name),t=!0)}),n.find(c.ClassDeclaration).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n&&null!=n.value&&n.value.id&&n.value.id.name&&(A(n,p.Types.ClassComponent,n.value.id.name),t=!0)}),n.find(c.ArrowFunctionExpression).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.id&&null!=n.parent.value.id.name&&(A(n,p.Types.FunctionalComponent,n.parent.value.id.name),t=!0)})),t},A=function(n,r,e){for(r=c.expressionStatement(c.assignmentExpression("=",c.memberExpression(c.identifier(e),c.identifier("_dtInfo")),O(r,e)));void 0!==n.parentPath&&"body"!==n.parentPath.name;)n=n.parentPath;void 0!==n.parentPath&&n.insertAfter(r)},O=function(n,r){return c.objectExpression([c.objectProperty(c.identifier("type"),c.numericLiteral(n)),c.objectProperty(c.identifier("name"),c.stringLiteral(r))])},h=function(n,r,e){var n=n.find(c.Identifier).filter(function(n){return n.node.name===r});1===n.length&&"ReturnStatement"===(n=n.paths()[0].parent.value.body.body[0]).type&&("boolean"==typeof e&&(n.argument=c.booleanLiteral(e)),"string"==typeof e&&(n.argument=c.stringLiteral(e)),"number"==typeof e)&&(n.argument=c.numericLiteral(e))},N=function(n,r){return c.withParser((0,d.babelParser)(a.extname(n)))(r)},P=function(n){return a.isAbsolute(n)?n.replace(t.default.getApplicationPath()+a.sep,""):n},I=function(n){try{var r=a.join(t.default.getBuildPath(),n+".dtx");e.default.checkIfFileExistsSync(r),e.default.deleteFileSync(r)}catch(n){}},H=function(n,r){r=a.join(t.default.getBuildPath(),r);try{e.default.checkIfFileExistsSync(a.dirname(r))}catch(n){e.default.createDirectorySync(a.dirname(r))}e.default.writeTextToFileSync(r+".dtx",n)},w=function(n,r){var e={input:!1,lifecycle:!1};return void 0!==r&&(void 0!==r.lifecycle&&void 0!==r.lifecycle.instrument&&r.lifecycle.instrument(n)&&(e.lifecycle=!0),void 0!==r.input)&&void 0!==r.input.instrument&&r.input.instrument(n)&&(e.input=!0),e},T=function(n){var r,n=n.find(c.Program);1===n.length&&(r=c.expressionStatement(c.callExpression(c.memberExpression(c.callExpression(c.identifier("require"),[c.stringLiteral("@dynatrace/react-native-plugin/lib/instrumentor/base/ElementHelper")]),c.identifier("instrumentCreateElement")),[c.memberExpression(c.identifier("module"),c.identifier("exports"))])),n.paths()[0].node.body.push(r))},U=function(n){var r=J(n,"runApplication",!0);1===r.length&&(rn(n,{p:"_DynatraceApplicationHandler",module:"@dynatrace/react-native-plugin",reference:"ApplicationHandler"}),x(r.paths()[0].parent.value.body.body,0,R("_DynatraceApplicationHandler","startup",[])))},B=function(n,r){n=n.paths()[0].value.program.body;null!=n&&(x(n,n.length,_({p:"_DynatraceErrorHandler",module:"@dynatrace/react-native-plugin/lib/instrumentor/base/ErrorHandler",reference:""})),x(n,n.length,R("_DynatraceErrorHandler","registerErrorHandler",[])))},x=function(n,r){for(var e=arguments.length,t=new Array(2<e?e-2:0),i=2;i<e;i++)t[i-2]=arguments[i];return n.splice.apply(n,[r,0].concat(t))},J=function(n,r,t){for(var e=arguments.length,i=new Array(3<e?e-3:0),u=3;u<e;u++)i[u-3]=arguments[u];return n.find(c.Identifier).filter(function(n){return n.node.name===r}).filter(function(n){return void 0!==n.parent&&void 0!==n.parent.value&&void 0!==n.parent.value.params}).filter(function(n){var r=void 0!==n.parent&&void 0!==n.parent.value;t||(r=r&&n.parent.value.params.length===i.length);for(var e=0;e<0;e++)r=r&&n.parent.value.params[e].name===i[e];return r})},M=function(n){if(n.includes("@dynatrace"))return o.i;var r=a.extname(n);if(".js"!==r&&".ts"!==r&&".tsx"!==r&&".jsx"!==r)return o.i;for(var e=a.parse(n),t=e.dir.split(a.sep),i=0;i<t.length;i++)if("node_modules"===t[i]){if("react-native"===t[i+1]||"create-react-class"===t[i+1]||"react-clone-referenced-element"===t[i+1])return y.includes(e.name)?o.o:o.i;if("react"===t[i+1]&&"index"===e.name)return o.l}return o.u},k=function(n,r,e){var t=V(n,r,e);return z(n,r,e)||t},V=function(n,r,e){var t=K(n,r);return 0<t.length&&(void 0!==(t=E(t,r.reference,!1))&&(e.p=t.localName),$(n,e),!0)},z=function(n,r,e){var t=C(n,r.module);if(1===t.length){t=E(t,r.reference,!0);if(void 0!==t)return nn(n,e.defaultImport,t.localName,"ImportNamespaceSpecifier"===t.type),!0}return!1},G=function(n,r){var e=JSON.parse(JSON.stringify(r.new));return{root:n,v:k(n,r.old,e)||Q(n,r.old,r.new.defaultImport)}},K=function(n,r){return n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r.module&&null!=n.node.specifiers&&n.node.specifiers.some(function(n){return j(n)&&n.imported.name===r.reference||n.local&&n.local.name===r.reference})})},j=function(n){return void 0!==n.imported},Q=function(n,r,e){var t=!1;return n.find(c.CallExpression).filter(function(n){return W(n.node.callee)&&X(n.node.arguments[0])&&n.node.arguments[0].value===r.module&&void 0!==n.parent}).forEach(function(n){(void 0===n.parent.value.property||void 0!==n.parent.value.property&&void 0!==n.parent.value.property.name&&n.parent.value.property.name===r.reference)&&(n.node.arguments[0].value=e,t=t||!0)}),t},W=function(n){return"require"===n.name},X=function(n){return"StringLiteral"===n.type||"Literal"===n.type},C=function(n,r){return n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r})},E=function(n,e,t){var i;return n.forEach(function(n){void 0!==n.node.specifiers&&(n.node.specifiers=n.node.specifiers.filter(function(n){var r;return j(n)&&!t?((r=n.imported.name!==e)||null==n.local||n.imported.name===n.local.name||(i={localName:n.local.name,type:n.type}),r):!(!j(n)&&t&&(null!=n.local&&(i={localName:n.local.name,type:n.type}),1))}),0===n.node.specifiers.length)&&n.prune()}),i},Y=function(n,r){n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r.module}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(F(r))})},Z=function(n,r,e){n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(e)})},D=function(n,r,e){var t=n.find(c.ImportDeclaration);0<t.length?c(t.paths()[0]).insertAfter(S(r,e)):1===(t=n.find(c.Program)).length&&t.paths()[0].node.body.unshift(S(r,e))},$=function(n,r){0<C(n,r.module).length?Y(n,r):D(n,r.module,[F(r)])},nn=function(n,r,e,t){var i=C(n,r),t=(t?cn:an)(e);0<i.length?Z(n,r,t):D(n,r,[t])},rn=function(n,r){n=n.find(c.VariableDeclaration);0<n.length&&c(n.paths()[0]).insertAfter(_(r))},R=function(n,r,e){return c.expressionStatement(en(n,r,e))},en=function(n,r,e){return c.callExpression(on(n,r),e)},_=function(n){return c.variableDeclaration("var",[tn(n)])},tn=function(n){return c.variableDeclarator(void 0!==n.p?c.identifier(n.p):c.identifier(n.reference),(0<n.reference.length?un:L)(n))},un=function(n){return c.memberExpression(L(n),c.identifier(n.reference))},on=function(n,r){return c.memberExpression(c.identifier(n),c.identifier(r))},L=function(n){return c.callExpression(c.identifier("require"),[c.literal(n.module)])},S=function(n,r){return c.importDeclaration(r,c.literal(n))},F=function(n){return void 0!==n.p?c.importSpecifier(c.identifier(n.reference),c.identifier(n.p)):c.importSpecifier(c.identifier(n.reference))},an=function(n){return c.importDefaultSpecifier(c.identifier(n))},cn=function(n){return c.importNamespaceSpecifier(c.identifier(n))};
+"use strict";var o,n=require("@babel/runtime/helpers/interopRequireDefault"),r=n(require("@babel/runtime/helpers/toConsumableArray")),a=(Object.defineProperty(exports,"t",{value:!0}),exports.instrument=void 0,require("path")),c=require("jscodeshift"),i=require("jscodeshift/src/Collection"),e=require("../../scripts/FileOperationHelper"),t=require("../../scripts/PathsConstants"),u=require("../react-native/Touchables.InstrInfo"),l=require("../react-native/RefreshControl.InstrInfo"),f=require("../react-native/Switch.InstrInfo"),s=require("../community/gesture-handler/Touchables.InstrInfo"),v=require("../community/Picker.InstrInfo"),d=require("./parser/Babel"),p=require("./model/Types"),m=(!function(n){n[n.i=-1]="Filtered",n[n.u=0]="Normal",n[n.o=1]="ReactNative",n[n.l=2]="React"}(o=o||{}),[]),y=(m.push.apply(m,(0,r.default)(u.instrumentationInfo)),m.push.apply(m,(0,r.default)(l.instrumentationInfo)),m.push.apply(m,(0,r.default)(f.instrumentationInfo)),m.push.apply(m,(0,r.default)(s.instrumentationInfo)),m.push.apply(m,(0,r.default)(v.instrumentationInfo)),["AppRegistry","renderApplication","setUpErrorHandling"]),instrument=function(n,r,e){r=P(r);var t=M(r);if(t!==o.i){var i=!1,u=N(r,n);if(t===o.l)T(u),i=!0;else if(t===o.o)r.endsWith("AppRegistry.js")?void 0!==e&&e.autoStart&&(U(u),i=!0):r.endsWith("renderApplication.js")?(q(u),i=!0):r.endsWith("setUpErrorHandling.js")&&void 0!==e&&e.autoStart&&e.errorHandler.enabled&&(B(u,e.autoStart,e.errorHandler.reportFatalErrorAsCrash),i=!0);else{var t=w(r,e);if(e.custom.reactnavigation&&g(r,u))i=!0;else{if(!t.input&&!t.lifecycle)return null!=e&&e.debug&&console.log("Dynatrace - Filtered All: ".concat(r)),E(r),n;t.lifecycle&&q(u)&&(i=!0),t.input&&m.forEach(function(n){n=G(u,n);u=n.root,i=i||n.v})}}i?(n=u.toSource({quote:"single"}),H(n,r)):E(r),null!=e&&e.debug&&i&&console.log("Dynatrace - Modified Filename: "+r)}else r.includes(a.join("@dynatrace","react-native-plugin"))&&r.endsWith(a.join("lib","instrumentor","base","configuration","ConfigurationPreset.js"))&&void 0!==e&&(t=N(r,n),void 0!==e.lifecycle&&h(t,"getLifecycleUpdate",e.lifecycle.includeUpdate),void 0!==e.debug&&h(t,"getLogLevel",e.debug?0:1),void 0!==e.bundleName&&h(t,"getBundleName",e.bundleName),void 0!==e.input&&void 0!==e.input.actionNamePrivacy&&h(t,"getActionNamePrivacy",e.input.actionNamePrivacy),void 0!==e.errorHandler&&(h(t,"isErrorHandlerEnabled",e.errorHandler.enabled),h(t,"isReportFatalErrorAsCrash",e.errorHandler.reportFatalErrorAsCrash)),e.autoStart&&h(t,"isAutoStartupEnabled",e.autoStart),n=t.toSource({quote:"single"}),H(n,r));return n},g=(exports.instrument=instrument,function(n,r){return!!b(n,r)&&(r.find(c.ImportDeclaration).at(0).insertBefore("import { registerListener } from '@dynatrace/react-native-plugin/lib/react-navigation/ReactNavigation';"),!0)}),b=function(n,r){var e=!1;return n.includes("react-navigation")&&n.includes("NavigationContainer.tsx")&&r.find(c.VariableDeclarator).forEach(function(n){e||null==n.value||null==n.value.id||"refContainer"!==n.value.id.name||null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.type&&"VariableDeclaration"===n.parent.value.type&&(n.parent.insertAfter("registerListener(refContainer);"),e=!0)}),e},q=function(n){var r=n.findJSXElements(),t=!1;return 0<r.length&&(n.find(c.FunctionDeclaration).forEach(function(n){var r,e=(0,i.fromPaths)([n]);0<e.findJSXElements().length&&null!=n&&null!=n.value&&null!=n.value.id&&n.value.id.name&&(r=e.find(c.ClassDeclaration),e=e.find(c.ClassExpression),0===r.length)&&0===e.length&&(A(n,p.Types.FunctionalComponent,n.value.id.name),t=!0)}),n.find(c.ClassDeclaration).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n&&null!=n.value&&n.value.id&&n.value.id.name&&(A(n,p.Types.ClassComponent,n.value.id.name),t=!0)}),n.find(c.ArrowFunctionExpression).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.id&&null!=n.parent.value.id.name&&(A(n,p.Types.FunctionalComponent,n.parent.value.id.name),t=!0)})),t},A=function(n,r,e){for(r=c.expressionStatement(c.assignmentExpression("=",c.memberExpression(c.identifier(e),c.identifier("_dtInfo")),O(r,e)));void 0!==n.parentPath&&"body"!==n.parentPath.name;)n=n.parentPath;void 0!==n.parentPath&&n.insertAfter(r)},O=function(n,r){return c.objectExpression([c.objectProperty(c.identifier("type"),c.numericLiteral(n)),c.objectProperty(c.identifier("name"),c.stringLiteral(r))])},h=function(n,r,e){var n=n.find(c.Identifier).filter(function(n){return n.node.name===r});1===n.length&&"ReturnStatement"===(n=n.paths()[0].parent.value.body.body[0]).type&&("boolean"==typeof e&&(n.argument=c.booleanLiteral(e)),"string"==typeof e&&(n.argument=c.stringLiteral(e)),"number"==typeof e)&&(n.argument=c.numericLiteral(e))},N=function(n,r){return c.withParser((0,d.babelParser)(a.extname(n)))(r)},P=function(n){return a.isAbsolute(n)?n.replace(t.default.getApplicationPath()+a.sep,""):n},E=function(n){try{var r=a.join(t.default.getBuildPath(),n+".dtx");e.default.checkIfFileExistsSync(r),e.default.deleteFileSync(r)}catch(n){}},H=function(n,r){r=a.join(t.default.getBuildPath(),r);try{e.default.checkIfFileExistsSync(a.dirname(r))}catch(n){e.default.createDirectorySync(a.dirname(r))}e.default.writeTextToFileSync(r+".dtx",n)},w=function(n,r){var e={input:!1,lifecycle:!1};return void 0!==r&&(void 0!==r.lifecycle&&void 0!==r.lifecycle.instrument&&r.lifecycle.instrument(n)&&(e.lifecycle=!0),void 0!==r.input)&&void 0!==r.input.instrument&&r.input.instrument(n)&&(e.input=!0),e},T=function(n){var r,n=n.find(c.Program);1===n.length&&(r=c.expressionStatement(c.callExpression(c.memberExpression(c.callExpression(c.identifier("require"),[c.stringLiteral("@dynatrace/react-native-plugin/lib/instrumentor/base/ElementHelper")]),c.identifier("instrumentCreateElement")),[c.memberExpression(c.identifier("module"),c.identifier("exports"))])),n.paths()[0].node.body.push(r))},U=function(n){var r=J(n,"runApplication",!0);1===r.length&&(rn(n,{p:"_DynatraceApplicationHandler",module:"@dynatrace/react-native-plugin",reference:"ApplicationHandler"}),I(r.paths()[0].parent.value.body.body,0,D("_DynatraceApplicationHandler","startup",[])))},B=function(n,r,e){n=n.paths()[0].value.program.body;null!=n&&(I(n,n.length,_({p:"_DynatraceErrorHandler",module:"@dynatrace/react-native-plugin/lib/instrumentor/base/ErrorHandler",reference:""})),I(n,n.length,D("_DynatraceErrorHandler","registerErrorHandler",[c.literal(e)])))},I=function(n,r){for(var e=arguments.length,t=new Array(2<e?e-2:0),i=2;i<e;i++)t[i-2]=arguments[i];return n.splice.apply(n,[r,0].concat(t))},J=function(n,r,t){for(var e=arguments.length,i=new Array(3<e?e-3:0),u=3;u<e;u++)i[u-3]=arguments[u];return n.find(c.Identifier).filter(function(n){return n.node.name===r}).filter(function(n){return void 0!==n.parent&&void 0!==n.parent.value&&void 0!==n.parent.value.params}).filter(function(n){var r=void 0!==n.parent&&void 0!==n.parent.value;t||(r=r&&n.parent.value.params.length===i.length);for(var e=0;e<0;e++)r=r&&n.parent.value.params[e].name===i[e];return r})},M=function(n){if(n.includes("@dynatrace"))return o.i;var r=a.extname(n);if(".js"!==r&&".ts"!==r&&".tsx"!==r&&".jsx"!==r)return o.i;for(var e=a.parse(n),t=e.dir.split(a.sep),i=0;i<t.length;i++)if("node_modules"===t[i]){if("react-native"===t[i+1]||"create-react-class"===t[i+1]||"react-clone-referenced-element"===t[i+1])return y.includes(e.name)?o.o:o.i;if("react"===t[i+1]&&"index"===e.name)return o.l}return o.u},k=function(n,r,e){var t=V(n,r,e);return z(n,r,e)||t},V=function(n,r,e){var t=K(n,r);return 0<t.length&&(void 0!==(t=j(t,r.reference,!1))&&(e.p=t.localName),$(n,e),!0)},z=function(n,r,e){var t=C(n,r.module);if(1===t.length){t=j(t,r.reference,!0);if(void 0!==t)return nn(n,e.defaultImport,t.localName,"ImportNamespaceSpecifier"===t.type),!0}return!1},G=function(n,r){var e=JSON.parse(JSON.stringify(r.new));return{root:n,v:k(n,r.old,e)||Q(n,r.old,r.new.defaultImport)}},K=function(n,r){return n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r.module&&null!=n.node.specifiers&&n.node.specifiers.some(function(n){return x(n)&&n.imported.name===r.reference||n.local&&n.local.name===r.reference})})},x=function(n){return void 0!==n.imported},Q=function(n,r,e){var t=!1;return n.find(c.CallExpression).filter(function(n){return W(n.node.callee)&&X(n.node.arguments[0])&&n.node.arguments[0].value===r.module&&void 0!==n.parent}).forEach(function(n){(void 0===n.parent.value.property||void 0!==n.parent.value.property&&void 0!==n.parent.value.property.name&&n.parent.value.property.name===r.reference)&&(n.node.arguments[0].value=e,t=t||!0)}),t},W=function(n){return"require"===n.name},X=function(n){return"StringLiteral"===n.type||"Literal"===n.type},C=function(n,r){return n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r})},j=function(n,e,t){var i;return n.forEach(function(n){void 0!==n.node.specifiers&&(n.node.specifiers=n.node.specifiers.filter(function(n){var r;return x(n)&&!t?((r=n.imported.name!==e)||null==n.local||n.imported.name===n.local.name||(i={localName:n.local.name,type:n.type}),r):!(!x(n)&&t&&(null!=n.local&&(i={localName:n.local.name,type:n.type}),1))}),0===n.node.specifiers.length)&&n.prune()}),i},Y=function(n,r){n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r.module}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(F(r))})},Z=function(n,r,e){n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(e)})},R=function(n,r,e){var t=n.find(c.ImportDeclaration);0<t.length?c(t.paths()[0]).insertAfter(S(r,e)):1===(t=n.find(c.Program)).length&&t.paths()[0].node.body.unshift(S(r,e))},$=function(n,r){0<C(n,r.module).length?Y(n,r):R(n,r.module,[F(r)])},nn=function(n,r,e,t){var i=C(n,r),t=(t?cn:an)(e);0<i.length?Z(n,r,t):R(n,r,[t])},rn=function(n,r){n=n.find(c.VariableDeclaration);0<n.length&&c(n.paths()[0]).insertAfter(_(r))},D=function(n,r,e){return c.expressionStatement(en(n,r,e))},en=function(n,r,e){return c.callExpression(on(n,r),e)},_=function(n){return c.variableDeclaration("var",[tn(n)])},tn=function(n){return c.variableDeclarator(void 0!==n.p?c.identifier(n.p):c.identifier(n.reference),(0<n.reference.length?un:L)(n))},un=function(n){return c.memberExpression(L(n),c.identifier(n.reference))},on=function(n,r){return c.memberExpression(c.identifier(n),c.identifier(r))},L=function(n){return c.callExpression(c.identifier("require"),[c.literal(n.module)])},S=function(n,r){return c.importDeclaration(r,c.literal(n))},F=function(n){return void 0!==n.p?c.importSpecifier(c.identifier(n.reference),c.identifier(n.p)):c.importSpecifier(c.identifier(n.reference))},an=function(n){return c.importDefaultSpecifier(c.identifier(n))},cn=function(n){return c.importNamespaceSpecifier(c.identifier(n))};

package/lib/instrumentor/base/Application.js

@@ -9,7 +9,7 @@ exports.ApplicationHandler = {
         if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
             const config = new ConfigurationBuilder_1.ConfigurationBuilder('', '').buildConfiguration();
             ConfigurationHandler_1.ConfigurationHandler.setConfiguration(config);
-            Logger_1.Logger.logDebug('Configuration set: ' + JSON.stringify(config));
+            Logger_1.Logger.logDebug('Configuration set: ' + config.toString());
             Logger_1.Logger.logInfo('Dynatrace React Native Plugin started!');
         }
     },

package/lib/instrumentor/base/Dynatrace.js

@@ -22,13 +22,20 @@ const NullRootAction_1 = require("./NullRootAction");
 const DynatraceInternal_1 = require("./DynatraceInternal");
 const DynatraceAction_1 = require("./DynatraceAction");
 const NullAction_1 = require("./NullAction");
+const ErrorHandler_1 = require("./ErrorHandler");
 exports.Dynatrace = {
     start: (configuration) => __awaiter(void 0, void 0, void 0, function* () {
         if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
             if (configuration !== undefined) {
                 DynatraceBridge_1.DynatraceNative.start(configuration);
+                if (configuration.errorHandler) {
+                    (0, ErrorHandler_1.registerErrorHandler)(configuration.reportFatalErrorAsCrash);
+                }
+                else {
+                    Logger_1.Logger.logDebug('Dynatrace error handler will not be enabled as errorHandler was set to false!');
+                }
                 ConfigurationHandler_1.ConfigurationHandler.setConfiguration(configuration);
-                Logger_1.Logger.logDebug('Manual Configuration set: ' + JSON.stringify(configuration));
+                Logger_1.Logger.logDebug('Configuration set: ' + configuration.toString());
             }
             else {
                 throw new Error('Configuration is empty! Not allowed for Manual Startup!');
@@ -151,7 +158,7 @@ exports.Dynatrace = {
                     }
                 }
                 Logger_1.Logger.logDebug(`Dynatrace reportCrash(${crashName}, ${reason}, ${stacktrace})`);
-                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, reason, stacktrace, false, true, platform === null || platform === void 0 ? void 0 : platform.toString());
+                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, reason, stacktrace, false, platform === null || platform === void 0 ? void 0 : platform.toString());
             }
         }
         else {
@@ -170,7 +177,7 @@ exports.Dynatrace = {
                     }
                 }
                 Logger_1.Logger.logDebug(`Dynatrace reportCrashWithException(${crashName}, ${crash.stack})`);
-                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, crashReason, crash.stack, true, true, platform === null || platform === void 0 ? void 0 : platform.toString());
+                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, crashReason, crash.stack, true, platform === null || platform === void 0 ? void 0 : platform.toString());
             }
         }
         else {

package/lib/instrumentor/base/DynatraceInternal.js

@@ -1,17 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynatraceInternal = void 0;
+const ReactNative = require("react-native");
 const DynatraceBridge_1 = require("./DynatraceBridge");
+const Dynatrace_1 = require("./Dynatrace");
 const Logger_1 = require("./Logger");
+const StringUtils_1 = require("./util/StringUtils");
 let counter = 0;
 exports.DynatraceInternal = {
-    reportErrorFromHandler: (isFatal, errorName, reason, stacktrace, isCustomErrorHandlerSet, platform) => {
-        Logger_1.Logger.logDebug(`Dynatrace reportErrorStacktrace(${isFatal}, ${errorName}, ${reason}, ${stacktrace})`);
-        if (isFatal) {
-            DynatraceBridge_1.DynatraceNative.reportCrash(errorName, reason, stacktrace, true, __DEV__ || isCustomErrorHandlerSet, platform === null || platform === void 0 ? void 0 : platform.toString());
+    reportErrorFromHandler: (isFatal, errorName, reason, stacktrace, isReportFatalErrorAsCrash, platform) => {
+        if (isFatal && isReportFatalErrorAsCrash) {
+            if (ReactNative.Platform.OS === 'ios') {
+                DynatraceBridge_1.DynatraceNative.storeCrash(errorName, reason, stacktrace);
+                Logger_1.Logger.logDebug(`ErrorHandler storeCrash(${errorName}, ${reason}, ${stacktrace})`);
+            }
+            else {
+                DynatraceBridge_1.DynatraceNative.reportCrash(errorName, reason, stacktrace, true, platform === null || platform === void 0 ? void 0 : platform.toString());
+                Logger_1.Logger.logDebug(`Dynatrace reportCrash(${errorName}, ${reason}, ${stacktrace})`);
+            }
         }
         else {
-            DynatraceBridge_1.DynatraceNative.reportError(errorName, '-', reason, stacktrace, platform === null || platform === void 0 ? void 0 : platform.toString());
+            if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(stacktrace)) {
+                DynatraceBridge_1.DynatraceNative.reportError(errorName, '-', reason, stacktrace, platform === null || platform === void 0 ? void 0 : platform.toString());
+                Logger_1.Logger.logDebug(`Dynatrace reportError(${errorName}, ${reason}, ${stacktrace})`);
+            }
+            else {
+                Dynatrace_1.Dynatrace.reportError(errorName, -1);
+                Logger_1.Logger.logDebug(`Dynatrace reportErrorWithoutStacktrace(${errorName})`);
+            }
         }
     },
     getCounter: () => counter++,

package/lib/instrumentor/base/ErrorHandler.js

@@ -1,24 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._reportErrorToDynatrace = exports.isCustomErrorHandlerSet = exports.registerErrorHandler = void 0;
+exports._reportErrorToDynatrace = exports.registerErrorHandler = void 0;
 const ReactNative = require("react-native");
 const DynatraceInternal_1 = require("./DynatraceInternal");
-const DynatraceBridge_1 = require("./DynatraceBridge");
 const Dynatrace_1 = require("./Dynatrace");
 const StringUtils_1 = require("./util/StringUtils");
 const Logger_1 = require("./Logger");
-const Platform_1 = require("./model/Platform");
-let _isCustomErrorHandlerSet = false;
+let _isReportFatalErrorAsCrash = true;
 const _isReactNativeGlobal = (globalScope) => globalScope.ErrorUtils !== undefined;
-const registerErrorHandler = () => {
+const registerErrorHandler = (reportFatalErrorAsCrash) => {
     if (global !== undefined && _isReactNativeGlobal(global)) {
+        _isReportFatalErrorAsCrash = reportFatalErrorAsCrash;
         const oldHandler = global.ErrorUtils.getGlobalHandler();
         global.ErrorUtils.setGlobalHandler((error, isFatal) => {
             (0, exports._reportErrorToDynatrace)(error, isFatal, oldHandler);
         });
         const setter = global.ErrorUtils.setGlobalHandler;
         global.ErrorUtils.setGlobalHandler = (errorHandler) => {
-            _isCustomErrorHandlerSet = true;
             setter((error, isFatal) => {
                 (0, exports._reportErrorToDynatrace)(error, isFatal, errorHandler);
             });
@@ -26,33 +24,19 @@ const registerErrorHandler = () => {
     }
 };
 exports.registerErrorHandler = registerErrorHandler;
-const isCustomErrorHandlerSet = () => _isCustomErrorHandlerSet;
-exports.isCustomErrorHandlerSet = isCustomErrorHandlerSet;
 const _reportErrorToDynatrace = (exception, isFatal, oldHandler) => {
     if (exception != null && isExceptionAnError(exception)) {
         if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(exception.name)) {
             if (isFatal === undefined) {
                 isFatal = false;
             }
-            if (exception.stack != null) {
-                if (ReactNative.Platform.OS === 'ios') {
-                    DynatraceBridge_1.DynatraceNative.storeCrash(String(exception.name), adjustedReason(exception.message), exception.stack, Platform_1.Platform.Ios.toString());
-                    Logger_1.Logger.logDebug(`ErrorHandler storeCrash(${exception}, ${isFatal})`);
-                }
-                else {
-                    DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), adjustedReason(exception.message), exception.stack, _isCustomErrorHandlerSet);
-                    Logger_1.Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception}, ${isFatal})`);
-                }
-            }
-            else {
-                Dynatrace_1.Dynatrace.reportError(String(exception.name) + ': ' + exception.message, -1);
-                Logger_1.Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception})`);
-            }
+            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})`);
         }
     }
     else {
         Dynatrace_1.Dynatrace.reportError(String(exception), -1);
-        Logger_1.Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception})`);
+        Logger_1.Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception}, -1)`);
     }
     if (oldHandler !== undefined) {
         if (ReactNative.Platform.OS === 'ios') {

package/lib/instrumentor/base/Touchable.js

@@ -25,7 +25,7 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             }
             else {
                 let finalNameOfAction = nameOfAction;
-                if (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}`);

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

@@ -1,16 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
+const LogLevel_1 = require("../model/LogLevel");
 class Configuration {
-    constructor(beaconUrl, applicationId, reportCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, bundleName) {
+    constructor(beaconUrl, applicationId, reportCrash, errorHandler, reportFatalErrorAsCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, bundleName) {
         this.beaconUrl = beaconUrl;
         this.applicationId = applicationId;
         this.reportCrash = reportCrash;
+        this.errorHandler = errorHandler;
+        this.reportFatalErrorAsCrash = reportFatalErrorAsCrash;
         this.logLevel = logLevel;
         this.lifecycleUpdate = lifecycleUpdate;
         this.userOptIn = userOptIn;
         this.actionNamePrivacy = actionNamePrivacy;
         this.bundleName = bundleName;
     }
+    toString() {
+        let configurationString;
+        if (this.beaconUrl === '' && this.applicationId === '') {
+            configurationString = '{Startup: Auto Start,';
+        }
+        else {
+            configurationString = `{Startup: Manual Start, applicationId: ${this.applicationId}, beaconUrl: ${this.beaconUrl},`;
+        }
+        configurationString += ` 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}`;
+        }
+        configurationString += '}';
+        return configurationString;
+    }
 }
 exports.Configuration = Configuration;

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

@@ -12,6 +12,8 @@ class ConfigurationBuilder {
         this.applicationId = applicationId;
         const preset = new ConfigurationPreset_1.ConfigurationPreset();
         this.reportCrash = ConfigurationDefaults_1.DEFAULT_REPORT_CRASH;
+        this.errorHandler = preset.isErrorHandlerEnabled();
+        this.reportFatalErrorAsCrash = preset.isReportFatalErrorAsCrash();
         this.logLevel = preset.getLogLevel();
         this.lifecycleUpdate = preset.getLifecycleUpdate();
         this.userOptIn = ConfigurationDefaults_1.DEFAULT_USER_OPT_IN;
@@ -23,6 +25,14 @@ class ConfigurationBuilder {
         this.reportCrash = reportCrash;
         return this;
     }
+    withErrorHandler(errorHandler) {
+        this.errorHandler = errorHandler;
+        return this;
+    }
+    withReportFatalErrorAsCrash(reportFatalErrorAsCrash) {
+        this.reportFatalErrorAsCrash = reportFatalErrorAsCrash;
+        return this;
+    }
     withLogLevel(logLevel) {
         this.logLevel = logLevel;
         return this;
@@ -50,7 +60,7 @@ class ConfigurationBuilder {
         if (!this.autoStartup && this.applicationId.length === 0) {
             throw new Error('applicationId configuration property is empty. This configuration is not possible! Please use a proper application id.');
         }
-        return new Configuration_1.Configuration(this.beaconUrl, this.applicationId, this.reportCrash, this.logLevel, this.lifecycleUpdate, this.userOptIn, this.actionNamePrivacy, this.bundleName);
+        return new Configuration_1.Configuration(this.beaconUrl, this.applicationId, this.reportCrash, this.errorHandler, this.reportFatalErrorAsCrash, this.logLevel, this.lifecycleUpdate, this.userOptIn, this.actionNamePrivacy, this.bundleName);
     }
 }
 exports.ConfigurationBuilder = ConfigurationBuilder;

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ACTION_NAME_PRIVACY = exports.DEFAULT_USER_OPT_IN = exports.DEFAULT_REPORT_CRASH = exports.DEFAULT_LOGLEVEL = exports.DEFAULT_LIFECYCLE_UPDATE = void 0;
+exports.DEFAULT_ACTION_NAME_PRIVACY = exports.DEFAULT_USER_OPT_IN = exports.DEFAULT_LOGLEVEL = exports.DEFAULT_FATAL_AS_CRASH = exports.DEFAULT_ERROR_HANDLER = exports.DEFAULT_REPORT_CRASH = exports.DEFAULT_LIFECYCLE_UPDATE = void 0;
 const LogLevel_1 = require("../model/LogLevel");
 exports.DEFAULT_LIFECYCLE_UPDATE = false;
-exports.DEFAULT_LOGLEVEL = LogLevel_1.LogLevel.Info;
 exports.DEFAULT_REPORT_CRASH = true;
+exports.DEFAULT_ERROR_HANDLER = true;
+exports.DEFAULT_FATAL_AS_CRASH = true;
+exports.DEFAULT_LOGLEVEL = LogLevel_1.LogLevel.Info;
 exports.DEFAULT_USER_OPT_IN = false;
 exports.DEFAULT_ACTION_NAME_PRIVACY = false;

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

@@ -8,6 +8,8 @@ exports.ConfigurationHandler = {
         _configuration = configuration;
     },
     isConfigurationAvailable: () => _configuration !== undefined,
+    isErrorHandlerEnabled: () => _configuration.errorHandler,
+    isReportFatalErrorAsCrash: () => _configuration.reportFatalErrorAsCrash,
     isDebugEnabled: () => _configuration.logLevel === LogLevel_1.LogLevel.Debug,
     isLifecycleUpdateEnabled: () => _configuration.lifecycleUpdate,
     isActionNamePrivacyEnabled: () => _configuration.actionNamePrivacy,

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

@@ -12,6 +12,12 @@ class ConfigurationPreset {
     getLogLevel() {
         return ConfigurationDefaults_1.DEFAULT_LOGLEVEL;
     }
+    isErrorHandlerEnabled() {
+        return ConfigurationDefaults_1.DEFAULT_ERROR_HANDLER;
+    }
+    isReportFatalErrorAsCrash() {
+        return ConfigurationDefaults_1.DEFAULT_FATAL_AS_CRASH;
+    }
     getActionNamePrivacy() {
         return ConfigurationDefaults_1.DEFAULT_ACTION_NAME_PRIVACY;
     }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManualStartupConfiguration = void 0;
+const LogLevel_1 = require("../model/LogLevel");
 const ConfigurationDefaults_1 = require("./ConfigurationDefaults");
 const ConfigurationPreset_1 = require("./ConfigurationPreset");
 class ManualStartupConfiguration {
@@ -14,6 +15,8 @@ class ManualStartupConfiguration {
         this.beaconUrl = beaconUrl;
         const preset = new ConfigurationPreset_1.ConfigurationPreset();
         this.logLevel = preset.getLogLevel();
+        this.errorHandler = preset.isErrorHandlerEnabled();
+        this.reportFatalErrorAsCrash = preset.isReportFatalErrorAsCrash();
         this.lifecycleUpdate = preset.getLifecycleUpdate();
         this.actionNamePrivacy = preset.getActionNamePrivacy();
         this.bundleName = preset.getBundleName();
@@ -36,5 +39,15 @@ class ManualStartupConfiguration {
             this.bundleName = bundleName;
         }
     }
+    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)}`;
+        if (this.bundleName !== undefined) {
+            configurationString += `, bundleName: ${this.bundleName}`;
+        }
+        configurationString += '}';
+        return configurationString;
+    }
 }
 exports.ManualStartupConfiguration = ManualStartupConfiguration;

package/lib/instrumentor/base/model/LogLevel.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevel = void 0;
+exports.LogLevelToString = exports.LogLevel = void 0;
 var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["Debug"] = 0] = "Debug";
     LogLevel[LogLevel["Info"] = 1] = "Info";
 })(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
+const LogLevelToString = (level) => {
+    if (level === LogLevel.Debug) {
+        return 'Debug';
+    }
+    else {
+        return 'Info';
+    }
+};
+exports.LogLevelToString = LogLevelToString;

package/lib/react-native/Touchables.js

@@ -1,63 +1,20 @@
 "use strict";
-var _a, _b, _c, _d, _e, _f;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pressable = exports.Text = exports.TouchableWithoutFeedback = exports.TouchableNativeFeedback = exports.TouchableHighlight = exports.TouchableOpacity = exports.Button = void 0;
 const ReactNative = require("react-native");
+const React = require("react");
 const Types_1 = require("../instrumentor/model/Types");
-if (typeof ReactNative.Button === 'object') {
-    exports.Button = Object.assign({ _dtInfo: { type: Types_1.Types.Button } }, ReactNative.Button);
-}
-else {
-    exports.Button = (_a = class Button extends ReactNative.Button {
-        },
-        _a._dtInfo = { type: Types_1.Types.Button },
-        _a);
-}
-if (typeof ReactNative.TouchableOpacity === 'object') {
-    exports.TouchableOpacity = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableOpacity } }, ReactNative.TouchableOpacity);
-}
-else {
-    exports.TouchableOpacity = (_b = class TouchableOpacity extends (ReactNative.TouchableOpacity) {
-        },
-        _b._dtInfo = { type: Types_1.Types.TouchableOpacity },
-        _b);
-}
-if (typeof ReactNative.TouchableHighlight === 'object') {
-    exports.TouchableHighlight = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableHighlight } }, ReactNative.TouchableHighlight);
-}
-else {
-    exports.TouchableHighlight = (_c = class TouchableHighlight extends (ReactNative.TouchableHighlight) {
-        },
-        _c._dtInfo = { type: Types_1.Types.TouchableHighlight },
-        _c);
-}
-if (typeof ReactNative.TouchableNativeFeedback === 'object') {
-    exports.TouchableNativeFeedback = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableNativeFeedback } }, ReactNative.TouchableNativeFeedback);
-}
-else {
-    exports.TouchableNativeFeedback = (_d = class TouchableNativeFeedback extends (ReactNative.TouchableNativeFeedback) {
-        },
-        _d._dtInfo = { type: Types_1.Types.TouchableNativeFeedback },
-        _d);
-}
-if (typeof ReactNative.TouchableWithoutFeedback === 'object') {
-    exports.TouchableWithoutFeedback = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableWithoutFeedback } }, ReactNative.TouchableWithoutFeedback);
-}
-else {
-    exports.TouchableWithoutFeedback = (_e = class TouchableWithoutFeedback extends (ReactNative.TouchableWithoutFeedback) {
-        },
-        _e._dtInfo = { type: Types_1.Types.TouchableWithoutFeedback },
-        _e);
-}
-if (typeof ReactNative.Text === 'object') {
-    exports.Text = Object.assign({ _dtInfo: { type: Types_1.Types.Text } }, ReactNative.Text);
-}
-else {
-    exports.Text = (_f = class Text extends ReactNative.Text {
-        },
-        _f._dtInfo = { type: Types_1.Types.Text },
-        _f);
-}
-if (typeof ReactNative.Pressable === 'object') {
-    exports.Pressable = Object.assign({ _dtInfo: { type: Types_1.Types.Pressable } }, ReactNative.Pressable);
-}
+exports.Button = React.forwardRef((props, ref) => React.createElement(ReactNative.Button, Object.assign({}, props, { ref: ref })));
+exports.Button._dtInfo = { type: Types_1.Types.Button };
+exports.TouchableOpacity = React.forwardRef((props, ref) => React.createElement(ReactNative.TouchableOpacity, Object.assign({}, props, { ref: ref })));
+exports.TouchableOpacity._dtInfo = { type: Types_1.Types.TouchableOpacity };
+exports.TouchableHighlight = React.forwardRef((props, ref) => React.createElement(ReactNative.TouchableHighlight, Object.assign({}, props, { ref: ref })));
+exports.TouchableHighlight._dtInfo = { type: Types_1.Types.TouchableHighlight };
+exports.TouchableNativeFeedback = React.forwardRef((props, ref) => React.createElement(ReactNative.TouchableNativeFeedback, Object.assign({}, props, { ref: ref })));
+exports.TouchableNativeFeedback._dtInfo = { type: Types_1.Types.TouchableNativeFeedback };
+exports.TouchableWithoutFeedback = React.forwardRef((props, ref) => React.createElement(ReactNative.TouchableWithoutFeedback, Object.assign({}, props, { ref: ref })));
+exports.TouchableWithoutFeedback._dtInfo = { type: Types_1.Types.TouchableWithoutFeedback };
+exports.Text = React.forwardRef((props, ref) => React.createElement(ReactNative.Text, Object.assign({}, props, { ref: ref })));
+exports.Text._dtInfo = { type: Types_1.Types.Text };
+exports.Pressable = React.forwardRef((props, ref) => React.createElement(ReactNative.Pressable, Object.assign({}, props, { ref: ref })));
+exports.Pressable._dtInfo = { type: Types_1.Types.Pressable };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dynatrace/react-native-plugin",
-    "version": "2.287.2",
+    "version": "2.289.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",
@@ -71,7 +71,7 @@
     "author": "Dynatrace",
     "license": "SEE LICENSE IN LICENSE.md",
     "dependencies": {
-        "@babel/runtime": "^7.24.1",
+        "@babel/runtime": "^7.24.4",
         "jscodeshift": "^0.15.2",
         "plist": "^3.1.0",
         "proxy-polyfill": "^0.3.2",
@@ -146,6 +146,7 @@
         "lib/community/gesture-handler/*.js",
         "lib/react-navigation/*.js",
         "lib/react-native/*.js",
+        "lib/react-native/Touchables.jsx",
         "lib/react/*.js",
         "lib/metro/*.js",
         "lib/util/*.js",

package/react-native-dynatrace.podspec

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

package/scripts/Config.js

@@ -19,6 +19,10 @@ exports.defaultConfig = {
     react: {
         autoStart: true,
         debug: false,
+        errorHandler: {
+            enabled: true,
+            reportFatalErrorAsCrash: true
+        },
         lifecycle: {
             includeUpdate: false,
             instrument: (filename) => false,

package/scripts/Ios.js

@@ -128,9 +128,9 @@ const checkForExcludedControls = (config) => config != null && config.indexOf('D
 const updatedExcludedStr = (config) => {
     if (checkForExcludedControls(config)) {
         const controlsArr = Object.keys(PlistConstants_1.CONTROLS_PROP_OPTIONS);
-        let updatedStr = `${PlistConstants_1.START_CONTROLS_PROP}${PlistConstants_1.CONTROLS_PROP_OPTIONS.PickerView}`;
+        let updatedStr = `${PlistConstants_1.START_CONTROLS_PROP}${PlistConstants_1.CONTROLS_PROP_OPTIONS.PickerView}${PlistConstants_1.CONTROLS_PROP_OPTIONS.Switch}`;
         for (let index = 0; index < controlsArr.length; index++) {
-            if (controlsArr[index] !== 'PickerView' && config.indexOf(PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]].trim()) >= 0) {
+            if (controlsArr[index] !== 'PickerView' && controlsArr[index] !== 'Switch' && config.indexOf(PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]].trim()) >= 0) {
                 updatedStr = updatedStr + PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]];
             }
         }

package/scripts/util/PlistConstants.js

@@ -5,7 +5,7 @@ exports.START_PLIST = '<plist><dict>';
 exports.END_PLIST = '</dict></plist>';
 exports.AUTO_START_PROP = '<key>DTXAutoStart</key>';
 exports.FLAVOR_PROP = '<key>DTXFlavor</key>\n<string>react_native</string>';
-exports.DEFAULT_CONTROLS_PROP = '<key>DTXExcludedControls</key>\n<array>\n\t<string>PickerView</string>\n</array>';
+exports.DEFAULT_CONTROLS_PROP = '<key>DTXExcludedControls</key>\n<array>\n\t<string>PickerView</string>\n\t<string>Switch</string>\n</array>';
 exports.START_CONTROLS_PROP = '<key>DTXExcludedControls</key>\n<array>';
 exports.END_CONTROLS_PROP = '\n</array>';
 exports.CONTROLS_PROP_OPTIONS = {

package/src/lib/instrumentor/base/interface/NativeDynatraceBridge.ts

@@ -33,9 +33,9 @@ export interface Spec extends TurboModule {
 	reportError(errorName: string, errorValue: string, reason: string, stacktrace: string, platform?: string): void;
 
 	// eslint-disable-next-line max-len
-	reportCrash(errorName: string, reason: string, stacktrace: string, isRealError: boolean, newSession: boolean, platform?: string): void;
+	reportCrash(errorName: string, reason: string, stacktrace: string, isRealError: boolean, platform?: string): void;
 
-	storeCrash(errorName: string, reason: string, stacktrace: string, platform?: string): void;
+	storeCrash(errorName: string, reason: string, stacktrace: string): void;
 
 	reportErrorInAction(key: string, errorName: string, errorCode: number, platform?: string): void;
 

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

@@ -574,6 +574,24 @@ export declare interface IConfiguration {
      */
 	readonly reportCrash: boolean;
 
+	/**
+     * Enables the react native error/crash handler. By default this value is true if nothing is passed.
+     *
+     * Be aware this value is only important for manual startup. In case of auto startup this needs to be handled via
+     * react configuration.
+     */
+	readonly errorHandler: boolean;
+
+    /**
+     * Reports a fatal error as a crash or as an error.
+     * The default value of true results in an unhandled fatal error being reported as a crash which will also end the current session. 
+	 * If the value is false, the unhandled fatal error will be reported as an error and the current session will continue.
+     *
+     * Be aware this value is only important for manual startup. In case of auto startup this needs to be handled via
+     * react configuration.
+     */
+	readonly reportFatalErrorAsCrash: boolean;
+
     /**
      * Log level of our plugin during application runtime. By default this values is LogLevel.Info, if nothing is passed.
      */
@@ -656,6 +674,24 @@ export declare class ManualStartupConfiguration implements IConfiguration {
      */
 	readonly reportCrash: boolean;
 
+	/**
+     * Enables the react native error/crash handler. By default this value is true if nothing is passed.
+     *
+     * Be aware this value is only important for manual startup. In case of auto startup this needs to be handled via
+     * react configuration.
+     */
+	readonly errorHandler: boolean;
+
+    /**
+     * Reports a fatal error as a crash or as an error.
+     * The default value of true results in an unhandled fatal error being reported as a crash which will also end the current session. 
+	 * If the value is false, the unhandled fatal error will be reported as an error and the current session will continue.
+     *
+     * Be aware this value is only important for manual startup. In case of auto startup this needs to be handled via
+     * react configuration.
+     */
+	readonly reportFatalErrorAsCrash: boolean;
+
     /**
      * Log level of our plugin during application runtime. By default this values is LogLevel.Info, if nothing is passed.
      */
@@ -711,6 +747,20 @@ export declare class ConfigurationBuilder {
 	 */
 	public withCrashReporting(reportCrash: boolean): ConfigurationBuilder;
 
+	/**
+	 * Builder function to handle error handler property
+	 *
+	 * @param {boolean} errorHandler Allows you to enable or disable the Dynatrace React Native error handler.   
+	 */
+	public withErrorHandler(errorHandler: boolean): ConfigurationBuilder;
+
+	/**
+	 * Builder function to handle preventing crash property
+	 *
+	 * @param {boolean} reportFatalErrorAsCrash If you want to report a fatal error as an error and not as a crash, set this to false.     
+	 */
+    public withReportFatalErrorAsCrash(reportFatalErrorAsCrash: boolean): ConfigurationBuilder;
+
 	/**
 	 * Builder function to handle loglevel property
 	 *