@microsoft/applicationinsights-dependencies-js 2.7.5-nightly.2203-03 → 2.7.5

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

@@ -1,5 +1,5 @@
 /*
- * Microsoft Application Insights XHR dependencies plugin, 2.7.5-nightly.2203-03
+ * Microsoft Application Insights XHR dependencies plugin, 2.7.5
  * Copyright (c) Microsoft and contributors. All rights reserved.
  *
  * Microsoft Application Insights Team
@@ -33,6 +33,7 @@ export declare class AjaxPlugin extends BaseTelemetryPlugin implements IDependen
     priority: number;
     constructor();
     initialize(config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?: ITelemetryPluginChain): void;
+    teardown(): void;
     processTelemetry(item: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void;
     /**
      * Logs dependency call

package/dist-esm/TraceParent.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.7.5-nightly.2203-03
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.7.5
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 import { generateW3CId } from "@microsoft/applicationinsights-core-js";

package/dist-esm/ajax.js

@@ -1,12 +1,12 @@
 /*
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.7.5-nightly.2203-03
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.7.5
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
 
 import { __assignFn as __assign, __extendsFn as __extends } from "@microsoft/applicationinsights-shims";
-import { RequestHeaders, CorrelationIdHelper, TelemetryItemCreator, RemoteDependencyData, dateTimeUtilsNow, DisabledPropertyName, PropertiesPluginIdentifier, isInternalApplicationInsightsEndpoint } from "@microsoft/applicationinsights-common";
-import { isNullOrUndefined, arrForEach, isString, strTrim, isFunction, LoggingSeverity, _InternalMessageId, BaseTelemetryPlugin, getLocation, getGlobal, strPrototype, InstrumentFunc, InstrumentProto, getPerformance, objForEachKey, generateW3CId, getIEVersion, dumpObj, isXhrSupported, eventOn, mergeEvtNamespace, createUniqueNamespace, createProcessTelemetryContext } from "@microsoft/applicationinsights-core-js";
+import { RequestHeaders, CorrelationIdHelper, TelemetryItemCreator, RemoteDependencyData, dateTimeUtilsNow, DisabledPropertyName, PropertiesPluginIdentifier, DistributedTracingModes, isInternalApplicationInsightsEndpoint } from "@microsoft/applicationinsights-common";
+import { isNullOrUndefined, arrForEach, isString, strTrim, isFunction, LoggingSeverity, _InternalMessageId, BaseTelemetryPlugin, getLocation, getGlobal, strPrototype, InstrumentFunc, InstrumentProto, getPerformance, objForEachKey, generateW3CId, getIEVersion, dumpObj, isXhrSupported, attachEvent } from "@microsoft/applicationinsights-core-js";
 import { ajaxRecord } from "./ajaxRecord";
 import { Traceparent } from "./TraceParent";
 import dynamicProto from "@microsoft/dynamicproto-js";
@@ -15,7 +15,6 @@ var strDiagLog = "diagLog";
 var strAjaxData = "ajaxData";
 var strThrowInternal = "throwInternal";
 var strFetch = "fetch";
-var strTrackDependencyDataInternal = "trackDependencyDataInternal"; // Using string to help with minification
 // Using a global value so that to handle same iKey with multiple app insights instances (mostly for testing)
 var _markCount = 0;
 /** @Ignore */
@@ -111,41 +110,81 @@ var AjaxMonitor = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this.identifier = AjaxMonitor.identifier;
         _this.priority = 120;
-        var _fetchInitialized; // fetch monitoring initialized
-        var _xhrInitialized; // XHR monitoring initialized
-        var _currentWindowHost;
-        var _config;
-        var _enableRequestHeaderTracking;
-        var _enableAjaxErrorStatusText;
-        var _trackAjaxAttempts;
+        var strTrackDependencyDataInternal = "trackDependencyDataInternal"; // Using string to help with minification
+        var location = getLocation();
+        var _fetchInitialized = false; // fetch monitoring initialized
+        var _xhrInitialized = false; // XHR monitoring initialized
+        var _currentWindowHost = location && location.host && location.host.toLowerCase();
+        var _config = AjaxMonitor.getEmptyConfig();
+        var _enableRequestHeaderTracking = false;
+        var _enableAjaxErrorStatusText = false;
+        var _trackAjaxAttempts = 0;
         var _context;
         var _isUsingW3CHeaders;
         var _isUsingAIHeaders;
         var _markPrefix;
