@microsoft/applicationinsights-dependencies-js 2.8.16-nightly.2308-02 → 2.8.16-nightly.2308-17

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

@@ -1,25 +1,25 @@
 {
     "name": "applicationinsights-dependencies-js",
-    "version": "2.8.16-nightly.2308-02",
+    "version": "2.8.16-nightly.2308-17",
     "ext": {
         "@js": {
             "file": "applicationinsights-dependencies-js.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-bV7acj8j/FLHAqLxtflHOWdaf7qiF19edYLPYFVQ/6I= sha384-nIiKzgB7HJhf82edazdI299h84JsjrqimtoazimYo8Gx7WE+uF17HUckaLcFtA5p sha512-L3ZJYpFXSP4qONKc/20qr9H3Ott5nmQ7rekDeTCW3/kjq1cWw7PyFrobC79CoxxAZBizvTlhUnlEeOor6hWgMQ==",
+            "integrity": "sha256-QzPu7SEyu+NNzxyoi1pc6aV/ZE/tldYhQQPG2yrL7VQ= sha384-MYMlGqlcYqpdU8EU95BX2q9v2ywmxB0UI81nX8jz56a5eO3UF7/8kafwcEnjQgQd sha512-g9S0AGPSQctmGD6b2s0dVrjjdGqH5HSt8jrpkuszoi4Ab0NgaP2Rj+Oj52PbC/z6K5FfD9tnRpq7hb489DP2Rw==",
             "hashes": {
-                "sha256": "bV7acj8j/FLHAqLxtflHOWdaf7qiF19edYLPYFVQ/6I=",
-                "sha384": "nIiKzgB7HJhf82edazdI299h84JsjrqimtoazimYo8Gx7WE+uF17HUckaLcFtA5p",
-                "sha512": "L3ZJYpFXSP4qONKc/20qr9H3Ott5nmQ7rekDeTCW3/kjq1cWw7PyFrobC79CoxxAZBizvTlhUnlEeOor6hWgMQ=="
+                "sha256": "QzPu7SEyu+NNzxyoi1pc6aV/ZE/tldYhQQPG2yrL7VQ=",
+                "sha384": "MYMlGqlcYqpdU8EU95BX2q9v2ywmxB0UI81nX8jz56a5eO3UF7/8kafwcEnjQgQd",
+                "sha512": "g9S0AGPSQctmGD6b2s0dVrjjdGqH5HSt8jrpkuszoi4Ab0NgaP2Rj+Oj52PbC/z6K5FfD9tnRpq7hb489DP2Rw=="
             }
         },
         "@min.js": {
             "file": "applicationinsights-dependencies-js.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-ceML9ZAZ9VYSSVwutrKX5bwcwH5uPZVBENqN6MUzJdc= sha384-gftrlcgt7laTZ6RD+kBruswX4QGqouDiAMfMoJYM/SMkZLuvCBGDEv7bI9AtJC9r sha512-yQ2R7R/B1UPuGpeSdiz7yN2gL8oN7mCT5JqzfuO9UOyrghbDKRgGOZixt5KZoUHgfWE4P+MABK0bWCkpnew8wQ==",
+            "integrity": "sha256-+Ls4VtAyV4DunMdyttjeb/CP+/+CN0InHG8OksRsSjI= sha384-uhjdaeMz2lG68wc3kDub8feKN5Jx/iun1clclUjbEoz7HXWggQhvygdRolxdyLDQ sha512-YJR4Akqsr4OdQMk172ms3z8hM9hvWUzswAheXBFpwCcsSZtF8/B0w3ywM8C0Wf5RYSBJCrL7yMEaiwn58a3RAg==",
             "hashes": {
-                "sha256": "ceML9ZAZ9VYSSVwutrKX5bwcwH5uPZVBENqN6MUzJdc=",
-                "sha384": "gftrlcgt7laTZ6RD+kBruswX4QGqouDiAMfMoJYM/SMkZLuvCBGDEv7bI9AtJC9r",
-                "sha512": "yQ2R7R/B1UPuGpeSdiz7yN2gL8oN7mCT5JqzfuO9UOyrghbDKRgGOZixt5KZoUHgfWE4P+MABK0bWCkpnew8wQ=="
+                "sha256": "+Ls4VtAyV4DunMdyttjeb/CP+/+CN0InHG8OksRsSjI=",
+                "sha384": "uhjdaeMz2lG68wc3kDub8feKN5Jx/iun1clclUjbEoz7HXWggQhvygdRolxdyLDQ",
+                "sha512": "YJR4Akqsr4OdQMk172ms3z8hM9hvWUzswAheXBFpwCcsSZtF8/B0w3ywM8C0Wf5RYSBJCrL7yMEaiwn58a3RAg=="
             }
         }
     }

package/browser/applicationinsights-dependencies-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-02
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 'use strict';
@@ -1307,7 +1307,7 @@ function newId(maxLength) {
 }
 
 var _objDefineProperty = ObjDefineProperty;
-var version = "2.8.16-nightly.2308-02";
+var version = "2.8.16-nightly.2308-17";
 var instanceName = "." + newId(6);
 var _dataUid = 0;
 function _createAccessor(target, prop, value) {
@@ -1516,7 +1516,7 @@ var INVALID_TRACE_ID = "00000000000000000000000000000000";
 var INVALID_SPAN_ID = "0000000000000000";
 function _isValid(value, len, invalidValue) {
     if (value && value[_DYN_LENGTH$2 ] === len && value !== invalidValue) {
-        return !!value.match(/^[\da-f]*$/);
+        return !!value.match(/^[\da-f]*$/i);
     }
     return false;
 }
@@ -1561,7 +1561,7 @@ function formatTraceParent(value) {
         if (version !== "00" && version !== "ff") {
             version = DEFAULT_VERSION;
         }
-        return "".concat(version, "-").concat(_formatValue(value.traceId, 32, INVALID_TRACE_ID), "-").concat(_formatValue(value.spanId, 16, INVALID_SPAN_ID), "-").concat(flags);
+        return "".concat(version.toLowerCase(), "-").concat(_formatValue(value.traceId, 32, INVALID_TRACE_ID).toLowerCase(), "-").concat(_formatValue(value.spanId, 16, INVALID_SPAN_ID).toLowerCase(), "-").concat(flags.toLowerCase());
     }
     return "";
 }
@@ -3133,7 +3133,7 @@ var ajaxRecord = /** @class */ (function () {
 
 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 ";
@@ -3165,7 +3165,8 @@ function isWebWorker() {
     }
     return _isWebWorker;
 }
-function _supportsAjaxMonitoring(ajaxMonitorInstance) {
+function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
+    var _a;
     var result = false;
     if (isXhrSupported()) {
         var proto = XMLHttpRequest[strShimPrototype];
@@ -3181,7 +3182,13 @@ 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;
         }
@@ -3194,11 +3201,44 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
     }
     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) {
@@ -3212,10 +3252,10 @@ 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) {
         _throwInternalCritical(ajaxMonitorInstance, internalMessage, message, {
-            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(args[_DYN_INST ]),
-            exception: dumpObj(args.err)
+            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails[_DYN_INST ], ajaxMonitorInstance._ajaxDataId),
+            exception: dumpObj(callDetails.err)
         });
     };
 }
