@dynatrace/react-native-plugin 2.271.2 → 2.273.1

package/README.md

@@ -29,8 +29,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.271.1.1003
-* iOS Agent: 8.271.2.1007
+* Android Agent: 8.273.1.1003
+* iOS Agent: 8.273.1.1006
 
 ## Quick Setup
 
@@ -1169,9 +1169,16 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.271.2
+2.273.1
+* Update Android (8.273.1.1003) & iOS Agent (8.273.1.1006)
+* Crash handler initialization happens earlier in the application
+* Ignoring duplicated crashes through native crash handler
+
+2.271.3
 * Update Android (8.271.1.1003) & iOS Agent (8.271.2.1007)
 * Fixed createElement logic for older React Native versions
+* Fixed asynchronous handler for Touchables
+* Updated instrumentation of RefreshControl
 
 2.269.1
 * Update Android (8.269.1.1009) & iOS Agent (8.269.1.1007)

package/android/build.gradle

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

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

@@ -169,10 +169,12 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, String platform){
+    public void reportCrash(String errorName, String reason, String stacktrace, boolean isRealError, boolean newSession, String platform){
         if (this.shouldWorkOnAndroid(platform)) {
             Dynatrace.reportCrash(isRealError ? PlatformType.JAVA_SCRIPT : PlatformType.CUSTOM, errorName, reason, stacktrace);
-            Dynatrace.createNewSession();
+            if(newSession){
+                Dynatrace.createNewSession();
+            }     
         }
     }
 

package/files/plugin.gradle

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

package/ios/DynatraceRNBridge.m

@@ -166,7 +166,7 @@ RCT_EXPORT_METHOD(reportError:(NSString *)errorName errorValue:(NSString *)error
     }
 }
 
-RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)errorReason stacktrace:(NSString *)stacktrace isRealError:(BOOL)isRealError platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)errorReason stacktrace:(NSString *)stacktrace isRealError:(BOOL)isRealError newSession:(BOOL)newSession platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
@@ -176,6 +176,7 @@ RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)erro
             [DTXAction reportExternalCrashForPlatformType:-1 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
         [Dynatrace endVisit];
     }
 }

package/ios/lib/Dynatrace.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Headers/Dynatrace.h

@@ -1,5 +1,5 @@
 // Dynatrace.h
-// Version: 8.271.2.1007
+// Version: 8.273.1.1006
 //
 // These materials contain confidential information and
 // trade secrets of Dynatrace Corporation. You shall

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Modules/Dynatrace.swiftmodule/arm64-apple-ios.abi.json

