@dynatrace/react-native-plugin 2.287.1 → 2.287.3

package/README.md

@@ -1320,9 +1320,11 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.287.1
+2.287.3
 * 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)
+* Improved logging of configuration at startup
+* Fixed dtActionName when using ActionNamePrivacy
 
 2.285.2
 * Fixed bridge module issue for older React Native versions (< 0.65.0)

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];
     }
 }
 
@@ -265,17 +267,12 @@ RCT_EXPORT_METHOD(startWebRequestTiming:(NSString*) requestTag url:(NSString*) u
     
 }
 
-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)
+RCT_EXPORT_METHOD(stopWebRequestTiming:(NSString*) requestTag url:(NSString*)url responseCode:(nonnull NSNumber*) responseCode responseMessage:(NSString*)responseMessage)
 {
     if(requestTag != NULL){
         DTXWebRequestTiming* timing = [webTimingsDict objectForKey:requestTag];
         if(timing){
-            [timing stopWebRequestTiming:[responseCode stringValue] bytesSent:[requestSize longLongValue] bytesReceived:[responseSize longLongValue]];
+            [timing stopWebRequestTiming:[responseCode stringValue]];
             [webTimingsDict removeObjectForKey:requestTag];
         }
     }
@@ -372,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
-        }];
     }
 }
 
@@ -482,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/Application.js

@@ -9,7 +9,7 @@ exports.ApplicationHandler = {
         if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
             const config = new ConfigurationBuilder_1.ConfigurationBuilder('', '').buildConfiguration();
             ConfigurationHandler_1.ConfigurationHandler.setConfiguration(config);
-            Logger_1.Logger.logDebug('Configuration set: ' + JSON.stringify(config));
+            Logger_1.Logger.logDebug('Configuration set: ' + config.toString());
             Logger_1.Logger.logInfo('Dynatrace React Native Plugin started!');
         }
     },

package/lib/instrumentor/base/Dynatrace.js

@@ -28,7 +28,7 @@ exports.Dynatrace = {
             if (configuration !== undefined) {
                 DynatraceBridge_1.DynatraceNative.start(configuration);
                 ConfigurationHandler_1.ConfigurationHandler.setConfiguration(configuration);
-                Logger_1.Logger.logDebug('Manual Configuration set: ' + JSON.stringify(configuration));
+                Logger_1.Logger.logDebug('Configuration set: ' + configuration.toString());
             }
             else {
                 throw new Error('Configuration is empty! Not allowed for Manual Startup!');

package/lib/instrumentor/base/Touchable.js

@@ -25,7 +25,7 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             }
             else {
                 let finalNameOfAction = nameOfAction;
-                if (ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled()) {
+                if (!(0, IDynatraceProperties_1.isDynatraceNaming)(props) && ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled()) {
                     finalNameOfAction = isButton ? 'Button' : 'Touchable';
                 }
                 const action = Dynatrace.enterAutoAction(`Touch on ${finalNameOfAction}`);

package/lib/instrumentor/base/configuration/Configuration.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
+const LogLevel_1 = require("../model/LogLevel");
 class Configuration {
     constructor(beaconUrl, applicationId, reportCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, bundleName) {
         this.beaconUrl = beaconUrl;
@@ -12,5 +13,22 @@ class Configuration {
         this.actionNamePrivacy = actionNamePrivacy;
         this.bundleName = bundleName;
     }
+    toString() {
+        let configurationString;
+        if (this.beaconUrl === '' && this.applicationId === '') {
+            configurationString = '{Startup: Auto Start,';
+        }
+        else {
+            configurationString = `{Startup: Manual Start, applicationId: ${this.applicationId}, beaconUrl: ${this.beaconUrl},`;
+        }
+        configurationString += ` reportCrash: ${this.reportCrash}, lifecycleUpdate: ${this.lifecycleUpdate},`
+            + ` userOptIn: ${this.userOptIn}, actionNamePrivacy: ${this.actionNamePrivacy},`
+            + ` logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
+        if (this.bundleName !== undefined) {
+            configurationString += `, bundleName: ${this.bundleName}`;
+        }
+        configurationString += '}';
+        return configurationString;
+    }
 }
 exports.Configuration = Configuration;

package/lib/instrumentor/base/configuration/ManualStartupConfiguration.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManualStartupConfiguration = void 0;
+const LogLevel_1 = require("../model/LogLevel");
 const ConfigurationDefaults_1 = require("./ConfigurationDefaults");
 const ConfigurationPreset_1 = require("./ConfigurationPreset");
 class ManualStartupConfiguration {
@@ -36,5 +37,15 @@ class ManualStartupConfiguration {
             this.bundleName = bundleName;
         }
     }
+    toString() {
+        let configurationString = `{Startup: Manual Start, applicationId: ${this.applicationId}, beaconUrl: ${this.beaconUrl},`
+            + ` reportCrash: ${this.reportCrash}, lifecycleUpdate: ${this.lifecycleUpdate}, userOptIn: ${this.userOptIn},`
+            + ` actionNamePrivacy: ${this.actionNamePrivacy}, logLevel: ${(0, LogLevel_1.LogLevelToString)(this.logLevel)}`;
+        if (this.bundleName !== undefined) {
+            configurationString += `, bundleName: ${this.bundleName}`;
+        }
+        configurationString += '}';
+        return configurationString;
+    }
 }
 exports.ManualStartupConfiguration = ManualStartupConfiguration;

package/lib/instrumentor/base/model/LogLevel.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevel = void 0;
+exports.LogLevelToString = exports.LogLevel = void 0;
 var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["Debug"] = 0] = "Debug";
     LogLevel[LogLevel["Info"] = 1] = "Info";
 })(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
+const LogLevelToString = (level) => {
+    if (level === LogLevel.Debug) {
+        return 'Debug';
+    }
+    else {
+        return 'Info';
+    }
+};
+exports.LogLevelToString = LogLevelToString;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dynatrace/react-native-plugin",
-    "version": "2.287.1",
+    "version": "2.287.3",
     "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.1",
+        "@babel/runtime": "^7.24.4",
         "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'}