-        var _enableAjaxPerfTracking;
-        var _maxAjaxCallsPerView;
-        var _enableResponseHeaderTracking;
-        var _disabledUrls;
-        var _disableAjaxTracking;
-        var _disableFetchTracking;
+        var _enableAjaxPerfTracking = false;
+        var _maxAjaxCallsPerView = 0;
+        var _enableResponseHeaderTracking = false;
+        var _hooks = [];
+        var _disabledUrls = {};
         var _excludeRequestFromAutoTrackingPatterns;
         var _addRequestContext;
-        var _evtNamespace;
-        dynamicProto(AjaxMonitor, _this, function (_self, _base) {
-            var _addHook = _base._addHook;
-            _initDefaults();
+        dynamicProto(AjaxMonitor, _this, function (_self, base) {
             _self.initialize = function (config, core, extensions, pluginChain) {
                 if (!_self.isInitialized()) {
-                    _base.initialize(config, core, extensions, pluginChain);
-                    _evtNamespace = mergeEvtNamespace(createUniqueNamespace("ajax"), core && core.evtNamespace && core.evtNamespace());
-                    _populateDefaults(config);
-                    _instrumentXhr();
+                    base.initialize(config, core, extensions, pluginChain);
+                    var ctx_1 = _self._getTelCtx();
+                    var defaultConfig = AjaxMonitor.getDefaultConfig();
+                    objForEachKey(defaultConfig, function (field, value) {
+                        _config[field] = ctx_1.getConfig(AjaxMonitor.identifier, field, value);
+                    });
+                    var distributedTracingMode = _config.distributedTracingMode;
+                    _enableRequestHeaderTracking = _config.enableRequestHeaderTracking;
+                    _enableAjaxErrorStatusText = _config.enableAjaxErrorStatusText;
+                    _enableAjaxPerfTracking = _config.enableAjaxPerfTracking;
+                    _maxAjaxCallsPerView = _config.maxAjaxCallsPerView;
+                    _enableResponseHeaderTracking = _config.enableResponseHeaderTracking;
+                    _excludeRequestFromAutoTrackingPatterns = _config.excludeRequestFromAutoTrackingPatterns;
+                    _addRequestContext = _config.addRequestContext;
+                    _isUsingAIHeaders = distributedTracingMode === DistributedTracingModes.AI || distributedTracingMode === DistributedTracingModes.AI_AND_W3C;
+                    _isUsingW3CHeaders = distributedTracingMode === DistributedTracingModes.AI_AND_W3C || distributedTracingMode === DistributedTracingModes.W3C;
+                    if (_enableAjaxPerfTracking) {
+                        var iKey = config.instrumentationKey || "unkwn";
+                        if (iKey.length > 5) {
+                            _markPrefix = AJAX_MONITOR_PREFIX + iKey.substring(iKey.length - 5) + ".";
+                        }
+                        else {
+                            _markPrefix = AJAX_MONITOR_PREFIX + iKey + ".";
+                        }
+                    }
+                    if (_config.disableAjaxTracking === false) {
+                        _instrumentXhr();
+                    }
                     _instrumentFetch();
-                    _populateContext();
+                    if (extensions.length > 0 && extensions) {
+                        var propExt = void 0, extIx = 0;
+                        while (!propExt && extIx < extensions.length) {
+                            if (extensions[extIx] && extensions[extIx].identifier === PropertiesPluginIdentifier) {
+                                propExt = extensions[extIx];
+                            }
+                            extIx++;
+                        }
+                        if (propExt) {
+                            _context = propExt.context; // we could move IPropertiesPlugin to common as well
+                        }
+                    }
                 }
             };
-            _self._doTeardown = function () {
-                _initDefaults();
+            _self.teardown = function () {
+                // Remove all instrumentation hooks
+                arrForEach(_hooks, function (fn) {
+                    fn.rm();
+                });
+                _hooks = [];
+                _fetchInitialized = false;
+                _xhrInitialized = false;
+                _self.setInitialized(false);
             };
             _self.trackDependencyData = function (dependency, properties) {
                 _self[strTrackDependencyDataInternal](dependency, properties);
@@ -219,8 +258,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 === DistributedTracingModes.W3C
+                        || _config.distributedTracingMode === DistributedTracingModes.AI_AND_W3C)
                         && typeof dependency.id === "string" && dependency.id[dependency.id.length - 1] !== ".") {
                         dependency.id += ".";
                     }
@@ -235,65 +274,6 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 ++_trackAjaxAttempts;
             };
-            function _initDefaults() {
-                var location = getLocation();
-                _fetchInitialized = false; // fetch monitoring initialized
-                _xhrInitialized = false; // XHR monitoring initialized
-                _currentWindowHost = location && location.host && location.host.toLowerCase();
-                _config = AjaxMonitor.getEmptyConfig();
-                _enableRequestHeaderTracking = false;
-                _enableAjaxErrorStatusText = false;
-                _trackAjaxAttempts = 0;
-                _context = null;
-                _isUsingW3CHeaders = false;
-                _isUsingAIHeaders = false;
-                _markPrefix = null;
-                _enableAjaxPerfTracking = false;
-                _maxAjaxCallsPerView = 0;
-                _enableResponseHeaderTracking = false;
-                _disabledUrls = {};
-                _disableAjaxTracking = false;
-                _disableFetchTracking = true;
-                _excludeRequestFromAutoTrackingPatterns = null;
-                _addRequestContext = null;
-                _evtNamespace = null;
-            }
-            function _populateDefaults(config) {
-                var ctx = createProcessTelemetryContext(null, config, _self.core);
-                // Reset to the empty config
-                _config = AjaxMonitor.getEmptyConfig();
-                var defaultConfig = AjaxMonitor.getDefaultConfig();
-                objForEachKey(defaultConfig, function (field, value) {
-                    _config[field] = ctx.getConfig(AjaxMonitor.identifier, field, value);
-                });
-                var distributedTracingMode = _config.distributedTracingMode;
-                _enableRequestHeaderTracking = _config.enableRequestHeaderTracking;
-                _enableAjaxErrorStatusText = _config.enableAjaxErrorStatusText;
-                _enableAjaxPerfTracking = _config.enableAjaxPerfTracking;
-                _maxAjaxCallsPerView = _config.maxAjaxCallsPerView;
-                _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 */;
-                if (_enableAjaxPerfTracking) {
-                    var iKey = config.instrumentationKey || "unkwn";
-                    if (iKey.length > 5) {
-                        _markPrefix = AJAX_MONITOR_PREFIX + iKey.substring(iKey.length - 5) + ".";
-                    }
-                    else {
-                        _markPrefix = AJAX_MONITOR_PREFIX + iKey + ".";
-                    }
-                }
-                _disableAjaxTracking = !!_config.disableAjaxTracking;
-                _disableFetchTracking = !!_config.disableFetchTracking;
-            }
-            function _populateContext() {
-                var propExt = _self.core.getPlugin(PropertiesPluginIdentifier);
-                if (propExt) {
-                    _context = propExt.plugin.context; // we could move IPropertiesPlugin to common as well
-                }
-            }
             // discard the header if it's defined as ignoreHeaders in ICorrelationConfig
             function _canIncludeHeaders(header) {
                 var rlt = true;
@@ -315,13 +295,12 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
                 var global = getGlobal();
                 var isPolyfill = fetch.polyfill;
-                if (!_disableFetchTracking && !_fetchInitialized) {
-                    _addHook(InstrumentFunc(global, strFetch, {
-                        ns: _evtNamespace,
+                if (_config.disableFetchTracking === false) {
+                    _hooks.push(InstrumentFunc(global, strFetch, {
                         // Add request hook
                         req: function (callDetails, input, init) {
                             var fetchData;
-                            if (!_disableFetchTracking && _fetchInitialized &&
+                            if (_fetchInitialized &&
                                 !_isDisabledRequest(null, input, init) &&
                                 // If we have a polyfil and XHR instrumented then let XHR report otherwise we get duplicates
                                 !(isPolyfill && _xhrInitialized)) {
@@ -335,34 +314,32 @@ var AjaxMonitor = /** @class */ (function (_super) {
                             }
                         },
                         rsp: function (callDetails, input) {
-                            if (!_disableFetchTracking) {
-                                var fetchData_1 = callDetails.ctx().data;
-                                if (fetchData_1) {
-                                    // Replace the result with the new promise from this code
-                                    callDetails.rslt = callDetails.rslt.then(function (response) {
-                                        _reportFetchMetrics(callDetails, (response || {}).status, input, response, fetchData_1, function () {
-                                            var ajaxResponse = {
-                                                statusText: response.statusText,
-                                                headerMap: null,
-                                                correlationContext: _getFetchCorrelationContext(response)
-                                            };
-                                            if (_enableResponseHeaderTracking) {
-                                                var responseHeaderMap_1 = {};
-                                                response.headers.forEach(function (value, name) {
-                                                    if (_canIncludeHeaders(name)) {
-                                                        responseHeaderMap_1[name] = value;
-                                                    }
-                                                });
-                                                ajaxResponse.headerMap = responseHeaderMap_1;
-                                            }
-                                            return ajaxResponse;
-                                        });
-                                        return response;
-                                    })["catch"](function (reason) {
-                                        _reportFetchMetrics(callDetails, 0, input, null, fetchData_1, null, { error: reason.message });
-                                        throw reason;
+                            var fetchData = callDetails.ctx().data;
+                            if (fetchData) {
+                                // Replace the result with the new promise from this code
+                                callDetails.rslt = callDetails.rslt.then(function (response) {
+                                    _reportFetchMetrics(callDetails, (response || {}).status, input, response, fetchData, function () {
+                                        var ajaxResponse = {
+                                            statusText: response.statusText,
+                                            headerMap: null,
+                                            correlationContext: _getFetchCorrelationContext(response)
+                                        };
+                                        if (_enableResponseHeaderTracking) {
+                                            var responseHeaderMap_1 = {};
+                                            response.headers.forEach(function (value, name) {
+                                                if (_canIncludeHeaders(name)) {
+                                                    responseHeaderMap_1[name] = value;
+                                                }
+                                            });
+                                            ajaxResponse.headerMap = responseHeaderMap_1;
+                                        }
+                                        return ajaxResponse;
                                     });
-                                }
+                                    return response;
+                                })["catch"](function (reason) {
+                                    _reportFetchMetrics(callDetails, 0, input, null, fetchData, null, { error: reason.message });
+                                    throw reason;
+                                });
                             }
                         },
                         // Create an error callback to report any hook errors
@@ -377,8 +354,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                     // Note: Polyfill implementations that don't support the "poyyfill" tag are not supported
                     // the workaround is to add a polyfill property to your fetch implementation before initializing
                     // App Insights
-                    _addHook(InstrumentFunc(global, strFetch, {
-                        ns: _evtNamespace,
+                    _hooks.push(InstrumentFunc(global, strFetch, {
                         req: function (callDetails, input, init) {
                             // Just call so that we record any disabled URL
                             _isDisabledRequest(null, input, init);
@@ -392,74 +368,64 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 }
             }
             function _hookProto(target, funcName, callbacks) {
-                _addHook(InstrumentProto(target, funcName, callbacks));
+                _hooks.push(InstrumentProto(target, funcName, callbacks));
             }
             function _instrumentXhr() {
-                if (_supportsAjaxMonitoring(_self) && !_disableAjaxTracking && !_xhrInitialized) {
+                if (_supportsAjaxMonitoring(_self) && !_xhrInitialized) {
                     // Instrument open
                     _hookProto(XMLHttpRequest, "open", {
-                        ns: _evtNamespace,
                         req: function (args, method, url, async) {
-                            if (!_disableAjaxTracking) {
-                                var xhr = args.inst;
-                                var ajaxData = xhr[strAjaxData];
-                                if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
-                                    if (!ajaxData || !ajaxData.xhrMonitoringState.openDone) {
-                                        // Only create a single ajaxData (even when multiple AI instances are running)
-                                        _openHandler(xhr, method, url, async);
-                                    }
-                                    // always attach to the on ready state change (required for handling multiple instances)
-                                    _attachToOnReadyStateChange(xhr);
+                            var xhr = args.inst;
+                            var ajaxData = xhr[strAjaxData];
+                            if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
+                                if (!ajaxData || !ajaxData.xhrMonitoringState.openDone) {
+                                    // Only create a single ajaxData (even when multiple AI instances are running)
+                                    _openHandler(xhr, method, url, async);
                                 }
+                                // always attach to the on ready state change (required for handling multiple instances)
+                                _attachToOnReadyStateChange(xhr);
                             }
                         },
                         hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxOpen, "Failed to monitor XMLHttpRequest.open, monitoring data for this ajax call may be incorrect.")
                     });
                     // Instrument send
                     _hookProto(XMLHttpRequest, "send", {
-                        ns: _evtNamespace,
                         req: function (args, context) {
-                            if (!_disableAjaxTracking) {
-                                var xhr = args.inst;
-                                var ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.sendDone) {
-                                    _createMarkId("xhr", ajaxData);
-                                    ajaxData.requestSentTime = dateTimeUtilsNow();
-                                    _self.includeCorrelationHeaders(ajaxData, undefined, undefined, xhr);
-                                    ajaxData.xhrMonitoringState.sendDone = true;
-                                }
+                            var xhr = args.inst;
+                            var ajaxData = xhr[strAjaxData];
+                            if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.sendDone) {
+                                _createMarkId("xhr", ajaxData);
+                                ajaxData.requestSentTime = dateTimeUtilsNow();
+                                _self.includeCorrelationHeaders(ajaxData, undefined, undefined, xhr);
+                                ajaxData.xhrMonitoringState.sendDone = true;
                             }
                         },
                         hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxSend, "Failed to monitor XMLHttpRequest, monitoring data for this ajax call may be incorrect.")
                     });
                     // Instrument abort
                     _hookProto(XMLHttpRequest, "abort", {
-                        ns: _evtNamespace,
                         req: function (args) {
-                            if (!_disableAjaxTracking) {
-                                var xhr = args.inst;
-                                var ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.abortDone) {
-                                    ajaxData.aborted = 1;
-                                    ajaxData.xhrMonitoringState.abortDone = true;
-                                }
+                            var xhr = args.inst;
+                            var ajaxData = xhr[strAjaxData];
+                            if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.abortDone) {
+                                ajaxData.aborted = 1;
+                                ajaxData.xhrMonitoringState.abortDone = true;
                             }
                         },
                         hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxAbort, "Failed to monitor XMLHttpRequest.abort, monitoring data for this ajax call may be incorrect.")
                     });
                     // Instrument setRequestHeader
-                    _hookProto(XMLHttpRequest, "setRequestHeader", {
-                        ns: _evtNamespace,
-                        req: function (args, header, value) {
-                            if (!_disableAjaxTracking && _enableRequestHeaderTracking) {
+                    if (_enableRequestHeaderTracking) {
+                        _hookProto(XMLHttpRequest, "setRequestHeader", {
+                            req: function (args, header, value) {
                                 var xhr = args.inst;
                                 if (_isMonitoredXhrInstance(xhr) && _canIncludeHeaders(header)) {
                                     xhr[strAjaxData].requestHeaders[header] = value;
                                 }
-                            }
-                        },
-                        hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxSetRequestHeader, "Failed to monitor XMLHttpRequest.setRequestHeader, monitoring data for this ajax call may be incorrect.")
-                    });
+                            },
+                            hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxSetRequestHeader, "Failed to monitor XMLHttpRequest.setRequestHeader, monitoring data for this ajax call may be incorrect.")
+                        });
+                    }
                     _xhrInitialized = true;
                 }
             }
@@ -544,7 +510,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                 xhr[strAjaxData] = ajaxData;
             }
             function _attachToOnReadyStateChange(xhr) {
-                xhr[strAjaxData].xhrMonitoringState.stateChangeAttached = eventOn(xhr, "readystatechange", function () {
+                xhr[strAjaxData].xhrMonitoringState.stateChangeAttached = attachEvent(xhr, "readystatechange", function () {
                     try {
                         if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
                             _onAjaxComplete(xhr);
@@ -560,7 +526,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
                             });
                         }
                     }
-                }, _evtNamespace);
+                });
             }
             function _getResponseText(xhr) {
                 try {
@@ -858,7 +824,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
             disableFetchTracking: true,
             excludeRequestFromAutoTrackingPatterns: undefined,
             disableCorrelationHeaders: false,
-            distributedTracingMode: 1 /* AI_AND_W3C */,
+            distributedTracingMode: DistributedTracingModes.AI_AND_W3C,
             correlationHeaderExcludedDomains: [
                 "*.blob.core.windows.net",
                 "*.blob.core.chinacloudapi.cn",
@@ -892,6 +858,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
         return emptyConfig;
     };
 // Removed Stub for AjaxMonitor.prototype.initialize.
+// Removed Stub for AjaxMonitor.prototype.teardown.
     AjaxMonitor.prototype.processTelemetry = function (item, itemCtx) {
         this.processNext(item, itemCtx);
     };