@@ -572,7 +572,7 @@
   },
   "ConstValues": [
     {
-      "filePath": "\/opt\/jenkins\/workspace\/eAgent_ios-agent_release_8.271.x\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
+      "filePath": "\/opt\/jenkins\/workspace\/gent_ios-agent_release_8.273.x_3\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
       "kind": "BooleanLiteral",
       "offset": 1277,
       "length": 4,

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/Headers/Dynatrace.h

@@ -1,5 +1,5 @@
 // Dynatrace.h
-// Version: 8.271.2.1007
+// Version: 8.273.1.1006
 //
 // These materials contain confidential information and
 // trade secrets of Dynatrace Corporation. You shall

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/Modules/Dynatrace.swiftmodule/arm64-apple-ios-simulator.abi.json

@@ -572,7 +572,7 @@
   },
   "ConstValues": [
     {
-      "filePath": "\/opt\/jenkins\/workspace\/eAgent_ios-agent_release_8.271.x\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
+      "filePath": "\/opt\/jenkins\/workspace\/gent_ios-agent_release_8.273.x_3\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
       "kind": "BooleanLiteral",
       "offset": 1277,
       "length": 4,

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/Modules/Dynatrace.swiftmodule/x86_64-apple-ios-simulator.abi.json

@@ -572,7 +572,7 @@
   },
   "ConstValues": [
     {
-      "filePath": "\/opt\/jenkins\/workspace\/eAgent_ios-agent_release_8.271.x\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
+      "filePath": "\/opt\/jenkins\/workspace\/gent_ios-agent_release_8.273.x_3\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
       "kind": "BooleanLiteral",
       "offset": 1277,
       "length": 4,

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/_CodeSignature/CodeResources

@@ -10,7 +10,7 @@
 		</data>
 		<key>Headers/Dynatrace.h</key>
 		<data>
-		IfnWbuE1XmMIlZTTmJqPgXXaooQ=
+		tA+O5/8g6/rB2FLe17KI5yzePow=
 		</data>
 		<key>Headers/DynatraceSwiftUI.h</key>
 		<data>
@@ -22,19 +22,19 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		aUIGXlEtFM1pPGO/KGBjiaXTSNs=
+		kWZvFuyywJXfcsKIdwFdv4vMqRY=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		lbzpqQTHExgWusb+3nxBfc9eTY4=
+		nGYd6fcFzsinN5v2YD46M0xgw6Q=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		HZTA0gLtCwGSIcesyvmBMswzzc4=
+		M9xjtk3KdqoyzyFZSeJ/7kKIv6A=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		ay+xTZfxmzbbXlge6CQiMxpMXSQ=
+		VMhlBOh0wRfx9mVKACsYqvY5YEo=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -50,11 +50,11 @@
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		D1kN3DL74rpLXzAVdJQIbHZLJ30=
+		uJJE3LLBHBxIIJbvpm+moYjOiRM=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		ay+xTZfxmzbbXlge6CQiMxpMXSQ=
+		VMhlBOh0wRfx9mVKACsYqvY5YEo=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -70,7 +70,7 @@
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		xSjgbd3OTIoKqKVfwdjPmqCrQDY=
+		3RB2vgFJJoAaw29phPfi0xUefD0=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -90,7 +90,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			CqclrjlCxIl6kZAXppPi7s0aqNcd9zrJhG2I2j06TxQ=
+			v6xgR0hc67MYVeOJrAPktN4CaweOsXdttN24LOG+1Uk=
 			</data>
 		</dict>
 		<key>Headers/DynatraceSwiftUI.h</key>
@@ -111,21 +111,21 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			DPdm2kuid9J0Zg1sPfvmaXWXtqKfWbSizm2OXAcRIF4=
+			nXfxDURihDle3OD/erhsemBn1KUj4m1V1kRwf5goA+0=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fg8io+MTpgurihFeeXZi/2/iflZ/YxvNyf5CZD9aeoE=
+			U67wZ+8OGsRS00EtjZKyZeNSMRzdcC3y240X98tmfNI=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qHFF46aeXb2Vc+dtpW4CU2rMhSCpRJ9xQAs+uGe5Pgc=
+			gSWc0s5BDfNCffdhXxZhG54fI23ZyJGe8Ed+KEO3ZG4=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -153,14 +153,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			JogEWmvGr3g9HkXZZhUYnOZrnCD1EJ0JdfIPgkZglPk=
+			1QWUoSDXybNA6a6kZa2g1CVR4AN77dXt6IJC3DjQY4M=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qHFF46aeXb2Vc+dtpW4CU2rMhSCpRJ9xQAs+uGe5Pgc=
+			gSWc0s5BDfNCffdhXxZhG54fI23ZyJGe8Ed+KEO3ZG4=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
@@ -188,7 +188,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			Vi+2FtdA5kWn9xwoPyU6TfUPE3xfRRn6mujpgt9Is7s=
+			MrPs4lpyt7q0Ok/ZasdlRz8+2RRiFSUuTTuAb9aKWzw=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/ios/lib/Dynatrace.xcframework/tvos-arm64/Dynatrace.framework/Headers/Dynatrace.h

@@ -1,5 +1,5 @@
 // Dynatrace.h
-// Version: 8.271.2.1007
+// Version: 8.273.1.1006
 //
 // These materials contain confidential information and
 // trade secrets of Dynatrace Corporation. You shall

package/ios/lib/Dynatrace.xcframework/tvos-arm64_x86_64-simulator/Dynatrace.framework/Headers/Dynatrace.h

@@ -1,5 +1,5 @@
 // Dynatrace.h
-// Version: 8.271.2.1007
+// Version: 8.273.1.1006
 //
 // These materials contain confidential information and
 // trade secrets of Dynatrace Corporation. You shall

package/ios/lib/Dynatrace.xcframework/tvos-arm64_x86_64-simulator/Dynatrace.framework/_CodeSignature/CodeResources

@@ -10,7 +10,7 @@
 		</data>
 		<key>Headers/Dynatrace.h</key>
 		<data>
-		IfnWbuE1XmMIlZTTmJqPgXXaooQ=
+		tA+O5/8g6/rB2FLe17KI5yzePow=
 		</data>
 		<key>Headers/DynatraceSwiftUI.h</key>
 		<data>
@@ -22,15 +22,15 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		ap3n7B6rUPhKEpCaGRpLgRAt390=
+		V5mWH0mFVcFIg3+ty69jiq+X3uc=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/Project/arm64-apple-tvos-simulator.swiftsourceinfo</key>
 		<data>
-		r27++Fm8pAhcrPs861pVQqs+K+c=
+		JFcOs56DZteICs6xAu9Ls/tupkM=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/Project/x86_64-apple-tvos-simulator.swiftsourceinfo</key>
 		<data>
-		p8+F21T5IhdERV/Sa6m3fIgFo88=
+		++t+1SVT78bdnoYPdtKMGZbEhJk=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.abi.json</key>
 		<data>
@@ -50,7 +50,7 @@
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.swiftmodule</key>
 		<data>
-		OjMxO1vdWCnEpnOS+6lg+pBdwW4=
+		A1uvrLIE/Vj5wK4+JdFjef/hS/Y=
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.abi.json</key>
 		<data>
@@ -70,7 +70,7 @@
 		</data>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.swiftmodule</key>
 		<data>
-		Xx7OeKo3zu/vYmoNyqFcdyMzv5Q=
+		qgW9/9Ak8Xv0XNwWR/dTLBE8zcU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -90,7 +90,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			CqclrjlCxIl6kZAXppPi7s0aqNcd9zrJhG2I2j06TxQ=
+			v6xgR0hc67MYVeOJrAPktN4CaweOsXdttN24LOG+1Uk=
 			</data>
 		</dict>
 		<key>Headers/DynatraceSwiftUI.h</key>
@@ -111,14 +111,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			RxrtNBAelwvhhHOiVigJDnnxm1secE/TtN547pdPHRI=
+			mLMfGjZFbsHNH5dRS+QMZHmtaicn+Ci01ETURDUoXl0=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/Project/x86_64-apple-tvos-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			meuU1XRVfHmRrCe11QUGX/uP0a3fDDXFg3iZdqMeZag=
+			gGAUqUkuL8wbwleAQ2aWp/T1D6gqFAvZxtRfo3FQpT0=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/arm64-apple-tvos-simulator.abi.json</key>
@@ -153,7 +153,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			VtpJjghtgGGatsfqBd1zkY5RGNDu6aY9evNl/xGxyro=
+			jvTzh67lWuideAD0jBPPJAnI6lTdh+kWNorC/CK8pvs=
 			</data>
 		</dict>
 		<key>Modules/Dynatrace.swiftmodule/x86_64-apple-tvos-simulator.abi.json</key>
@@ -188,7 +188,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			SzG+HfALPqVugOXFGU+PKRcaXRZ7nWnloohZz9dkbKo=
+			oGseKteFcaSQ05EyAt3nZuGEuNauL3lFzDspXkTTYwg=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/lib/instrumentor/DynatraceInstrumentation.js

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

package/lib/instrumentor/base/Application.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationHandler = void 0;
-const ErrorHandler_1 = require("./ErrorHandler");
-const Dynatrace_1 = require("./Dynatrace");
 const Configuration_1 = require("./configuration/Configuration");
 const Logger_1 = require("./Logger");
 exports.ApplicationHandler = {
@@ -10,7 +8,6 @@ exports.ApplicationHandler = {
         if (!Configuration_1.Configuration.isConfigurationAvailable()) {
             Logger_1.Logger.logDebug('Configuration set: ' +
                 JSON.stringify(Configuration_1.Configuration.loadConfiguration()));
-            (0, ErrorHandler_1.ErrorHandler)(Dynatrace_1.Dynatrace, Logger_1.Logger).registerErrorHandler();
             Logger_1.Logger.logInfo('Dynatrace React Native Plugin started!');
         }
     },

package/lib/instrumentor/base/Dynatrace.js

@@ -17,7 +17,6 @@ const DataCollectionLevel_1 = require("./model/DataCollectionLevel");
 const UserPrivacyOptions_1 = require("./UserPrivacyOptions");
 const Logger_1 = require("./Logger");
 const Configuration_1 = require("./configuration/Configuration");
-const ErrorHandler_1 = require("./ErrorHandler");
 const DynatraceRootAction_1 = require("./DynatraceRootAction");
 const NullRootAction_1 = require("./NullRootAction");
 const DynatraceInternal_1 = require("./DynatraceInternal");
@@ -28,9 +27,6 @@ exports.Dynatrace = {
         if (!Configuration_1.Configuration.isConfigurationAvailable()) {
             if (configuration !== undefined) {
                 yield DynatraceBridge_1.DynatraceNative.start(configuration);
-                if (configuration.reportCrash != null) {
-                    (0, ErrorHandler_1.ErrorHandler)(exports.Dynatrace, Logger_1.Logger).registerErrorHandler();
-                }
                 Configuration_1.Configuration.setConfiguration(configuration);
                 Logger_1.Logger.logDebug('Manual Configuration set: ' + JSON.stringify(configuration));
             }
@@ -155,7 +151,7 @@ exports.Dynatrace = {
                     }
                 }
                 Logger_1.Logger.logDebug(`Dynatrace reportCrash(${crashName}, ${reason}, ${stacktrace})`);
-                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, reason, stacktrace, false, platform);
+                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, reason, stacktrace, false, true, platform);
             }
         }
         else {
@@ -174,7 +170,7 @@ exports.Dynatrace = {
                     }
                 }
                 Logger_1.Logger.logDebug(`Dynatrace reportCrashWithException(${crashName}, ${crash.stack})`);
-                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, crashReason, crash.stack, true, platform);
+                DynatraceBridge_1.DynatraceNative.reportCrash(crashName, crashReason, crash.stack, true, true, platform);
             }
         }
         else {

package/lib/instrumentor/base/DynatraceInternal.js

@@ -4,6 +4,7 @@ exports.DynatraceInternal = void 0;
 const StringUtils_1 = require("./util/StringUtils");
 const DynatraceBridge_1 = require("./DynatraceBridge");
 const Logger_1 = require("./Logger");
+const ErrorHandler_1 = require("./ErrorHandler");
 let counter = 0;
 exports.DynatraceInternal = {
     reportErrorFromHandler: (isFatal, errorName, reason, stacktrace, platform) => {
@@ -15,7 +16,7 @@ exports.DynatraceInternal = {
         }
         Logger_1.Logger.logDebug(`Dynatrace reportErrorStacktrace(${isFatal}, ${errorName}, ${reason}, ${stacktrace})`);
         if (isFatal) {
-            DynatraceBridge_1.DynatraceNative.reportCrash(errorName, reason, stacktrace, true, platform);
+            DynatraceBridge_1.DynatraceNative.reportCrash(errorName, reason, stacktrace, true, __DEV__ || (0, ErrorHandler_1.isCustomErrorHandlerSet)(), platform);
         }
         else {
             DynatraceBridge_1.DynatraceNative.reportError(errorName, '-', reason, stacktrace, platform);

package/lib/instrumentor/base/ElementHelper.js

@@ -7,6 +7,7 @@ const Logger_1 = require("./Logger");
 const Picker_1 = require("./Picker");
 const Touchable_1 = require("./Touchable");
 const Dynatrace_1 = require("./Dynatrace");
+const RefreshControl_1 = require("./RefreshControl");
 const instrumentCreateElement = (reactModule) => {
     if (reactModule != null && reactModule.createElement != null) {
         const reactCreateElement = reactModule.createElement;
@@ -30,7 +31,10 @@ const instrumentCreateElement = (reactModule) => {
 exports.instrumentCreateElement = instrumentCreateElement;
 const modifyElement = (type, props, ...children) => {
     if (props != null) {
-        if (type._dtInfo.type === Types_1.Types.Button ||
+        if (type._dtInfo.type === Types_1.Types.RefreshControl && props.onRefresh != null) {
+            (0, RefreshControl_1.RefreshControlHelper)(Dynatrace_1.Dynatrace, Logger_1.Logger).attachOnRefresh(props);
+        }
+        else if (type._dtInfo.type === Types_1.Types.Button ||
             type._dtInfo.type === Types_1.Types.Text ||
             type._dtInfo.type === Types_1.Types.Pressable ||
             (0, Types_1.isTypeTouchable)(type._dtInfo.type)) {

package/lib/instrumentor/base/ErrorHandler.js

@@ -1,48 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorHandler = void 0;
+exports._reportErrorToDynatrace = exports.isCustomErrorHandlerSet = exports.registerErrorHandler = void 0;
 const DynatraceInternal_1 = require("./DynatraceInternal");
+const Dynatrace_1 = require("./Dynatrace");
 const StringUtils_1 = require("./util/StringUtils");
+const Logger_1 = require("./Logger");
+let _isCustomErrorHandlerSet = false;
 const _isReactNativeGlobal = (globalScope) => globalScope.ErrorUtils !== undefined;
-const ErrorHandler = (Dynatrace, Logger) => ({
-    registerErrorHandler() {
-        if (global !== undefined && _isReactNativeGlobal(global)) {
-            const oldHandler = global.ErrorUtils.getGlobalHandler();
-            global.ErrorUtils.setGlobalHandler((error, isFatal) => {
-                this._reportErrorToDynatrace(error, isFatal, oldHandler);
+const registerErrorHandler = () => {
+    if (global !== undefined && _isReactNativeGlobal(global)) {
+        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);
             });
-            const setter = global.ErrorUtils.setGlobalHandler;
-            global.ErrorUtils.setGlobalHandler = (errorHandler) => {
-                setter((error, isFatal) => {
-                    this._reportErrorToDynatrace(error, isFatal, errorHandler);
-                });
-            };
-        }
-    },
-    _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) {
-                    DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), exception.message, exception.stack);
-                    Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception}, ${isFatal})`);
-                }
-                else {
-                    Dynatrace.reportError(String(exception.name) + ': ' + exception.message, -1);
-                    Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception})`);
-                }
+        };
+    }
+};
+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) {
+                DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), exception.message, exception.stack);
+                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})`);
             }
         }
-        else {
-            Dynatrace.reportError(String(exception), -1);
-            Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception})`);
-        }
-        if (oldHandler !== undefined) {
-            oldHandler(exception, isFatal);
-        }
-    },
-});
-exports.ErrorHandler = ErrorHandler;
+    }
+    else {
+        Dynatrace_1.Dynatrace.reportError(String(exception), -1);
+        Logger_1.Logger.logDebug(`ErrorHandler _reportErrorToDynatrace(${exception})`);
+    }
+    if (oldHandler !== undefined) {
+        oldHandler(exception, isFatal);
+    }
+};
+exports._reportErrorToDynatrace = _reportErrorToDynatrace;
 const isExceptionAnError = (exception) => exception.message !== undefined;

