@microsoft/applicationinsights-dependencies-js 2.8.4-nightly.2205-08 → 2.8.4

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

@@ -1,5 +1,5 @@
 /*
- * Microsoft Application Insights XHR dependencies plugin, 2.8.4-nightly.2205-08
+ * Microsoft Application Insights XHR dependencies plugin, 2.8.4
  * Copyright (c) Microsoft and contributors. All rights reserved.
  *
  * Microsoft Application Insights Team
@@ -42,6 +42,13 @@ export declare class AjaxPlugin extends BaseTelemetryPlugin implements IDependen
         [key: string]: any;
     }): void;
     includeCorrelationHeaders(ajaxData: ajaxRecord, input?: Request | string, init?: RequestInit, xhr?: XMLHttpRequestInstrumented): any;
+    /**
+     * Add an ajax listener which is called just prior to the request being sent and before the correlation headers are added, to allow you
+     * to access the headers and modify the values used to generate the distributed tracing correlation headers.
+     * @param dependencyListener - The Telemetry Initializer function
+     * @returns - A IDependencyListenerHandler to enable the initializer to be removed
+     */
+    addDependencyListener(dependencyListener: DependencyListenerFunction): IDependencyListenerHandler;
     /**
      * 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
@@ -82,12 +89,15 @@ export declare class ajaxRecord {
     clientFailure: number;
     traceID: string;
     spanID: string;
+    traceFlags?: number;
     constructor(traceID: string, spanID: string, logger: IDiagnosticLogger);
     getAbsoluteUrl(): string;
     getPathName(): string;
     CreateTrackItem(ajaxType: string, enableRequestHeaderTracking: boolean, getResponse: () => IAjaxRecordResponse): IDependencyTelemetry;
 }
 
+declare type DependencyListenerFunction = (dependencyDetails: IDependencyListenerDetails) => void;
+
 declare interface IAjaxRecordResponse {
     statusText: string;
     headerMap: Object;
@@ -97,7 +107,7 @@ declare interface IAjaxRecordResponse {
     response?: Object;
 }
 
-export declare interface IDependenciesPlugin {
+export declare interface IDependenciesPlugin extends IDependencyListenerContainer {
     /**
      * Logs dependency call
      * @param dependencyData dependency data object
@@ -105,6 +115,59 @@ export declare interface IDependenciesPlugin {
     trackDependencyData(dependency: IDependencyTelemetry): void;
 }
 
+declare interface IDependencyListenerContainer {
+    /**
+     * Add an ajax listener which is called just prior to the request being sent and before the correlation headers are added, to allow you
+     * to access the headers and modify the values used to generate the distributed tracing correlation headers. (added in v2.8.4)
+     * @param dependencyListener - The Telemetry Initializer function
+     * @returns - A IDependencyListenerHandler to enable the initializer to be removed
+     */
+    addDependencyListener(dependencyListener: DependencyListenerFunction): IDependencyListenerHandler;
+}
+
+declare interface IDependencyListenerDetails {
+    /**
+     * The current core instance
+     */
+    core: IAppInsightsCore;
+    /**
+     * Provided only if the dependency request is an XHR call
+     */
+    xhr?: XMLHttpRequest;
+    /**
+     * Provided only if the dependency request is a fetch call, this is the input argument being used,
+     * re-assigning this value has not affect on the value used for the request, however, when this is a Request
+     * object changing the value of the Request will be used for the outbound request.
+     */
+    input?: Request | string;
+    /**
+     * Provided only if the dependency request is a fetch call, this is the init argument being used,
+     * re-assigning this value does not change the value used for the request, however, changing properties
+     * of this object will be used.
+     */
+    init?: RequestInit;
+    /**
+     * Returns the unique identifier for a trace. All requests / spans from the same trace share the same traceId.
+     * Must be read from incoming headers or generated according to the W3C TraceContext specification,
+     * in a hex representation of 16-byte array. A.k.a. trace-id, TraceID or Distributed TraceID
+     */
+    traceId?: string;
+    /**
+     * Self-generated 8-bytes identifier of the incoming request. Must be a hex representation of 8-byte array.
+     * Also know as the parentId, used to link requests together
+     */
+    spanId?: string;
+    /**
+     * An integer representation of the W3C TraceContext trace-flags.
+     * https://www.w3.org/TR/trace-context/#trace-flags
+     */
+    traceFlags?: number;
+}
+
+declare interface IDependencyListenerHandler {
+    remove(): void;
+}
+
 export declare interface IInstrumentationRequirements extends IDependenciesPlugin {
     includeCorrelationHeaders: (ajaxData: ajaxRecord, input?: Request | string, init?: RequestInit, xhr?: XMLHttpRequestInstrumented) => any;
 }