@@ -3349,6 +3389,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
         var _excludeRequestFromAutoTrackingPatterns;
         var _addRequestContext;
         var _evtNamespace;
+        var _ajaxDataId;
         var _dependencyHandlerId;
         var _dependencyListeners;
         var _dependencyInitializers;
@@ -3412,17 +3453,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 else if (xhr) {
                     if (CorrelationIdHelper[_DYN_CAN_INCLUDE_CORRELAT3 ](_config, 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 = _config[_DYN_APP_ID ] || (_context && _context[_DYN_APP_ID ]());
                         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) {
@@ -3430,10 +3481,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");
                             }
                         }
                     }
@@ -3490,6 +3546,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _dependencyHandlerId = 0;
                 _dependencyListeners = [];
                 _dependencyInitializers = [];
+                _ajaxDataId = createUniqueNamespace("ajaxData");
+                _self._ajaxDataId = _ajaxDataId;
             }
             function _populateDefaults(config) {
                 var ctx = createProcessTelemetryContext(null, config, _self[_DYN_CORE ]);
@@ -3612,18 +3670,18 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _addHook(InstrumentProto(target, funcName, callbacks));
             }
             function _instrumentXhr() {
-                if (_supportsAjaxMonitoring(_self) && !_disableAjaxTracking && !_xhrInitialized) {
+                if (_supportsAjaxMonitoring(_self, _ajaxDataId) && !_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);
                                 }
                             }
                         },
@@ -3631,11 +3689,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);
@@ -3647,11 +3705,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;
                                 }
@@ -3661,11 +3719,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;
+                                        }
+                                    }
                                 }
                             }
                         },
@@ -3719,11 +3783,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;
@@ -3743,7 +3807,9 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 var distributedTraceCtx = _getDistributedTraceCtx();
                 var traceID = (distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_ID ]()) || generateW3CId();
                 var spanID = generateW3CId().substr(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;
@@ -3751,12 +3817,12 @@ 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_ATTACHE14 ] = eventOn(xhr, "readystatechange", function () {
+            function _attachToOnReadyStateChange(xhr, ajaxData) {
+                ajaxData.xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE14 ] = eventOn(xhr, "readystatechange", function () {
                     try {
-                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
+                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
                             _onAjaxComplete(xhr);
                         }
                     }
@@ -3764,7 +3830,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, {
-                                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                                 exception: exceptionText
                             });
                         }
@@ -3783,12 +3849,12 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 return null;
             }
             function _onAjaxComplete(xhr) {
-                var ajaxData = xhr[strAjaxData];
+                var ajaxData = _getAjaxData(xhr, _ajaxDataId);
                 ajaxData[_DYN_RESPONSE_FINISHED_TI15 ] = 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);
                     }
@@ -3848,7 +3914,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) {
                         }
@@ -3870,7 +3940,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 catch (e) {
                     _throwInternalWarning(_self, 18 , CORRELATION_HEADER_ERROR, {
-                        ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                        ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                         exception: dumpObj(e)
                     });
                 }