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

package/dist/applicationinsights-dependencies-js.rollup.d.ts

@@ -1,5 +1,5 @@
 /*
- * Microsoft Application Insights XHR dependencies plugin, 2.8.16-nightly.2308-04
+ * Microsoft Application Insights XHR dependencies plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  *
  * Microsoft Application Insights Team
@@ -37,7 +37,7 @@ export declare class AjaxPlugin extends BaseTelemetryPlugin implements IDependen
     processTelemetry(item: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void;
     /**
      * Logs dependency call
-     * @param dependencyData dependency data object
+     * @param dependencyData - dependency data object
      */
     trackDependencyData(dependency: IDependencyTelemetry, properties?: {
         [key: string]: any;
@@ -63,7 +63,7 @@ export declare class AjaxPlugin extends BaseTelemetryPlugin implements IDependen
      * Protected function to allow sub classes the chance to add additional properties to the dependency event
      * before it's sent. This function calls track, so sub-classes must call this function after they have
      * populated their properties.
-     * @param dependencyData dependency data object
+     * @param dependencyData - dependency data object
      */
     protected trackDependencyDataInternal(dependency: IDependencyTelemetry, properties?: {
         [key: string]: any;
@@ -159,7 +159,7 @@ declare interface IAjaxRecordResponse {
 export declare interface IDependenciesPlugin extends IDependencyListenerContainer {
     /**
      * Logs dependency call
-     * @param dependencyData dependency data object
+     * @param dependencyData - dependency data object
      */
     trackDependencyData(dependency: IDependencyTelemetry): void;
 }
@@ -283,8 +283,24 @@ declare class XHRMonitoringState {
     constructor();
 }
 
+export declare interface XMLHttpRequestData {
+    /**
+     * The "Shared" XHR headers, avoids causing multiple instances
+     */
+    xh?: Array<{
+        n: string;
+        v: string;
+    }>;
+    /**
+     * The individual tracking data for each AI instance
+     */
+    i: {
+        [key: string]: ajaxRecord;
+    };
+}
+
 export declare interface XMLHttpRequestInstrumented extends XMLHttpRequest {
-    ajaxData: ajaxRecord;
+    _ajaxData: XMLHttpRequestData;
 }
 
 export { }

package/dist-esm/DependencyInitializer.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-04
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 export {};

package/dist-esm/DependencyListener.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-04
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/InternalConstants.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-04
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/__DynamicConstants.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-04
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/ajax.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-04
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.16-nightly.2308-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
@@ -13,7 +13,7 @@ import { _DYN_ABORTED, _DYN_ABORT_DONE, _DYN_ADD_REQUEST_CONTEXT, _DYN_AJAX_PERF
 import { ajaxRecord } from "./ajaxRecord";
 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 ";
@@ -52,7 +52,8 @@ function isWebWorker() {
  * @returns True if Ajax monitoring is supported on this page, otherwise false
  * @ignore
  */
-function _supportsAjaxMonitoring(ajaxMonitorInstance) {
+function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
+    var _a;
     var result = false;
     if (isXhrSupported()) {
         var proto = XMLHttpRequest[strPrototype];
@@ -69,7 +70,13 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
         // Disable if the XmlHttpRequest can't be extended or hooked
         try {
             var xhr = new XMLHttpRequest();
-            xhr[strAjaxData] = {};
+            var xhrData = {
+                xh: [],
+                i: (_a = {},
+                    _a[ajaxDataId] = {},
+                    _a)
+            };
+            xhr[AJAX_DATA_CONTAINER] = xhrData;
             // Check that we can update the prototype
             var theOpen = XMLHttpRequest[strPrototype].open;
             XMLHttpRequest[strPrototype].open = theOpen;
@@ -84,12 +91,57 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
     }
     return result;
 }
+/**
+ * Internal helper to fetch the SDK instance tracking data for this XHR request
+ * @param xhr
+ * @param ajaxDataId
+ * @returns
+ */
+var _getAjaxData = function (xhr, ajaxDataId) {
+    if (xhr && ajaxDataId && xhr[AJAX_DATA_CONTAINER]) {
+        return (xhr[AJAX_DATA_CONTAINER].i || {})[ajaxDataId];
+    }
+    return null;
+};
+/**
+ * @ignore
+ * Internal helper to track the singleton shared tracking headers, so we can attempt to not create headers
+ * that might cause an issue if multiple values are populated.
+ * @param xhr - The instrumented XHR instance
+ */
+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;
+};
 /** @Ignore */
-function _getFailedAjaxDiagnosticsMessage(xhr) {
+function _getFailedAjaxDiagnosticsMessage(xhr, ajaxDataId) {
     var result = "";
     try {
-        if (xhr && xhr[strAjaxData] && xhr[strAjaxData][_DYN_REQUEST_URL /* @min:%2erequestUrl */]) {
-            result += "(url: '" + xhr[strAjaxData][_DYN_REQUEST_URL /* @min:%2erequestUrl */] + "')";
+        var ajaxData = _getAjaxData(xhr, ajaxDataId);
+        if (ajaxData && ajaxData[_DYN_REQUEST_URL /* @min:%2erequestUrl */]) {
+            result += "(url: '" + ajaxData[_DYN_REQUEST_URL /* @min:%2erequestUrl */] + "')";
         }
     }
     catch (e) {
@@ -108,10 +160,10 @@ function _throwInternalWarning(ajaxMonitorInstance, msgId, message, properties,
 /** @Ignore */
 function _createErrorCallbackFunc(ajaxMonitorInstance, internalMessage, message) {
     // tslint:disable-next-line
-    return function (args) {
+    return function (callDetails) {
         _throwInternalCritical(ajaxMonitorInstance, internalMessage, message, {
-            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(args[_DYN_INST /* @min:%2einst */]),
-            exception: dumpObj(args.err)
+            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails[_DYN_INST /* @min:%2einst */], ajaxMonitorInstance._ajaxDataId),
+            exception: dumpObj(callDetails.err)
         });
     };
 }
@@ -245,6 +297,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
         var _excludeRequestFromAutoTrackingPatterns;
         var _addRequestContext;
         var _evtNamespace;
+        var _ajaxDataId;
         var _dependencyHandlerId;
         var _dependencyListeners;
         var _dependencyInitializers;
@@ -312,17 +365,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 else if (xhr) { // XHR
                     if (CorrelationIdHelper[_DYN_CAN_INCLUDE_CORRELAT3 /* @min:%2ecanIncludeCorrelationHeader */](_config, ajaxData[_DYN_GET_ABSOLUTE_URL /* @min:%2egetAbsoluteUrl */](), currentWindowHost)) {
                         if (_isUsingAIHeaders) {
-                            var id = "|" + ajaxData[_DYN_TRACE_ID /* @min:%2etraceID */] + "." + ajaxData[_DYN_SPAN_ID /* @min:%2espanID */];
-                            xhr[_DYN_SET_REQUEST_HEADER /* @min:%2esetRequestHeader */](RequestHeaders[3 /* eRequestHeaders.requestIdHeader */], id);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][RequestHeaders[3 /* eRequestHeaders.requestIdHeader */]] = id;
+                            if (!_isHeaderSet(xhr, RequestHeaders[3 /* eRequestHeaders.requestIdHeader */])) {
+                                var id = "|" + ajaxData[_DYN_TRACE_ID /* @min:%2etraceID */] + "." + ajaxData[_DYN_SPAN_ID /* @min:%2espanID */];
+                                xhr[_DYN_SET_REQUEST_HEADER /* @min:%2esetRequestHeader */](RequestHeaders[3 /* eRequestHeaders.requestIdHeader */], id);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][RequestHeaders[3 /* eRequestHeaders.requestIdHeader */]] = id;
+                                }
+                            }
+                            else {
+                                _throwInternalWarning(_self, 71 /* _eInternalMessageId.FailedMonitorAjaxSetRequestHeader */, "Unable to set [" + RequestHeaders[3 /* eRequestHeaders.requestIdHeader */] + "] as it has already been set by another instance");
                             }
                         }
                         var appId = _config[_DYN_APP_ID /* @min:%2eappId */] || (_context && _context[_DYN_APP_ID /* @min:%2eappId */]());
                         if (appId) {
-                            xhr[_DYN_SET_REQUEST_HEADER /* @min:%2esetRequestHeader */](RequestHeaders[0 /* eRequestHeaders.requestContextHeader */], RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][RequestHeaders[0 /* eRequestHeaders.requestContextHeader */]] = RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId;
+                            if (!_isHeaderSet(xhr, RequestHeaders[0 /* eRequestHeaders.requestContextHeader */])) {
+                                xhr[_DYN_SET_REQUEST_HEADER /* @min:%2esetRequestHeader */](RequestHeaders[0 /* eRequestHeaders.requestContextHeader */], RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][RequestHeaders[0 /* eRequestHeaders.requestContextHeader */]] = RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId;
+                                }
+                            }
+                            else {
+                                _throwInternalWarning(_self, 71 /* _eInternalMessageId.FailedMonitorAjaxSetRequestHeader */, "Unable to set [" + RequestHeaders[0 /* eRequestHeaders.requestContextHeader */] + "] as it has already been set by another instance");
                             }
                         }
                         if (_isUsingW3CHeaders) {
@@ -330,10 +393,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
                             if (isNullOrUndefined(traceFlags)) {
                                 traceFlags = 0x01;
                             }
-                            var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID /* @min:%2etraceID */], ajaxData[_DYN_SPAN_ID /* @min:%2espanID */], traceFlags));
-                            xhr[_DYN_SET_REQUEST_HEADER /* @min:%2esetRequestHeader */](RequestHeaders[4 /* eRequestHeaders.traceParentHeader */], traceParent);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][RequestHeaders[4 /* eRequestHeaders.traceParentHeader */]] = traceParent;
+                            if (!_isHeaderSet(xhr, RequestHeaders[4 /* eRequestHeaders.traceParentHeader */])) {
+                                var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID /* @min:%2etraceID */], ajaxData[_DYN_SPAN_ID /* @min:%2espanID */], traceFlags));
+                                xhr[_DYN_SET_REQUEST_HEADER /* @min:%2esetRequestHeader */](RequestHeaders[4 /* eRequestHeaders.traceParentHeader */], traceParent);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][RequestHeaders[4 /* eRequestHeaders.traceParentHeader */]] = traceParent;
+                                }
+                            }
+                            else {
+                                _throwInternalWarning(_self, 71 /* _eInternalMessageId.FailedMonitorAjaxSetRequestHeader */, "Unable to set [" + RequestHeaders[4 /* eRequestHeaders.traceParentHeader */] + "] as it has already been set by another instance");
                             }
                         }
                     }
