@microsoft/applicationinsights-dependencies-js 2.8.0-beta.2203-08 → 2.8.0-beta.2203-11

package/browser/applicationinsights-dependencies-js.integrity.json

@@ -1,25 +1,25 @@
 {
     "name": "applicationinsights-dependencies-js",
-    "version": "2.8.0-beta.2203-08",
+    "version": "2.8.0-beta.2203-11",
     "ext": {
         "@js": {
             "file": "applicationinsights-dependencies-js.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-l7ZtgfOtXfUOdT0610zwm00KmW5WHa8HKdqYiE3xZoQ= sha384-rv2D5GpecrAHdMKf7mxSMhX/EBZXOvPnz/t8zNy1CPVvidfOlqLWuyGpoofXCeF1 sha512-fULCTeoq3N1TMJrPHHSLatHWPJfQldSznusivAjW2jDL8/JFmzlcjjeWs2bJLfMb0ufFi1KJY4XarwjmkH43uA==",
+            "integrity": "sha256-fNu6GqrLqA9OS6p5CMVWmTvvLgZwaM3i5r6qsVyS5fE= sha384-bIEO8UpG2vfYXb7bukk2R/qNnckD1260wEwg+mYGHtlMtm9WJFU0afy15UYYptBS sha512-EvO5e8iZMVv9M6THxfK64b/cjpKD0Wdr3DuVuLip1Qv2FQ0pEWgH3qVNNds4EtvUa7J9tw3gls1HjiSuVJ2rjw==",
             "hashes": {
-                "sha256": "l7ZtgfOtXfUOdT0610zwm00KmW5WHa8HKdqYiE3xZoQ=",
-                "sha384": "rv2D5GpecrAHdMKf7mxSMhX/EBZXOvPnz/t8zNy1CPVvidfOlqLWuyGpoofXCeF1",
-                "sha512": "fULCTeoq3N1TMJrPHHSLatHWPJfQldSznusivAjW2jDL8/JFmzlcjjeWs2bJLfMb0ufFi1KJY4XarwjmkH43uA=="
+                "sha256": "fNu6GqrLqA9OS6p5CMVWmTvvLgZwaM3i5r6qsVyS5fE=",
+                "sha384": "bIEO8UpG2vfYXb7bukk2R/qNnckD1260wEwg+mYGHtlMtm9WJFU0afy15UYYptBS",
+                "sha512": "EvO5e8iZMVv9M6THxfK64b/cjpKD0Wdr3DuVuLip1Qv2FQ0pEWgH3qVNNds4EtvUa7J9tw3gls1HjiSuVJ2rjw=="
             }
         },
         "@min.js": {
             "file": "applicationinsights-dependencies-js.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-udu3vgu0CFuFq/KzMliz2EdGgrHFUWoq+QyCcbtDlMQ= sha384-ctJGmY6bxpwiAnBp3d3jZpGt5ZJ6vMeZ2zQkUXC5F95LYRyP8OdKITLSQrAjoXy5 sha512-fJDie5/AOvjUFcSSpG4ZLwW/0gtE43hEw+RNU5er+fq7o9J7S2TUOixdQBAe+kf/AKGENs7PcWkeydFbmLxuOA==",
+            "integrity": "sha256-/JSnUoBCdNhWDu7rnFpgqKjJ30BW2zlo5uKGeV0i+I4= sha384-+WGYuMqXLB5TJuduWGiP92MUBYu9IA4d/Hu0vXfM89ZxuPtrASirDOwmNeId5g5z sha512-bU0QteeGVvQupT4BuX0KPDJoUC0gSJHnFZEYxz9/XDrQzn/W2iyoHoVyrVmVID2Fh944fU9xhtAPhw8aozK73g==",
             "hashes": {
-                "sha256": "udu3vgu0CFuFq/KzMliz2EdGgrHFUWoq+QyCcbtDlMQ=",
-                "sha384": "ctJGmY6bxpwiAnBp3d3jZpGt5ZJ6vMeZ2zQkUXC5F95LYRyP8OdKITLSQrAjoXy5",
-                "sha512": "fJDie5/AOvjUFcSSpG4ZLwW/0gtE43hEw+RNU5er+fq7o9J7S2TUOixdQBAe+kf/AKGENs7PcWkeydFbmLxuOA=="
+                "sha256": "/JSnUoBCdNhWDu7rnFpgqKjJ30BW2zlo5uKGeV0i+I4=",
+                "sha384": "+WGYuMqXLB5TJuduWGiP92MUBYu9IA4d/Hu0vXfM89ZxuPtrASirDOwmNeId5g5z",
+                "sha512": "bU0QteeGVvQupT4BuX0KPDJoUC0gSJHnFZEYxz9/XDrQzn/W2iyoHoVyrVmVID2Fh944fU9xhtAPhw8aozK73g=="
             }
         }
     }

package/browser/applicationinsights-dependencies-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.0-beta.2203-08
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.0-beta.2203-11
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -75,7 +75,9 @@
     var __assignFn = ObjAssign || __objAssignFnImpl;
     var extendStaticsFn = function (d, b) {
         extendStaticsFn = ObjClass["setPrototypeOf"] ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            ({ __proto__: [] } instanceof Array && function (d, b) {
+                d.__proto__ = b;
+            }) ||
             function (d, b) {
                 for (var p in b) {
                     if (b[strShimHasOwnProperty](p)) {
@@ -90,7 +92,9 @@
             throwTypeError("Class extends value " + String(b) + " is not a constructor or null");
         }
         extendStaticsFn(d, b);
-        function __() { this.constructor = d; }
+        function __() {
+            this.constructor = d;
+        }
         d[strShimPrototype] = b === null ? objCreateFn(b) : (__[strShimPrototype] = b[strShimPrototype], new __());
     }
 
@@ -1138,7 +1142,7 @@
     }
 
     var _objDefineProperty = ObjDefineProperty;
-    var version = "2.7.3";
+    var version = "2.8.0-beta.2203-11";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function _createAccessor(target, prop, value) {
@@ -1236,7 +1240,9 @@
         var context = {
             _next: _moveNext,
             ctx: {
-                core: function () { return core; },
+                core: function () {
+                    return core;
+                },
                 diagLog: function () {
                     return safeGetLogger(core, config);
                 },
@@ -1734,6 +1740,8 @@
     var strEvents = "events";
     createUniqueNamespace("aiEvtPageHide");
     createUniqueNamespace("aiEvtPageShow");
+    var rRemoveEmptyNs = /\.[\.]+/g;
+    var rRemoveTrailingEmptyNs = /[\.]+$/;
     var _guid = 1;
     var elmNodeData = createElmNodeData("events");
     var eventNamespace = /^([^.]*)(?:\.(.+)|)/;
@@ -1768,10 +1776,10 @@
                 eventName = (eventName || "") + theNamespace_1;
             }
         }
-        var parsedEvent = (eventNamespace.exec(eventName) || []);
+        var parsedEvent = (eventNamespace.exec(eventName || "") || []);
         return {
             type: parsedEvent[1],
-            ns: ((parsedEvent[2] || "").split(".").sort()).join(".")
+            ns: ((parsedEvent[2] || "").replace(rRemoveEmptyNs, ".").replace(rRemoveTrailingEmptyNs, "").split(".").sort()).join(".")
         };
     }
     function _getRegisteredEvents(target, evtName, addDefault) {
@@ -1806,6 +1814,7 @@
             else {
                 newNamespaces = [theNamespace, namespaces];
             }
+            newNamespaces = (_getEvtNamespace("xx", newNamespaces).ns).split(".");
         }
         else {
             newNamespaces = theNamespace;
@@ -2737,6 +2746,7 @@
     var strAjaxData = "ajaxData";
     var strThrowInternal = "throwInternal";
     var strFetch = "fetch";
+    var strTrackDependencyDataInternal = "trackDependencyDataInternal";
     var _markCount = 0;
     function _supportsFetch() {
         var _global = getGlobal();
@@ -2816,77 +2826,41 @@
             var _this = _super.call(this) || this;
             _this.identifier = AjaxMonitor.identifier;
             _this.priority = 120;
-            var strTrackDependencyDataInternal = "trackDependencyDataInternal";
-            var location = getLocation();
-            var _fetchInitialized = false;
-            var _xhrInitialized = false;
-            var _currentWindowHost = location && location.host && location.host.toLowerCase();
-            var _config = AjaxMonitor.getEmptyConfig();
-            var _enableRequestHeaderTracking = false;
-            var _enableAjaxErrorStatusText = false;
-            var _trackAjaxAttempts = 0;
+            var _fetchInitialized;
+            var _xhrInitialized;
+            var _currentWindowHost;
+            var _config;
+            var _enableRequestHeaderTracking;
+            var _enableAjaxErrorStatusText;
+            var _trackAjaxAttempts;
             var _context;
             var _isUsingW3CHeaders;
             var _isUsingAIHeaders;
             var _markPrefix;
-            var _enableAjaxPerfTracking = false;
-            var _maxAjaxCallsPerView = 0;
-            var _enableResponseHeaderTracking = false;
-            var _disabledUrls = {};
+            var _enableAjaxPerfTracking;
+            var _maxAjaxCallsPerView;
+            var _enableResponseHeaderTracking;
+            var _disabledUrls;
+            var _disableAjaxTracking;
+            var _disableFetchTracking;
             var _excludeRequestFromAutoTrackingPatterns;
             var _addRequestContext;
             var _evtNamespace;
             dynamicProto(AjaxMonitor, _this, function (_self, _base) {
                 var _addHook = _base._addHook;
+                _initDefaults();
                 _self.initialize = function (config, core, extensions, pluginChain) {
                     if (!_self.isInitialized()) {
                         _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);
-                        });
                         _evtNamespace = mergeEvtNamespace(createUniqueNamespace("ajax"), core && core.evtNamespace && core.evtNamespace());
-                        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  || distributedTracingMode === 1 ;
-                        _isUsingW3CHeaders = distributedTracingMode === 1  || distributedTracingMode === 2 ;
-                        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();
-                        }
+                        _populateDefaults(config);
+                        _instrumentXhr();
                         _instrumentFetch();
-                        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;
-                            }
-                        }
+                        _populateContext();
                     }
                 };
                 _self._doTeardown = function () {
-                    _fetchInitialized = false;
-                    _xhrInitialized = false;
+                    _initDefaults();
                 };
                 _self.trackDependencyData = function (dependency, properties) {
                     _self[strTrackDependencyDataInternal](dependency, properties);
@@ -2969,6 +2943,64 @@
                     }
                     ++_trackAjaxAttempts;
                 };
