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

package/src/ajax.ts

@@ -25,7 +25,7 @@ declare let self: any;
 
 const AJAX_MONITOR_PREFIX = "ai.ajxmn.";
 const strDiagLog = "diagLog";
-const strAjaxData = "ajaxData";
+const AJAX_DATA_CONTAINER = "_ajaxData";
 const STR_FETCH = "fetch";
 
 const ERROR_HEADER = "Failed to monitor XMLHttpRequest";
@@ -76,7 +76,7 @@ function isWebWorker() {
  * @returns True if Ajax monitoring is supported on this page, otherwise false
  * @ignore
  */
-function _supportsAjaxMonitoring(ajaxMonitorInstance:AjaxMonitor): boolean {
+function _supportsAjaxMonitoring(ajaxMonitorInstance: AjaxMonitor, ajaxDataId: string): boolean {
     let result = false;
 
     if (isXhrSupported()) {
@@ -96,7 +96,14 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance:AjaxMonitor): boolean {
         // Disable if the XmlHttpRequest can't be extended or hooked
         try {
             let xhr = new XMLHttpRequest();
-            xhr[strAjaxData] = {};
+            let xhrData: XMLHttpRequestData = {
+                xh: [],
+                i: {
+                    [ajaxDataId]: {} as ajaxRecord
+                }
+            };
+
+            xhr[AJAX_DATA_CONTAINER] = xhrData;
 
             // Check that we can update the prototype
             let theOpen = XMLHttpRequest[strPrototype].open;
@@ -116,12 +123,62 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance:AjaxMonitor): boolean {
     return result;
 }
 
+/**
+ * Internal helper to fetch the SDK instance tracking data for this XHR request
+ * @param xhr
+ * @param ajaxDataId
+ * @returns
+ */
+const _getAjaxData = (xhr: XMLHttpRequestInstrumented, ajaxDataId: string): ajaxRecord => {
+    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
+ */
+const _addSharedXhrHeaders = (xhr: XMLHttpRequestInstrumented, name: string, value: string) => {
+    if (xhr) {
+        let headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
+        if (headers) {
+            headers.push({
+                n: name,
+                v: value
+            });
+        }
+    }
+}
+
+const _isHeaderSet = (xhr: XMLHttpRequestInstrumented, name: string) => {
+    let isPresent = false;
+    if (xhr) {
+        let headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
+        if (headers) {
+            arrForEach(headers, (header) => {
+                if (header.n === name) {
+                    isPresent = true;
+                    return -1;
+                }
+            });
+        }
+    }
+
+    return isPresent;
+}
+
 /** @Ignore */
-function _getFailedAjaxDiagnosticsMessage(xhr: XMLHttpRequestInstrumented): string {
+function _getFailedAjaxDiagnosticsMessage(xhr: XMLHttpRequestInstrumented, ajaxDataId: string): string {
     let result = "";
     try {
-        if (xhr && xhr[strAjaxData] && xhr[strAjaxData].requestUrl) {
-            result += "(url: '" + xhr[strAjaxData].requestUrl + "')";
+        let ajaxData = _getAjaxData(xhr, ajaxDataId);
+        if (ajaxData && ajaxData.requestUrl) {
+            result += "(url: '" + ajaxData.requestUrl + "')";
         }
     } catch (e) {
         // eslint-disable-next-line no-empty
@@ -141,15 +198,15 @@ function _throwInternalWarning(ajaxMonitorInstance:AjaxMonitor, msgId: _eInterna
 }
 
 /** @Ignore */
-function _createErrorCallbackFunc(ajaxMonitorInstance:AjaxMonitor, internalMessage: _eInternalMessageId, message:string) {
+function _createErrorCallbackFunc(ajaxMonitorInstance: AjaxMonitor, internalMessage: _eInternalMessageId, message:string) {
     // tslint:disable-next-line
-    return function (args:IInstrumentCallDetails) {
+    return function (callDetails: IInstrumentCallDetails) {
         _throwInternalCritical(ajaxMonitorInstance,
             internalMessage,
             message,
             {
-                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(args.inst),
-                exception: dumpObj(args.err)
+                ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails.inst, (ajaxMonitorInstance as any)._ajaxDataId),
+                exception: dumpObj(callDetails.err)
             });
     };
 }
@@ -226,8 +283,20 @@ function _processDependencyListeners(listeners: _IInternalDependencyHandler<Depe
     }
 }
 
+export 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 interface XMLHttpRequestInstrumented extends XMLHttpRequest {
-    ajaxData: ajaxRecord;
+    _ajaxData: XMLHttpRequestData;
 }
 
 const BLOB_CORE = "*.blob.core.";
@@ -247,7 +316,7 @@ const _internalExcludeEndpoints = [
 export interface IDependenciesPlugin extends IDependencyListenerContainer {
     /**
      * Logs dependency call
-     * @param dependencyData dependency data object
+     * @param dependencyData - dependency data object
      */
     trackDependencyData(dependency: IDependencyTelemetry): void;
 }
@@ -328,6 +397,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
         let _excludeRequestFromAutoTrackingPatterns: (string | RegExp)[];
         let _addRequestContext: (requestContext?: IRequestContext) => ICustomProperties;
         let _evtNamespace: string | string[];
+        let _ajaxDataId: string;
         let _dependencyHandlerId: number;
         let _dependencyListeners: _IInternalDependencyHandler<DependencyListenerFunction>[];
         let _dependencyInitializers: _IInternalDependencyHandler<DependencyInitializerFunction>[];
@@ -340,7 +410,6 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
             _self.initialize = (config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?:ITelemetryPluginChain) => {
                 if (!_self.isInitialized()) {
                     _base.initialize(config, core, extensions, pluginChain);
-
                     _evtNamespace = mergeEvtNamespace(createUniqueNamespace("ajax"), core && core.evtNamespace && core.evtNamespace());
 
                     _populateDefaults(config);
@@ -409,17 +478,27 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 } else if (xhr) { // XHR
                     if (CorrelationIdHelper.canIncludeCorrelationHeader(_config, ajaxData.getAbsoluteUrl(), currentWindowHost)) {
                         if (_isUsingAIHeaders) {
-                            const id = "|" + ajaxData.traceID + "." + ajaxData.spanID;
-                            xhr.setRequestHeader(RequestHeaders[eRequestHeaders.requestIdHeader], id);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[eRequestHeaders.requestIdHeader]] = id;
+                            if (!_isHeaderSet(xhr, RequestHeaders[eRequestHeaders.requestIdHeader])) {
+                                const id = "|" + ajaxData.traceID + "." + ajaxData.spanID;
+                                xhr.setRequestHeader(RequestHeaders[eRequestHeaders.requestIdHeader], id);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData.requestHeaders[RequestHeaders[eRequestHeaders.requestIdHeader]] = id;
+                                }
+                            } else {
+                                _throwInternalWarning(_self, _eInternalMessageId.FailedMonitorAjaxSetRequestHeader,
+                                    "Unable to set [" + RequestHeaders[eRequestHeaders.requestIdHeader] + "] as it has already been set by another instance");
                             }
                         }
                         const appId = _config.appId || (_context && _context.appId());
                         if (appId) {
-                            xhr.setRequestHeader(RequestHeaders[eRequestHeaders.requestContextHeader], RequestHeaders[eRequestHeaders.requestContextAppIdFormat] + appId);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[eRequestHeaders.requestContextHeader]] = RequestHeaders[eRequestHeaders.requestContextAppIdFormat] + appId;
+                            if (!_isHeaderSet(xhr, RequestHeaders[eRequestHeaders.requestContextHeader])) {
+                                xhr.setRequestHeader(RequestHeaders[eRequestHeaders.requestContextHeader], RequestHeaders[eRequestHeaders.requestContextAppIdFormat] + appId);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData.requestHeaders[RequestHeaders[eRequestHeaders.requestContextHeader]] = RequestHeaders[eRequestHeaders.requestContextAppIdFormat] + appId;
+                                }
+                            } else {
+                                _throwInternalWarning(_self, _eInternalMessageId.FailedMonitorAjaxSetRequestHeader,
+                                    "Unable to set [" + RequestHeaders[eRequestHeaders.requestContextHeader] + "] as it has already been set by another instance");
                             }
                         }
                         if (_isUsingW3CHeaders) {
@@ -428,10 +507,15 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                                 traceFlags = 0x01;
                             }
 
-                            const traceParent = formatTraceParent(createTraceParent(ajaxData.traceID, ajaxData.spanID, traceFlags));
-                            xhr.setRequestHeader(RequestHeaders[eRequestHeaders.traceParentHeader], traceParent);
-                            if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[eRequestHeaders.traceParentHeader]] = traceParent;
+                            if (!_isHeaderSet(xhr, RequestHeaders[eRequestHeaders.traceParentHeader])) {
+                                const traceParent = formatTraceParent(createTraceParent(ajaxData.traceID, ajaxData.spanID, traceFlags));
+                                xhr.setRequestHeader(RequestHeaders[eRequestHeaders.traceParentHeader], traceParent);
+                                if (_enableRequestHeaderTracking) {
+                                    ajaxData.requestHeaders[RequestHeaders[eRequestHeaders.traceParentHeader]] = traceParent;
+                                }
+                            } else {
+                                _throwInternalWarning(_self, _eInternalMessageId.FailedMonitorAjaxSetRequestHeader,
+                                    "Unable to set [" + RequestHeaders[eRequestHeaders.traceParentHeader] + "] as it has already been set by another instance");
                             }
                         }
                     }
@@ -509,6 +593,8 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 _dependencyHandlerId = 0;
                 _dependencyListeners = [];
                 _dependencyInitializers = [];
+                _ajaxDataId = createUniqueNamespace("ajaxData");
+                (_self as any)._ajaxDataId = _ajaxDataId;
             }
 
             function _populateDefaults(config: IConfiguration) {
@@ -665,22 +751,22 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
             }
 
             function _instrumentXhr():void {
-                if (_supportsAjaxMonitoring(_self) && !_disableAjaxTracking && !_xhrInitialized) {
+                if (_supportsAjaxMonitoring(_self, _ajaxDataId) && !_disableAjaxTracking && !_xhrInitialized) {
                     // Instrument open
                     _hookProto(XMLHttpRequest, "open", {
                         ns: _evtNamespace,
-                        req: (args:IInstrumentCallDetails, method:string, url:string, async?:boolean) => {
+                        req: (callDetails: IInstrumentCallDetails, method:string, url:string, async?:boolean) => {
                             if (!_disableAjaxTracking) {
-                                let xhr = args.inst as XMLHttpRequestInstrumented;
-                                let ajaxData = xhr[strAjaxData];
-                                if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
+                                let xhr = callDetails.inst as XMLHttpRequestInstrumented;
+                                let ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, ajaxData, true)) {
                                     if (!ajaxData || !ajaxData.xhrMonitoringState.openDone) {
                                         // 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);
                                 }
                             }
                         },
@@ -691,11 +777,11 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                     // Instrument send
                     _hookProto(XMLHttpRequest, "send", {
                         ns: _evtNamespace,
-                        req: (args:IInstrumentCallDetails, context?: Document | BodyInit | null) => {
+                        req: (callDetails: IInstrumentCallDetails, context?: Document | BodyInit | null) => {
                             if (!_disableAjaxTracking) {
-                                let xhr = args.inst as XMLHttpRequestInstrumented;
-                                let ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.sendDone) {
+                                let xhr = callDetails.inst as XMLHttpRequestInstrumented;
+                                let ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState.sendDone) {
                                     _createMarkId("xhr", ajaxData);
                                     ajaxData.requestSentTime = dateTimeUtilsNow();
                                     _self.includeCorrelationHeaders(ajaxData, undefined, undefined, xhr);
@@ -710,11 +796,11 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                     // Instrument abort
                     _hookProto(XMLHttpRequest, "abort", {
                         ns: _evtNamespace,
-                        req: (args:IInstrumentCallDetails) => {
+                        req: (callDetails: IInstrumentCallDetails) => {
                             if (!_disableAjaxTracking) {
-                                let xhr = args.inst as XMLHttpRequestInstrumented;
-                                let ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.abortDone) {
+                                let xhr = callDetails.inst as XMLHttpRequestInstrumented;
+                                let ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState.abortDone) {
                                     ajaxData.aborted = 1;
                                     ajaxData.xhrMonitoringState.abortDone = true;
                                 }
@@ -727,11 +813,17 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                     // Instrument setRequestHeader
                     _hookProto(XMLHttpRequest, "setRequestHeader", {
                         ns: _evtNamespace,
-                        req: (args: IInstrumentCallDetails, header: string, value: string) => {
-                            if (!_disableAjaxTracking && _enableRequestHeaderTracking) {
-                                let xhr = args.inst as XMLHttpRequestInstrumented;
-                                if (_isMonitoredXhrInstance(xhr) && _canIncludeHeaders(header)) {
-                                    xhr[strAjaxData].requestHeaders[header] = value;
+                        req: (callDetails: IInstrumentCallDetails, header: string, value: string) => {
+                            if (!_disableAjaxTracking) {
+                                let xhr = callDetails.inst as XMLHttpRequestInstrumented;
+                                let ajaxData = _getAjaxData(xhr, _ajaxDataId);
+                                if (ajaxData && _isMonitoredXhrInstance(xhr, ajaxData)) {
+                                    _addSharedXhrHeaders(xhr, header, value);
+                                    if (_enableRequestHeaderTracking && _canIncludeHeaders(header)) {
+                                        if (ajaxData) {
+                                            ajaxData.requestHeaders[header] = value;
+                                        }
+                                    }
                                 }
                             }
                         },
@@ -804,14 +896,14 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 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: XMLHttpRequestInstrumented, excludeAjaxDataValidation?: boolean): boolean {
+            function _isMonitoredXhrInstance(xhr: XMLHttpRequestInstrumented, ajaxData: ajaxRecord, excludeAjaxDataValidation?: boolean): boolean {
                 let ajaxValidation = true;
                 let 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
@@ -834,13 +926,16 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 return distributedTraceCtx;
             }
 
-            function _openHandler(xhr: XMLHttpRequestInstrumented, method: string, url: string, async: boolean) {
+            function _openHandler(xhr: XMLHttpRequestInstrumented, method: string, url: string, async: boolean): ajaxRecord {
                 let distributedTraceCtx: IDistributedTraceContext = _getDistributedTraceCtx();
 
                 const traceID = (distributedTraceCtx && distributedTraceCtx.getTraceId()) || generateW3CId();
                 const spanID = generateW3CId().substr(0, 16);
 
-                const ajaxData = new ajaxRecord(traceID, spanID, _self[strDiagLog](), _self.core?.getTraceCtx());
+                let xhrRequestData = xhr[AJAX_DATA_CONTAINER] = (xhr[AJAX_DATA_CONTAINER] || { xh:[], i: {}});
+                let ajaxDataCntr = xhrRequestData.i = (xhrRequestData.i || { });
+                const ajaxData = ajaxDataCntr[_ajaxDataId] = (ajaxDataCntr[_ajaxDataId] || new ajaxRecord(traceID, spanID, _self[strDiagLog](), _self.core?.getTraceCtx()));
+
                 ajaxData.traceFlags = distributedTraceCtx && distributedTraceCtx.getTraceFlags();
                 ajaxData.method = method;
                 ajaxData.requestUrl = url;
@@ -848,13 +943,14 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 ajaxData.requestHeaders = {};
                 ajaxData.async = async;
                 ajaxData.errorStatusText = _enableAjaxErrorStatusText;
-                xhr[strAjaxData] = ajaxData;
+
+                return ajaxData;
             }
 
-            function _attachToOnReadyStateChange(xhr: XMLHttpRequestInstrumented) {
-                xhr[strAjaxData].xhrMonitoringState.stateChangeAttached = eventOn(xhr, "readystatechange", () => {
+            function _attachToOnReadyStateChange(xhr: XMLHttpRequestInstrumented, ajaxData: ajaxRecord) {
+                ajaxData.xhrMonitoringState.stateChangeAttached = eventOn(xhr, "readystatechange", () => {
                     try {
-                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
+                        if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
                             _onAjaxComplete(xhr);
                         }
                     } catch (e) {
@@ -866,7 +962,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                                 _eInternalMessageId.FailedMonitorAjaxRSC,
                                 ERROR_HEADER + " 'readystatechange' event handler" + ERROR_POSTFIX,
                                 {
-                                    ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                                    ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                                     exception: exceptionText
                                 });
                         }
@@ -889,13 +985,13 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
             }
 
             function _onAjaxComplete(xhr: XMLHttpRequestInstrumented) {
-                let ajaxData = xhr[strAjaxData];
+                let ajaxData = _getAjaxData(xhr, _ajaxDataId);
                 ajaxData.responseFinishedTime = dateTimeUtilsNow();
                 ajaxData.status = xhr.status;
 
                 function _reportXhrError(e: any, failedProps?:Object) {
                     let errorProps = failedProps||{};
-                    errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr);
+                    errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId);
                     if (e) {
                         errorProps["exception"]  = dumpObj(e);
                     }
@@ -969,7 +1065,11 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                     } finally {
                         // cleanup telemetry data
                         try {
-                            xhr[strAjaxData] = null;
+                            let xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {}});
+                            let ajaxDataCntr = (xhrRequestData.i || { });
+                            if (ajaxDataCntr[_ajaxDataId]) {
+                                ajaxDataCntr[_ajaxDataId] = null;
+                            }
                         } catch (e) {
                             // May throw in environments that prevent extension or freeze xhr
                         }
@@ -994,7 +1094,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                         _eInternalMessageId.FailedMonitorAjaxGetCorrelationHeader,
                         CORRELATION_HEADER_ERROR,
                         {
-                            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
+                            ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
                             exception: dumpObj(e)
                         });
                 }
@@ -1251,7 +1351,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
 
     /**
      * Logs dependency call
-     * @param dependencyData dependency data object
+     * @param dependencyData - dependency data object
      */
     public trackDependencyData(dependency: IDependencyTelemetry, properties?: { [key: string]: any }) {
         // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
@@ -1288,7 +1388,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
      * 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 }, systemProperties?: { [key: string]: any }) {
         // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging

package/src/applicationinsights-dependencies-js.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 export {
-    AjaxMonitor as AjaxPlugin, IDependenciesPlugin, XMLHttpRequestInstrumented, IInstrumentationRequirements, DfltAjaxCorrelationHeaderExDomains
+    AjaxMonitor as AjaxPlugin, IDependenciesPlugin, XMLHttpRequestData, XMLHttpRequestInstrumented, IInstrumentationRequirements, DfltAjaxCorrelationHeaderExDomains
 } from "./ajax";
 export { ajaxRecord } from "./ajaxRecord";
 export { IDependencyHandler, IDependencyListenerHandler, IDependencyListenerDetails, DependencyListenerFunction } from "./DependencyListener";

package/types/ajax.d.ts

@@ -3,14 +3,29 @@ import { BaseTelemetryPlugin, IAppInsightsCore, IConfiguration, IPlugin, IProces
 import { DependencyInitializerFunction, IDependencyInitializerHandler } from "./DependencyInitializer";
 import { DependencyListenerFunction, IDependencyListenerContainer, IDependencyListenerHandler } from "./DependencyListener";
 import { ajaxRecord } from "./ajaxRecord";
+export 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 interface XMLHttpRequestInstrumented extends XMLHttpRequest {
-    ajaxData: ajaxRecord;
+    _ajaxData: XMLHttpRequestData;
 }
 export declare const DfltAjaxCorrelationHeaderExDomains: string[];
 export interface IDependenciesPlugin extends IDependencyListenerContainer {
     /**
      * Logs dependency call
-     * @param dependencyData dependency data object
+     * @param dependencyData - dependency data object
      */
     trackDependencyData(dependency: IDependencyTelemetry): void;
 }
@@ -30,7 +45,7 @@ export declare class AjaxMonitor extends BaseTelemetryPlugin implements IDepende
     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;
@@ -56,7 +71,7 @@ export declare class AjaxMonitor extends BaseTelemetryPlugin implements IDepende
      * 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;

package/types/applicationinsights-dependencies-js.d.ts

@@ -1,4 +1,4 @@
-export { AjaxMonitor as AjaxPlugin, IDependenciesPlugin, XMLHttpRequestInstrumented, IInstrumentationRequirements, DfltAjaxCorrelationHeaderExDomains } from "./ajax";
+export { AjaxMonitor as AjaxPlugin, IDependenciesPlugin, XMLHttpRequestData, XMLHttpRequestInstrumented, IInstrumentationRequirements, DfltAjaxCorrelationHeaderExDomains } from "./ajax";
 export { ajaxRecord } from "./ajaxRecord";
 export { IDependencyHandler, IDependencyListenerHandler, IDependencyListenerDetails, DependencyListenerFunction } from "./DependencyListener";
 export { IDependencyInitializerHandler, IDependencyInitializerDetails, DependencyInitializerFunction } from "./DependencyInitializer";

package/types/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.36.3"
+      "packageVersion": "7.36.4"
     }
   ]
 }