@dynatrace/react-native-plugin 2.301.2 → 2.303.2

package/README.md

@@ -23,16 +23,16 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 * React Native v0.60 or newer
 * For Android users:
   * SDK version 21+
-  * Gradle version 6.1.1+ ([How to update?](#updating-to-gradle-6))
-  * Android Gradle plugin version 4.0+
+  * Gradle version 7.0+ ([How to update?](#updating-to-gradle-7))
+  * Android Gradle plugin version 7.0+
   * Java 11
 * For iOS users: Minimum iOS 12
 
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* Android Agent: 8.301.1.1004
-* iOS Agent: 8.301.1.1008
+* Android Agent: 8.303.2.1014
+* iOS Agent: 8.303.1.1004
 
 ## Quick Setup
 
@@ -78,7 +78,7 @@ This agent versions are configured in this plugin:
 * [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)
+* [Upgrading project to Gradle 7](#updating-to-gradle-7)
 * [Maven Central in top-level gradle file](#maven-central-in-top-level-gradle-file)
 * [Configuration of standalone React Native project](#configuration-of-standalone-react-native-project)
 * [Instrumentation Overhead](#instrumentation-overhead)
@@ -1314,17 +1314,17 @@ The location of the [top-level build.gradle](https://dt-url.net/jm610pso) should
 **Note:**
 JCenter has noted its [sunset](https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/) on May 1st. Though, JCenter is still syncing with Maven Central so having`jcenter()` in your **build.gradle** file without the use of `mavenCentral()` will retrieve the Dynatrace Android Gradle Plugin no problem.
 
-## Updating to Gradle 6
+## Updating to Gradle 7
 
-Updating Gradle only affects your Android build. To update your project to Gradle 6, modify the following 3 files in your Android folder. 
+Updating Gradle only affects your Android build. To update your project to Gradle 7, modify the following 3 files in your Android folder. 
 
 - `ProjectFolder\android\gradle\wrapper\gradle-wrapper.properties` Update the distributionUrl to get a newer gradle version.
 
 ```
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
 ```
 
-- `ProjectFolder\android\build.gradle` Update the version of your Android gradle plugin (minimum 4.x) as Gradle 6 needs a newer one. To get the newer versions, add `google()` in your repositories. Example of a build.gradle file:
+- `ProjectFolder\android\build.gradle` Update the version of your Android gradle plugin (minimum 7.x) as Gradle 7 needs a newer one. To get the newer versions, add `google()` in your repositories. Example of a build.gradle file:
 
 ```
 buildscript {
@@ -1332,7 +1332,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:x.x.x'
     }
 }
 
@@ -1460,6 +1460,12 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.303.2
+* Updated Android (8.303.2.1014) & iOS Agent (8.303.1.1004)
+* Android Gradle Plugin version requirement raised to 7.0+
+* Gradle Plugin version requirement raised to 7.0+
+* Fixed warnings for jsx runtime when using expo
+
 2.301.2
 * Updated Android (8.301.1.1004) & iOS Agent (8.301.1.1008)
 * Fix iOS crashes to not report on session after crash

package/android/build.gradle

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

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

@@ -262,12 +262,6 @@ public class DynatraceRNBridgeImpl {
         }
     }
 
-    public void sendEvent(String name, ReadableMap attributes, String platform) {
-        if(this.shouldWorkOnAndroid(platform)) {
-            Dynatrace.sendEvent(name, new JSONObject(toHashMap(attributes)));
-        }
-    }
-
     public void sendBizEvent(String type, ReadableMap attributes, String platform) {
         if(this.shouldWorkOnAndroid(platform)) {
             Dynatrace.sendBizEvent(type, new JSONObject(toHashMap(attributes)));

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

@@ -135,11 +135,6 @@ public class DynatraceRNBridge extends NativeDynatraceBridgeSpec {
         this.impl.reportDoubleValueInAction(actionKey, name, value, platform);
     }
 
-    @Override
-    public void sendEvent(String name, ReadableMap attributes, String platform) {
-        this.impl.sendEvent(name, attributes, platform);
-    }
-
     @Override
     public void sendBizEvent(String type, ReadableMap attributes, String platform) {
         this.impl.sendBizEvent(type, attributes, platform);

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

@@ -137,11 +137,6 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
         this.impl.reportDoubleValueInAction(actionKey, name, value, platform);
     }
 
-    @ReactMethod
-    public void sendEvent(String name, ReadableMap attributes, String platform) {
-        this.impl.sendEvent(name, attributes, platform);
-    }
-
     @ReactMethod
     public void sendBizEvent(String type, ReadableMap attributes, String platform) {
         this.impl.sendBizEvent(type, attributes, platform);

package/files/plugin.gradle

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

package/ios/DynatraceRNBridge.h

@@ -28,7 +28,6 @@ typedef enum : NSUInteger {
 @end
 
 @interface Dynatrace (Events)
-+ (void)sendEventWithName:(NSString*)name attributes:(NSDictionary<NSString*,id>* _Nullable)attributes;
 + (void)sendBizEventWithType:(NSString *)type attributes:(NSDictionary<NSString *, id> *_Nullable)attributes;
 @end
 

package/ios/DynatraceRNBridge.mm

@@ -301,14 +301,6 @@ RCT_EXPORT_METHOD(reportEventInAction:(nonnull NSString *)actionKey withName: (N
     }
 }
 
-RCT_EXPORT_METHOD(sendEvent:(NSString *)name withAttributes:(NSDictionary<NSString*, id>*) attributes platform: (NSString *) platform)
-{
-    if ([self shouldWorkOnIosWithPlatform: platform])
-    {
-        [Dynatrace sendEventWithName:name attributes:attributes];
-    }
-}
-
 RCT_EXPORT_METHOD(sendBizEvent:(NSString *)type withAttributes:(NSDictionary<NSString*, id>*) attributes platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])

package/lib/instrumentor/base/Dynatrace.js

@@ -191,26 +191,6 @@ exports.Dynatrace = {
             Logger_1.Logger.logInfo(`Dynatrace reportCrashWithException(${crashName}, ${crash}): React Native plugin has not been started yet! Crash will not be reported!`);
         }
     },
-    sendEvent: (name, attributes = {}, platform) => {
-        if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
-            if (StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(name)) {
-                Logger_1.Logger.logDebug(`Dynatrace sendEvent(${name}, ${attributes}): Name must be a non empty string`);
-                return;
-            }
-            if (typeof attributes !== 'object' ||
-                attributes === null ||
-                Array.isArray(attributes)) {
-                Logger_1.Logger.logDebug(`Dynatrace sendEvent(${name}, ${attributes}): Payload toplevel must be an object`);
-                return;
-            }
-            const internalAttributes = Object.assign({}, attributes);
-            Logger_1.Logger.logDebug(`Dynatrace sendEvent(${name}, ${internalAttributes})`);
-            DynatraceBridge_1.DynatraceNative.sendEvent(name, internalAttributes, platform === null || platform === void 0 ? void 0 : platform.toString());
-        }
-        else {
-            Logger_1.Logger.logInfo(`Dynatrace sendEvent(${name}, ${attributes}): React Native plugin has not been started yet! Event will not be reported!`);
-        }
-    },
     sendBizEvent: (type, attributes = {}, platform) => {
         if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
             if (StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(type)) {

package/lib/jsx-dev-runtime.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.301.2",
+  "version": "2.303.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",

package/react-native-dynatrace.podspec

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

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

@@ -103,8 +103,6 @@ export interface Spec extends TurboModule {
         platform?: string,
     ): void;
 
-    sendEvent(name: string, attributes: UnsafeObject, plaform?: string): void;
-
     sendBizEvent(
         type: string,
         attributes: UnsafeObject,