@dynatrace/cordova-plugin 2.333.1 → 2.335.1

package/README.md

@@ -2,7 +2,7 @@
 
 # Dynatrace Cordova Plugin
 
-This plugin gives you the ability to use the Dynatrace instrumentation in your hybrid application (Cordova, Ionic, Capacitor ..). It uses the Mobile Agent and the JavaScript Agent. The Mobile Agent will give you all device specific values containing lifecycle information and the JavaScript Agent will allow you to manually instrument your JavaScript/TypeScript code out of the box (TypeScript definitions included). The JavaScript Agent will cover the network calls (depending on your used libraries) and will automatically detect them.
+This plugin gives you the ability to use the Dynatrace instrumentation in your hybrid application (Cordova, Ionic, Capacitor ..). It uses OneAgent for Mobile and RUM JavaScript. OneAgent for Mobile will give you all device specific values containing lifecycle information and RUM JavaScript will allow you to manually instrument your JavaScript/TypeScript code out of the box (TypeScript definitions included). RUM JavaScript will cover the network calls (depending on your used libraries) and will automatically detect them.
 
 ## Upgrading major versions
 
@@ -24,17 +24,31 @@ For information as to why this is necessary, read more [here](#migration-from-ma
   * Java 11
   * Jetpack Compose 1.4 - 1.10 - see [Compose Compatibility Note](#compose-compatibility-note)
 * For iOS users: Minimum iOS 12
-* For JavaScript Agent: access to API of cluster
+* For RUM JavaScript: access to API of cluster
 * Node: >= 20.x
 * Cordova: 10+
 * Capacitor: 6+
 
-## Agent Versions
+## OneAgent Versions
 
-These agent versions are configured in this plugin:
+These OneAgent versions are configured in this plugin:
 
-* Android Agent: 8.333.1.1006
-* iOS Agent: 8.333.1.1005
+* Android OneAgent: 8.335.1.1001
+* iOS OneAgent: 8.335.1.1009
+
+## OneAgent compatibility
+
+OneAgent for Mobile and RUM JavaScript are compatible with each other unless at least one of them reaches End of Support (EoS). To check the support status of their versions, see [Scheduled EoL for unsupported OneAgent versions](https://docs.dynatrace.com/docs/shortlink/end-of-life#scheduled-eol-for-unsupported-oneagent-versions).
+
+If versions of both OneAgent for Mobile and RUM JavaScript are within their supported lifecycles, no additional compatibility validation is required. The optimal approach is to keep both of them updated to their latest versions. The only exception is when the Dynatrace documentation explicitly identifies a conflict between specific versions of OneAgent for Mobile and RUM JavaScript. In this case, refer to the documentation for guidance on how to resolve the conflict.
+
+### Feature-specific compatibility requirements
+
+Some features require a minimum version of OneAgent for Mobile or RUM JavaScript to function properly. If you rely on a feature that has a version dependency, you must ensure both OneAgent for Mobile and RUM JavaScript meet those minimum requirements even if both are within their supported lifecycles.
+
+Examples of known feature-specific version requirements:
+
+* To use the [iOS-only configuration feature](#ios-only-configuration) with the Dynatrace Cordova plugin, **RUM JavaScript version 1.327 or higher** is required. In addition to the minimum version, you must add the corresponding property to your `dynatrace.config.js` file. See [iOS only configuration](#ios-only-configuration) for required configuration details.
 
 ## Quick Setup
 
@@ -45,6 +59,8 @@ These agent versions are configured in this plugin:
 
 ## Advanced Topics 
 
+* [OneAgent compatibility](#oneagent-compatibility)
+    * [Feature-specific compatibility requirements](#feature-specific-compatibility)
 * [Capacitor instrumentation](#capacitor-instrumentation)
     * [Opt out](#opt-out)
 * [Cordova configuration](#cordova-configuration)
@@ -52,14 +68,14 @@ These agent versions are configured in this plugin:
     * [Content Security Policy url](#content-security-policy-url)
     * [Cookie Proxy](#cookie-proxy)
     * [Capacitor Cookie Proxy](#capacitor-cookie-proxy)
-    * [JS Agent Path](#js-agent-path)
+    * [RUM JavaScript Path](#rum-javascript-path)
     * [Gradle Path](#gradle-path)
     * [Plist Path](#plist-path)
-* [Mobile Agent configuration](#mobile-agent-configuration)
+* [OneAgent for Mobile configuration](#oneagent-for-mobile-configuration)
     * [Hybrid related configuration](#hybrid-related-configuration)
     * [iOS only configuration](#ios-only-configuration)
-* [JavaScript Agent configuration](#javascript-agent-configuration)
-    * [JavaScript Agent Snippet Mode](#javascript-agent-snippet-mode)
+* [RUM JavaScript configuration](#rum-javascript-configuration)
+    * [RUM JavaScript Snippet Mode](#rum-javascript-snippet-mode)
     * [HTML Instrumentation Requirements](#html-instrumentation-requirements)
     * [Allow any certificate](#allow-any-certificate)
 * [Manual instrumentation](#manual-instrumentation)
@@ -67,11 +83,11 @@ These agent versions are configured in this plugin:
     * [Report error](#report-error)
     * [Identify user](#identify-user)
     * [More examples](#more-examples)
-    * [Typings file for JavaScript Agent API](#typings-file-for-javascript-agent-api)
-* [Manual instrumentation - Mobile Agent](#manual-instrumentation-mobile-agent)
+    * [Typings file for RUM JavaScript API](#typings-file-for-rum-javascript-api)
+* [Manual instrumentation - OneAgent for Mobile](#manual-instrumentation-oneagent-for-mobile)
     * [End session](#end-session)
     * [User Privacy Options](#user-privacy-options)
-    * [Typings file for Mobile Agent API](#typings-file-for-mobile-agent-api)
+    * [Typings file for OneAgent for Mobile API](#typings-file-for-oneagent-for-mobile-api)
 * [Native Webrequests](#native-webrequests)
 * [IBM Mobile First](#ibm-mobile-first)
 * [Ionic WebView for Cordova](#ionic-webview-for-cordova)
@@ -119,7 +135,7 @@ Be aware for Capacitor after installation some [extra configuration steps](#capa
 
 ## 2. Configuration with Dynatrace
 
-If you want to instrument your Cordova application just go to your Dynatrace WebUI and select the menu point "Deploy Dynatrace". Choose to setup mobile monitoring and select Cordova. Afterwards it is possible for you to add the Web part (JavaScript Agent) automatically and download the `dynatrace.config.js` file.
+If you want to instrument your Cordova application just go to your Dynatrace WebUI and select the menu point "Deploy Dynatrace". Choose to setup mobile monitoring and select Cordova. Afterwards it is possible for you to add the Web part (RUM JavaScript) automatically and download the `dynatrace.config.js` file.
  
 This file should be placed in the `root of your project` (same place where the *package.json* is stored). If the file is not available the instrumentation will not work.
 
@@ -216,7 +232,7 @@ There is flag for updating the CSP (Content Security Policy). By default this va
 
 ### Cookie Proxy
 
-Issues with cookies are somehow a persistent companion in Ionic or Capacitor applications. Therefore, we provide a proxy script which is wrapping the document.cookie API and are storing the cookies which are important for the Dynatrace Agents in the session storage. Of course this wrapping is still calling the original API. Please see the [Capacitor Cookie Proxy](#capacitor-cookie-proxy) section below if you are using `CapacitorCookies` in your application. If not, please see the configuration below.
+Issues with cookies are somehow a persistent companion in Ionic or Capacitor applications. Therefore, we provide a proxy script which is wrapping the document.cookie API and are storing the cookies which are important for Dynatrace OneAgents in the session storage. Of course this wrapping is still calling the original API. Please see the [Capacitor Cookie Proxy](#capacitor-cookie-proxy) section below if you are using `CapacitorCookies` in your application. If not, please see the configuration below.
 
 Per default the cookie proxy is turned off. To make use of this proxy you need to enable it in the cordova configuration in the dynatrace.config.js:
 
@@ -249,20 +265,20 @@ If you are not using `CapacitorCookies` in your application, please be sure to f
 **NOTE:** 
 If `CapacitorCookies` is set to true, we will not inject our proxy as there have been issues when using both `CapacitorCookies` and our proxy at the same time. Also, if you have both `cookieProxy` and `capacitorCookieProxy` set to true while `CapacitorCookies` is set to false, we will add the capacitor cookie proxy.
 
-### JS Agent Path
+### RUM JavaScript Path
 
-If you want to use a local script/text file that includes the JS Agent snippet downloaded from the WebUI or retrieved from using the Dynatrace API. Note that you can name the file whatever you want but the file and directory that you use needs to exist. The file downloaded from the WebUI will be named `jsSnippet.txt` by default.
+If you want to use a local script/text file that includes the RUM JavaScript snippet downloaded from the WebUI or retrieved from using the Dynatrace API. Note that you can name the file whatever you want but the file and directory that you use needs to exist. The file downloaded from the WebUI will be named `jsSnippet.txt` by default.
 
 ### Gradle Path
 
-If your top level build.gradle is not in the standard location or you want to use a specific build.gradle, you can specify a path to the desired file. We will assume that the other gradle file resides in `/app/build.gradle`. This will add all agent dependencies automatically for you and will update the configuration.
+If your top level build.gradle is not in the standard location or you want to use a specific build.gradle, you can specify a path to the desired file. We will assume that the other gradle file resides in `/app/build.gradle`. This will add all OneAgent dependencies automatically for you and will update the configuration.
 
 ### Plist Path
 
-Tell the script where your Info.plist file is. The plist file is used for updating the configuration for the iOS agent. 
+Tell the script where your Info.plist file is. The plist file is used for updating the configuration for the iOS OneAgent. 
 
 
-## Mobile Agent configuration
+## OneAgent for Mobile configuration
 
 ```js
 module.exports = {
@@ -276,7 +292,7 @@ module.exports = {
 }
 ```
 
-The native configuration contains all the settings which are necessary for the Mobile Agent(s). You can find all the available properties in the [documentation](#official-documentation) of the mobile agent.
+The native configuration contains all the settings which are necessary for OneAgent for Mobile. You can find all the available properties in the [documentation](#official-documentation) of OneAgent for Mobile.
 
 The content of the `ios.config` property will be directly copied to the plist file. The content of the `android.config` property will be directly copied to the gradle file.
 
@@ -320,13 +336,13 @@ module.exports = {
 
 * `DTXHybridApplication` or `hybridWebView.enabled` : Set to `true` if you have a Hybrid application. The default value is `false`.
 
-* `DTXSetCookiesForDomain` or `hybridWebView.domains` : For hybrid applications using the JavaScript agent, cookies need to be set for each instrumented domain or server the application communicates with. You can specify domains, host or IP addresses. Domains or sub-domains must start with a dot. Separate the list elements with a comma.
+* `DTXSetCookiesForDomain` or `hybridWebView.domains` : For hybrid applications using RUM JavaScript, cookies need to be set for each instrumented domain or server the application communicates with. You can specify domains, host or IP addresses. Domains or sub-domains must start with a dot. Separate the list elements with a comma.
 
 ### iOS only configuration
 
 The `DTXHybridApplicationMode` flag is available for iOS only. 
 
-Using the default value of `cookies` will set the behavior of the iOS agent to inject Javascript into the webview which allows the JS agent and iOS agent to correlate the mobile and web session via cookies and or local storage.
+Using the default value of `cookies` will set the behavior of the iOS OneAgent to inject Javascript into the webview which allows RUM JavaScript and the iOS OneAgent to correlate the mobile and web session via cookies and or local storage.
 
 ```js
 module.exports = {
@@ -339,7 +355,7 @@ module.exports = {
 }
 ```
 
-Using the value of `useragent` will result in modifying the UserAgent header, which appends specific key/values that will allow the JS agent to correlate mobile and web sessions properly. This option requires cluster version (or JavaScript Agent version) 327 or higher.
+Using the value of `useragent` will result in modifying the UserAgent header, which appends specific key/values that will allow RUM JavaScript to correlate mobile and web sessions properly. This option requires cluster version (or RUM JavaScript version) 327 or higher.
 
 **Note:** Using this setting will preserve the original UserAgent header and append the following string: `DTHybrid/x.x dtAdk=... dtAdkSettings=...`
 
@@ -356,18 +372,18 @@ module.exports = {
 
 * `DTXHybridApplication` or `hybridWebView.enabled` : Set to `true` if you have a Hybrid application. This property is automatically set to true if you are using the dynatrace.config.js file downloaded from the Instrumentation Wizard. Otherwise, the default value is `false`.
 
-## JavaScript Agent configuration
+## RUM JavaScript configuration
 
-Basically all needed properties for the JavaScript Agent are predefined by the downloadable `dynatrace.config.js`. There are four available properties: 
-* `url` - Dynatrace API url to retrieve the JS agent script tag.
-* `mode` - Values can be numbers 0-4 depending on what JavaScript Agent code snippet you want to use.
-* `allowanycert` - Allows the plugin to ignore certificate issues when retrieving the JavaScript Agent.
+Basically all needed properties for RUM JavaScript are predefined by the downloadable `dynatrace.config.js`. There are four available properties: 
+* `url` - Dynatrace API url to retrieve the RUM JavaScript script tag.
+* `mode` - Values can be numbers 0-4 depending on what RUM JavaScript code snippet you want to use.
+* `allowanycert` - Allows the plugin to ignore certificate issues when retrieving RUM JavaScript.
 * `htmlFiles` - A string array which allows you to specify .html files to be instrumented. **Note**: The `htmlFiles` property should only be used if you have html files that are not automatically instrumented by the plugin.
 
 
-### JavaScript Agent Snippet Mode
+### RUM JavaScript Snippet Mode
 
-Using a specific mode can allow you during build to insert any of the available JavaScript agent code snippet options that are offered. 
+Using a specific mode can allow you during build to insert any of the available RUM JavaScript code snippet options that are offered. 
 [Click here](https://www.dynatrace.com/support/help/shortlink/rum-injection#manual-insertion) for more details on the options listed below:
 * 0 - `jsInlineScript`
 * 1 - `jsTagComplete` (Default)
@@ -385,7 +401,7 @@ module.exports = {
 ```
 
 
-The above example will use mode option 2 and retrieve the synchronous code snippet of the JavaScript agent. 
+The above example will use mode option 2 and retrieve the synchronous code snippet of RUM JavaScript. 
 
 **Note:**
 The default url value will be used if mode is not included in the `dynatrace.config.js` file or if mode exists and the value is not valid (i.e. not a number 0 through 4).
@@ -415,13 +431,13 @@ Be aware that relative paths will always be used based on the assets folder. Cor
 
 ### Allow any certificate
 
-If you are having an issue retrieving the JavaScript Agent and see an error message relating to a certificate:
+If you are having an issue retrieving RUM JavaScript and see an error message relating to a certificate:
 
 ```
 Could not retrieve the JavaScript Agent! - Could not retrieve agent optionsError: unable to verify the first certificate
 ```
 
-You are able to bypass those errors at your **OWN RISK** by using `allowanycert: true` within the `js` property. This will ignore the fact that the SSL connection is not secure (e.g. because of an invalid certificate) and will retrieve the JavaScript Agent snippet anyways. An example would look like this:
+You are able to bypass those errors at your **OWN RISK** by using `allowanycert: true` within the `js` property. This will ignore the fact that the SSL connection is not secure (e.g. because of an invalid certificate) and will retrieve RUM JavaScript snippet anyways. An example would look like this:
 
 ```js
 module.exports = {
@@ -434,7 +450,7 @@ module.exports = {
 
 ## Manual instrumentation
 
-The JavaScript Agent interface will be provided by the JavaScript Agent, it can be used everywhere in your application by simply calling `dtrum`.
+The RUM JavaScript interface will be provided by RUM JavaScript, it can be used everywhere in your application by simply calling `dtrum`.
 
 This gives you the possibility to instrument your code even further by adding manual instrumentation. If you like to know more about the manual instrumentation, have a look into the Dynatrace [documentation](#official-documentation). 
 
@@ -478,9 +494,9 @@ The above functionalities are only a small part of how you can use the API. If y
 
 [![N|Solid](https://dt-cdn.net/images/settings-1103-17bfa1ae2f.png)]()
 
-### Typings file for JavaScript Agent API
+### Typings file for RUM JavaScript API
 
-If you are using typescript and want to use the manual instrumentation of the JSAgent you should install the typings. The typings are available under the package name `@dynatrace/dtrum-api-types`. External typings have the advantage that you can apply the version that is actually needed. 
+If you are using typescript and want to use the manual instrumentation of RUM JavaScript you should install the typings. The typings are available under the package name `@dynatrace/dtrum-api-types`. External typings have the advantage that you can apply the version that is actually needed. 
 
 After installing the typings, they can be used by inserting the following line at the top of the file:
 
@@ -508,13 +524,13 @@ let dtrum = window.dtrum;
 dtrum.enterAction(...);
 ```
 
-## Manual instrumentation - Mobile Agent
+## Manual instrumentation - OneAgent for Mobile
 
-The Mobile Agent interface will be provided by the Mobile Agent, so it can be used everywhere in your application by simply calling `dynatraceMobile`.
+The OneAgent for Mobile interface will be provided by OneAgent for Mobile, so it can be used everywhere in your application by simply calling `dynatraceMobile`.
 
 ### End session
 
-In a hybrid scenario it is only possible for the mobile agent to end a session/visit. That's why we expose the endVisit function of the Mobile Agent. 
+In a hybrid scenario it is only possible for OneAgent for Mobile to end a session/visit. That's why we expose the endVisit function of OneAgent for Mobile. 
 
 The interface is available with the name `dynatraceMobile` (TypeScript definitions included). Calling `dynatraceMobile.endVisit(successCallback, errorCallback)` will end the session/visit. Example how this call looks like:
 
@@ -579,9 +595,9 @@ const enum DataCollectionLevel {
 }
 ```
 
-1. Off: Native Agent doesn't capture any monitoring data.
-2. Performance: Native Agent captures only anonymous performance data. Monitoring data that can be used to identify individual users, such as user tags and custom values, aren't captured.
-3. UserBehavior: Native Agent captures both performance and user data. In this mode, Native Agent recognizes and reports users who re-visit in future sessions.
+1. Off: OneAgent for Mobile doesn't capture any monitoring data.
+2. Performance: OneAgent for Mobile captures only anonymous performance data. Monitoring data that can be used to identify individual users, such as user tags and custom values, aren't captured.
+3. UserBehavior: OneAgent for Mobile captures both performance and user data. In this mode, OneAgent for Mobile recognizes and reports users who re-visit in future sessions.
 
 Here are some examples of how to use the API:
 
@@ -610,9 +626,9 @@ dynatraceMobile.applyUserPrivacyOptions(DataCollectionLevel.UserBehavior, true,
 });
 ```
 
-### Typings file for Mobile Agent API
+### Typings file for OneAgent for Mobile API
 
-To use the interface of the Mobile Agent directly you must specify the typing definition file in the *tsconfig.json*. Add the following block to the *tsconfig.json*: 
+To use the interface of OneAgent for Mobile directly you must specify the typing definition file in the *tsconfig.json*. Add the following block to the *tsconfig.json*: 
 
 ```
 "files": [
@@ -699,7 +715,7 @@ if(!dynatraceMobile.getMobileFirstNetworkInterceptor().isInterceptorEnabled()){
 
 ## Ionic WebView for Cordova
 
-The Mobile agent usually sets cookies on the correct domain but the [cordova-plugin-ionic-webview](https://github.com/ionic-team/cordova-plugin-ionic-webview) uses different domains. Those domains need to be added in the configuration. If you defined a custom [hostname](https://github.com/ionic-team/cordova-plugin-ionic-webview#hostname) you need to take this into account as well for choosing the correct domain. A sample configuration which takes care about the default domain for cordova-plugin-ionic-webview looks like the following:
+OneAgent for Mobile usually sets cookies on the correct domain but the [cordova-plugin-ionic-webview](https://github.com/ionic-team/cordova-plugin-ionic-webview) uses different domains. Those domains need to be added in the configuration. If you defined a custom [hostname](https://github.com/ionic-team/cordova-plugin-ionic-webview#hostname) you need to take this into account as well for choosing the correct domain. A sample configuration which takes care about the default domain for cordova-plugin-ionic-webview looks like the following:
 
 ```js
 module.exports = {
@@ -748,10 +764,10 @@ This will download the version `1.191.1` of our plugin. In general we recommend
 
 Our script assumes that the usual cordova project structure is given. The following arguments can be specified for our instrumentation script if the project structure is different.
 
-* `--gradle=C:\MyCordovaAndroidProject\platforms\android\build.gradle` - the location of the root build.gradle file. We will assume that the other gradle file resides in `/app/build.gradle`. This will add all agent dependencies automatically for you and will update the configuration.
-* `--plist=C:\MyCordovaIOSProject\platforms\ios\projectName\projectName-Info.plist` - Tell the script where your Info.plist file is. The plist file is used for updating the configuration for the agent. 
+* `--gradle=C:\MyCordovaAndroidProject\platforms\android\build.gradle` - the location of the root build.gradle file. We will assume that the other gradle file resides in `/app/build.gradle`. This will add all OneAgent dependencies automatically for you and will update the configuration.
+* `--plist=C:\MyCordovaIOSProject\platforms\ios\projectName\projectName-Info.plist` - Tell the script where your Info.plist file is. The plist file is used for updating the configuration for OneAgent. 
 * `--config=C:\SpecialFolderForDynatrace\dynatrace.config.js` - Used for if you have not added your config file in the root folder of the Cordova project but somewhere else.
-* `--jsagent=C:\MyCordovaProject\scripts\jsSnippet.txt` - If you want to use a local script/text file that includes the JS Agent snippet downloaded from the WebUI or retrieved from using the Dynatrace API. Note that you can name the file whatever you want but the file and directory that you use needs to exist. The file downloaded from the WebUI will be named `jsSnippet.txt` by default.
+* `--jsagent=C:\MyCordovaProject\scripts\jsSnippet.txt` - If you want to use a local script/text file that includes the RUM JavaScript snippet downloaded from the WebUI or retrieved from using the Dynatrace API. Note that you can name the file whatever you want but the file and directory that you use needs to exist. The file downloaded from the WebUI will be named `jsSnippet.txt` by default.
 
 Example:
 
@@ -776,7 +792,7 @@ If you use Capacitor make sure to directly modify the sync command in `package.j
 When reinstalling our plugin, your custom command will be replaced with our default command unless the [opt out](#opt-out) feature is used. Be sure to [opt out](#opt-out) when using a custom command. If you are using a relative path like in the example above, the path will be appended by process.cwd(), which is the current working directory while executing the capacitor sync.
 
 **Additional Note:**
-For the local script file, we copy the specified file 1:1. It is best to download the JS agent snippet from the WebUI after selecting the desired JS agent format and clicking the **Download** link below the shown code snippet. To get to this page, go to your **Web Application** settings and then select **Setup**. The contents of the file will be copied 1:1 inside of the `<head>` tag of your Cordova applications platform based html files. 
+For the local script file, we copy the specified file 1:1. It is best to download the RUM JavaScript snippet from the WebUI after selecting the desired RUM JavaScript format and clicking the **Download** link below the shown code snippet. To get to this page, go to your **Web Application** settings and then select **Setup**. The contents of the file will be copied 1:1 inside of the `<head>` tag of your Cordova applications platform based html files. 
 
 [![N|Solid](https://dt-cdn.net/images/downloadjsagent-931-db2b060f72.png)]()
 
@@ -824,7 +840,7 @@ process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] = 'https\\://services.gra
 
 ## MavenCentral in top level gradle file
 
-Because the Dynatrace Android agent now requires the MavenCentral repository, if either `jcenter()` or `mavenCentral()` is not added inside of **ALL** the repositories blocks via the [top-level build.gradle](https://dt-url.net/jm610pso), the build will fail. 
+Because the Dynatrace Android OneAgent now requires the MavenCentral repository, if either `jcenter()` or `mavenCentral()` is not added inside of **ALL** the repositories blocks via the [top-level build.gradle](https://dt-url.net/jm610pso), the build will fail. 
 Below is an example of what a basic [top-level build.gradle](https://dt-url.net/jm610pso) file should look like after adding `mavenCentral()` to all repository blocks:
 
 ![mavenCentral](https://dt-cdn.net/images/mavencentral-572-5b31f6f446.png)
@@ -840,7 +856,7 @@ JCenter has noted its [sunset](https://jfrog.com/blog/into-the-sunset-bintray-jc
 
 ## Native OneAgent debug logs
 
-If your application starts but you see no data (or the session is not merged), you probably need to dig deeper to find out why the OneAgents aren't sending any data. Opening up a support ticket is a great idea, but gathering logs first is even better. Please attach the mobile agent logs and the [doctor dynatrace](#doctor-dynatrace) logs when opening a support ticket.
+If your application starts but you see no data (or the session is not merged), you probably need to dig deeper to find out why the OneAgents aren't sending any data. Opening up a support ticket is a great idea, but gathering logs first is even better. Please attach the OneAgent for Mobile logs and the [doctor dynatrace](#doctor-dynatrace) logs when opening a support ticket.
 
 ### Android
 
@@ -878,7 +894,7 @@ ios: {
 
 ## Compose Compatibility Note
 
-Our Android Agent currently supports **Jetpack Compose 1.4 - 1.10**. If you are using an incompatible version of Jetpack Compose, you may encounter the following error message during build:
+Our Android OneAgent currently supports **Jetpack Compose 1.4 - 1.10**. If you are using an incompatible version of Jetpack Compose, you may encounter the following error message during build:
 
 ```
 Could not resolve all dependencies for configuration ':app:debugCompileClasspath'.
@@ -888,7 +904,7 @@ Please use the latest version of the Dynatrace Android Gradle plugin.
 
 If you encounter compatibility issues or want to disable Jetpack Compose instrumentation, you can configure this in your `dynatrace.config.js` file. **Note: Disabling Jetpack Compose instrumentation will skip the compatibility check, allowing you to build with any version of Jetpack Compose without triggering version validation errors.**
 
-**Important**: The configuration example below shows **only the Compose-specific setting**. You must ensure that your complete `dynatrace.config.js` file includes all other required configuration settings (such as `beaconUrl`, `applicationId`, etc.) as described in the [Android block](#mobile-agent-configuration) section of this documentation.
+**Important**: The configuration example below shows **only the Compose-specific setting**. You must ensure that your complete `dynatrace.config.js` file includes all other required configuration settings (such as `beaconUrl`, `applicationId`, etc.) as described in the [Android block](#oneagent-for-mobile-configuration) section of this documentation.
 
 ```js
 module.exports = {
@@ -913,8 +929,8 @@ For more information about Jetpack Compose instrumentation and monitoring capabi
 
 ## Official documentation
 
-  * Android Agent: https://www.dynatrace.com/support/help/technology-support/operating-systems/android/
-  * iOS Agent: https://www.dynatrace.com/support/help/technology-support/operating-systems/ios/
+  * Android OneAgent: https://www.dynatrace.com/support/help/technology-support/operating-systems/android/
+  * iOS OneAgent: https://www.dynatrace.com/support/help/technology-support/operating-systems/ios/
 
 ## Doctor Dynatrace
 
@@ -925,7 +941,7 @@ To run this tool, open terminal in the root directory of your project and run th
 The results will be generated in the terminal window as well as stored in log folder located in the following directory:
   * `C:\CurrentProject\node_modules\@dynatrace\cordova-plugin\logs\currentDoctorDynatrace.txt`
 
-The log file will also include a list of your `package.json` *dependencies* and *devDependencies* which will be helpful when investigating possible issues that arise. Please add this doctor dynatrace log and [mobile agent debug logs](#native-oneagent-debug-logs) when opening a support ticket.
+The log file will also include a list of your `package.json` *dependencies* and *devDependencies* which will be helpful when investigating possible issues that arise. Please add this doctor dynatrace log and [OneAgent for Mobile debug logs](#native-oneagent-debug-logs) when opening a support ticket.
 
 ## Instrumentation Overhead
 
@@ -946,28 +962,28 @@ The Dynatrace Android Gradle plugin is hosted on [Maven Central](https://search.
 
 Basically if you have problems with the plugin please have a look into the logs. They will tell you what went wrong. The logs can be found in the plugins folder of your Cordova project. There is a directory called "Logs". 
 
-* If you see a message like "Error: Could not retrieve the JSAgent! Error: self signed certificate in certificate chain" try to switch the JavaScript Agent configuration from HTTPS to HTTP.
-* If you use live reload (e.g. ionic cordova run android -l) be aware that Ionic/Cordova doesn't use files from the platform folder, so the JavaScript Agent injection will not take place, as we only instrument the temporary platform folder. You are still able to add the copied JS Agent code snippet from the WebUI manually to your index.html (in the source directory). To get to this page, go to your **Web Application** settings and then select **Setup**. Auto-Instrumentation with the Mobile Agent still takes place.
-* If you have problems retrieving the JavaScript Agent and you get error messages that the JavaScript Agent can not be retrieved, you probably don't have access to the API or there is a certificate issue. If this is the certificate use the [allow any certificate](#allow-any-certificate) feature. In any other case a workaround is possible to use the cli and add the `--jsagent=` custom parameter and download the full Javascript Agent and add the path to the downloaded JS Agent file to the custom parameter value - With this the plugin will not retrieve the JS agent and will use the one that is specified.
+* If you see a message like "Error: Could not retrieve the JSAgent! Error: self signed certificate in certificate chain" try to switch the RUM JavaScript configuration from HTTPS to HTTP.
+* If you use live reload (e.g. ionic cordova run android -l) be aware that Ionic/Cordova doesn't use files from the platform folder, so the RUM JavaScript injection will not take place, as we only instrument the temporary platform folder. You are still able to add the copied RUM JavaScript code snippet from the WebUI manually to your index.html (in the source directory). To get to this page, go to your **Web Application** settings and then select **Setup**. Auto-Instrumentation with OneAgent for Mobile still takes place.
+* If you have problems retrieving RUM JavaScript and you get error messages that RUM JavaScript can not be retrieved, you probably don't have access to the API or there is a certificate issue. If this is the certificate use the [allow any certificate](#allow-any-certificate) feature. In any other case a workaround is possible to use the cli and add the `--jsagent=` custom parameter and download the full RUM JavaScript and add the path to the downloaded RUM JavaScript file to the custom parameter value - With this the plugin will not retrieve RUM JavaScript and will use the one that is specified.
 * If you are not seeing data when using Capacitor 3+, please make sure you follow the steps in the [Capacitor Instrumentation](#capacitor-instrumentation) section (more specifically step 4 for the proper commands). Please read the note at the bottom of that section for more information.
 * For Android, if you see an error like "Gradle sync failed: Could not find com.dynatrace.tools.android:gradle-plugin:8.221.1.1005.", please see the [MavenCentral](#mavencentral-in-top-level-gradle-file) section for an example and more information.
-* If you see a message like "Error: Could not retrieve JS Agent optionsForbidden", this means that the internal axios library is too old for processing the request correctly. The solution is to update the Cordova Plugin version, which internally uses a newer axios version to retrieve the JavaScript agent.
+* If you see a message like "Error: Could not retrieve JS Agent optionsForbidden", this means that the internal axios library is too old for processing the request correctly. The solution is to update the Cordova Plugin version, which internally uses a newer axios version to retrieve RUM JavaScript.
 
 
 ### iOS Session Correlation Issues
 
 iOS apps using ionic/capacitor have issues with passing cookies from the native layer to WkWebView layer. This issue is due to ionic and capacitor using their own default custom schemes (i.e. *ionic://* or *capacitor://*) and the strict policy of Apple's WebKit not allowing cookies to be set in WkWebView with these custom schemes.
 
-To resolve this issue and allow the Mobile and Web sessions to correlate properly, we inject the session information into local storage so that the JavaScript agent can use this info for the Web session it creates.
+To resolve this issue and allow the Mobile and Web sessions to correlate properly, we inject the session information into local storage so that RUM JavaScript can use this info for the Web session it creates.
 
 **Requirements**
-  * iOS agent version 8.219.1.1004+ (already included in our plugin)
-  * JavaScript agent version 1.219+
+  * iOS OneAgent version 8.219.1.1004+ (already included in our plugin)
+  * RUM JavaScript version 1.219+
     * Any version lower will not check local storage and correlation of the mobile and web sessions will not occur.
 
 ### Using Apple Pay with WebKit/WKWebView
 
-When using Apple Pay with WKWebView, there are specific checks that WebKit (Apple) uses when loading the Apple Pay SDK. The Apple Pay SDK does not work when using script injection APIs which is what our iOS agent uses to properly communicate with the JS agent and to correlate the Mobile and Web User Sessions.
+When using Apple Pay with WKWebView, there are specific checks that WebKit (Apple) uses when loading the Apple Pay SDK. The Apple Pay SDK does not work when using script injection APIs which is what the iOS OneAgent uses to properly communicate with RUM JavaScript and to correlate the Mobile and Web User Sessions.
 
 **Solution:** Set the `DTXHybridApplicationMode` flag to `useragent` that will allow our plugin to work properly with Apple Pay. For more information, see [iOS only configuration.](#ios-only-configuration)
 
@@ -975,96 +991,99 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 
 ## Changelog
 
+2.335.1
+* Updated Android (8.335.1.1001) & iOS OneAgent (8.335.1.1009)
+
 2.333.1
-* Updated Android (8.333.1.1006) & iOS Agent (8.333.1.1005)
+* Updated Android (8.333.1.1006) & iOS OneAgent (8.333.1.1005)
 * Dropped support for Capacitor 5 and lower as they are no longer supported [per Capacitor Support Status](https://capacitorjs.com/docs/main/reference/support-policy#capacitor-maintenance-and-support-status)
 
 2.331.1
-* Updated Android (8.331.1.1004) & iOS Agent (8.331.1.1008)
+* Updated Android (8.331.1.1004) & iOS OneAgent (8.331.1.1008)
 * Added Swift Package Manager (SPM) support for Capacitor iOS projects
 * Added [Compose Compatibility Note](#compose-compatibility-note)
 
 2.329.1
-* Updated Android (8.329.1.1014) & iOS Agent (8.329.1.1017)
+* Updated Android (8.329.1.1014) & iOS OneAgent (8.329.1.1017)
 * Updated logic for dynatraceMobile API for iOS to use messageHandler if there is no script injection in WKWebView (see [iOS only configuration](#ios-only-configuration))
 
 2.327.1
-* Updated Android (8.327.2.1004) & iOS Agent (8.327.1.1020)
+* Updated Android (8.327.2.1004) & iOS OneAgent (8.327.1.1020)
 
 2.325.1
-* Updated Android (8.325.1.1007) & iOS Agent (8.325.1.1012)
+* Updated Android (8.325.1.1007) & iOS OneAgent (8.325.1.1012)
 
 2.323.1
 * Deprecation of Node 18
-* Updated Android (8.323.2.1002) & iOS Agent (8.323.1.1009)
+* Updated Android (8.323.2.1002) & iOS OneAgent (8.323.1.1009)
 
 2.321.1
-* Updated Android (8.321.2.1009) & iOS Agent (8.321.1.1007)
+* Updated Android (8.321.2.1009) & iOS OneAgent (8.321.1.1007)
 
 2.319.1
-* Updated Android (8.319.2.1011) & iOS Agent (8.319.1.1005)
+* Updated Android (8.319.2.1011) & iOS OneAgent (8.319.1.1005)
 
 2.317.1
-* Updated Android (8.317.1.1007) & iOS Agent (8.317.1.1003)
+* Updated Android (8.317.1.1007) & iOS OneAgent (8.317.1.1003)
 
 2.315.1
-* Updated Android (8.315.1.1005) & iOS Agent (8.315.1.1002)
+* Updated Android (8.315.1.1005) & iOS OneAgent (8.315.1.1002)
 
 2.313.1
 * Native web requests utils no longer set and need x-dynatrace header 
-* Updated Android (8.313.1.1004) & iOS Agent (8.313.1.1016)
+* Updated Android (8.313.1.1004) & iOS OneAgent (8.313.1.1016)
 
 2.311.1
-* Updated Android (8.311.1.1007) & iOS Agent (8.311.1.1013)
+* Updated Android (8.311.1.1007) & iOS OneAgent (8.311.1.1013)
 
 2.309.1
-* Updated Android (8.309.2.1011) & iOS Agent (8.309.1.1009)
+* Updated Android (8.309.2.1011) & iOS OneAgent (8.309.1.1009)
 
 2.307.1
-* Updated Android (8.307.1.1005) & iOS Agent (8.307.1.1014)
+* Updated Android (8.307.1.1005) & iOS OneAgent (8.307.1.1014)
 * Deprecation of Node 16
 
 2.305.1
-* Updated Android (8.305.1.1005) & iOS Agent (8.305.3.1016)
+* Updated Android (8.305.1.1005) & iOS OneAgent (8.305.3.1016)
 
 2.303.1
-* Updated Android (8.303.2.1014) & iOS Agent (8.303.1.1004)
+* Updated Android (8.303.2.1014) & iOS OneAgent (8.303.1.1004)
 * Android Gradle Plugin version requirement raised to 7.0+
 * Gradle version requirement raised to 7.0+
 
 2.301.1
-* Updated Android (8.301.1.1004) & iOS Agent (8.301.1.1008)
+* Updated Android (8.301.1.1004) & iOS OneAgent (8.301.1.1008)
 
 2.299.1
-* Updated Android (8.299.1.1004) & iOS Agent (8.299.1.1003)
+* Updated Android (8.299.1.1004) & iOS OneAgent (8.299.1.1003)
 
 2.297.1
-* Updated Android (8.297.1.1003) & iOS Agent (8.297.1.1004)
+* Updated Android (8.297.1.1003) & iOS OneAgent (8.297.1.1004)
 * Added [Instrumentation Overhead](#instrumentation-overhead) section
 * Added [Capacitor Cookie Proxy](#capacitor-cookie-proxy) option for when `CapacitorCookies` is needed
 
 2.295.1
-* Updated Android (8.295.1.1006) & iOS Agent (8.295.1.1020)
-* Using cookie postfix of JavaScript agent when enabled
-* Updated [HTML Instrumentation Requirements](#html-instrumentation-requirements) for when injecting the JS agent into html
+* Updated Android (8.295.1.1006) & iOS OneAgent (8.295.1.1020)
+* Using cookie postfix of RUM JavaScript when enabled
+* Updated [HTML Instrumentation Requirements](#html-instrumentation-requirements) for when injecting RUM JavaScript into html
 
 2.293.1
-* Updated Android (8.293.1.1003) & iOS Agent (8.293.1.1003)
+* Updated Android (8.293.1.1003) & iOS OneAgent (8.293.1.1003)
 
 2.291.1
-* Updated Android (8.291.1.1002) & iOS Agent (8.291.1.1004)
+* Updated Android (8.291.1.1002) & iOS OneAgent (8.291.1.1004)
 
 2.289.1
-* Updated Android (8.289.2.1007) & iOS Agent (8.289.1.1015)
+* Updated Android (8.289.2.1007) & iOS OneAgent (8.289.1.1015)
 
 2.287.1
-* Updated Android (8.287.1.1006) & iOS Agent (8.287.2.1009)
+* Updated Android (8.287.1.1006) & iOS OneAgent (8.287.2.1009)
 
 2.285.1
-* Updated Android (8.285.1.1006) & iOS Agent (8.285.1.1004)
+* Updated Android (8.285.1.1006) & iOS OneAgent (8.285.1.1004)
 
 2.283.1
-* Updated Android (8.283.1.1004) & iOS Agent (8.283.1.1004)
+* Updated Android (8.283.1.1004) & iOS OneAgent (8.283.1.1004)
 * Minimum iOS Version was raised to iOS 12
 
 2.279.2
@@ -1073,15 +1092,15 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 * Fixed x-dtc issue for native web requests
 * Changed default injection mode from SyncCS to JsTagComplete
 * Fixed issue with path for npx and capacitor
-* Updated Android (8.279.1.1002) & iOS Agent (8.279.2.1010)
+* Updated Android (8.279.1.1002) & iOS OneAgent (8.279.2.1010)
 
 2.277.1
 * Updated requirements for Cordova 10+
 * Changed plugin id to @dynatrace/cordova-plugin and removed old workarounds used for plugin migration
-* Updated Android (8.277.1.1003) & iOS Agent (8.277.1.1004)
+* Updated Android (8.277.1.1003) & iOS OneAgent (8.277.1.1004)
 
 1.275.1
-* Updated iOS Agent (8.275.1.1006)
+* Updated iOS OneAgent (8.275.1.1006)
 * Added an [opt-out](#opt-out) feature for modifying package.json
 * Fixed PageContext cookie for native web request tracking
 * Updated logic to create x-dtc header for native web requests
@@ -1089,61 +1108,61 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 
 1.273.2
 * Removed package.json modification for doctorDynatrace
-* Updated Android (8.273.1.1003) & iOS Agent (8.273.1.1006)
+* Updated Android (8.273.1.1003) & iOS OneAgent (8.273.1.1006)
 
 1.271.1
-* Updated Android (8.271.1.1003) & iOS Agent (8.271.2.1007)
+* Updated Android (8.271.1.1003) & iOS OneAgent (8.271.2.1007)
 
 1.267.1
-* Updated Android (8.267.1.1005) & iOS Agent (8.267.1.1006)
+* Updated Android (8.267.1.1005) & iOS OneAgent (8.267.1.1006)
 
 1.265.1
-* Updated Android (8.265.1.1002) & iOS Agent (8.265.1.1003)
+* Updated Android (8.265.1.1002) & iOS OneAgent (8.265.1.1003)
 * Fixed installation issue with old plugin
 
 1.263.1
-* Updated Android (8.263.1.1002) & iOS Agent (8.263.2.1005)
+* Updated Android (8.263.1.1002) & iOS OneAgent (8.263.2.1005)
 
 1.261.3
-* Updated Android (8.261.2.1013) & iOS Agent (8.261.1.1006)
+* Updated Android (8.261.2.1013) & iOS OneAgent (8.261.1.1006)
 * Fixed file not found during doctor command
 * Minimum Java Version was raised to 11
 * Added [htmlFiles](#html-instrumentation-requirements) to dynatrace.config.js to customize instrumented html files
 
 1.259.2
-* Updated Android (8.259.1.1008) & iOS Agent (8.259.1.1009)
+* Updated Android (8.259.1.1008) & iOS OneAgent (8.259.1.1009)
 * Hooks using now correct script names (case sensitive)
 
 1.257.1
-* Updated Android (8.257.1.1007) & iOS Agent (8.257.1.1007)
+* Updated Android (8.257.1.1007) & iOS OneAgent (8.257.1.1007)
 * Node Support changed to latest LTS Version (14.x)
 * Minimum iOS Version has been raised to 11
 
 1.255.1
 * MFP Server URL added to [enableInterceptor API](#ibm-mobile-first)
-* Updated Android (8.255.1.1005) & iOS Agent (8.255.1.1006)
+* Updated Android (8.255.1.1005) & iOS OneAgent (8.255.1.1006)
 
 1.253.5
-* Updated Android (8.253.1.1003) & iOS Agent (8.253.1.1006)
+* Updated Android (8.253.1.1003) & iOS OneAgent (8.253.1.1006)
 * Fixed wrong declaration for dtrum & MFP API 
 * Fixed broken export of axios library
 
 1.247.0
 * Added support for [Capacitor run command](#capacitor-instrumentation) for Capacitor versions 3.1+
-* Added option to specify paths for [jsAgent](#js-agent-path), [gradlePath](#gradle-path) and [plistPath](#plist-path) in `dynatrace.config.js` file
+* Added option to specify paths for [jsAgent](#rum-javascript-path), [gradlePath](#gradle-path) and [plistPath](#plist-path) in `dynatrace.config.js` file
 * Improved capacitor check for specific platforms logic
-* Updated Android (8.247.1.1003) & iOS Agent (8.247.1.1007)
+* Updated Android (8.247.1.1003) & iOS OneAgent (8.247.1.1007)
 * Minimum Android SDK has been raised to SDK 21 and above
 
 1.233.1
 * Fixed issue where old static lib was referenced
 * Improved capacitor check logic
 * Improved injection logic for html
-* Updated Android (8.231.2.1007) & iOS Agent (8.233.1.1006)
+* Updated Android (8.231.2.1007) & iOS OneAgent (8.233.1.1006)
 
 1.229.0
 * Adding SessionStorage values to Native web request instrumentation
-* Updated Android (8.229.1.1003) & iOS Agent (8.229.1.1004)
+* Updated Android (8.229.1.1003) & iOS OneAgent (8.229.1.1004)
 
 1.227.6
 * Added Cookie Proxy for Ionic & Capacitor
@@ -1151,7 +1170,7 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 * Fixed wrong check for missing dtrum
 * Fixed incorrectly reading cspURL value
 * Fixed waiting for async hooks to complete
-* Updated Android (8.227.1.1002) & iOS Agent (8.227.1.1019)
+* Updated Android (8.227.1.1002) & iOS OneAgent (8.227.1.1019)
 
 1.225.1
 * Fixed [doctor dynatrace](#doctor-dynatrace) plugin version check issue
@@ -1161,9 +1180,9 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 * Removed check and adding of -ObjC linker for Capacitor apps
 * Added support for Capacitor 3
 * Enhanced user action creation/correlation for Native WR/MFP requests
-* Updated Android (8.223.1.1003) & iOS Agent (8.223.1.1006)
+* Updated Android (8.223.1.1003) & iOS OneAgent (8.223.1.1006)
 * [IBM MFP Wrapper](#ibm-mobile-first) is now passing all arguments
-* Removed JSAgent typings which are [available via NPM](#typings-file-for-mobile-agent-api)
+* Removed JSAgent typings which are [available via NPM](#typings-file-for-oneagent-for-mobile-api)
 
 1.219.1
 * Fixed issue with older Android versions
@@ -1177,25 +1196,25 @@ When using Apple Pay with WKWebView, there are specific checks that WebKit (Appl
 * Added [UserPrivacyOptions API](#user-privacy-options)
 * End session available via dtrum API
 * Added support for [ionic capacitor](#capacitor-instrumentation)
-* Updated iOS (8.217.1.1003) and Android Agent (8.211.1.1010)
+* Updated iOS (8.217.1.1003) and Android OneAgent (8.211.1.1010)
 
 1.213.0
-* Added new [custom parameter for cli](#custom-arguments-for-instrumentation-script) to allow use of local js agent script file
-* Added [mode option](#javascript-agent-snippet-mode) in the config file for using specific JSAgent code snippet
-* No longer store JS Agent file and only inject platform html
-* Added dtrum API that will prevent errors if JS agent is not loaded
-* Updated iOS (8.209.1.1003) and Android Agent (8.211.1.1010)
+* Added new [custom parameter for cli](#custom-arguments-for-instrumentation-script) to allow use of local RUM JavaScript script file
+* Added [mode option](#rum-javascript-snippet-mode) in the config file for using specific RUM JavaScript code snippet
+* No longer store RUM JavaScript file and only inject platform html
+* Added dtrum API that will prevent errors if RUM JavaScript is not loaded
+* Updated iOS (8.209.1.1003) and Android OneAgent (8.211.1.1010)
 * Skipping not readable files instead of throwing an exception
 
 1.205.0
-* Updated iOS and Android agent
+* Updated iOS and Android OneAgent
 
 1.201.0
-* Updated iOS and Android agent
+* Updated iOS and Android OneAgent
 
 1.192.0
 * Fix for Installation/Removing issues
 
 1.191.2
 * Android Instrumentation changed to Gradle
-* New Mobile Agents (> 8.x)
+* New Mobile OneAgents (> 8.x)