package/lib/instrumentor/base/Picker.js

@@ -1,20 +1,29 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickerHelper = void 0;
 const PickerHelper = (Dynatrace, Logger) => ({
     attachToOnValueChange(onValueChange, children) {
-        return (itemValue, itemNumber) => {
+        return (itemValue, itemNumber) => __awaiter(this, void 0, void 0, function* () {
             const value = this.getPickerItemValue(children, itemNumber, itemValue);
             if (value !== undefined) {
                 const action = Dynatrace.enterAutoAction(`Picked Value: ${value}`);
                 if (onValueChange !== undefined) {
-                    onValueChange(itemValue, itemNumber);
+                    yield onValueChange(itemValue, itemNumber);
                 }
                 if (action != null) {
                     action.leaveAction();
                 }
             }
-        };
+        });
     },
     getPickerItemValue: (children, index, value) => {
         if (children != null && index >= 0) {

package/lib/instrumentor/base/RefreshControl.js

@@ -1,32 +1,25 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshControlHelper = void 0;
 const RefreshControlHelper = (Dynatrace, Logger) => ({
-    attachToRender(refreshControl) {
-        if (refreshControl.render !== undefined) {
-            const renderOrig = refreshControl.render.bind(refreshControl);
-            refreshControl.render = () => this.renderRefreshControl(renderOrig);
-        }
-    },
-    renderRefreshControl(renderOrig) {
-        const refreshControlRender = renderOrig();
-        if (refreshControlRender != null &&
-            refreshControlRender.props != null &&
-            refreshControlRender.props.onRefresh) {
-            return Object.assign(Object.assign({}, refreshControlRender), { props: Object.assign(Object.assign({}, refreshControlRender.props), { onRefresh: () => {
-                        this.onRefresh(refreshControlRender);
-                    } }) });
-        }
-        else {
-            return refreshControlRender;
-        }
-    },
-    onRefresh: (refreshControl) => {
-        const action = Dynatrace.enterAutoAction('Swipe to Refesh');
-        if (refreshControl.props.onRefresh !== undefined) {
-            refreshControl.props.onRefresh();
-        }
-        action.leaveAction();
+    attachOnRefresh: (refreshControlProps) => {
+        const origOnRefresh = refreshControlProps.onRefresh;
+        refreshControlProps.onRefresh = () => __awaiter(void 0, void 0, void 0, function* () {
+            const action = Dynatrace.enterAutoAction('Swipe to Refesh');
+            if (origOnRefresh != null) {
+                yield origOnRefresh();
+            }
+            action.leaveAction();
+        });
     },
 });
 exports.RefreshControlHelper = RefreshControlHelper;

package/lib/instrumentor/base/Touchable.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchableHelper = void 0;
 const Configuration_1 = require("./configuration/Configuration");
@@ -9,17 +18,17 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             : props.onPress;
         const nameOfAction = this._findActionName(props, children);
         const isButton = this._isPropsButton(props);
-        return (event) => {
+        return (event) => __awaiter(this, void 0, void 0, function* () {
             if (nameOfAction == null) {
                 Logger.logDebug('TouchableHelper: Skipping creation of action as no name was found!');
                 if (origFunction != null) {
-                    origFunction(event);
+                    yield origFunction(event);
                 }
             }
             else if (!Configuration_1.Configuration.isConfigurationAvailable()) {
                 Logger.logInfo('TouchableHelper: React Native plugin has not been started yet! Touch will not be reported!');
                 if (origFunction != null) {
-                    origFunction(event);
+                    yield origFunction(event);
                 }
             }
             else {
@@ -29,11 +38,11 @@ const TouchableHelper = (Dynatrace, Logger) => ({
                 }
                 const action = Dynatrace.enterAutoAction(`Touch on ${finalNameOfAction}`);
                 if (origFunction != null) {
-                    origFunction(event);
+                    yield origFunction(event);
                 }
                 action.leaveAction();
             }
-        };
+        });
     },
     _findActionName(props, children) {
         if (this._isDynatraceProperties(props)) {

package/lib/instrumentor/model/Types.js

@@ -18,6 +18,7 @@ var Types;
     Types[Types["TouchableNativeFeedbackGestureHandler"] = 12] = "TouchableNativeFeedbackGestureHandler";
     Types[Types["TouchableWithoutFeedbackGestureHandler"] = 13] = "TouchableWithoutFeedbackGestureHandler";
     Types[Types["RectButtonGestureHandler"] = 14] = "RectButtonGestureHandler";
+    Types[Types["RefreshControl"] = 15] = "RefreshControl";
 })(Types = exports.Types || (exports.Types = {}));
 const isTypeReactNativeTouchable = (type) => type === Types.TouchableHighlight
     || type === Types.TouchableNativeFeedback

package/lib/react-native/RefreshControl.js

@@ -1,14 +1,15 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshControl = void 0;
 const ReactNative = require("react-native");
-const Dynatrace_1 = require("../instrumentor/base/Dynatrace");
-const Logger_1 = require("../instrumentor/base/Logger");
-const RefreshControl_1 = require("../instrumentor/base/RefreshControl");
-class RefreshControl extends ReactNative.RefreshControl {
-    constructor(props, context) {
-        super(props, context);
-        (0, RefreshControl_1.RefreshControlHelper)(Dynatrace_1.Dynatrace, Logger_1.Logger).attachToRender(this);
-    }
+const Types_1 = require("../instrumentor/model/Types");
+if (typeof ReactNative.RefreshControl === 'object') {
+    exports.RefreshControl = Object.assign({ _dtInfo: { type: Types_1.Types.RefreshControl } }, ReactNative.RefreshControl);
+}
+else {
+    exports.RefreshControl = (_a = class RefreshControl extends ReactNative.RefreshControl {
+        },
+        _a._dtInfo = { type: Types_1.Types.RefreshControl },
+        _a);
 }
-exports.RefreshControl = RefreshControl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.271.2",
+  "version": "2.273.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.22.6",
+    "@babel/runtime": "^7.22.10",
     "jscodeshift": "^0.15.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",