@dynatrace/react-native-plugin 2.291.1 → 2.293.1

package/README.md

@@ -31,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.291.1.1002
-* iOS Agent: 8.291.1.1004
+* Android Agent: 8.293.1.1003
+* iOS Agent: 8.293.1.1003
 
 ## Quick Setup
 
@@ -1414,9 +1414,14 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.291.1
+2.293.1
+* Update Android (8.293.1.1003) & iOS Agent (8.293.1.1003)
+* Preventing double instrumentation of touchables
+
+2.291.2
 * Update Android (8.291.1.1002) & iOS Agent (8.291.1.1004)
 * Updated the way we report unhandled errors without a stacktrace
+* Touchable instrumentation was partly broken for static access
 
 2.289.1
 * Update Android (8.289.2.1007) & iOS Agent (8.289.1.1015)

package/android/build.gradle

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

package/files/plugin.gradle

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

package/lib/instrumentor/base/Touchable.js

@@ -10,13 +10,18 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             : props.onPress;
         const nameOfAction = this._findActionName(props, children);
         const isButton = this._isPropsButton(props);
-        return (event) => {
+        const wrappedFunction = (event) => {
             if (nameOfAction == null) {
                 Logger.logDebug('TouchableHelper: Skipping creation of action as no name was found!');
                 if (origFunction != null) {
                     return origFunction(event);
                 }
             }
+            else if (origFunction != null && origFunction._dtWrapped !== undefined
+                && origFunction._dtWrapped === true) {
+                Logger.logDebug(`TouchableHelper: Skip wrapping of ${nameOfAction} onPress as it is already wrapped!`);
+                return origFunction(event);
+            }
             else if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
                 Logger.logInfo('TouchableHelper: React Native plugin has not been started yet! Touch will not be reported!');
                 if (origFunction != null) {
@@ -35,7 +40,7 @@ const TouchableHelper = (Dynatrace, Logger) => ({
                         const returnValue = origFunction(event);
                         if (_isPromise(returnValue)) {
                             isSyncError = false;
-                            return returnValue.finally(() => {
+                            return Promise.resolve(returnValue).finally(() => {
                                 action.leaveAction();
                             });
                         }
@@ -55,6 +60,8 @@ const TouchableHelper = (Dynatrace, Logger) => ({
                 }
             }
         };
+        wrappedFunction._dtWrapped = true;
+        return wrappedFunction;
     },
     _findActionName(props, children) {
         if ((0, IDynatraceProperties_1.isDynatraceNaming)(props)) {

package/lib/react-native/Touchables.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a, _b, _c;
 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");
@@ -6,12 +7,33 @@ const React = require("react");
 const Types_1 = require("../instrumentor/model/Types");
 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 };
+if (typeof ReactNative.TouchableOpacity === 'object') {
+    exports.TouchableOpacity = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableOpacity } }, ReactNative.TouchableOpacity);
+}
+else {
+    exports.TouchableOpacity = (_a = class TouchableOpacity extends (ReactNative.TouchableOpacity) {
+        },
+        _a._dtInfo = { type: Types_1.Types.TouchableOpacity },
+        _a);
+}
+if (typeof ReactNative.TouchableHighlight === 'object') {
+    exports.TouchableHighlight = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableHighlight } }, ReactNative.TouchableHighlight);
+}
+else {
+    exports.TouchableHighlight = (_b = class TouchableHighlight extends (ReactNative.TouchableHighlight) {
+        },
+        _b._dtInfo = { type: Types_1.Types.TouchableHighlight },
+        _b);
+}
+if (typeof ReactNative.TouchableNativeFeedback === 'object') {
+    exports.TouchableNativeFeedback = Object.assign({ _dtInfo: { type: Types_1.Types.TouchableNativeFeedback } }, ReactNative.TouchableNativeFeedback);
+}
+else {
+    exports.TouchableNativeFeedback = (_c = class TouchableNativeFeedback extends (ReactNative.TouchableNativeFeedback) {
+        },
+        _c._dtInfo = { type: Types_1.Types.TouchableNativeFeedback },
+        _c);
+}
 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 })));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dynatrace/react-native-plugin",
-    "version": "2.291.1",
+    "version": "2.293.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,8 +71,8 @@
     "author": "Dynatrace",
     "license": "SEE LICENSE IN LICENSE.md",
     "dependencies": {
-        "@babel/runtime": "^7.24.5",
-        "jscodeshift": "^0.15.2",
+        "@babel/runtime": "^7.24.7",
+        "jscodeshift": "^0.16.0",
         "plist": "^3.1.0",
         "proxy-polyfill": "^0.3.2",
         "semver": "^7.6.2"
@@ -85,7 +85,7 @@
         "react-native": ">=0.62.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.22.9",
+        "@babel/cli": "^7.24.5",
         "@babel/plugin-proposal-class-properties": "^7.8.3",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
         "@babel/plugin-proposal-optional-chaining": "^7.8.3",

package/react-native-dynatrace.podspec

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