package/dist-esm/DependencyListener.js

@@ -0,0 +1,8 @@
+/*
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.4
+ * Copyright (c) Microsoft and contributors. All rights reserved.
+ */
+
+
+export {};
+//# sourceMappingURL=DependencyListener.js.map

package/dist-esm/DependencyListener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DependencyListener.js.map","sources":["DependencyListener.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nexport {};\r\n//# sourceMappingURL=DependencyListener.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA"}

package/dist-esm/ajax.js

@@ -1,12 +1,12 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.4-nightly.2205-08
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.4
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
 
 import { __assignFn as __assign, __extendsFn as __extends } from "@microsoft/applicationinsights-shims";
-import { RequestHeaders, CorrelationIdHelper, createTelemetryItem, RemoteDependencyData, dateTimeUtilsNow, DisabledPropertyName, PropertiesPluginIdentifier, isInternalApplicationInsightsEndpoint, formatTraceParent, createTraceParent } from "@microsoft/applicationinsights-common";
-import { isNullOrUndefined, arrForEach, isString, strTrim, isFunction, BaseTelemetryPlugin, getLocation, getGlobal, strPrototype, InstrumentFunc, InstrumentProto, getPerformance, objForEachKey, generateW3CId, getIEVersion, dumpObj, isXhrSupported, eventOn, mergeEvtNamespace, createUniqueNamespace, createProcessTelemetryContext, _throwInternal } from "@microsoft/applicationinsights-core-js";
+import { RequestHeaders, CorrelationIdHelper, createTelemetryItem, RemoteDependencyData, dateTimeUtilsNow, DisabledPropertyName, PropertiesPluginIdentifier, isInternalApplicationInsightsEndpoint, formatTraceParent, createTraceParent, createDistributedTraceContextFromTrace } from "@microsoft/applicationinsights-common";
+import { isNullOrUndefined, arrForEach, isString, strTrim, isFunction, BaseTelemetryPlugin, getLocation, getGlobal, strPrototype, InstrumentFunc, InstrumentProto, getPerformance, objForEachKey, generateW3CId, getIEVersion, dumpObj, isXhrSupported, eventOn, mergeEvtNamespace, createUniqueNamespace, createProcessTelemetryContext, _throwInternal, getExceptionName } from "@microsoft/applicationinsights-core-js";
 import { ajaxRecord } from "./ajaxRecord";
 import dynamicProto from "@microsoft/dynamicproto-js";
 var AJAX_MONITOR_PREFIX = "ai.ajxmn.";
@@ -57,7 +57,7 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
         catch (e) {
             // We can't decorate the xhr object so disable monitoring
             result = false;
-            _throwInternalCritical(ajaxMonitorInstance, 15 /* FailedMonitorAjaxOpen */, "Failed to enable XMLHttpRequest monitoring, extension is not supported", {
+            _throwInternalCritical(ajaxMonitorInstance, 15 /* _eInternalMessageId.FailedMonitorAjaxOpen */, "Failed to enable XMLHttpRequest monitoring, extension is not supported", {
                 exception: dumpObj(e)
             });
         }
@@ -81,11 +81,11 @@ function _getFailedAjaxDiagnosticsMessage(xhr) {
 }
 /** @ignore */
 function _throwInternalCritical(ajaxMonitorInstance, msgId, message, properties, isUserAct) {
-    _throwInternal(ajaxMonitorInstance[strDiagLog](), 1 /* CRITICAL */, msgId, message, properties, isUserAct);
+    _throwInternal(ajaxMonitorInstance[strDiagLog](), 1 /* eLoggingSeverity.CRITICAL */, msgId, message, properties, isUserAct);
 }
 /** @ignore */
 function _throwInternalWarning(ajaxMonitorInstance, msgId, message, properties, isUserAct) {
-    _throwInternal(ajaxMonitorInstance[strDiagLog](), 2 /* WARNING */, msgId, message, properties, isUserAct);
+    _throwInternal(ajaxMonitorInstance[strDiagLog](), 2 /* eLoggingSeverity.WARNING */, msgId, message, properties, isUserAct);
 }
 /** @Ignore */
 function _createErrorCallbackFunc(ajaxMonitorInstance, internalMessage, message) {
@@ -103,6 +103,35 @@ function _indexOf(value, match) {
     }
     return -1;
 }
+function _processDependencyListeners(listeners, core, ajaxData, xhr, input, init) {
+    var initializersCount = listeners.length;
+    if (initializersCount > 0) {
+        var details = {
+            core: core,
+            xhr: xhr,
+            input: input,
+            init: init,
+            traceId: ajaxData.traceID,
+            spanId: ajaxData.spanID,
+            traceFlags: ajaxData.traceFlags
+        };
+        for (var i = 0; i < initializersCount; ++i) {
+            var dependencyListener = listeners[i];
+            if (dependencyListener && dependencyListener.fn) {
+                try {
+                    dependencyListener.fn.call(null, details);
+                }
+                catch (e) {
+                    var core_1 = details.core;
+                    _throwInternal(core_1 && core_1.logger, 1 /* eLoggingSeverity.CRITICAL */, 64 /* _eInternalMessageId.TelemetryInitializerFailed */, "Dependency listener [#" + i + "] failed: " + getExceptionName(e), { exception: dumpObj(e) }, true);
+                }
+            }
+        }
+        ajaxData.traceID = details.traceId;
+        ajaxData.spanID = details.spanId;
+        ajaxData.traceFlags = details.traceFlags;
+    }
+}
 var AjaxMonitor = /** @class */ (function (_super) {
     __extends(AjaxMonitor, _super);
     function AjaxMonitor() {
@@ -129,6 +158,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
         var _excludeRequestFromAutoTrackingPatterns;
         var _addRequestContext;
         var _evtNamespace;
+        var _dependencyListenerId;
+        var _dependencyListeners;
         dynamicProto(AjaxMonitor, _this, function (_self, _base) {
             var _addHook = _base._addHook;
             _initDefaults();
@@ -151,6 +182,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
             _self.includeCorrelationHeaders = function (ajaxData, input, init, xhr) {
                 // Test Hook to allow the overriding of the location host
                 var currentWindowHost = _self["_currentWindowHost"] || _currentWindowHost;
+                _processDependencyListeners(_dependencyListeners, _self.core, ajaxData, xhr, input, init);
                 if (input) { // Fetch
                     if (CorrelationIdHelper.canIncludeCorrelationHeader(_config, ajaxData.getAbsoluteUrl(), currentWindowHost)) {
                         if (!init) {
@@ -162,23 +194,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         init.headers = new Headers(init.headers || (input instanceof Request ? (input.headers || {}) : {}));
                         if (_isUsingAIHeaders) {
                             var id = "|" + ajaxData.traceID + "." + ajaxData.spanID;
-                            init.headers.set(RequestHeaders[3 /* requestIdHeader */], id);
+                            init.headers.set(RequestHeaders[3 /* eRequestHeaders.requestIdHeader */], id);
                             if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[3 /* requestIdHeader */]] = id;
+                                ajaxData.requestHeaders[RequestHeaders[3 /* eRequestHeaders.requestIdHeader */]] = id;
                             }
                         }
                         var appId = _config.appId || (_context && _context.appId());
                         if (appId) {
-                            init.headers.set(RequestHeaders[0 /* requestContextHeader */], RequestHeaders[2 /* requestContextAppIdFormat */] + appId);
+                            init.headers.set(RequestHeaders[0 /* eRequestHeaders.requestContextHeader */], RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId);
                             if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[0 /* requestContextHeader */]] = RequestHeaders[2 /* requestContextAppIdFormat */] + appId;
+                                ajaxData.requestHeaders[RequestHeaders[0 /* eRequestHeaders.requestContextHeader */]] = RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId;
                             }
                         }
                         if (_isUsingW3CHeaders) {
-                            var traceParent = formatTraceParent(createTraceParent(ajaxData.traceID, ajaxData.spanID, 0x01));
-                            init.headers.set(RequestHeaders[4 /* traceParentHeader */], traceParent);
+                            var traceFlags = ajaxData.traceFlags;
+                            if (isNullOrUndefined(traceFlags)) {
+                                traceFlags = 0x01;
+                            }
+                            var traceParent = formatTraceParent(createTraceParent(ajaxData.traceID, ajaxData.spanID, traceFlags));
+                            init.headers.set(RequestHeaders[4 /* eRequestHeaders.traceParentHeader */], traceParent);
                             if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[4 /* traceParentHeader */]] = traceParent;
+                                ajaxData.requestHeaders[RequestHeaders[4 /* eRequestHeaders.traceParentHeader */]] = traceParent;
                             }
                         }
                     }
@@ -188,23 +224,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     if (CorrelationIdHelper.canIncludeCorrelationHeader(_config, ajaxData.getAbsoluteUrl(), currentWindowHost)) {
                         if (_isUsingAIHeaders) {
                             var id = "|" + ajaxData.traceID + "." + ajaxData.spanID;
-                            xhr.setRequestHeader(RequestHeaders[3 /* requestIdHeader */], id);
+                            xhr.setRequestHeader(RequestHeaders[3 /* eRequestHeaders.requestIdHeader */], id);
                             if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[3 /* requestIdHeader */]] = id;
+                                ajaxData.requestHeaders[RequestHeaders[3 /* eRequestHeaders.requestIdHeader */]] = id;
                             }
                         }
                         var appId = _config.appId || (_context && _context.appId());
                         if (appId) {
-                            xhr.setRequestHeader(RequestHeaders[0 /* requestContextHeader */], RequestHeaders[2 /* requestContextAppIdFormat */] + appId);
+                            xhr.setRequestHeader(RequestHeaders[0 /* eRequestHeaders.requestContextHeader */], RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId);
                             if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[0 /* requestContextHeader */]] = RequestHeaders[2 /* requestContextAppIdFormat */] + appId;
+                                ajaxData.requestHeaders[RequestHeaders[0 /* eRequestHeaders.requestContextHeader */]] = RequestHeaders[2 /* eRequestHeaders.requestContextAppIdFormat */] + appId;
                             }
                         }
                         if (_isUsingW3CHeaders) {
-                            var traceParent = formatTraceParent(createTraceParent(ajaxData.traceID, ajaxData.spanID, 0x01));
-                            xhr.setRequestHeader(RequestHeaders[4 /* traceParentHeader */], traceParent);
+                            var traceFlags = ajaxData.traceFlags;
+                            if (isNullOrUndefined(traceFlags)) {
+                                traceFlags = 0x01;
+                            }
+                            var traceParent = formatTraceParent(createTraceParent(ajaxData.traceID, ajaxData.spanID, traceFlags));
+                            xhr.setRequestHeader(RequestHeaders[4 /* eRequestHeaders.traceParentHeader */], traceParent);
                             if (_enableRequestHeaderTracking) {
-                                ajaxData.requestHeaders[RequestHeaders[4 /* traceParentHeader */]] = traceParent;
+                                ajaxData.requestHeaders[RequestHeaders[4 /* eRequestHeaders.traceParentHeader */]] = traceParent;
                             }
                         }
                     }
@@ -217,8 +257,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     // Hack since expected format in w3c mode is |abc.def.
                     // Non-w3c format is |abc.def
                     // @todo Remove if better solution is available, e.g. handle in portal
-                    if ((_config.distributedTracingMode === 2 /* W3C */
-                        || _config.distributedTracingMode === 1 /* AI_AND_W3C */)
+                    if ((_config.distributedTracingMode === 2 /* eDistributedTracingModes.W3C */
+                        || _config.distributedTracingMode === 1 /* eDistributedTracingModes.AI_AND_W3C */)
                         && typeof dependency.id === "string" && dependency.id[dependency.id.length - 1] !== ".") {
                         dependency.id += ".";
                     }
@@ -229,10 +269,28 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     _self.core.track(item);
                 }
                 else if (_trackAjaxAttempts === _maxAjaxCallsPerView) {
-                    _throwInternalCritical(_self, 55 /* MaxAjaxPerPVExceeded */, "Maximum ajax per page view limit reached, ajax monitoring is paused until the next trackPageView(). In order to increase the limit set the maxAjaxCallsPerView configuration parameter.", true);
+                    _throwInternalCritical(_self, 55 /* _eInternalMessageId.MaxAjaxPerPVExceeded */, "Maximum ajax per page view limit reached, ajax monitoring is paused until the next trackPageView(). In order to increase the limit set the maxAjaxCallsPerView configuration parameter.", true);
                 }
                 ++_trackAjaxAttempts;
             };
+            _self.addDependencyListener = function (dependencyListener) {
+                var theInitializer = {
+                    id: _dependencyListenerId++,
+                    fn: dependencyListener
+                };
+                _dependencyListeners.push(theInitializer);
+                var handler = {
+                    remove: function () {
+                        arrForEach(_dependencyListeners, function (initializer, idx) {
+                            if (initializer.id === theInitializer.id) {
+                                _dependencyListeners.splice(idx, 1);
+                                return -1;
+                            }
+                        });
+                    }
+                };
+                return handler;
+            };
             function _initDefaults() {
                 var location = getLocation();
                 _fetchInitialized = false; // fetch monitoring initialized
@@ -255,6 +313,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _excludeRequestFromAutoTrackingPatterns = null;
                 _addRequestContext = null;
                 _evtNamespace = null;
+                _dependencyListenerId = 0;
+                _dependencyListeners = [];
             }
             function _populateDefaults(config) {
                 var ctx = createProcessTelemetryContext(null, config, _self.core);
@@ -272,8 +332,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 _enableResponseHeaderTracking = _config.enableResponseHeaderTracking;
                 _excludeRequestFromAutoTrackingPatterns = _config.excludeRequestFromAutoTrackingPatterns;
                 _addRequestContext = _config.addRequestContext;
-                _isUsingAIHeaders = distributedTracingMode === 0 /* AI */ || distributedTracingMode === 1 /* AI_AND_W3C */;
-                _isUsingW3CHeaders = distributedTracingMode === 1 /* AI_AND_W3C */ || distributedTracingMode === 2 /* W3C */;
+                _isUsingAIHeaders = distributedTracingMode === 0 /* eDistributedTracingModes.AI */ || distributedTracingMode === 1 /* eDistributedTracingModes.AI_AND_W3C */;
+                _isUsingW3CHeaders = distributedTracingMode === 1 /* eDistributedTracingModes.AI_AND_W3C */ || distributedTracingMode === 2 /* eDistributedTracingModes.W3C */;
                 if (_enableAjaxPerfTracking) {
                     var iKey = config.instrumentationKey || "unkwn";
                     if (iKey.length > 5) {
@@ -364,7 +424,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                             }
                         },
                         // Create an error callback to report any hook errors
-                        hkErr: _createErrorCallbackFunc(_self, 15 /* FailedMonitorAjaxOpen */, "Failed to monitor Window.fetch, monitoring data for this fetch call may be incorrect.")
+                        hkErr: _createErrorCallbackFunc(_self, 15 /* _eInternalMessageId.FailedMonitorAjaxOpen */, "Failed to monitor Window.fetch, monitoring data for this fetch call may be incorrect.")
                     }));
                     _fetchInitialized = true;
                 }
@@ -411,7 +471,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                                 }
                             }
                         },
-                        hkErr: _createErrorCallbackFunc(_self, 15 /* FailedMonitorAjaxOpen */, "Failed to monitor XMLHttpRequest.open, monitoring data for this ajax call may be incorrect.")
+                        hkErr: _createErrorCallbackFunc(_self, 15 /* _eInternalMessageId.FailedMonitorAjaxOpen */, "Failed to monitor XMLHttpRequest.open, monitoring data for this ajax call may be incorrect.")
                     });
                     // Instrument send
                     _hookProto(XMLHttpRequest, "send", {
@@ -428,7 +488,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                                 }
                             }
                         },
-                        hkErr: _createErrorCallbackFunc(_self, 17 /* FailedMonitorAjaxSend */, "Failed to monitor XMLHttpRequest, monitoring data for this ajax call may be incorrect.")
+                        hkErr: _createErrorCallbackFunc(_self, 17 /* _eInternalMessageId.FailedMonitorAjaxSend */, "Failed to monitor XMLHttpRequest, monitoring data for this ajax call may be incorrect.")
                     });
                     // Instrument abort
                     _hookProto(XMLHttpRequest, "abort", {
@@ -443,7 +503,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                                 }
                             }
                         },
-                        hkErr: _createErrorCallbackFunc(_self, 13 /* FailedMonitorAjaxAbort */, "Failed to monitor XMLHttpRequest.abort, monitoring data for this ajax call may be incorrect.")
+                        hkErr: _createErrorCallbackFunc(_self, 13 /* _eInternalMessageId.FailedMonitorAjaxAbort */, "Failed to monitor XMLHttpRequest.abort, monitoring data for this ajax call may be incorrect.")
                     });
                     // Instrument setRequestHeader
                     _hookProto(XMLHttpRequest, "setRequestHeader", {
@@ -456,7 +516,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                                 }
                             }
                         },
-                        hkErr: _createErrorCallbackFunc(_self, 71 /* FailedMonitorAjaxSetRequestHeader */, "Failed to monitor XMLHttpRequest.setRequestHeader, monitoring data for this ajax call may be incorrect.")
+                        hkErr: _createErrorCallbackFunc(_self, 71 /* _eInternalMessageId.FailedMonitorAjaxSetRequestHeader */, "Failed to monitor XMLHttpRequest.setRequestHeader, monitoring data for this ajax call may be incorrect.")
                     });
                     _xhrInitialized = true;
                 }
@@ -529,10 +589,23 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     // checking on ajaxData to see that it was not removed in user code
                     && ajaxValidation;
             }
