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

package/dist/applicationinsights-dependencies-js.api.json

@@ -1,7 +1,7 @@
 {
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
-    "toolVersion": "7.36.3",
+    "toolVersion": "7.36.4",
     "schemaVersion": 1011,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
@@ -2899,6 +2899,92 @@
             }
           ]
         },
+        {
+          "kind": "Interface",
+          "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestData:interface",
+          "docComment": "",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export interface XMLHttpRequestData "
+            }
+          ],
+          "fileUrlPath": "types/ajax.d.ts",
+          "releaseTag": "Public",
+          "name": "XMLHttpRequestData",
+          "preserveMemberOrder": false,
+          "members": [
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestData#i:member",
+              "docComment": "/**\n * The individual tracking data for each AI instance\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "i: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "{\n        [key: string]: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "ajaxRecord",
+                  "canonicalReference": "@microsoft/applicationinsights-dependencies-js!ajaxRecord:class"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";\n    }"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": false,
+              "releaseTag": "Public",
+              "name": "i",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 4
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestData#xh:member",
+              "docComment": "/**\n * The \"Shared\" XHR headers, avoids causing multiple instances\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "xh?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Array",
+                  "canonicalReference": "!Array:interface"
+                },
+                {
+                  "kind": "Content",
+                  "text": "<{\n        n: string;\n        v: string;\n    }>"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "xh",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
+            }
+          ],
+          "extendsTokenRanges": []
+        },
         {
           "kind": "Interface",
           "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestInstrumented:interface",
@@ -2925,17 +3011,17 @@
           "members": [
             {
               "kind": "PropertySignature",
-              "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestInstrumented#ajaxData:member",
+              "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestInstrumented#_ajaxData:member",
               "docComment": "",
               "excerptTokens": [
                 {
                   "kind": "Content",
-                  "text": "ajaxData: "
+                  "text": "_ajaxData: "
                 },
                 {
                   "kind": "Reference",
-                  "text": "ajaxRecord",
-                  "canonicalReference": "@microsoft/applicationinsights-dependencies-js!ajaxRecord:class"
+                  "text": "XMLHttpRequestData",
+                  "canonicalReference": "@microsoft/applicationinsights-dependencies-js!XMLHttpRequestData:interface"
                 },
                 {
                   "kind": "Content",
@@ -2945,7 +3031,7 @@
               "isReadonly": false,
               "isOptional": false,
               "releaseTag": "Public",
-              "name": "ajaxData",
+              "name": "_ajaxData",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
                 "endIndex": 2

package/dist/applicationinsights-dependencies-js.api.md

@@ -193,10 +193,21 @@ export interface IInstrumentationRequirements extends IDependenciesPlugin {
     includeCorrelationHeaders: (ajaxData: ajaxRecord, input?: Request | string, init?: RequestInit, xhr?: XMLHttpRequestInstrumented) => any;
 }
 
+// @public (undocumented)
+export interface XMLHttpRequestData {
+    i: {
+        [key: string]: ajaxRecord;
+    };
+    xh?: Array<{
+        n: string;
+        v: string;
+    }>;
+}
+
 // @public (undocumented)
 export interface XMLHttpRequestInstrumented extends XMLHttpRequest {
     // (undocumented)
-    ajaxData: ajaxRecord;
+    _ajaxData: XMLHttpRequestData;
 }
 
 // (No @packageDocumentation comment for this package)

package/dist/applicationinsights-dependencies-js.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
@@ -31,7 +31,7 @@ declare namespace ApplicationInsights {
         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;
@@ -57,7 +57,7 @@ declare namespace ApplicationInsights {
          * 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;
@@ -153,7 +153,7 @@ declare namespace ApplicationInsights {
     interface IDependenciesPlugin extends IDependencyListenerContainer {
         /**
          * Logs dependency call
-         * @param dependencyData dependency data object
+         * @param dependencyData - dependency data object
          */
         trackDependencyData(dependency: IDependencyTelemetry): void;
     }
@@ -277,8 +277,24 @@ declare namespace ApplicationInsights {
         constructor();
     }
 
+    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;
+        };
+    }
+
     interface XMLHttpRequestInstrumented extends XMLHttpRequest {
-        ajaxData: ajaxRecord;
+        _ajaxData: XMLHttpRequestData;
     }
 
     

package/dist/applicationinsights-dependencies-js.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.
  */
 (function (global, factory) {
@@ -1280,7 +1280,7 @@
     }
 
     var _objDefineProperty = ObjDefineProperty;
-    var version = "2.8.16-nightly.2308-04";
+    var version = "2.8.16-nightly.2308-17";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function _createAccessor(target, prop, value) {
@@ -1489,7 +1489,7 @@
     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;
     }
@@ -1534,7 +1534,7 @@
             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 "";
     }
@@ -3106,7 +3106,7 @@
 
     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 ";
@@ -3138,7 +3138,8 @@
         }
         return _isWebWorker;
     }
-    function _supportsAjaxMonitoring(ajaxMonitorInstance) {
+    function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
+        var _a;
         var result = false;
         if (isXhrSupported()) {
             var proto = XMLHttpRequest[strShimPrototype];
@@ -3154,7 +3155,13 @@
         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;
             }
@@ -3167,11 +3174,44 @@
         }
         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) {
@@ -3185,10 +3225,10 @@
         _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)
             });
         };
     }
@@ -3322,6 +3362,7 @@
             var _excludeRequestFromAutoTrackingPatterns;
             var _addRequestContext;
             var _evtNamespace;
+            var _ajaxDataId;
             var _dependencyHandlerId;
             var _dependencyListeners;
             var _dependencyInitializers;
@@ -3385,17 +3426,27 @@
                     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) {
@@ -3403,10 +3454,15 @@
                                 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");
                                 }
                             }
                         }
@@ -3463,6 +3519,8 @@
                     _dependencyHandlerId = 0;
                     _dependencyListeners = [];
                     _dependencyInitializers = [];
+                    _ajaxDataId = createUniqueNamespace("ajaxData");
+                    _self._ajaxDataId = _ajaxDataId;
                 }
                 function _populateDefaults(config) {
                     var ctx = createProcessTelemetryContext(null, config, _self[_DYN_CORE ]);
@@ -3585,18 +3643,18 @@
                     _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);
                                     }
                                 }
                             },
@@ -3604,11 +3662,11 @@
                         });
                         _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);
@@ -3620,11 +3678,11 @@
                         });
                         _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;
                                     }
@@ -3634,11 +3692,17 @@
                         });
                         _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;
+                                            }
+                                        }
                                     }
                                 }
                             },
@@ -3692,11 +3756,11 @@
                     }
                     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;
@@ -3716,7 +3780,9 @@
                     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;
@@ -3724,12 +3790,12 @@
                     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);
                             }
                         }
@@ -3737,7 +3803,7 @@
                             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
                                 });
                             }
@@ -3756,12 +3822,12 @@
                     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);
                         }
@@ -3821,7 +3887,11 @@
                         }
                         finally {
                             try {
-                                xhr[strAjaxData] = null;
+                                var xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {} });
+                                var ajaxDataCntr = (xhrRequestData.i || {});
+                                if (ajaxDataCntr[_ajaxDataId]) {
+                                    ajaxDataCntr[_ajaxDataId] = null;
+                                }
                             }
                             catch (e) {
                             }
@@ -3843,7 +3913,7 @@
                     }
                     catch (e) {
                         _throwInternalWarning(_self, 18 , CORRELATION_HEADER_ERROR, {
-                            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                             exception: dumpObj(e)
                         });
                     }