@dynatrace/react-native-plugin 2.285.2 → 2.287.2

package/README.md

@@ -30,7 +30,7 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 This agent versions are configured in this plugin:
 
 * Android Agent: 8.287.1.1006
-* iOS Agent: 8.285.1.1004
+* 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,6 +1320,10 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.287.2
+* 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

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/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/ios/DynatraceRNBridge.h

@@ -5,19 +5,10 @@
 #ifndef DynatraceRNBridge_h
 #define DynatraceRNBridge_h
 
-@import Dynatrace;
-
-// For Turbo Module
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "DynatraceBridgeSpec.h"
-
-@interface DynatraceRNBridge : NSObject <DynatraceBridgeSpec>
-// For Legacy Native Module
-#else
+#import <Dynatrace/Dynatrace.h>
 #import <React/RCTBridgeModule.h>
 
 @interface DynatraceRNBridge : NSObject <RCTBridgeModule>
-#endif
 - (void) newAction:(NSString *)name key:(NSString *)key parentAction:(DTXAction *)parentAction;
 - (DTXAction *) getAction:(NSString *)key;
 - (BOOL) shouldWorkOnIosWithPlatform: (NSString *) platform;
@@ -26,6 +17,7 @@
 typedef enum : NSUInteger {
     DTXActionPlatformJavaScript = 1,
     DTXActionPlatformXamarin,
+    DTXActionPlatformCustom = 10
 } DTXActionPlatformType;
 
 @interface DTXAction (ExternalAgents)

package/ios/{DynatraceRNBridge.m → DynatraceRNBridge.mm}

@@ -1,5 +1,5 @@
 //
-//  DynatraceRNBridge.m
+//  DynatraceRNBridge.mm
 //
 
 #import "DynatraceRNBridge.h"
@@ -168,7 +168,7 @@ RCT_EXPORT_METHOD(reportError:(NSString *)errorName errorValue:(NSString *)error
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
-        [DTXAction reportExternalErrorForPlatformType:-1 errorName:errorName errorValue:errorValue reason:errorReason stacktrace:stacktrace];
+        [DTXAction reportExternalErrorForPlatformType:DTXActionPlatformCustom errorName:errorName errorValue:errorValue reason:errorReason stacktrace:stacktrace];
     }
 }
 
@@ -179,7 +179,7 @@ RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)erro
         if(isRealError){
             [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformJavaScript crashName:errorName reason:errorReason stacktrace:stacktrace];
         }else{
-            [DTXAction reportExternalCrashForPlatformType:-1 crashName:errorName reason:errorReason stacktrace:stacktrace];
+            [DTXAction reportExternalCrashForPlatformType:DTXActionPlatformCustom 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
@@ -187,22 +187,24 @@ RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)erro
     }
 }
 