@@ -393,6 +461,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 /* @min:%2ecore */]);
@@ -531,21 +601,21 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _addHook(InstrumentProto(target, funcName, callbacks));
             }
             function _instrumentXhr() {
-                if (_supportsAjaxMonitoring(_self) && !_disableAjaxTracking && !_xhrInitialized) {
+                if (_supportsAjaxMonitoring(_self, _ajaxDataId) && !_disableAjaxTracking && !_xhrInitialized) {
                     // Instrument open
                     _hookProto(XMLHttpRequest, "open", {
                         ns: _evtNamespace,
-                        req: function (args, method, url, async) {
+                        req: function (callDetails, method, url, async) {
                             if (!_disableAjaxTracking) {
-                                var xhr = args[_DYN_INST /* @min:%2einst */];
-                                var ajaxData = xhr[strAjaxData];
-                                if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
+                                var xhr = callDetails[_DYN_INST /* @min:%2einst */];
+                                var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, ajaxData, true)) {
                                     if (!ajaxData || !ajaxData.xhrMonitoringState[_DYN_OPEN_DONE /* @min:%2eopenDone */]) {
                                         // Only create a single ajaxData (even when multiple AI instances are running)
-                                        _openHandler(xhr, method, url, async);
+                                        ajaxData = _openHandler(xhr, method, url, async);
                                     }
                                     // always attach to the on ready state change (required for handling multiple instances)
-                                    _attachToOnReadyStateChange(xhr);
+                                    _attachToOnReadyStateChange(xhr, ajaxData);
                                 }
                             }
                         },
@@ -554,11 +624,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     // Instrument send
                     _hookProto(XMLHttpRequest, "send", {
                         ns: _evtNamespace,
-                        req: function (args, context) {
+                        req: function (callDetails, context) {
                             if (!_disableAjaxTracking) {
-                                var xhr = args[_DYN_INST /* @min:%2einst */];
-                                var ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE /* @min:%2esendDone */]) {
+                                var xhr = callDetails[_DYN_INST /* @min:%2einst */];
+                                var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE /* @min:%2esendDone */]) {
                                     _createMarkId("xhr", ajaxData);
                                     ajaxData[_DYN_REQUEST_SENT_TIME /* @min:%2erequestSentTime */] = dateTimeUtilsNow();
                                     _self[_DYN_INCLUDE_CORRELATION_2 /* @min:%2eincludeCorrelationHeaders */](ajaxData, undefined, undefined, xhr);
@@ -571,11 +641,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     // Instrument abort
                     _hookProto(XMLHttpRequest, "abort", {
                         ns: _evtNamespace,
-                        req: function (args) {
+                        req: function (callDetails) {
                             if (!_disableAjaxTracking) {
-                                var xhr = args[_DYN_INST /* @min:%2einst */];
-                                var ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE /* @min:%2eabortDone */]) {
+                                var xhr = callDetails[_DYN_INST /* @min:%2einst */];
+                                var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE /* @min:%2eabortDone */]) {
                                     ajaxData[_DYN_ABORTED /* @min:%2eaborted */] = 1;
                                     ajaxData.xhrMonitoringState[_DYN_ABORT_DONE /* @min:%2eabortDone */] = true;
                                 }
@@ -586,11 +656,17 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     // Instrument setRequestHeader
                     _hookProto(XMLHttpRequest, "setRequestHeader", {
                         ns: _evtNamespace,
-                        req: function (args, header, value) {
-                            if (!_disableAjaxTracking && _enableRequestHeaderTracking) {
-                                var xhr = args[_DYN_INST /* @min:%2einst */];
-                                if (_isMonitoredXhrInstance(xhr) && _canIncludeHeaders(header)) {
-                                    xhr[strAjaxData][_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][header] = value;
+                        req: function (callDetails, header, value) {
+                            if (!_disableAjaxTracking) {
+                                var xhr = callDetails[_DYN_INST /* @min:%2einst */];
+                                var ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (ajaxData && _isMonitoredXhrInstance(xhr, ajaxData)) {
+                                    _addSharedXhrHeaders(xhr, header, value);
+                                    if (_enableRequestHeaderTracking && _canIncludeHeaders(header)) {
+                                        if (ajaxData) {
+                                            ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */][header] = value;
+                                        }
+                                    }
                                 }
                             }
                         },
@@ -653,14 +729,14 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 return isDisabled;
             }
-            /// <summary>Verifies that particalar instance of XMLHttpRequest needs to be monitored</summary>
+            /// <summary>Verifies that particular instance of XMLHttpRequest needs to be monitored</summary>
             /// <param name="excludeAjaxDataValidation">Optional parameter. True if ajaxData must be excluded from verification</param>
             /// <returns type="bool">True if instance needs to be monitored, otherwise false</returns>
-            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);
                 }
                 // checking to see that all interested functions on xhr were instrumented
                 return initialized
@@ -683,7 +759,9 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 var distributedTraceCtx = _getDistributedTraceCtx();
                 var traceID = (distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_ID /* @min:%2egetTraceId */]()) || 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 /* @min:%2etraceFlags */] = distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_FLAGS /* @min:%2egetTraceFlags */]();
                 ajaxData[_DYN_METHOD /* @min:%2emethod */] = method;
                 ajaxData[_DYN_REQUEST_URL /* @min:%2erequestUrl */] = url;
@@ -691,12 +769,12 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 ajaxData[_DYN_REQUEST_HEADERS /* @min:%2erequestHeaders */] = {};
                 ajaxData.async = async;
                 ajaxData[_DYN_ERROR_STATUS_TEXT /* @min:%2eerrorStatusText */] = _enableAjaxErrorStatusText;
-                xhr[strAjaxData] = ajaxData;
+                return ajaxData;
             }
-            function _attachToOnReadyStateChange(xhr) {
-                xhr[strAjaxData].xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE14 /* @min:%2estateChangeAttached */] = eventOn(xhr, "readystatechange", function () {
+            function _attachToOnReadyStateChange(xhr, ajaxData) {
+                ajaxData.xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE14 /* @min:%2estateChangeAttached */] = eventOn(xhr, "readystatechange", function () {
                     try {
-                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
+                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
                             _onAjaxComplete(xhr);
                         }
                     }
@@ -705,7 +783,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         // ignore messages with c00c023f, as this a known IE9 XHR abort issue
                         if (!exceptionText || _indexOf(exceptionText[_DYN_TO_LOWER_CASE /* @min:%2etoLowerCase */](), "c00c023f") === -1) {
                             _throwInternalCritical(_self, 16 /* _eInternalMessageId.FailedMonitorAjaxRSC */, ERROR_HEADER + " 'readystatechange' event handler" + ERROR_POSTFIX, {
-                                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                                 exception: exceptionText
                             });
                         }
@@ -726,12 +804,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 /* @min:%2eresponseFinishedTime */] = dateTimeUtilsNow();
                 ajaxData[_DYN_STATUS /* @min:%2estatus */] = xhr[_DYN_STATUS /* @min:%2estatus */];
                 function _reportXhrError(e, failedProps) {
                     var errorProps = failedProps || {};
-                    errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr);
+                    errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId);
                     if (e) {
                         errorProps["exception"] = dumpObj(e);
                     }
@@ -794,7 +872,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     finally {
                         // cleanup telemetry data
                         try {
-                            xhr[strAjaxData] = null;
+                            var xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {} });
+                            var ajaxDataCntr = (xhrRequestData.i || {});
+                            if (ajaxDataCntr[_ajaxDataId]) {
+                                ajaxDataCntr[_ajaxDataId] = null;
+                            }
                         }
                         catch (e) {
                             // May throw in environments that prevent extension or freeze xhr
@@ -817,7 +899,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 catch (e) {
                     _throwInternalWarning(_self, 18 /* _eInternalMessageId.FailedMonitorAjaxGetCorrelationHeader */, CORRELATION_HEADER_ERROR, {
-                        ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                        ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                         exception: dumpObj(e)
                     });
                 }