@dynatrace/react-native-plugin 2.255.1 → 2.257.1

package/LICENSE.md

@@ -0,0 +1 @@
+[Authorized Dynatrace Customer Subscription Agreement](https://github.com/Dynatrace/dem-license/blob/main/LICENSE.md)

package/README.md

@@ -23,20 +23,21 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
   * SDK version 21+
   * Gradle version 6.1.1+ ([How to update?](#updating-to-gradle-6))
   * Android Gradle plugin version 4.0+
-* For iOS users: Minimum iOS 9
+* For iOS users: Minimum iOS 11
 
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* iOS Agent: 8.255.1.1006
-* Android Agent: 8.255.1.1005
+* iOS Agent: 8.257.1.1007
+* Android Agent: 8.257.1.1007
 
 ## Quick Setup
 
 1. [Install plugin](#1-install-the-plugin)
 2. [Register Dynatrace transformer](#2-register-the-dynatrace-transformer)
 3. [Setup configuration](#3-setup-dynatraceconfigjs)
-4. [Build and run your app](#4-build-and-run-your-app)
+4. [Update Babel Configuration](#4-update-babel-configuration)
+5. [Build and run your app](#4-build-and-run-your-app)
 
 ## Advanced topics
 * [Manual OneAgent Startup](#manual-oneagent-startup)
@@ -132,7 +133,7 @@ Depending on your version of Metro or Expo (if used), your babel configuration `
 The changes have to be done in the following cases:
 
 - metro >= 0.72.0: https://github.com/facebook/metro/releases/tag/v0.72.0
-- expo >= 0.44.0 or babel-preset-expo >= 9.0.0: https://github.com/expo/expo/blob/main/packages/babel-preset-expo/CHANGELOG.md#900--2021-12-03
+- expo >= 44.0.0 or babel-preset-expo >= 9.0.0: https://github.com/expo/expo/blob/main/packages/babel-preset-expo/CHANGELOG.md#900--2021-12-03
 
 The required changes for the versions above can be found [here](#react-automatic-runtime).
 
@@ -215,21 +216,24 @@ new ManualStartupConfiguration(
   reportCrash: true,
   logLevel: LogLevel.Info,
   lifecycleUpdate: false,
-  certificateValidation: true;
-  userOptIn: false;
+  userOptIn: false,
+  actionNamePrivacy: false,
+  bundleName: undefined
 )
 ```
 
 | Property name    | Type   | Default     | Description                                       |
 |------------------|--------|-------------|---------------------------------------------------|
-|beaconUrl         |string  |null         |Identifies your environment within Dynatrace. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
-|applicationId     |string  |null         |Identifies your mobile app. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
+|beaconUrl         |string  |undefined         |Identifies your environment within Dynatrace. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
+|applicationId     |string  |undefined         |Identifies your mobile app. This property is mandatory for [manual startup](#manual-oneagent-startup). OneAgent issues an error when the key isn't present.|
 |reportCrash       |boolean |true         |Reports crashes.                  |
 |logLevel          |LogLevel|LogLevel.Info|Allows you to choose between `LogLevel.Info` and `LogLevel.Debug`. Debug returns more logs. This is especially important when something is not functioning correctly.|
 |lifecycleUpdate   |boolean |false        |Decide if you want to see update cycles on lifecycle actions as well. This is per default false as it creates a lot more actions.|
-|certificateValidation|boolean |true         |Allows the use of self-signed certificates. By default, it is set to false. When set to true, OneAgent accepts self-signed certificates that are not signed by a root-CA. This configuration key doesn't impact mobile app connections. It's only used for OneAgent communication, but doesn't overrule the host-name validation.|
 |userOptIn        |boolean  |false        |Activates the privacy mode when set to `true`. User consent must be queried and set. The privacy settings for [data collection](#data-collection) and [crash reporting](#crash-reporting) can be changed via  OneAgent SDK for Mobile as described under Data privacy. The default value is `false`.|
 |actionNamePrivacy|boolean|false|Activates a privacy mode especially for Touchables and Buttons. Setting this option to true means that a name for the control will no longer be shown, e.g. "Touch on Button". When setting a dtActionName onto the component this setting will be ignored. 
+|bundleName|string|undefined|Should be used only if you have a multiple bundle setup where you load several .bundle files within your React Native application. Enter the name of your bundle. This should be unique in comparison to your other bundle names. This will ensure that actions coming from different bundles will not interfere with each other.
+
+
 
 **Note**: The values used for the parameters are their default value.
 
@@ -255,10 +259,15 @@ Combining manual and auto instrumentation is not creating a problem as both are
 
 ### Create custom actions
 
+There are two options to create an action. Either using `enterAutoAction` (the previous `enterAction`) or `enterManualAction`:
+
+* `enterAutoAction` - Creates an Action which will be automatically handled by the plugin (This is the type of action which is internally used by the plugin when monitoring components and touchables). This means that the plugin decides about the hierachy of this action. If there is no open action, the following action will be a root action. All other actions created by this method, while a root action is open, will be automatically inserted as a child action. Furthermore the plugin will automatically link webrequest (if they are not tagged manually) to the open root action.
+* `enterManualAction` - Creates an Action which will NOT be handled by the plugin. This means that you have full control about the hierachy of your actions. This function will create a root action for you, which has the ability to create child actions via `enterAction`. Be aware, because of the full manual approach the plugin will not link webrequest automatically. Webrequest have to be manually tagged by using the tag provided by the action via `getRequestTag`.
+
 To create a custom action named `"MyButton tapped"`, use the following code. The *leaveAction* closes the action again. To report values for this action before closing, see [Report Values](#report-values).
 
 ```js
-let myAction = Dynatrace.enterAction("MyButton tapped");
+let myAction = Dynatrace.enterManualAction("MyButton tapped");
 //Perform the action and whatever else is needed.
 myAction.leaveAction();
 ```
@@ -601,14 +610,14 @@ Here is a list of all the counterparts for the options that can be used with a m
 
 | Property Name | Default | Android | iOS | React |
 |---------------|------|---------|-------------|-------------|
-|beaconUrl|null|autoStart.beaconUrl|DTXBeaconURL| - |
-|applicationId|null|autoStart.applicationId|DTXApplicationId| - |
+|beaconUrl|undefined|autoStart.beaconUrl|DTXBeaconURL| - |
+|applicationId|undefined|autoStart.applicationId|DTXApplicationId| - |
 |reportCrash|true|crashReporting|DTXCrashReporting| - |
 |logLevel|LogLevel.Info|debug.agentLogging|DTXLogLevel| debug |
 |lifecycleUpdate|false| - | - | lifecycle.includeUpdate |
-|certificateValidation|false|debug.certificateValidation|DTXAllowAnyCert| - |
 |userOptIn|false|userOptIn|DTXUserOptIn| - |
 |actionNamePrivacy|false|-|-|input.actionNamePrivacy
+|bundleName|undefined|-|-|bundleName
 
 ### React block
 
@@ -668,6 +677,16 @@ react: {
 
 This activates the AutoStart mode, which will insert an auto start call in your React Native application. This is per default true. If you want to use a manual startup call, please have a look into the [manual startup section](#manual-oneagent-startup).
 
+#### Bundle Name
+
+Should be used only if you have a multiple bundle setup where you load several .bundle files within your React Native application. Enter the name of your bundle. This should be unique in comparison to your other bundle names. This will ensure that actions coming from different bundles will not interfere with each other.
+
+```js
+react: {
+  bundleName: "MyCustomBundle"
+}
+```
+
 ### Android block
 
 The Android block is a wrapper for the Android configuration you find in the WebUI (in the Mobile Application Settings). Copy the content into the following block:
@@ -891,7 +910,7 @@ module.exports = {
 }
 ``` 
 
-Using `babel-expo-preset`:
+Using `babel-preset-expo`:
 
 ```js
 module.exports = {
@@ -1078,7 +1097,13 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.555.1
+2.257.1
+* Added API for creating a [manual custom action](#create-custom-actions)
+* Removed option to disable certificate validation
+* Updated Android (8.257.1.1007) & iOS Agent (8.257.1.1007)
+* Minimum Support iOS version raised to 11
+
+2.255.1
 * Enhanced debug logging
 * Adding instrumentation for touchables of react-native-gesture-handler
 * Fixed Auto instrumentation in case of missing start of plugin

package/android/build.gradle

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

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

@@ -11,9 +11,9 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 
+import java.net.MalformedURLException;
 import java.util.Hashtable;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,7 +27,8 @@ import com.dynatrace.android.agent.conf.UserPrivacyOptions;
 
 public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     
-    private Hashtable<Integer, DTXAction> actions;
+    private HashMap<String, WebRequestTiming> webTimings;
+    private HashMap<String, DTXAction> actions;
     private static final String PLATFORM_ANDROID = "android";
     private static final String PLATFORM_IOS = "ios";
     private static final String DATA_COLLECTION_OFF = "OFF";
@@ -38,7 +39,8 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
 
     public DynatraceRNBridge(ReactApplicationContext reactContext, PrivateDTBridge internal) {
         super(reactContext);
-        actions = new Hashtable<>();
+        webTimings = new HashMap<>();
+        actions = new HashMap<>();
         _internal = internal;
     }
 
@@ -74,7 +76,6 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
             builder.withCrashReporting(configuration.getBoolean("reportCrash"));
             // 0 == Debug / 1 == Info
             builder.withDebugLogging(configuration.getInt("logLevel") == 0);
-            builder.withCertificateValidation(configuration.getBoolean("certificateValidation"));
 
             Dynatrace.startup(getReactApplicationContext(), builder.buildConfiguration());
         } 
@@ -84,7 +85,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     // Expects a key which is generated in JS. This is to circumvent the async callback system.
     //
     @ReactMethod
-    public void enterAction(String name, int key, String platform) {
+    public void enterAction(String name, String key, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             try {
                 newAction(name, key);
@@ -94,7 +95,26 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void leaveAction(int key, String platform) {
+    public void enterManualAction(String name, String key, String platform) {
+        if (this.shouldWorkOnAndroid(platform)) {
+			actions.put(key, Dynatrace.enterAction(name));
+        }
+    }
+
+    private void enterManualActionWithParent(String name, String key, int parentKey, String platform) {
+		if (this.shouldWorkOnAndroid(platform)) {
+			DTXAction parent = actions.get(parentKey);
+
+			if (parent != null) {
+				actions.put(key, Dynatrace.enterAction(name, parent));
+			} else {
+				enterAction(name, key, platform);
+			}
+		}
+	}
+
+    @ReactMethod
+    public void leaveAction(String key, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(key);
             if (action == null) return;
@@ -104,17 +124,17 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
                 action.leaveAction();
             }
 
-            actions.remove(Integer.valueOf(key));
+            actions.remove(key);
         }
     }
 
     @ReactMethod
-    public void cancelAction(int key, String platform) {
+    public void cancelAction(String key, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(key);
             if (action == null) return;
             action.cancel();
-            actions.remove(Integer.valueOf(key));
+            actions.remove(key);
         }
     }
 
@@ -156,7 +176,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportErrorInAction(int key, String errorName, int errorCode, String platform) {
+    public void reportErrorInAction(String key, String errorName, int errorCode, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(key);
             if (action == null) return;
@@ -165,7 +185,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportValue(int key, String valueName, String value, String platform) {
+    public void reportValue(String key, String valueName, String value, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(key);
             if (action == null) return;
@@ -174,8 +194,41 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void getRequestTag(Promise promise){
-        promise.resolve(Dynatrace.getRequestTag());
+    public void getRequestTag(String key, String url, Promise promise){
+        DTXAction action = getAction(key);
+
+        if (action == null){
+            promise.resolve(Dynatrace.getRequestTag());
+            return;
+        };
+
+        promise.resolve(action.getRequestTag());
+    }
+
+    @ReactMethod
+    public void startWebRequestTiming(String requestTag, String url) {
+        if (requestTag != null) {
+            WebRequestTiming timing = Dynatrace.getWebRequestTiming(requestTag);
+            if(timing != null){
+                webTimings.put(requestTag, timing);
+                timing.startWebRequestTiming();
+            }
+        }
+    }
+    
+    @ReactMethod
+    public void stopWebRequestTiming(String requestTag, String url, int responseCode, String responseMessage) {
+        if (requestTag != null) {
+            WebRequestTiming timing = webTimings.get(requestTag);
+            if (timing != null) {
+                try {
+                    timing.stopWebRequestTiming(url, responseCode, responseMessage);
+                    webTimings.remove(requestTag);
+                } catch (MalformedURLException ex) {
+                    // do nothing
+                }
+            }
+        }
     }
 
     @ReactMethod
@@ -186,7 +239,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportEventInAction(int actionKey, String name, String platform) {
+    public void reportEventInAction(String actionKey, String name, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(actionKey);
             if (action == null) return;
@@ -195,7 +248,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportStringValueInAction(int actionKey, String name, String value, String platform) {
+    public void reportStringValueInAction(String actionKey, String name, String value, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(actionKey);
             if (action == null) return;
@@ -204,7 +257,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportIntValueInAction(int actionKey, String name, int value, String platform) {
+    public void reportIntValueInAction(String actionKey, String name, int value, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(actionKey);
             if (action == null) return;
@@ -213,7 +266,7 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void reportDoubleValueInAction(int actionKey, String name, double value, String platform) {
+    public void reportDoubleValueInAction(String actionKey, String name, double value, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(actionKey);
             if (action == null) return;
@@ -322,13 +375,13 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
         }
     }
 
-    private void newAction(String name, int key) throws Exception {
+    private void newAction(String name, String key) throws Exception {
         if (name == null) throw new Exception("action name is null");
-        actions.put(Integer.valueOf(key), _internal.enterAction(name));
+        actions.put(key, _internal.enterAction(name));
     }
 
-    private DTXAction getAction(int key){
-        return actions.get(Integer.valueOf(key));
+    private DTXAction getAction(String key){
+        return actions.get(key);
     }
 
     private Boolean shouldWorkOnAndroid(String platform) {

package/files/plugin.gradle

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

package/ios/DynatraceRNBridge.h

@@ -10,8 +10,8 @@
 
 
 @interface DynatraceRNBridge : NSObject <RCTBridgeModule>
-- (void) newAction:(NSString *)name key:(NSNumber *)key parentAction:(DTXAction *)parentAction;
-- (DTXAction *) getAction:(NSNumber *)key;
+- (void) newAction:(NSString *)name key:(NSString *)key parentAction:(DTXAction *)parentAction;
+- (DTXAction *) getAction:(NSString *)key;
 - (BOOL) shouldWorkOnIosWithPlatform: (NSString *) platform;
 @end
 

package/ios/DynatraceRNBridge.m

@@ -9,6 +9,7 @@
 @implementation DynatraceRNBridge
 
 NSMutableDictionary *actionDict;
+NSMutableDictionary *webTimingsDict;
 
 NSString *const PlatformAndroid = @"android";
 NSString *const PlatformiOS = @"ios";
@@ -23,6 +24,7 @@ RCT_EXPORT_MODULE(DynatraceBridge);
   self = [super init];
   if (self) {
     actionDict = [[NSMutableDictionary alloc] init];
+    webTimingsDict = [[NSMutableDictionary alloc] init];
   }
   return self;
 }
@@ -64,16 +66,12 @@ RCT_EXPORT_METHOD(start:(NSDictionary *) options)
         properties[@"DTXLogLevel"] = @"ALL";
     }
 
-    if (options[@"certificateValidation"] != NULL && [[options valueForKey:@"certificateValidation"] isEqual: @(NO)]) {
-        properties[@"DTXAllowAnyCert"] = @YES;
-    }
-
     if (properties[@"DTXBeaconURL"] != NULL && properties[@"DTXApplicationID"] != NULL) {
         [Dynatrace startupWithConfig:properties];
     }
 }
 
-RCT_EXPORT_METHOD(enterAction:(NSString *)name key:(nonnull NSNumber *)key platform: (NSString *) platform)
+RCT_EXPORT_METHOD(enterAction:(NSString *)name key:(nonnull NSString *)key platform: (NSString *) platform)
 {
   if ([self shouldWorkOnIosWithPlatform: platform])
   {
@@ -81,7 +79,7 @@ RCT_EXPORT_METHOD(enterAction:(NSString *)name key:(nonnull NSNumber *)key platf
   }
 }
 
-RCT_EXPORT_METHOD(enterActionWithParent:(NSString *)name key:(nonnull NSNumber *)key parentKey:(nonnull NSNumber *)parentKey platform: (NSString *) platform)
+RCT_EXPORT_METHOD(enterActionWithParent:(NSString *)name key:(nonnull NSString *)key parentKey:(nonnull NSString *)parentKey platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
@@ -89,7 +87,7 @@ RCT_EXPORT_METHOD(enterActionWithParent:(NSString *)name key:(nonnull NSNumber *
     }
 }
 
-RCT_EXPORT_METHOD(leaveAction:(nonnull NSNumber *)key platform: (NSString *) platform)
+RCT_EXPORT_METHOD(leaveAction:(nonnull NSString *)key platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
@@ -99,7 +97,7 @@ RCT_EXPORT_METHOD(leaveAction:(nonnull NSNumber *)key platform: (NSString *) pla
     }
 }
 
-RCT_EXPORT_METHOD(cancelAction:(nonnull NSNumber *)key platform: (NSString *) platform)
+RCT_EXPORT_METHOD(cancelAction:(nonnull NSString *)key platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
@@ -150,7 +148,7 @@ RCT_EXPORT_METHOD(reportCrash:(NSString *)errorName errorReason:(NSString *)erro
     }
 }
 
-RCT_EXPORT_METHOD(reportErrorInAction:(nonnull NSNumber *)key errorName:(NSString *)errorName errorCode:(nonnull NSNumber *)errorCode platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportErrorInAction:(nonnull NSString *)key errorName:(NSString *)errorName errorCode:(nonnull NSNumber *)errorCode platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
@@ -161,7 +159,7 @@ RCT_EXPORT_METHOD(reportErrorInAction:(nonnull NSNumber *)key errorName:(NSStrin
     }
 }
 
-RCT_EXPORT_METHOD(reportStringValueInAction:(nonnull NSNumber *)actionKey withName:(NSString *)name value: (NSString *)value platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportStringValueInAction:(nonnull NSString *)actionKey withName:(NSString *)name value: (NSString *)value platform: (NSString *) platform)
 {
   if ([self shouldWorkOnIosWithPlatform: platform])
   {
@@ -171,7 +169,7 @@ RCT_EXPORT_METHOD(reportStringValueInAction:(nonnull NSNumber *)actionKey withNa
   }
 }
 
-RCT_EXPORT_METHOD(reportIntValueInAction:(nonnull NSNumber *)actionKey withName:(NSString *)name value: (nonnull NSNumber *)value platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportIntValueInAction:(nonnull NSString *)actionKey withName:(NSString *)name value: (nonnull NSNumber *)value platform: (NSString *) platform)
 {
   if ([self shouldWorkOnIosWithPlatform: platform])
   {
@@ -181,7 +179,7 @@ RCT_EXPORT_METHOD(reportIntValueInAction:(nonnull NSNumber *)actionKey withName:
   }
 }
 
-RCT_EXPORT_METHOD(reportDoubleValueInAction:(nonnull NSNumber *)actionKey withName:(NSString *)name value: (nonnull NSNumber *)value platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportDoubleValueInAction:(nonnull NSString *)actionKey withName:(NSString *)name value: (nonnull NSNumber *)value platform: (NSString *) platform)
 {
   if ([self shouldWorkOnIosWithPlatform: platform])
   {
@@ -191,9 +189,32 @@ RCT_EXPORT_METHOD(reportDoubleValueInAction:(nonnull NSNumber *)actionKey withNa
   }
 }
 
-RCT_REMAP_METHOD(getRequestTag, getRequestTagWithResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getRequestTag:(nonnull NSNumber *)actionKey withUrl:(NSString *)url getRequestTagWithResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    DTXAction* action = [self getAction:actionKey];
+    resolve([action getTagForURL:[NSURL URLWithString:url]]);
+}
+
+RCT_EXPORT_METHOD(startWebRequestTiming:(NSString*) requestTag url:(NSString*) url)
+{
+    if(requestTag != NULL && url != NULL){
+        DTXWebRequestTiming* timing = [DTXWebRequestTiming getDTXWebRequestTiming:requestTag requestUrl:[NSURL URLWithString:url]];
+        if (timing != NULL) {
+            [webTimingsDict setObject:timing forKey:[NSString stringWithString:requestTag]];
+            [timing startWebRequestTiming];
+        }
+    }
+}
+
+RCT_EXPORT_METHOD(stopWebRequestTiming:(NSString*) requestTag url:(NSString*)url responseCode:(nonnull NSNumber*) responseCode responseMessage:(NSString*)responseMessage)
 {
-  resolve([Dynatrace getRequestTagValueForURL:nil]);
+    if(requestTag != NULL){
+        DTXWebRequestTiming* timing = [webTimingsDict objectForKey:requestTag];
+        if(timing){
+            [timing stopWebRequestTiming:[responseCode stringValue]];
+            [webTimingsDict removeObjectForKey:requestTag];
+        }
+    }
 }
 
 RCT_EXPORT_METHOD(identifyUser:(NSString *)user platform: (NSString *) platform)
@@ -204,7 +225,7 @@ RCT_EXPORT_METHOD(identifyUser:(NSString *)user platform: (NSString *) platform)
     }
 }
 
-RCT_EXPORT_METHOD(reportEventInAction:(nonnull NSNumber *)actionKey withName: (NSString *)name platform: (NSString *) platform)
+RCT_EXPORT_METHOD(reportEventInAction:(nonnull NSString *)actionKey withName: (NSString *)name platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
@@ -366,7 +387,7 @@ RCT_EXPORT_METHOD(applyUserPrivacyOptions:(NSDictionary *) userPrivacyOptions pl
     }
 }
 
-- (void) newAction:(NSString *)name key:(nonnull NSNumber *)key parentAction:(DTXAction *)parentAction
+- (void) newAction:(NSString *)name key:(nonnull NSString *)key parentAction:(DTXAction *)parentAction
 {
     DTXAction *action = [DTXAction integrateActionWithName:name];
     
@@ -376,7 +397,7 @@ RCT_EXPORT_METHOD(applyUserPrivacyOptions:(NSDictionary *) userPrivacyOptions pl
     }
 }
 
-- (DTXAction *) getAction:(nonnull NSNumber *)key
+- (DTXAction *) getAction:(nonnull NSString *)key
 {
   return [actionDict objectForKey:key];
 }

package/ios/lib/Dynatrace.xcframework/Info.plist

@@ -6,57 +6,57 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>