@dynatrace/react-native-plugin 2.317.1 → 2.317.2

package/README.md

@@ -1461,8 +1461,9 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.317.1
+2.317.2
 * Updated Android (8.317.1.1007) & iOS Agent (8.317.1.1003)
+* Webrequest correlation with user action fixed for iOS
 
 2.313.1
 * Updated Android (8.313.1.1004) & iOS Agent (8.313.1.1016)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.317.1",
+  "version": "2.317.2",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "typings/react-native-dynatrace.d.ts",

package/scripts/Ios.js

@@ -2,7 +2,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodePath = require("path");
-const plist = require("plist");
+const plist_1 = require("plist");
 const Logger_1 = require("./Logger");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
@@ -62,20 +62,20 @@ const modifyPListFile = (pathToPList, iosConfig, removeOnly) => {
 };
 const removePListConfig = (file) => {
     const pListContent = FileOperationHelper_1.default.readTextFromFileSync(file);
-    const pListObj = plist.parse(pListContent);
+    const pListObj = (0, plist_1.parse)(pListContent);
     const pListObjCopy = Object.assign({}, pListObj);
     for (const property in pListObj) {
         if (property.startsWith('DTX')) {
             delete pListObjCopy[property];
         }
     }
-    FileOperationHelper_1.default.writeTextToFileSync(file, plist.build(pListObjCopy));
+    FileOperationHelper_1.default.writeTextToFileSync(file, (0, plist_1.build)(pListObjCopy));
     Logger_1.default.logMessageSync('Removed old configuration in plist file: ' + file, Logger_1.default.INFO);
 };
 const addAgentConfigToPListFile = (file, config) => {
     const pListContent = FileOperationHelper_1.default.readTextFromFileSync(file);
     const newPListContent = PlistConstants_1.START_PLIST + config + PlistConstants_1.END_PLIST;
-    FileOperationHelper_1.default.writeTextToFileSync(file, plist.build(Object.assign(Object.assign({}, plist.parse(pListContent)), plist.parse(newPListContent))));
+    FileOperationHelper_1.default.writeTextToFileSync(file, (0, plist_1.build)(Object.assign(Object.assign({}, (0, plist_1.parse)(pListContent)), (0, plist_1.parse)(newPListContent))));
     Logger_1.default.logMessageSync('Updated configuration in plist file: ' + file, Logger_1.default.INFO);
 };
 const findPListFile = () => {
@@ -106,13 +106,13 @@ const findPListFile = () => {
 };
 const parsePList = (file) => {
     const pListContent = FileOperationHelper_1.default.readTextFromFileSync(file);
-    let pListObj = plist.parse(pListContent);
+    let pListObj = (0, plist_1.parse)(pListContent);
     return pListObj = Object.assign({}, pListObj);
 };
 const isAutoStartEnabled = (config) => {
     if (config !== undefined && config.indexOf(PlistConstants_1.AUTO_START_PROP) >= 0) {
         const configObj = PlistConstants_1.START_PLIST + config + PlistConstants_1.END_PLIST;
-        const configObjCopy = plist.parse(configObj);
+        const configObjCopy = (0, plist_1.parse)(configObj);
         const configKeys = Object.keys(configObjCopy);
         const configValues = Object.values(configObjCopy);
         for (const key in configKeys) {
@@ -142,7 +142,7 @@ const updatedExcludedStr = (config) => {
 };
 const isPropertyCountEqual = (parsedPList, config) => {
     const configObj = PlistConstants_1.START_PLIST + config + PlistConstants_1.END_PLIST;
-    const configObjCopy = plist.parse(configObj);
+    const configObjCopy = (0, plist_1.parse)(configObj);
     return Object.keys(parsedPList)
         .filter((pListDtxKeys) => pListDtxKeys.startsWith('DTX')).length === Object.keys(configObjCopy)
         .filter((configDtxKeys) => configDtxKeys.startsWith('DTX')).length;
@@ -162,7 +162,7 @@ const areConfigsEqual = (parsedPList, configObj) => {
 };
 const comparePListAndConfig = (pListObj, config) => {
     const configObj = PlistConstants_1.START_PLIST + config + PlistConstants_1.END_PLIST;
-    const configObjCopy = plist.parse(configObj);
+    const configObjCopy = (0, plist_1.parse)(configObj);
     removeNonDTXProperties(pListObj);
     removeNonDTXProperties(configObjCopy);
     return areConfigsEqual(pListObj, configObjCopy);
@@ -183,7 +183,7 @@ const hasDuplicateProperties = (config) => {
     return !newConfigArr.every((property) => newConfigArr.indexOf(property) === newConfigArr.lastIndexOf(property));
 };
 const createNewPListIfRequired = (parsedPList, configProps, pathToPList) => {
-    const configIncludingFlavor = configProps + PlistConstants_1.FLAVOR_PROP + updatedExcludedStr(configProps);
+    const configIncludingFlavor = configProps + getAdditionalInternalPluginKeys() + updatedExcludedStr(configProps);
     if (isPropertyCountEqual(parsedPList, configIncludingFlavor) && comparePListAndConfig(parsedPList, configIncludingFlavor)) {
         Logger_1.default.logMessageSync('Not generating a new plist as the current plist and ' +
             '   dynatrace.config.js iOS properties are identical!', Logger_1.default.INFO);
@@ -195,6 +195,7 @@ const createNewPListIfRequired = (parsedPList, configProps, pathToPList) => {
         addAgentConfigToPListFile(pathToPList, configIncludingFlavor);
     }
 };
+const getAdditionalInternalPluginKeys = () => PlistConstants_1.FLAVOR_PROP + PlistConstants_1.WEBREQUEST_FALLBACK_PROP;
 exports.default = {
     modifyPListFile,
     findPListFile,

package/scripts/util/PlistConstants.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONTROLS_PROP_OPTIONS = exports.END_CONTROLS_PROP = exports.START_CONTROLS_PROP = exports.DEFAULT_CONTROLS_PROP = exports.FLAVOR_PROP = exports.AUTO_START_PROP = exports.END_PLIST = exports.START_PLIST = void 0;
+exports.CONTROLS_PROP_OPTIONS = exports.END_CONTROLS_PROP = exports.START_CONTROLS_PROP = exports.DEFAULT_CONTROLS_PROP = exports.WEBREQUEST_FALLBACK_PROP = exports.FLAVOR_PROP = exports.AUTO_START_PROP = exports.END_PLIST = exports.START_PLIST = void 0;
 exports.START_PLIST = '<plist><dict>';
 exports.END_PLIST = '</dict></plist>';
 exports.AUTO_START_PROP = '<key>DTXAutoStart</key>';
 exports.FLAVOR_PROP = '<key>DTXFlavor</key>\n<string>react_native</string>';
+exports.WEBREQUEST_FALLBACK_PROP = '<key>DTXDisableWebRequestsInstrumentationV2</key>\n<true/>';
 exports.DEFAULT_CONTROLS_PROP = '<key>DTXExcludedControls</key>\n<array>\n\t<string>PickerView</string>\n\t<string>Switch</string>\n</array>';
 exports.START_CONTROLS_PROP = '<key>DTXExcludedControls</key>\n<array>';
 exports.END_CONTROLS_PROP = '\n</array>';