@dynatrace/react-native-plugin 2.285.1 → 2.287.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.285.1.1006
-* iOS Agent: 8.285.1.1004
+* Android Agent: 8.287.1.1006
+* iOS Agent: 8.287.2.1009
 
 ## Quick Setup
 
@@ -356,7 +356,11 @@ let timing = new DynatraceWebRequestTiming(url, tag);
 
 try {      
   timing.startWebRequestTiming();
-  let axiosResponse = await axios.get(url);
+  let axiosResponse = await axios.get(url, {
+    headers: {
+        timing.getRequestTagHeader(): tag
+    }
+  });
   timing.stopWebRequestTiming(axiosResponse.status, axiosResponse.data);
 } catch (error) {
   timing.stopWebRequestTiming(-1, error);
@@ -365,6 +369,26 @@ try {
 }
 ```
 
+There is also the option to report values for request and response size:
+
+```js
+let url = 'https://www.dynatrace.com';
+// You can also use enterAutoAction if desired
+let action = Dynatrace.enterManualAction("Manual Web Request");
+let tag = await action.getRequestTag(url);
+let timing = new DynatraceWebRequestTiming(url, tag);
+
+try {      
+  timing.startWebRequestTiming();
+  let axiosResponse = await axios.get(url);
+  timing.stopWebRequestTimingWithSize(axiosResponse.status, axiosResponse.data, 122, 63);
+} catch (error) {
+  timing.stopWebRequestTiming(-1, error);
+} finally {
+  action.leaveAction();
+}
+```
+
 ### Report values
 
 For any open action you can report certain values. The following API is available for action:
@@ -1296,9 +1320,14 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.285.1
+2.287.1
+* 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)
+
+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.285.1.1006) & iOS Agent (8.285.1.1004)
+* Update Android (8.287.1.1006) & iOS Agent (8.285.1.1004)
 
 2.283.3
 * Added Auto-Instrumentation for React Native Switch

package/android/build.gradle

@@ -70,7 +70,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.dynatrace.agent:agent-android:8.285.1.1006'
+	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/DynatraceRNBridgeImpl.java

@@ -13,7 +13,8 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 
-import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Hashtable;
 import java.util.HashMap;
 import java.util.Map;
@@ -207,13 +208,17 @@ public class DynatraceRNBridgeImpl {
     }
     
     public void stopWebRequestTiming(String requestTag, String url, int responseCode, String responseMessage) {
+        stopWebRequestTimingWithSize(requestTag, url, responseCode, responseMessage, -1, -1);
+    }
+
+    public void stopWebRequestTimingWithSize(String requestTag, String url, int responseCode, String responseMessage, long requestSize, long responseSize) {
         if (requestTag != null) {
             WebRequestTiming timing = webTimings.get(requestTag);
             if (timing != null) {
                 try {
-                    timing.stopWebRequestTiming(url, responseCode, responseMessage);
+                    timing.stopWebRequestTiming(new URI(url), responseCode, responseMessage, requestSize, responseSize);
                     webTimings.remove(requestTag);
-                } catch (MalformedURLException ex) {
+                } catch (URISyntaxException ex) {
                     // do nothing
                 }
             }

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/android/src/new/java/com/dynatrace/android/agent/DynatraceRNBridge.java

@@ -105,6 +105,11 @@ public class DynatraceRNBridge extends NativeDynatraceBridgeSpec {
         this.impl.stopWebRequestTiming(requestTag, url, (int) responseCode, responseMessage);
     }
 
+    @Override
+    public void stopWebRequestTimingWithSize(String requestTag, String url, double responseCode, String responseMessage, double requestSize, double responseSize) {
+        this.impl.stopWebRequestTimingWithSize(requestTag, url, (int) responseCode, responseMessage, (long) requestSize, (long) responseSize);
+    }
+
     @Override
     public void identifyUser(String user, String platform) {
         this.impl.identifyUser(user, platform);

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

@@ -107,6 +107,11 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
         this.impl.stopWebRequestTiming(requestTag, url, responseCode, responseMessage);
     }
 
+    @ReactMethod
+    public void stopWebRequestTimingWithSize(String requestTag, String url, int responseCode, String responseMessage, double requestSize, double responseSize) {
+        this.impl.stopWebRequestTimingWithSize(requestTag, url, responseCode, responseMessage, (long) requestSize, (long) responseSize);
+    }
+
     @ReactMethod
     public void identifyUser(String user, String platform) {
         this.impl.identifyUser(user, platform);

package/files/plugin.gradle

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

package/ios/DynatraceRNBridge.m

@@ -265,12 +265,17 @@ RCT_EXPORT_METHOD(startWebRequestTiming:(NSString*) requestTag url:(NSString*) u
     
 }
 
-RCT_EXPORT_METHOD(stopWebRequestTiming:(NSString*) requestTag url:(NSString*)url responseCode:(nonnull NSNumber*) responseCode responseMessage:(NSString*)responseMessage)
+RCT_EXPORT_METHOD(stopWebRequestTiming:(NSString*) requestTag responseCode:(nonnull NSNumber*) responseCode responseMessage:(NSString*)responseMessage)
+{
+    [self stopWebRequestTimingWithSize:requestTag responseCode:responseCode requestSize:-1 responseSize:-1];
+}
+
+RCT_EXPORT_METHOD(stopWebRequestTimingWithSize:(NSString*) requestTag responseCode:(nonnull NSNumber*) responseCode responseMessage:(NSString*)responseMessage requestSize:(nonnull NSNumber*) requestSize responseSize:(nonnull NSNumber*) responseSize)
 {
     if(requestTag != NULL){
         DTXWebRequestTiming* timing = [webTimingsDict objectForKey:requestTag];
         if(timing){
-            [timing stopWebRequestTiming:[responseCode stringValue]];
+            [timing stopWebRequestTiming:[responseCode stringValue] bytesSent:[requestSize longLongValue] bytesReceived:[responseSize longLongValue]];
             [webTimingsDict removeObjectForKey:requestTag];
         }
     }

package/lib/instrumentor/base/DynatraceWebRequestTiming.js

@@ -10,7 +10,7 @@ class DynatraceWebRequestTiming {
         this.url = url;
     }
     startWebRequestTiming() {
-        if (this.requestTag != null && !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url)) {
+        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) && !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url)) {
             DynatraceBridge_1.DynatraceNative.startWebRequestTiming(this.requestTag, this.url);
         }
         else {
@@ -18,13 +18,17 @@ class DynatraceWebRequestTiming {
         }
     }
     stopWebRequestTiming(responseCode, responseMessage) {
-        if (this.requestTag != null && !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url) &&
-            responseCode != null && !(Boolean(StringUtils_1.StringUtils.isStringNullOrUndefined(responseMessage)))) {
-            DynatraceBridge_1.DynatraceNative.stopWebRequestTiming(this.requestTag, this.url, responseCode, responseMessage);
+        this.stopWebRequestTimingWithSize(responseCode, responseMessage, -1, -1);
+    }
+    stopWebRequestTimingWithSize(responseCode, responseMessage, requestSize, responseSize) {
+        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) && !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url) &&
+            responseCode != null && !StringUtils_1.StringUtils.isStringNullOrUndefined(responseMessage)) {
+            DynatraceBridge_1.DynatraceNative.stopWebRequestTimingWithSize(this.requestTag, this.url, responseCode, responseMessage, requestSize, responseSize);
         }
         else {
-            Logger_1.Logger.logDebug(`Web Request Timing could not be stopped! - Request Tag: 
-          ${this.requestTag} Url: ${this.url} responseCode: ${responseCode} responseMessage: ${responseMessage}`);
+            Logger_1.Logger.logDebug(`Web Request Timing could not be stopped! - requestTag: ${this.requestTag} ` +
+                `url: ${this.url} responseCode: ${responseCode} responseMessage: ${responseMessage} ` +
+                `requestSize: ${requestSize} responseSize: ${responseSize}`);
         }
     }
     getRequestTag() {

package/lib/instrumentor/base/NullWebRequestTiming.js

@@ -6,6 +6,9 @@ class NullWebRequestTiming {
     stopWebRequestTiming(responseCode, responseMessage) {
         return;
     }
+    stopWebRequestTimingWithSize(responseCode, responseMessage, requestSize, responseSize) {
+        return;
+    }
     getRequestTag() {
         return '';
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dynatrace/react-native-plugin",
-    "version": "2.285.1",
+    "version": "2.287.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.0",
+        "@babel/runtime": "^7.24.1",
         "jscodeshift": "^0.15.2",
         "plist": "^3.1.0",
         "proxy-polyfill": "^0.3.2",

package/react-native-dynatrace.podspec

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

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

@@ -79,6 +79,9 @@ export interface Spec extends TurboModule {
 	startWebRequestTiming(requestTag: string, url: string): void;
 
   	stopWebRequestTiming(requestTag: string, url: string, responseCode: number, responseMessage: string): void;
+
+	stopWebRequestTimingWithSize(requestTag: string, url: string, responseCode: number, responseMessage: string,
+		requestSize: number, responseSize: number): void;
 }
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions