@microsoft/applicationinsights-dependencies-js 3.0.3-nightly3.2308-10 → 3.0.3-nightly3.2308-16

package/browser/es5/applicationinsights-dependencies-js.integrity.json

@@ -1,65 +1,65 @@
 {
     "name": "applicationinsights-dependencies-js",
-    "version": "3.0.3-nightly3.2308-10",
+    "version": "3.0.3-nightly3.2308-16",
     "ext": {
         "@cjs.js": {
             "file": "applicationinsights-dependencies-js.cjs.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-8rTkRnHZOmRliQhA4OCi3Wds1tk2rx5M67s6MLitZZc= sha384-rPB/16XuQM3LVXgoAw5UIPWLlNGaMMVHo6bmuA7XkPsehztbTJ6GKwGHKU+vzHnS sha512-Om2o+YELfJwok3MAOlg5oOZ3ffC65oYUmPIcNhPRRkKn6m9ga7JtgNXS8rgtDCoi/artgi6u+KQ93h6bwgKr6A==",
+            "integrity": "sha256-4PQ73wCI8102m2Az69niR40rehQyCIaNhZ1fSGdtGog= sha384-OFgsubmjBm+3nzyANb4aOasB9prNgLB0RL7cFROaGXzaNum9jzfOCpT/zY87WM39 sha512-hADe6QbhOhWOuZ6dWvWHDbFXzo9S0kKFWbhBsYMsScKjNRM16wra7yCUBl6iw9mJ8bWhCNy5jYHpULAhUCbvlQ==",
             "hashes": {
-                "sha256": "8rTkRnHZOmRliQhA4OCi3Wds1tk2rx5M67s6MLitZZc=",
-                "sha384": "rPB/16XuQM3LVXgoAw5UIPWLlNGaMMVHo6bmuA7XkPsehztbTJ6GKwGHKU+vzHnS",
-                "sha512": "Om2o+YELfJwok3MAOlg5oOZ3ffC65oYUmPIcNhPRRkKn6m9ga7JtgNXS8rgtDCoi/artgi6u+KQ93h6bwgKr6A=="
+                "sha256": "4PQ73wCI8102m2Az69niR40rehQyCIaNhZ1fSGdtGog=",
+                "sha384": "OFgsubmjBm+3nzyANb4aOasB9prNgLB0RL7cFROaGXzaNum9jzfOCpT/zY87WM39",
+                "sha512": "hADe6QbhOhWOuZ6dWvWHDbFXzo9S0kKFWbhBsYMsScKjNRM16wra7yCUBl6iw9mJ8bWhCNy5jYHpULAhUCbvlQ=="
             }
         },
         "@cjs.min.js": {
             "file": "applicationinsights-dependencies-js.cjs.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-K/rqR49wZ8ASqLvSXZeuhSFbvJ/LMulJ3RkeNNyBLFo= sha384-Fa6kTqgBmC2qFx/vpQiKpdbesUV5InwZUB3nLQ2fmwwBioZ7quNUNAzMRumh3OF8 sha512-QxWs/DFw/vDeB2xqDP0Atys7GWtg6gg24pHtZ5oA1SEAJSI5ORuhVcwwYrnmXriuolJIVWZ4In3TrfZQ0EP/fg==",
+            "integrity": "sha256-wgVL0X7QTZeSUo1EK79zVSbc4I/qHWZFGp67vo0g1qI= sha384-xV8hHLQza6ZGUzBzKBu8fJQi0GQNhtIYfO4wOpQt4lsuKUpRYqsfmEgAfDoiywa/ sha512-2mC0RN61HCw7vcF7BObqDWHop5xiN67tUpVZVUEs4UMoZI/1JdikIdA13xBk3UyZHYu/vzgjGO+weBjDP/fXQw==",
             "hashes": {
-                "sha256": "K/rqR49wZ8ASqLvSXZeuhSFbvJ/LMulJ3RkeNNyBLFo=",
-                "sha384": "Fa6kTqgBmC2qFx/vpQiKpdbesUV5InwZUB3nLQ2fmwwBioZ7quNUNAzMRumh3OF8",
-                "sha512": "QxWs/DFw/vDeB2xqDP0Atys7GWtg6gg24pHtZ5oA1SEAJSI5ORuhVcwwYrnmXriuolJIVWZ4In3TrfZQ0EP/fg=="
+                "sha256": "wgVL0X7QTZeSUo1EK79zVSbc4I/qHWZFGp67vo0g1qI=",
+                "sha384": "xV8hHLQza6ZGUzBzKBu8fJQi0GQNhtIYfO4wOpQt4lsuKUpRYqsfmEgAfDoiywa/",
+                "sha512": "2mC0RN61HCw7vcF7BObqDWHop5xiN67tUpVZVUEs4UMoZI/1JdikIdA13xBk3UyZHYu/vzgjGO+weBjDP/fXQw=="
             }
         },
         "@gbl.js": {
             "file": "applicationinsights-dependencies-js.gbl.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-u4UaSOi6xohdgK7I87DUbRQ41cLju0IuyXYXqAIlYvs= sha384-kP+fGiOGq75q4DfItwg6gIfCBfx9nYTBwthH9lyRfsSgG1uR2om4jBLMvgTd1WbC sha512-1nx+1AA4YcA6I77ae3FHVP0chAzQBCXOdbx3PAEIY6NXBwV7zseXDnhLgXzs0SomhoPMGB9LV/C2Jou2eQx4tA==",
+            "integrity": "sha256-JQpKY/duJndWyTMbfGMCHQKYUejMSQRbMDXcneTP/lk= sha384-4UJV/7+3OQgHoS3/BxTG2dYVoKIvSjsqUfs96ITxIjpY195S3p6Ifd8nFNtCUoso sha512-QVO5AGJGqGiHjgPzdKJOPk24NkY3GAxmajkgJhoEi6/Zx4a+q9lcG0TWXFjXCrdKRzetyL63qN+wmUyqtucixw==",
             "hashes": {
-                "sha256": "u4UaSOi6xohdgK7I87DUbRQ41cLju0IuyXYXqAIlYvs=",
-                "sha384": "kP+fGiOGq75q4DfItwg6gIfCBfx9nYTBwthH9lyRfsSgG1uR2om4jBLMvgTd1WbC",
-                "sha512": "1nx+1AA4YcA6I77ae3FHVP0chAzQBCXOdbx3PAEIY6NXBwV7zseXDnhLgXzs0SomhoPMGB9LV/C2Jou2eQx4tA=="
+                "sha256": "JQpKY/duJndWyTMbfGMCHQKYUejMSQRbMDXcneTP/lk=",
+                "sha384": "4UJV/7+3OQgHoS3/BxTG2dYVoKIvSjsqUfs96ITxIjpY195S3p6Ifd8nFNtCUoso",
+                "sha512": "QVO5AGJGqGiHjgPzdKJOPk24NkY3GAxmajkgJhoEi6/Zx4a+q9lcG0TWXFjXCrdKRzetyL63qN+wmUyqtucixw=="
             }
         },
         "@gbl.min.js": {
             "file": "applicationinsights-dependencies-js.gbl.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-GXA8jK6AYHa+Rv89fGZvHMVsxxUFFrq5wzsdkDgWtyo= sha384-fh5IdFXkdb7RMrJSD7YToO5x8HAqK0lerpPf33MC3gVe1HYhnekkk0Vhgsn9T7vl sha512-x19DGONS+zlnzoFI5YtSKVLDf0KL5fsViHfY31kIV6idYASitnWa76QBZ94oe4zd9FhHq4nca3dkZiTi6u1RHw==",
+            "integrity": "sha256-KPxnPjEPiWxVrzWE8BzWPRjCbik3TLoVVuq7FNK5Ezc= sha384-dQYEIru08SzwMUKZpDF9aOj1dvAYceO43UI3Kuq6Yqp3xZ2911wcIMJxktXk0DRw sha512-Mf5qhtd+ozO6xBp6lnxXydQqPzHgFWOANfAYs8sI5c2aCf9uNH7uL2l3s4V53ZJ4DZEGpvjugaVrp3HoWag0oA==",
             "hashes": {
-                "sha256": "GXA8jK6AYHa+Rv89fGZvHMVsxxUFFrq5wzsdkDgWtyo=",
-                "sha384": "fh5IdFXkdb7RMrJSD7YToO5x8HAqK0lerpPf33MC3gVe1HYhnekkk0Vhgsn9T7vl",
-                "sha512": "x19DGONS+zlnzoFI5YtSKVLDf0KL5fsViHfY31kIV6idYASitnWa76QBZ94oe4zd9FhHq4nca3dkZiTi6u1RHw=="
+                "sha256": "KPxnPjEPiWxVrzWE8BzWPRjCbik3TLoVVuq7FNK5Ezc=",
+                "sha384": "dQYEIru08SzwMUKZpDF9aOj1dvAYceO43UI3Kuq6Yqp3xZ2911wcIMJxktXk0DRw",
+                "sha512": "Mf5qhtd+ozO6xBp6lnxXydQqPzHgFWOANfAYs8sI5c2aCf9uNH7uL2l3s4V53ZJ4DZEGpvjugaVrp3HoWag0oA=="
             }
         },
         "@js": {
             "file": "applicationinsights-dependencies-js.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-TD0tXTgNed3lS69wVfuqXU/UIflpCNIT3gSGuZs0j44= sha384-77z/cgKYZd0R65IfOTQib6CItgFinuZ2ehsRRKGmTpy4XD8TGIR5zXtUwctfputx sha512-7MSLArlxjch8wEaX/jUC7ZvF38vaT3HMYpB+SnX+GVLCUkmidp6ku3zW7TkrxoyKLYMgtHMY+PtoXCW2V77IQw==",
+            "integrity": "sha256-g/JpVCg2CsooG+mr/pWeze7wvz4Nq8p9pDBm4B5+WDw= sha384-PPnglfaVFHqjSFnclUsdg2pZQ3i1f0KBEyVg1cz5JWjnUnHfipa83OA2meIYnU+d sha512-/32NFJw5mwf58kVs1ZtMiNfUGk3dRJiZ0UdOuvStZMwKjNG+u6bt+WvoQzGLXEOpeL2KNerqeclJk9O4nMzDlA==",
             "hashes": {
-                "sha256": "TD0tXTgNed3lS69wVfuqXU/UIflpCNIT3gSGuZs0j44=",
-                "sha384": "77z/cgKYZd0R65IfOTQib6CItgFinuZ2ehsRRKGmTpy4XD8TGIR5zXtUwctfputx",
-                "sha512": "7MSLArlxjch8wEaX/jUC7ZvF38vaT3HMYpB+SnX+GVLCUkmidp6ku3zW7TkrxoyKLYMgtHMY+PtoXCW2V77IQw=="
+                "sha256": "g/JpVCg2CsooG+mr/pWeze7wvz4Nq8p9pDBm4B5+WDw=",
+                "sha384": "PPnglfaVFHqjSFnclUsdg2pZQ3i1f0KBEyVg1cz5JWjnUnHfipa83OA2meIYnU+d",
+                "sha512": "/32NFJw5mwf58kVs1ZtMiNfUGk3dRJiZ0UdOuvStZMwKjNG+u6bt+WvoQzGLXEOpeL2KNerqeclJk9O4nMzDlA=="
             }
         },
         "@min.js": {
             "file": "applicationinsights-dependencies-js.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-zuKrkqDzq1hUYSdA+dXFl9bGMhTpKDOjDgXGBRG6aNU= sha384-72EFH/F5k0jnRoX01XdWku0XQmqq3cdN5JhpKTisF9S5WwkhoCRGrW6MnLHWTbus sha512-nIPTmUB5v7RxD7CPJnjU7VVOnnppCrmwlOCksEDjfwXJxCKfpyiCXYw4NDqR2pemW+ri7ZR+c9wngXSTicGWkw==",
+            "integrity": "sha256-O1WiWOfY/ZlRqnDJjMsbum1euCy5HTbM3Llyhy2I6/E= sha384-RaW0pxIPRAQY98J2MA4nkj8n+ww9aZT9++KQtWmNwZb7IXpbAN6I2hDzz8mHUbZv sha512-Q6XAhOqr0OUKA2C7xOPEW2rjBOQ33p8Z/OnJWhT/ZEk9yfWwwtGiUHtSTzc/QnnVSWeCHEcCDXq3kMx52Xo6VQ==",
             "hashes": {
-                "sha256": "zuKrkqDzq1hUYSdA+dXFl9bGMhTpKDOjDgXGBRG6aNU=",
-                "sha384": "72EFH/F5k0jnRoX01XdWku0XQmqq3cdN5JhpKTisF9S5WwkhoCRGrW6MnLHWTbus",
-                "sha512": "nIPTmUB5v7RxD7CPJnjU7VVOnnppCrmwlOCksEDjfwXJxCKfpyiCXYw4NDqR2pemW+ri7ZR+c9wngXSTicGWkw=="
+                "sha256": "O1WiWOfY/ZlRqnDJjMsbum1euCy5HTbM3Llyhy2I6/E=",
+                "sha384": "RaW0pxIPRAQY98J2MA4nkj8n+ww9aZT9++KQtWmNwZb7IXpbAN6I2hDzz8mHUbZv",
+                "sha512": "Q6XAhOqr0OUKA2C7xOPEW2rjBOQ33p8Z/OnJWhT/ZEk9yfWwwtGiUHtSTzc/QnnVSWeCHEcCDXq3kMx52Xo6VQ=="
             }
         }
     }

package/browser/es5/applicationinsights-dependencies-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2308-10
+ * Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2308-16
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -7,8 +7,8 @@
     typeof exports === "object" && typeof module !== undef ? factory(exports) :
     typeof define === "function" && define.amd ? define(["exports"], factory) :
     (function(global){
-        var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_dependencies_js_3_0_3_nightly3_2308_10", msMod="__ms$mod__";
-        var mods={}, modDetail=mods[modName]={}, ver="3.0.3-nightly3.2308-10";
+        var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_dependencies_js_3_0_3_nightly3_2308_16", msMod="__ms$mod__";
+        var mods={}, modDetail=mods[modName]={}, ver="3.0.3-nightly3.2308-16";
         var baseNs=global, nsKey="Microsoft", baseNs=baseNs[nsKey]=(baseNs[nsKey]||{});
         // Versioned namespace "Microsoft.ApplicationInsights3"
         var exportNs=baseNs, nsKey="ApplicationInsights3", exportNs=exportNs[nsKey]=(exportNs[nsKey]||{});
@@ -1387,7 +1387,7 @@ function newId(maxLength) {
     return result;
 }
 
-var version = '3.0.3-nightly3.2308-10';
+var version = '3.0.3-nightly3.2308-16';
 var instanceName = "." + newId(6);
 var _dataUid = 0;
 function _canAcceptData(target) {
@@ -4092,7 +4092,7 @@ var ajaxRecord = /** @class */ (function () {
 var _a;
 var AJAX_MONITOR_PREFIX = "ai.ajxmn.";
 var strDiagLog = "diagLog";
-var strAjaxData = "ajaxData";
+var AJAX_DATA_CONTAINER = "_ajaxData";
 var STR_FETCH = "fetch";
 var ERROR_HEADER = "Failed to monitor XMLHttpRequest";
 var ERROR_PREFIX = ", monitoring data for this ajax call ";
@@ -4112,8 +4112,8 @@ function _supportsFetch() {
     }
     return _global[STR_FETCH];
 }
-function _supportsAjaxMonitoring(ajaxMonitorInstance) {
-    var _a;
+function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
+    var _a, _b;
     var result = false;
     if (isXhrSupported()) {
         var proto = XMLHttpRequest[strShimPrototype];
@@ -4129,24 +4129,63 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
     if (result) {
         try {
             var xhr = new XMLHttpRequest();
-            xhr[strAjaxData] = {};
+            var xhrData = {
+                xh: [],
+                i: (_a = {},
+                    _a[ajaxDataId] = {},
+                    _a)
+            };
+            xhr[AJAX_DATA_CONTAINER] = xhrData;
             var theOpen = XMLHttpRequest[strShimPrototype].open;
             XMLHttpRequest[strShimPrototype].open = theOpen;
         }
         catch (e) {
             result = false;
-            _throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (_a = {},
-                _a[_DYN_EXCEPTION ] = dumpObj(e),
-                _a));
+            _throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (_b = {},
+                _b[_DYN_EXCEPTION ] = dumpObj(e),
+                _b));
         }
     }
     return result;
 }
-function _getFailedAjaxDiagnosticsMessage(xhr) {
+var _getAjaxData = function (xhr, ajaxDataId) {
+    if (xhr && ajaxDataId && xhr[AJAX_DATA_CONTAINER]) {
+        return (xhr[AJAX_DATA_CONTAINER].i || {})[ajaxDataId];
+    }
+    return null;
+};
+var _addSharedXhrHeaders = function (xhr, name, value) {
+    if (xhr) {
+        var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
+        if (headers) {
+            headers.push({
+                n: name,
+                v: value
+            });
+        }
+    }
+};
+var _isHeaderSet = function (xhr, name) {
+    var isPresent = false;
+    if (xhr) {
+        var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
+        if (headers) {
+            arrForEach(headers, function (header) {
+                if (header.n === name) {
+                    isPresent = true;
+                    return -1;
+                }
+            });
+        }
+    }
+    return isPresent;
+};
+function _getFailedAjaxDiagnosticsMessage(xhr, ajaxDataId) {
     var result = "";
     try {
-        if (xhr && xhr[strAjaxData] && xhr[strAjaxData][_DYN_REQUEST_URL ]) {
-            result += "(url: '" + xhr[strAjaxData][_DYN_REQUEST_URL ] + "')";
+        var ajaxData = _getAjaxData(xhr, ajaxDataId);
+        if (ajaxData && ajaxData[_DYN_REQUEST_URL ]) {
+            result += "(url: '" + ajaxData[_DYN_REQUEST_URL ] + "')";
         }
     }
     catch (e) {
@@ -4160,12 +4199,12 @@ function _throwInternalWarning(ajaxMonitorInstance, msgId, message, properties,
     _throwInternal(ajaxMonitorInstance[strDiagLog](), 2 , msgId, message, properties, isUserAct);
 }
 function _createErrorCallbackFunc(ajaxMonitorInstance, internalMessage, message) {
-    return function (args) {
+    return function (callDetails) {
         var _a;
         _throwInternalCritical(ajaxMonitorInstance, internalMessage, message, (_a = {
-                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(args[_DYN_INST ])
+                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails[_DYN_INST ], ajaxMonitorInstance._ajaxDataId)
             },
-            _a[_DYN_EXCEPTION ] = dumpObj(args.err),
+            _a[_DYN_EXCEPTION ] = dumpObj(callDetails.err),
             _a));
     };
 }
@@ -4290,6 +4329,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
         var _excludeRequestFromAutoTrackingPatterns;
         var _addRequestContext;
         var _evtNamespace;
+        var _ajaxDataId;
         var _dependencyHandlerId;
         var _dependencyListeners;
         var _dependencyInitializers;
@@ -4359,17 +4399,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 else if (xhr) {
                     if (correlationIdCanIncludeCorrelationHeader(_extensionConfig, ajaxData[_DYN_GET_ABSOLUTE_URL ](), currentWindowHost)) {
                         if (_isUsingAIHeaders) {
-                            var id = "|" + ajaxData[_DYN_TRACE_ID ] + "." + ajaxData[_DYN_SPAN_ID ];
-                            xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[3 ], id);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[3 ]] = id;
+                            if (!_isHeaderSet(xhr, RequestHeaders[3 ])) {
+                                var id = "|" + ajaxData[_DYN_TRACE_ID ] + "." + ajaxData[_DYN_SPAN_ID ];
+                                xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[3 ], id);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[3 ]] = id;
+                                }
+                            }
+                            else {
+                                _throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[3 ] + "] as it has already been set by another instance");
                             }
                         }
                         var appId = _appId || (_context && _context.appId());
                         if (appId) {
-                            xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[0 ], RequestHeaders[2 ] + appId);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[0 ]] = RequestHeaders[2 ] + appId;
+                            if (!_isHeaderSet(xhr, RequestHeaders[0 ])) {
+                                xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[0 ], RequestHeaders[2 ] + appId);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[0 ]] = RequestHeaders[2 ] + appId;
+                                }
+                            }
+                            else {
+                                _throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[0 ] + "] as it has already been set by another instance");
                             }
                         }
                         if (_isUsingW3CHeaders) {
@@ -4377,10 +4427,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
                             if (isNullOrUndefined(traceFlags)) {
                                 traceFlags = 0x01;
                             }
-                            var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID ], ajaxData[_DYN_SPAN_ID ], traceFlags));
-                            xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[4 ], traceParent);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[4 ]] = traceParent;
+                            if (!_isHeaderSet(xhr, RequestHeaders[4 ])) {
+                                var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID ], ajaxData[_DYN_SPAN_ID ], traceFlags));
+                                xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[4 ], traceParent);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[4 ]] = traceParent;
+                                }
+                            }
+                            else {
+                                _throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[4 ] + "] as it has already been set by another instance");
                             }
                         }
                     }
@@ -4438,6 +4493,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _dependencyHandlerId = 0;
                 _dependencyListeners = [];
                 _dependencyInitializers = [];
+                _ajaxDataId = createUniqueNamespace("ajaxData");
+                _self._ajaxDataId = _ajaxDataId;
                 _ignoreHeaders = null;
                 _maxAjaxPerfLookupAttempts = 1;
                 _ajaxPerfLookupDelay = 1;
@@ -4574,7 +4631,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _addHook(InstrumentProto(target, funcName, callbacks));
             }
             function _instrumentXhr() {
-                if (!_supportsAjaxMonitoring(_self)) {
+                if (!_supportsAjaxMonitoring(_self, _ajaxDataId)) {
                     return;
                 }
                 _self[_DYN__ADD_HOOK ](onConfigChange(_extensionConfig, function () {
@@ -4583,15 +4640,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     if (!_disableAjaxTracking && !_xhrInitialized) {
                         _hookProto(XMLHttpRequest, "open", {
                             ns: _evtNamespace,
-                            req: function (args, method, url, async) {
+                            req: function (callDetails, method, url, async) {
                                 if (!_disableAjaxTracking) {
-                                    var xhr = args[_DYN_INST ];
-                                    var ajaxData = xhr[strAjaxData];
-                                    if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
+                                    var xhr = callDetails[_DYN_INST ];
+                                    var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                    if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, ajaxData, true)) {
                                         if (!ajaxData || !ajaxData.xhrMonitoringState[_DYN_OPEN_DONE ]) {
-                                            _openHandler(xhr, method, url, async);
+                                            ajaxData = _openHandler(xhr, method, url, async);
                                         }
-                                        _attachToOnReadyStateChange(xhr);
+                                        _attachToOnReadyStateChange(xhr, ajaxData);
                                     }
                                 }
                             },
@@ -4599,11 +4656,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         });
                         _hookProto(XMLHttpRequest, "send", {
                             ns: _evtNamespace,
-                            req: function (args, context) {
+                            req: function (callDetails, context) {
                                 if (!_disableAjaxTracking) {
-                                    var xhr = args[_DYN_INST ];
-                                    var ajaxData = xhr[strAjaxData];
-                                    if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
+                                    var xhr = callDetails[_DYN_INST ];
+                                    var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                    if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
                                         _createMarkId("xhr", ajaxData);
                                         ajaxData[_DYN_REQUEST_SENT_TIME ] = dateTimeUtilsNow();
                                         _self[_DYN_INCLUDE_CORRELATION_2 ](ajaxData, undefined, undefined, xhr);
@@ -4615,11 +4672,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         });
                         _hookProto(XMLHttpRequest, "abort", {
                             ns: _evtNamespace,
-                            req: function (args) {
+                            req: function (callDetails) {
                                 if (!_disableAjaxTracking) {
-                                    var xhr = args[_DYN_INST ];
-                                    var ajaxData = xhr[strAjaxData];
-                                    if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
+                                    var xhr = callDetails[_DYN_INST ];
+                                    var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                    if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
                                         ajaxData[_DYN_ABORTED ] = 1;
                                         ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ] = true;
                                     }
@@ -4629,11 +4686,17 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         });
                         _hookProto(XMLHttpRequest, "setRequestHeader", {
                             ns: _evtNamespace,
-                            req: function (args, header, value) {
-                                if (!_disableAjaxTracking && _enableRequestHeaderTracking) {
-                                    var xhr = args[_DYN_INST ];
-                                    if (_isMonitoredXhrInstance(xhr) && _canIncludeHeaders(header)) {
-                                        xhr[strAjaxData][_DYN_REQUEST_HEADERS ][header] = value;
+                            req: function (callDetails, header, value) {
+                                if (!_disableAjaxTracking) {
+                                    var xhr = callDetails[_DYN_INST ];
+                                    var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                    if (ajaxData && _isMonitoredXhrInstance(xhr, ajaxData)) {
+                                        _addSharedXhrHeaders(xhr, header, value);
+                                        if (_enableRequestHeaderTracking && _canIncludeHeaders(header)) {
+                                            if (ajaxData) {
+                                                ajaxData[_DYN_REQUEST_HEADERS ][header] = value;
+                                            }
+                                        }
                                     }
                                 }
                             },
@@ -4688,11 +4751,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 return isDisabled;
             }
-            function _isMonitoredXhrInstance(xhr, excludeAjaxDataValidation) {
+            function _isMonitoredXhrInstance(xhr, ajaxData, excludeAjaxDataValidation) {
                 var ajaxValidation = true;
                 var initialized = _xhrInitialized;
                 if (!isNullOrUndefined(xhr)) {
-                    ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(xhr[strAjaxData]);
+                    ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(ajaxData);
                 }
                 return initialized
                     && ajaxValidation;
@@ -4712,7 +4775,9 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 var distributedTraceCtx = _getDistributedTraceCtx();
                 var traceID = (distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_ID ]()) || generateW3CId();
                 var spanID = strSubstr(generateW3CId(), 0, 16);
-                var ajaxData = new ajaxRecord(traceID, spanID, _self[strDiagLog](), (_a = _self.core) === null || _a === void 0 ? void 0 : _a.getTraceCtx());
+                var xhrRequestData = xhr[AJAX_DATA_CONTAINER] = (xhr[AJAX_DATA_CONTAINER] || { xh: [], i: {} });
+                var ajaxDataCntr = xhrRequestData.i = (xhrRequestData.i || {});
+                var ajaxData = ajaxDataCntr[_ajaxDataId] = (ajaxDataCntr[_ajaxDataId] || new ajaxRecord(traceID, spanID, _self[strDiagLog](), (_a = _self.core) === null || _a === void 0 ? void 0 : _a.getTraceCtx()));
                 ajaxData[_DYN_TRACE_FLAGS ] = distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_FLAGS ]();
                 ajaxData[_DYN_METHOD ] = method;
                 ajaxData[_DYN_REQUEST_URL ] = url;
@@ -4720,13 +4785,13 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 ajaxData[_DYN_REQUEST_HEADERS ] = {};
                 ajaxData.async = async;
                 ajaxData[_DYN_ERROR_STATUS_TEXT ] = _enableAjaxErrorStatusText;
-                xhr[strAjaxData] = ajaxData;
+                return ajaxData;
             }
-            function _attachToOnReadyStateChange(xhr) {
-                xhr[strAjaxData].xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE13 ] = eventOn(xhr, "readystatechange", function () {
+            function _attachToOnReadyStateChange(xhr, ajaxData) {
+                ajaxData.xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE13 ] = eventOn(xhr, "readystatechange", function () {
                     var _a;
                     try {
-                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
+                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
                             _onAjaxComplete(xhr);
                         }
                     }
@@ -4734,7 +4799,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         var exceptionText = dumpObj(e);
                         if (!exceptionText || _indexOf(exceptionText[_DYN_TO_LOWER_CASE ](), "c00c023f") === -1) {
                             _throwInternalCritical(_self, 16 , ERROR_HEADER + " 'readystatechange' event handler" + ERROR_POSTFIX, (_a = {},
-                                _a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
+                                _a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                                 _a[_DYN_EXCEPTION ] = exceptionText,
                                 _a));
                         }
@@ -4753,12 +4818,12 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 return null;
             }
             function _onAjaxComplete(xhr) {
-                var ajaxData = xhr[strAjaxData];
+                var ajaxData = _getAjaxData(xhr, _ajaxDataId);
                 ajaxData[_DYN_RESPONSE_FINISHED_TI14 ] = dateTimeUtilsNow();
                 ajaxData[_DYN_STATUS ] = xhr[_DYN_STATUS ];
                 function _reportXhrError(e, failedProps) {
                     var errorProps = failedProps || {};
-                    errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr);
+                    errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId);
                     if (e) {
                         errorProps["exception"] = dumpObj(e);
                     }
@@ -4820,7 +4885,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     }
                     finally {
                         try {
-                            xhr[strAjaxData] = null;
+                            var xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {} });
+                            var ajaxDataCntr = (xhrRequestData.i || {});
+                            if (ajaxDataCntr[_ajaxDataId]) {
+                                ajaxDataCntr[_ajaxDataId] = null;
+                            }
                         }
                         catch (e) {
                         }
@@ -4843,7 +4912,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 catch (e) {
                     _throwInternalWarning(_self, 18 , CORRELATION_HEADER_ERROR, (_a = {},
-                        _a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
+                        _a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                         _a[_DYN_EXCEPTION ] = dumpObj(e),
                         _a));
                 }