+            function _getDistributedTraceCtx() {
+                var distributedTraceCtx = null;
+                if (_self.core && _self.core.getTraceCtx) {
+                    distributedTraceCtx = _self.core.getTraceCtx(false);
+                }
+                // Fall back
+                if (!distributedTraceCtx && _context && _context.telemetryTrace) {
+                    distributedTraceCtx = createDistributedTraceContextFromTrace(_context.telemetryTrace);
+                }
+                return distributedTraceCtx;
+            }
             function _openHandler(xhr, method, url, async) {
-                var traceID = (_context && _context.telemetryTrace && _context.telemetryTrace.traceID) || generateW3CId();
+                var distributedTraceCtx = _getDistributedTraceCtx();
+                var traceID = (distributedTraceCtx && distributedTraceCtx.getTraceId()) || generateW3CId();
                 var spanID = generateW3CId().substr(0, 16);
                 var ajaxData = new ajaxRecord(traceID, spanID, _self[strDiagLog]());
+                ajaxData.traceFlags = distributedTraceCtx && distributedTraceCtx.getTraceFlags();
                 ajaxData.method = method;
                 ajaxData.requestUrl = url;
                 ajaxData.xhrMonitoringState.openDone = true;
@@ -552,7 +625,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         var exceptionText = dumpObj(e);
                         // ignore messages with c00c023f, as this a known IE9 XHR abort issue
                         if (!exceptionText || _indexOf(exceptionText.toLowerCase(), "c00c023f") === -1) {
-                            _throwInternalCritical(_self, 16 /* FailedMonitorAjaxRSC */, "Failed to monitor XMLHttpRequest 'readystatechange' event handler, monitoring data for this ajax call may be incorrect.", {
+                            _throwInternalCritical(_self, 16 /* _eInternalMessageId.FailedMonitorAjaxRSC */, "Failed to monitor XMLHttpRequest 'readystatechange' event handler, monitoring data for this ajax call may be incorrect.", {
                                 ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
                                 exception: exceptionText
                             });
@@ -583,7 +656,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     if (e) {
                         errorProps["exception"] = dumpObj(e);
                     }
-                    _throwInternalWarning(_self, 14 /* FailedMonitorAjaxDur */, "Failed to calculate the duration of the ajax call, monitoring data for this ajax call won't be sent.", errorProps);
+                    _throwInternalWarning(_self, 14 /* _eInternalMessageId.FailedMonitorAjaxDur */, "Failed to calculate the duration of the ajax call, monitoring data for this ajax call won't be sent.", errorProps);
                 }
                 _findPerfResourceEntry("xmlhttprequest", ajaxData, function () {
                     try {
@@ -623,7 +696,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                             }
                         }
                         catch (e) {
-                            _throwInternalWarning(_self, 104 /* FailedAddingCustomDefinedRequestContext */, "Failed to add custom defined request context as configured call back may missing a null check.");
+                            _throwInternalWarning(_self, 104 /* _eInternalMessageId.FailedAddingCustomDefinedRequestContext */, "Failed to add custom defined request context as configured call back may missing a null check.");
                         }
                         if (dependency) {
                             if (properties !== undefined) {
@@ -655,15 +728,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 try {
                     var responseHeadersString = xhr.getAllResponseHeaders();
                     if (responseHeadersString !== null) {
-                        var index = _indexOf(responseHeadersString.toLowerCase(), RequestHeaders[8 /* requestContextHeaderLowerCase */]);
+                        var index = _indexOf(responseHeadersString.toLowerCase(), RequestHeaders[8 /* eRequestHeaders.requestContextHeaderLowerCase */]);
                         if (index !== -1) {
-                            var responseHeader = xhr.getResponseHeader(RequestHeaders[0 /* requestContextHeader */]);
+                            var responseHeader = xhr.getResponseHeader(RequestHeaders[0 /* eRequestHeaders.requestContextHeader */]);
                             return CorrelationIdHelper.getCorrelationContext(responseHeader);
                         }
                     }
                 }
                 catch (e) {
-                    _throwInternalWarning(_self, 18 /* FailedMonitorAjaxGetCorrelationHeader */, "Failed to get Request-Context correlation header as it may be not included in the response or not accessible.", {
+                    _throwInternalWarning(_self, 18 /* _eInternalMessageId.FailedMonitorAjaxGetCorrelationHeader */, "Failed to get Request-Context correlation header as it may be not included in the response or not accessible.", {
                         ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(xhr),
                         exception: dumpObj(e)
                     });
@@ -742,9 +815,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 })();
             }
             function _createFetchRecord(input, init) {
-                var traceID = (_context && _context.telemetryTrace && _context.telemetryTrace.traceID) || generateW3CId();
+                var distributedTraceCtx = _getDistributedTraceCtx();
+                var traceID = (distributedTraceCtx && distributedTraceCtx.getTraceId()) || generateW3CId();
                 var spanID = generateW3CId().substr(0, 16);
                 var ajaxData = new ajaxRecord(traceID, spanID, _self[strDiagLog]());
+                ajaxData.traceFlags = distributedTraceCtx && distributedTraceCtx.getTraceFlags();
                 ajaxData.requestSentTime = dateTimeUtilsNow();
                 ajaxData.errorStatusText = _enableAjaxErrorStatusText;
                 if (input instanceof Request) {
@@ -787,7 +862,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     }
                 }
                 catch (e) {
-                    _throwInternalCritical(_self, 15 /* FailedMonitorAjaxOpen */, "Failed to grab failed fetch diagnostics message", { exception: dumpObj(e) });
+                    _throwInternalCritical(_self, 15 /* _eInternalMessageId.FailedMonitorAjaxOpen */, "Failed to grab failed fetch diagnostics message", { exception: dumpObj(e) });
                 }
                 return result;
             }
@@ -814,7 +889,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         }
                     }
                     catch (e) {
-                        _throwInternalWarning(_self, 104 /* FailedAddingCustomDefinedRequestContext */, "Failed to add custom defined request context as configured call back may missing a null check.");
+                        _throwInternalWarning(_self, 104 /* _eInternalMessageId.FailedAddingCustomDefinedRequestContext */, "Failed to add custom defined request context as configured call back may missing a null check.");
                     }
                     if (dependency) {
                         if (properties !== undefined) {
@@ -823,23 +898,23 @@ var AjaxMonitor = /** @class */ (function (_super) {
                         _self[strTrackDependencyDataInternal](dependency);
                     }
                     else {
-                        _reportFetchError(14 /* FailedMonitorAjaxDur */, null, {
+                        _reportFetchError(14 /* _eInternalMessageId.FailedMonitorAjaxDur */, null, {
                             requestSentTime: ajaxData.requestSentTime,
                             responseFinishedTime: ajaxData.responseFinishedTime
                         });
                     }
                 }, function (e) {
-                    _reportFetchError(18 /* FailedMonitorAjaxGetCorrelationHeader */, e, null);
+                    _reportFetchError(18 /* _eInternalMessageId.FailedMonitorAjaxGetCorrelationHeader */, e, null);
                 });
             }
             function _getFetchCorrelationContext(response) {
                 if (response && response.headers) {
                     try {
-                        var responseHeader = response.headers.get(RequestHeaders[0 /* requestContextHeader */]);
+                        var responseHeader = response.headers.get(RequestHeaders[0 /* eRequestHeaders.requestContextHeader */]);
                         return CorrelationIdHelper.getCorrelationContext(responseHeader);
                     }
                     catch (e) {
-                        _throwInternalWarning(_self, 18 /* FailedMonitorAjaxGetCorrelationHeader */, "Failed to get Request-Context correlation header as it may be not included in the response or not accessible.", {
+                        _throwInternalWarning(_self, 18 /* _eInternalMessageId.FailedMonitorAjaxGetCorrelationHeader */, "Failed to get Request-Context correlation header as it may be not included in the response or not accessible.", {
                             fetchDiagnosticsMessage: _getFailedFetchDiagnosticsMessage(response),
                             exception: dumpObj(e)
                         });
@@ -856,7 +931,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
             disableFetchTracking: false,
             excludeRequestFromAutoTrackingPatterns: undefined,
             disableCorrelationHeaders: false,
-            distributedTracingMode: 1 /* AI_AND_W3C */,
+            distributedTracingMode: 1 /* eDistributedTracingModes.AI_AND_W3C */,
             correlationHeaderExcludedDomains: [
                 "*.blob.core.windows.net",
                 "*.blob.core.chinacloudapi.cn",
@@ -895,6 +970,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
     };
 // Removed Stub for AjaxMonitor.prototype.trackDependencyData.
 // Removed Stub for AjaxMonitor.prototype.includeCorrelationHeaders.
+// Removed Stub for AjaxMonitor.prototype.addDependencyListener.
 // Removed Stub for AjaxMonitor.prototype.trackDependencyDataInternal.
     AjaxMonitor.identifier = "AjaxDependencyPlugin";
     return AjaxMonitor;