+                function _initDefaults() {
+                    var location = getLocation();
+                    _fetchInitialized = false;
+                    _xhrInitialized = false;
+                    _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);
+                    _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  || distributedTracingMode === 1 ;
+                    _isUsingW3CHeaders = distributedTracingMode === 1  || distributedTracingMode === 2 ;
+                    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;
+                    }
+                }
                 function _canIncludeHeaders(header) {
                     var rlt = true;
                     if (header || _config.ignoreHeaders) {
@@ -2988,11 +3020,12 @@
                     }
                     var global = getGlobal();
                     var isPolyfill = fetch.polyfill;
-                    if (_config.disableFetchTracking === false) {
+                    if (!_disableFetchTracking && !_fetchInitialized) {
                         _addHook(InstrumentFunc(global, strFetch, {
+                            ns: _evtNamespace,
                             req: function (callDetails, input, init) {
                                 var fetchData;
-                                if (_fetchInitialized &&
+                                if (!_disableFetchTracking && _fetchInitialized &&
                                     !_isDisabledRequest(null, input, init) &&
                                     !(isPolyfill && _xhrInitialized)) {
                                     var ctx = callDetails.ctx();
@@ -3005,31 +3038,33 @@
                                 }
                             },
                             rsp: function (callDetails, input) {
-                                var fetchData = callDetails.ctx().data;
-                                if (fetchData) {
-                                    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;
+                                if (!_disableFetchTracking) {
+                                    var fetchData_1 = callDetails.ctx().data;
+                                    if (fetchData_1) {
+                                        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;
                                         });
-                                        return response;
-                                    })["catch"](function (reason) {
-                                        _reportFetchMetrics(callDetails, 0, input, null, fetchData, null, { error: reason.message });
-                                        throw reason;
-                                    });
+                                    }
                                 }
                             },
                             hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxOpen, "Failed to monitor Window.fetch, monitoring data for this fetch call may be incorrect.")
@@ -3038,6 +3073,7 @@
                     }
                     else if (isPolyfill) {
                         _addHook(InstrumentFunc(global, strFetch, {
+                            ns: _evtNamespace,
                             req: function (callDetails, input, init) {
                                 _isDisabledRequest(null, input, init);
                             }
@@ -3051,55 +3087,65 @@
                     _addHook(InstrumentProto(target, funcName, callbacks));
                 }
                 function _instrumentXhr() {
-                    if (_supportsAjaxMonitoring(_self) && !_xhrInitialized) {
+                    if (_supportsAjaxMonitoring(_self) && !_disableAjaxTracking && !_xhrInitialized) {
                         _hookProto(XMLHttpRequest, "open", {
+                            ns: _evtNamespace,
                             req: function (args, method, url, async) {
-                                var xhr = args.inst;
-                                var ajaxData = xhr[strAjaxData];
-                                if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
-                                    if (!ajaxData || !ajaxData.xhrMonitoringState.openDone) {
-                                        _openHandler(xhr, 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) {
+                                            _openHandler(xhr, method, url, async);
+                                        }
+                                        _attachToOnReadyStateChange(xhr);
                                     }
-                                    _attachToOnReadyStateChange(xhr);
                                 }
                             },
                             hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxOpen, "Failed to monitor XMLHttpRequest.open, monitoring data for this ajax call may be incorrect.")
                         });
                         _hookProto(XMLHttpRequest, "send", {
+                            ns: _evtNamespace,
                             req: function (args, context) {
-                                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;
+                                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;
+                                    }
                                 }
                             },
                             hkErr: _createErrorCallbackFunc(_self, _InternalMessageId.FailedMonitorAjaxSend, "Failed to monitor XMLHttpRequest, monitoring data for this ajax call may be incorrect.")
                         });
                         _hookProto(XMLHttpRequest, "abort", {
+                            ns: _evtNamespace,
                             req: function (args) {
-                                var xhr = args.inst;
-                                var ajaxData = xhr[strAjaxData];
-                                if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState.abortDone) {
-                                    ajaxData.aborted = 1;
-                                    ajaxData.xhrMonitoringState.abortDone = true;
+                                if (!_disableAjaxTracking) {
+                                    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.")
                         });
-                        if (_enableRequestHeaderTracking) {
-                            _hookProto(XMLHttpRequest, "setRequestHeader", {
-                                req: function (args, header, value) {
+                        _hookProto(XMLHttpRequest, "setRequestHeader", {
+                            ns: _evtNamespace,
+                            req: function (args, header, value) {
+                                if (!_disableAjaxTracking && _enableRequestHeaderTracking) {
                                     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;
                     }
                 }