@dynatrace/react-native-plugin 2.283.3 → 2.285.2

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.283.1.1004
-* iOS Agent: 8.283.1.1004
+* Android Agent: 8.287.1.1006
+* iOS Agent: 8.285.1.1004
 
 ## Quick Setup
 
@@ -1053,6 +1053,25 @@ module.exports = {
 };
 ```
 
+Using `@react-native/babel-preset`:
+
+```js
+module.exports = {
+  presets: [
+    ['module:@react-native/babel-preset'],
+  ],
+  plugins: [
+      [
+          '@babel/plugin-transform-react-jsx',
+          {
+              runtime: 'automatic',
+              importSource: "@dynatrace/react-native-plugin"
+          },
+      ],
+  ],
+};
+```
+
 Using `metro-react-native-babel-preset`:
 
 ```js
@@ -1277,6 +1296,11 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.285.2
+* Fixed bridge module issue for older React Native versions (< 0.65.0)
+* Introduced support for @react-native/metro-babel-transformer
+* Update Android (8.287.1.1006) & iOS Agent (8.285.1.1004)
+
 2.283.3
 * Added Auto-Instrumentation for React Native Switch
 * Updated instrumentation of RefreshControl (dtActionIgnore & dtActionName)

package/android/build.gradle

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

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

@@ -1,34 +1,57 @@
 package com.dynatrace.android.agent;
 
 import androidx.annotation.Nullable;
+import android.util.Log;
+
+import com.facebook.react.ReactPackage;
 import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.uimanager.ViewManager;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class DynatraceReactPackage extends TurboReactPackage {
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class DynatraceReactPackage extends TurboReactPackage implements ReactPackage {
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        PrivateDTBridge bridge = new PrivateDTBridge(reactContext);
+        return Arrays.<NativeModule>asList(new DynatraceRNBridge(reactContext, bridge), bridge);
+    }
 
     @Override
     public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return () -> {
-            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
-            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-            moduleInfos.put(
-                    DynatraceRNBridgeImpl.NAME,
-                    new ReactModuleInfo(
-                            DynatraceRNBridgeImpl.NAME,
-                            DynatraceRNBridgeImpl.NAME,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            isTurboModule // isTurboModule
-                    ));
-            return moduleInfos;
+        final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+        boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+        moduleInfos.put(
+                DynatraceRNBridgeImpl.NAME,
+                new ReactModuleInfo(
+                        DynatraceRNBridgeImpl.NAME,
+                        DynatraceRNBridgeImpl.NAME,
+                        false, // canOverrideExistingModule
+                        false, // needsEagerInit
+                        true, // hasConstants
+                        false, // isCxxModule
+                        isTurboModule // isTurboModule
+                ));
+
+        return new ReactModuleInfoProvider() {
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                return moduleInfos;
+            }
         };
     }
 
@@ -41,5 +64,4 @@ public class DynatraceReactPackage extends TurboReactPackage {
             return null;
         }
     }
-
 }

package/files/plugin.gradle

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

package/lib/dynatrace-transformer.js

@@ -46,7 +46,12 @@ const getUpstreamTransformer = (reactOptions) => {
         return require(reactOptions.upstreamTransformer);
     }
     else {
-        return require('metro-react-native-babel-transformer/src/index');
+        try {
+            return require('metro-react-native-babel-transformer/src/index');
+        }
+        catch (e) {
+            return require('@react-native/metro-babel-transformer');
+        }
     }
 };
 exports.getUpstreamTransformer = getUpstreamTransformer;

package/lib/instrumentor/base/DynatraceAction.js

@@ -101,7 +101,7 @@ class DynatraceAction {
                 resolve('');
             });
         }
-        Logger_1.Logger.logDebug(`DynatraceAction getRequest(${url}): in Action - ${this.name}`);
+        Logger_1.Logger.logDebug(`DynatraceAction getRequestTag(${url}): in Action - ${this.name}`);
         return DynatraceBridge_1.DynatraceNative.getRequestTag(this.key, url);
     }
     getRequestTagHeader() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dynatrace/react-native-plugin",
-    "version": "2.283.3",
+    "version": "2.285.2",
     "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.23.9",
-        "jscodeshift": "^0.15.1",
+        "@babel/runtime": "^7.24.0",
+        "jscodeshift": "^0.15.2",
         "plist": "^3.1.0",
         "proxy-polyfill": "^0.3.2",
         "semver": "^7.6.0"

package/react-native-dynatrace.podspec

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