-RCT_EXPORT_METHOD(storeCrash:(NSString *)crashName reason:(NSString *)reason stacktrace:(NSString *)stacktrace platform:(NSString *) platform) {
-    if ([self shouldWorkOnIosWithPlatform: platform])
-    {
-        NSString* dirPath = [[[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] firstObject] path];
-        dirPath = [dirPath stringByAppendingPathComponent:@"DTXExternalCrashes"];
-        // Create the Application Support/DTXExternalCrashes directory if it does not exist
-        if (![[NSFileManager defaultManager] fileExistsAtPath:dirPath]) {
-            NSError *e;
-            [[NSFileManager defaultManager] createDirectoryAtPath:dirPath withIntermediateDirectories:YES attributes:nil error:&e];
-            NSAssert(e == nil, @"Couldn't create Application Support directory, %@", e.localizedDescription);
-        }
-        NSDictionary* crashDict = @{ @"crashName": crashName, @"reason": reason, @"stacktrace": stacktrace, @"technologyType": @"j" };
-        NSData* jsonData = [NSJSONSerialization dataWithJSONObject:crashDict options:NSJSONWritingPrettyPrinted error:nil];
-        NSString* crashJson= [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        // Store react native crash
-        [[NSFileManager defaultManager] createFileAtPath:[dirPath stringByAppendingPathComponent:@"RNCrash.txt"] contents:[crashJson dataUsingEncoding:NSUTF8StringEncoding] attributes:nil];
+RCT_EXPORT_METHOD(storeCrash:(NSString *)crashName reason:(NSString *)reason stacktrace:(NSString *)stacktrace newSession:(BOOL)newSession) {
+    NSString* dirPath = [[[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] firstObject] path];
+    dirPath = [dirPath stringByAppendingPathComponent:@"DTXExternalCrashes"];
+    // Create the Application Support/DTXExternalCrashes directory if it does not exist
+    if (![[NSFileManager defaultManager] fileExistsAtPath:dirPath]) {
+        NSError *e;
+        [[NSFileManager defaultManager] createDirectoryAtPath:dirPath withIntermediateDirectories:YES attributes:nil error:&e];
+        NSAssert(e == nil, @"Couldn't create Application Support directory, %@", e.localizedDescription);
+    }
+    NSDictionary* crashDict = @{ @"crashName": crashName, @"reason": reason, @"stacktrace": stacktrace, @"technologyType": @"j" };
+    NSData* jsonData = [NSJSONSerialization dataWithJSONObject:crashDict options:NSJSONWritingPrettyPrinted error:nil];
+    NSString* crashJson= [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    // Store react native crash
+    [[NSFileManager defaultManager] createFileAtPath:[dirPath stringByAppendingPathComponent:@"RNCrash.txt"] contents:[crashJson dataUsingEncoding:NSUTF8StringEncoding] attributes:nil];
+
+    // Create a new session if the app is in debug mode or reloadOnFatalError value is set to true where the crash is caught and the app is not forced to shutdown
+    if (newSession) {
+        [Dynatrace endVisit];
     }
 }
 
@@ -367,19 +369,13 @@ RCT_EXPORT_METHOD(setDataCollectionLevel:(nonnull NSString *) dataCollectionLeve
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
-        int dataCollectionLevelEnum;
-        
         if([dataCollectionLevel isEqualToString: DataCollectionPerformance]){
-            dataCollectionLevelEnum = DTX_DataCollectionPerformance;
+            [Dynatrace setDataCollectionLevel:DTX_DataCollectionPerformance completion:^(BOOL successful) {}];
         }else if([dataCollectionLevel isEqualToString: DataCollectionUserBehavior]){
-            dataCollectionLevelEnum = DTX_DataCollectionUserBehavior;
+            [Dynatrace setDataCollectionLevel:DTX_DataCollectionUserBehavior completion:^(BOOL successful) {}];
         }else{
-            dataCollectionLevelEnum = DTX_DataCollectionOff;
+            [Dynatrace setDataCollectionLevel:DTX_DataCollectionOff completion:^(BOOL successful) {}];
         }
-        
-        [Dynatrace setDataCollectionLevel:dataCollectionLevelEnum completion:^(BOOL successful) {
-            // Do nothing - Not sure
-        }];
     }
 }
 
@@ -477,7 +473,7 @@ RCT_EXPORT_METHOD(applyUserPrivacyOptions:(NSDictionary *) userPrivacyOptions pl
  - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
  {
-    return std::make_shared<facebook::react::<NativeDynatraceBridgeSpecJSI>>(params);
+    return std::make_shared<facebook::react::NativeDynatraceBridgeSpecJSI>(params);
  }
 #endif
 

package/ios/DynatraceRNBridge.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		680D85DC2243B77D007953B5 /* DynatraceRNBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 680D85DB2243B77D007953B5 /* DynatraceRNBridge.m */; };
+		680D85DC2243B77D007953B5 /* DynatraceRNBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 680D85DB2243B77D007953B5 /* DynatraceRNBridge.mm */; };
 		68368004225F1139001BFE0F /* libDynatrace.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 68FC4BE92243D05900C87820 /* libDynatrace.a */; };
-		FE85101429BB606C0073625D /* DynatraceRNBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 680D85DB2243B77D007953B5 /* DynatraceRNBridge.m */; };
+		FE85101429BB606C0073625D /* DynatraceRNBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 680D85DB2243B77D007953B5 /* DynatraceRNBridge.mm */; };
 		FE85101629BB606C0073625D /* libDynatrace.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 68FC4BE92243D05900C87820 /* libDynatrace.a */; };
 /* End PBXBuildFile section */
 
@@ -37,7 +37,7 @@
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRNDynatrace.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNDynatrace.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		680D85DA2243B77D007953B5 /* DynatraceRNBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynatraceRNBridge.h; sourceTree = "<group>"; };
-		680D85DB2243B77D007953B5 /* DynatraceRNBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DynatraceRNBridge.m; sourceTree = "<group>"; };
+		680D85DB2243B77D007953B5 /* DynatraceRNBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DynatraceRNBridge.mm; sourceTree = "<group>"; };
 		68FC4BE92243D05900C87820 /* libDynatrace.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDynatrace.a; path = lib/libDynatrace.a; sourceTree = "<group>"; };
 		68FC4BEA2243D05900C87820 /* Dynatrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dynatrace.h; path = lib/Dynatrace.h; sourceTree = "<group>"; };
 		FE85101B29BB606C0073625D /* libRNDynatrace-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRNDynatrace-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -77,7 +77,7 @@
 				134814211AA4EA7D00B7C361 /* Products */,
 				FE85101B29BB606C0073625D /* libRNDynatrace-tvOS.a */,
 				680D85DA2243B77D007953B5 /* DynatraceRNBridge.h */,
-				680D85DB2243B77D007953B5 /* DynatraceRNBridge.m */,
+				680D85DB2243B77D007953B5 /* DynatraceRNBridge.mm */,
 				680D868C2243CCA0007953B5 /* Frameworks */,
 			);
 			sourceTree = "<group>";
@@ -166,7 +166,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				680D85DC2243B77D007953B5 /* DynatraceRNBridge.m in Sources */,
+				680D85DC2243B77D007953B5 /* DynatraceRNBridge.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FE85101429BB606C0073625D /* DynatraceRNBridge.m in Sources */,
+				FE85101429BB606C0073625D /* DynatraceRNBridge.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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.2",
+    "version": "2.287.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,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

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.homepage      = package['homepage'] 
   s.ios.deployment_target = "12.0"
   s.tvos.deployment_target = "12.0"
-  s.source_files  = ["ios/*.{h,m}","ios/lib/*.h"]
+  s.source_files  = ["ios/*.{h,mm}"]
 
   s.license = { :type => 'Commercial', :text => 'https://github.com/Dynatrace/dem-license/blob/main/LICENSE.md'} 
 
@@ -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