@microsoft/applicationinsights-dependencies-js 2.8.0-beta.2203-01 → 2.8.0-beta.2203-04

package/browser/applicationinsights-dependencies-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.0-beta.2203-01
+ * Application Insights JavaScript SDK - Dependencies Plugin, 2.8.0-beta.2203-04
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -335,105 +335,20 @@
     };
     dynamicProto[DynProtoDefaultOptions] = perfDefaults;
 
-    var LoggingSeverity;
-    (function (LoggingSeverity) {
-        LoggingSeverity[LoggingSeverity["CRITICAL"] = 1] = "CRITICAL";
-        LoggingSeverity[LoggingSeverity["WARNING"] = 2] = "WARNING";
-    })(LoggingSeverity || (LoggingSeverity = {}));
-    var _InternalMessageId = {
-        BrowserDoesNotSupportLocalStorage: 0,
-        BrowserCannotReadLocalStorage: 1,
-        BrowserCannotReadSessionStorage: 2,
-        BrowserCannotWriteLocalStorage: 3,
-        BrowserCannotWriteSessionStorage: 4,
-        BrowserFailedRemovalFromLocalStorage: 5,
-        BrowserFailedRemovalFromSessionStorage: 6,
-        CannotSendEmptyTelemetry: 7,
-        ClientPerformanceMathError: 8,
-        ErrorParsingAISessionCookie: 9,
-        ErrorPVCalc: 10,
-        ExceptionWhileLoggingError: 11,
-        FailedAddingTelemetryToBuffer: 12,
-        FailedMonitorAjaxAbort: 13,
-        FailedMonitorAjaxDur: 14,
-        FailedMonitorAjaxOpen: 15,
-        FailedMonitorAjaxRSC: 16,
-        FailedMonitorAjaxSend: 17,
-        FailedMonitorAjaxGetCorrelationHeader: 18,
-        FailedToAddHandlerForOnBeforeUnload: 19,
-        FailedToSendQueuedTelemetry: 20,
-        FailedToReportDataLoss: 21,
-        FlushFailed: 22,
-        MessageLimitPerPVExceeded: 23,
-        MissingRequiredFieldSpecification: 24,
-        NavigationTimingNotSupported: 25,
-        OnError: 26,
-        SessionRenewalDateIsZero: 27,
-        SenderNotInitialized: 28,
-        StartTrackEventFailed: 29,
-        StopTrackEventFailed: 30,
-        StartTrackFailed: 31,
-        StopTrackFailed: 32,
-        TelemetrySampledAndNotSent: 33,
-        TrackEventFailed: 34,
-        TrackExceptionFailed: 35,
-        TrackMetricFailed: 36,
-        TrackPVFailed: 37,
-        TrackPVFailedCalc: 38,
-        TrackTraceFailed: 39,
-        TransmissionFailed: 40,
-        FailedToSetStorageBuffer: 41,
-        FailedToRestoreStorageBuffer: 42,
-        InvalidBackendResponse: 43,
-        FailedToFixDepricatedValues: 44,
-        InvalidDurationValue: 45,
-        TelemetryEnvelopeInvalid: 46,
-        CreateEnvelopeError: 47,
-        CannotSerializeObject: 48,
-        CannotSerializeObjectNonSerializable: 49,
-        CircularReferenceDetected: 50,
-        ClearAuthContextFailed: 51,
-        ExceptionTruncated: 52,
-        IllegalCharsInName: 53,
-        ItemNotInArray: 54,
-        MaxAjaxPerPVExceeded: 55,
-        MessageTruncated: 56,
-        NameTooLong: 57,
-        SampleRateOutOfRange: 58,
-        SetAuthContextFailed: 59,
-        SetAuthContextFailedAccountName: 60,
-        StringValueTooLong: 61,
-        StartCalledMoreThanOnce: 62,
-        StopCalledWithoutStart: 63,
-        TelemetryInitializerFailed: 64,
-        TrackArgumentsNotSpecified: 65,
-        UrlTooLong: 66,
-        SessionStorageBufferFull: 67,
-        CannotAccessCookie: 68,
-        IdTooLong: 69,
-        InvalidEvent: 70,
-        FailedMonitorAjaxSetRequestHeader: 71,
-        SendBrowserInfoOnUserInit: 72,
-        PluginException: 73,
-        NotificationException: 74,
-        SnippetScriptLoadFailure: 99,
-        InvalidInstrumentationKey: 100,
-        CannotParseAiBlobValue: 101,
-        InvalidContentBlob: 102,
-        TrackPageActionEventFailed: 103,
-        FailedAddingCustomDefinedRequestContext: 104,
-        InMemoryStorageBufferFull: 105
-    };
+    var strEmpty$1 = "";
+    var strSetNextPlugin = "setNextPlugin";
+    var strIsInitialized = "isInitialized";
+    var strTeardown = "teardown";
+    var strCore = "core";
+    var strDisabled = "disabled";
+    var strDoTeardown = "_doTeardown";
 
-    var strOnPrefix = "on";
-    var strAttachEvent = "attachEvent";
-    var strAddEventHelper = "addEventListener";
     var strToISOString = "toISOString";
     var cStrTrim = "trim";
     var strToString = "toString";
     var str__Proto = "__proto__";
     var strConstructor = "constructor";
-    var _objDefineProperty = ObjDefineProperty;
+    var _objDefineProperty$1 = ObjDefineProperty;
     var _objFreeze = ObjClass.freeze;
     var _objKeys = ObjClass.keys;
     var StringProto = String[strShimPrototype];
@@ -475,25 +390,6 @@
     function isFunction(value) {
         return !!(value && typeof value === strShimFunction);
     }
-    function attachEvent(obj, eventNameWithoutOn, handlerRef, useCapture) {
-        if (useCapture === void 0) { useCapture = false; }
-        var result = false;
-        if (!isNullOrUndefined(obj)) {
-            try {
-                if (!isNullOrUndefined(obj[strAddEventHelper])) {
-                    obj[strAddEventHelper](eventNameWithoutOn, handlerRef, useCapture);
-                    result = true;
-                }
-                else if (!isNullOrUndefined(obj[strAttachEvent])) {
-                    obj[strAttachEvent](strOnPrefix + eventNameWithoutOn, handlerRef);
-                    result = true;
-                }
-            }
-            catch (e) {
-            }
-        }
-        return result;
-    }
     function normalizeJsName(name) {
         var value = name;
         if (value && isString(value)) {
@@ -630,7 +526,7 @@
         return result;
     }
     function objDefineAccessors(target, prop, getProp, setProp) {
-        if (_objDefineProperty) {
+        if (_objDefineProperty$1) {
             try {
                 var descriptor = {
                     enumerable: true,
@@ -642,7 +538,7 @@
                 if (setProp) {
                     descriptor.set = setProp;
                 }
-                _objDefineProperty(target, prop, descriptor);
+                _objDefineProperty$1(target, prop, descriptor);
                 return true;
             }
             catch (e) {
@@ -669,6 +565,47 @@
         }
         return theValue;
     }
+    function throwError(message) {
+        throw new Error(message);
+    }
+    function _createProxyFunction(source, funcName) {
+        var srcFunc = null;
+        var src = null;
+        if (isFunction(source)) {
+            srcFunc = source;
+        }
+        else {
+            src = source;
+        }
+        return function () {
+            var originalArguments = arguments;
+            if (srcFunc) {
+                src = srcFunc();
+            }
+            if (src) {
+                return src[funcName].apply(src, originalArguments);
+            }
+        };
+    }
+    function proxyFunctionAs(target, name, source, theFunc, overwriteTarget) {
+        if (overwriteTarget === void 0) { overwriteTarget = true; }
+        if (target && name && source) {
+            if (overwriteTarget || isUndefined(target[name])) {
+                target[name] = _createProxyFunction(source, theFunc);
+            }
+        }
+    }
+    function createEnumStyle(values) {
+        var enumClass = {};
+        objForEachKey(values, function (field, value) {
+            enumClass[field] = value;
+            if (!isUndefined(enumClass[value])) {
+                throwError("[" + value + "] exists for " + field);
+            }
+            enumClass[value] = field;
+        });
+        return objFreeze(enumClass);
+    }
     function objExtend(obj, obj2, obj3, obj4, obj5, obj6) {
         var theArgs = arguments;
         var extended = theArgs[0] || {};
@@ -801,7 +738,7 @@
         var nav = getNavigator();
         if (nav && (nav.userAgent !== _navUserAgentCheck || _isTrident === null)) {
             _navUserAgentCheck = nav.userAgent;
-            var userAgent = (_navUserAgentCheck || "").toLowerCase();
+            var userAgent = (_navUserAgentCheck || strEmpty$1).toLowerCase();
             _isTrident = (strContains(userAgent, strMsie) || strContains(userAgent, strTrident));
         }
         return _isTrident;
@@ -810,9 +747,9 @@
         if (userAgentStr === void 0) { userAgentStr = null; }
         if (!userAgentStr) {
             var navigator_1 = getNavigator() || {};
-            userAgentStr = navigator_1 ? (navigator_1.userAgent || "").toLowerCase() : "";
+            userAgentStr = navigator_1 ? (navigator_1.userAgent || strEmpty$1).toLowerCase() : strEmpty$1;
         }
-        var ua = (userAgentStr || "").toLowerCase();
+        var ua = (userAgentStr || strEmpty$1).toLowerCase();
         if (strContains(ua, strMsie)) {
             var doc = getDocument() || {};
             return Math.max(parseInt(ua.split(strMsie)[1]), (doc[strDocumentMode] || 0));
@@ -827,7 +764,7 @@
     }
     function dumpObj(object) {
         var objectTypeDump = Object[strShimPrototype].toString.call(object);
-        var propertyValueDump = "";
+        var propertyValueDump = strEmpty$1;
         if (objectTypeDump === "[object Error]") {
             propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
         }
@@ -870,9 +807,9 @@
     var strWarnToConsole = "warnToConsole";
     function _sanitizeDiagnosticText(text) {
         if (text) {
-            return "\"" + text.replace(/\"/g, "") + "\"";
+            return "\"" + text.replace(/\"/g, strEmpty$1) + "\"";
         }
-        return "";
+        return strEmpty$1;
     }
     function _logToConsole(func, message) {
         var theConsole = getConsole();
@@ -894,12 +831,12 @@
             _self.message =
                 (isUserAct ? AiUserActionablePrefix : AiNonUserActionablePrefix) +
                     msgId;
-            var strProps = "";
+            var strProps = strEmpty$1;
             if (hasJSON()) {
                 strProps = getJSON().stringify(properties);
             }
-            var diagnosticText = (msg ? " message:" + _sanitizeDiagnosticText(msg) : "") +
-                (properties ? " props:" + _sanitizeDiagnosticText(strProps) : "");
+            var diagnosticText = (msg ? " message:" + _sanitizeDiagnosticText(msg) : strEmpty$1) +
+                (properties ? " props:" + _sanitizeDiagnosticText(strProps) : strEmpty$1);
             _self.message += diagnosticText;
         }
         _InternalLogMessage.dataType = "MessageData";
@@ -929,7 +866,7 @@
                         throw message;
                     }
                     else {
-                        var logFunc = severity === LoggingSeverity.CRITICAL ? strErrorToConsole : strWarnToConsole;
+                        var logFunc = severity === 1  ? strErrorToConsole : strWarnToConsole;
                         if (!isUndefined(message.message)) {
                             var logLevel = _self.consoleLoggingLevel();
                             if (isUserAct) {
@@ -947,7 +884,7 @@
                             _self.logInternalMessage(severity, message);
                         }
                         else {
-                            _debugExtMsg("throw" + (severity === LoggingSeverity.CRITICAL ? "Critical" : "Warning"), message);
+                            _debugExtMsg("throw" + (severity === 1  ? "Critical" : "Warning"), message);
                         }
                     }
                 };
@@ -979,13 +916,13 @@
                         if (severity <= _self.telemetryLoggingLevel()) {
                             _self.queue.push(message);
                             _messageCount++;
-                            _debugExtMsg((severity === LoggingSeverity.CRITICAL ? "error" : "warn"), message);
+                            _debugExtMsg((severity === 1  ? "error" : "warn"), message);
                         }
                         if (_messageCount === _self.maxInternalMessageLimit()) {
                             var throttleLimitMessage = "Internal events throttle limit per PageView reached for this app.";
-                            var throttleMessage = new _InternalLogMessage(_InternalMessageId.MessageLimitPerPVExceeded, throttleLimitMessage, false);
+                            var throttleMessage = new _InternalLogMessage(23 , throttleLimitMessage, false);
                             _self.queue.push(throttleMessage);
-                            if (severity === LoggingSeverity.CRITICAL) {
+                            if (severity === 1 ) {
                                 _self.errorToConsole(throttleLimitMessage);
                             }
                             else {
@@ -1127,6 +1064,151 @@
         return func();
     }
 
+    var UInt32Mask = 0x100000000;
+    var MaxUInt32 = 0xffffffff;
+    var _mwcSeeded = false;
+    var _mwcW = 123456789;
+    var _mwcZ = 987654321;
+    function _mwcSeed(seedValue) {
+        if (seedValue < 0) {
+            seedValue >>>= 0;
+        }
+        _mwcW = (123456789 + seedValue) & MaxUInt32;
+        _mwcZ = (987654321 - seedValue) & MaxUInt32;
+        _mwcSeeded = true;
+    }
+    function _autoSeedMwc() {
+        try {
+            var now = dateNow() & 0x7fffffff;
+            _mwcSeed(((Math.random() * UInt32Mask) ^ now) + now);
+        }
+        catch (e) {
+        }
+    }
+    function random32(signed) {
+        var value = 0;
+        var c = getCrypto() || getMsCrypto();
+        if (c && c.getRandomValues) {
+            value = c.getRandomValues(new Uint32Array(1))[0] & MaxUInt32;
+        }
+        if (value === 0 && isIE()) {
+            if (!_mwcSeeded) {
+                _autoSeedMwc();
+            }
+            value = mwcRandom32() & MaxUInt32;
+        }
+        if (value === 0) {
+            value = Math.floor((UInt32Mask * Math.random()) | 0);
+        }
+        if (!signed) {
+            value >>>= 0;
+        }
+        return value;
+    }
+    function mwcRandom32(signed) {
+        _mwcZ = (36969 * (_mwcZ & 0xFFFF) + (_mwcZ >> 16)) & MaxUInt32;
+        _mwcW = (18000 * (_mwcW & 0xFFFF) + (_mwcW >> 16)) & MaxUInt32;
+        var value = (((_mwcZ << 16) + (_mwcW & 0xFFFF)) >>> 0) & MaxUInt32 | 0;
+        if (!signed) {
+            value >>>= 0;
+        }
+        return value;
+    }
+    function newId(maxLength) {
+        if (maxLength === void 0) { maxLength = 22; }
+        var base64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+        var number = random32() >>> 0;
+        var chars = 0;
+        var result = strEmpty$1;
+        while (result.length < maxLength) {
+            chars++;
+            result += base64chars.charAt(number & 0x3F);
+            number >>>= 6;
+            if (chars === 5) {
+                number = (((random32() << 2) & 0xFFFFFFFF) | (number & 0x03)) >>> 0;
+                chars = 0;
+            }
+        }
+        return result;
+    }
+
+    var _objDefineProperty = ObjDefineProperty;
+    var version = "2.7.3";
+    var instanceName = "." + newId(6);
+    var _dataUid = 0;
+    function _createAccessor(target, prop, value) {
+        if (_objDefineProperty) {
+            try {
+                _objDefineProperty(target, prop, {
+                    value: value,
+                    enumerable: false,
+                    configurable: true
+                });
+                return true;
+            }
+            catch (e) {
+            }
+        }
+        return false;
+    }
+    function _canAcceptData(target) {
+        return target.nodeType === 1 || target.nodeType === 9 || !(+target.nodeType);
+    }
+    function _getCache(data, target) {
+        var theCache = target[data.id];
+        if (!theCache) {
+            theCache = {};
+            try {
+                if (_canAcceptData(target)) {
+                    if (!_createAccessor(target, data.id, theCache)) {
+                        target[data.id] = theCache;
+                    }
+                }
+            }
+            catch (e) {
+            }
+        }
+        return theCache;
+    }
+    function createUniqueNamespace(name, includeVersion) {
+        if (includeVersion === void 0) { includeVersion = false; }
+        return normalizeJsName(name + (_dataUid++) + (includeVersion ? "." + version : "") + instanceName);
+    }
+    function createElmNodeData(name) {
+        var data = {
+            id: createUniqueNamespace("_aiData-" + (name || "") + "." + version),
+            accept: function (target) {
+                return _canAcceptData(target);
+            },
+            get: function (target, name, defValue, addDefault) {
+                var theCache = target[data.id];
+                if (!theCache) {
+                    if (addDefault) {
+                        theCache = _getCache(data, target);
+                        theCache[normalizeJsName(name)] = defValue;
+                    }
+                    return defValue;
+                }
+                return theCache[normalizeJsName(name)];
+            },
+            kill: function (target, name) {
+                if (target && target[name]) {
+                    try {
+                        delete target[name];
+                    }
+                    catch (e) {
+                    }
+                }
+            }
+        };
+        return data;
+    }
+
+    var pluginStateData = createElmNodeData("plugin");
+    function _getPluginState(plugin) {
+        return pluginStateData.get(plugin, "state", {}, true);
+    }
+
     var strTelemetryPluginChain = "TelemetryPluginChain";
     var strHasRunFlags = "_hasRun";
     var strGetTelCtx = "_getTelCtx";
@@ -1140,53 +1222,69 @@
         }
         return createTelemetryProxyChain([startAt], config, core);
     }
-    function createProcessTelemetryContext(telemetryChain, config, core, startAt) {
+    function _createInternalContext(telemetryChain, config, core, startAt) {
         var _nextProxy = null;
-        var _onComplete = null;
-        if (startAt) {
-            _nextProxy = _getNextProxyStart(telemetryChain, config, core, startAt);
-        }
-        else {
-            _nextProxy = telemetryChain;
+        var _onComplete = [];
+        if (startAt !== null) {
+            _nextProxy = startAt ? _getNextProxyStart(telemetryChain, config, core, startAt) : telemetryChain;
         }
         var context = {
-            core: function () {
-                return core;
-            },
-            diagLog: function () {
-                return safeGetLogger(core, config);
-            },
-            getCfg: function () {
-                return config;
-            },
-            getExtCfg: _getExtCfg,
-            getConfig: _getConfig,
-            hasNext: function () {
-                return _nextProxy != null;
-            },
-            getNext: function () {
-                return _nextProxy;
-            },
-            setNext: function (nextPlugin) {
-                _nextProxy = nextPlugin;
-            },
-            processNext: function (env) {
-                _processChain(function (nextPlugin) {
-                    nextPlugin.processTelemetry(env, context);
+            _next: _moveNext,
+            ctx: {
+                core: function () { return core; },
+                diagLog: function () {
+                    return safeGetLogger(core, config);
+                },
+                getCfg: function () {
+                    return config;
+                },
+                getExtCfg: _getExtCfg,
+                getConfig: _getConfig,
+                hasNext: function () {
+                    return !!_nextProxy;
+                },
+                getNext: function () {
+                    return _nextProxy;
+                },
+                setNext: function (nextPlugin) {
+                    _nextProxy = nextPlugin;
+                },
+                iterate: _iterateChain,
+                onComplete: _addOnComplete
+            }
+        };
+        function _addOnComplete(onComplete, that) {
+            var args = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args[_i - 2] = arguments[_i];
+            }
+            if (onComplete) {
+                _onComplete.push({
+                    func: onComplete,
+                    self: !isUndefined(that) ? that : context.ctx,
+                    args: args
                 });
-            },
-            iterate: _iterateChain,
-            createNew: function (plugins, startAt) {
-                if (plugins === void 0) { plugins = null; }
-                if (isArray(plugins)) {
-                    plugins = createTelemetryProxyChain(plugins, config, core, startAt);
+            }
+        }
+        function _moveNext() {
+            var nextProxy = _nextProxy;
+            _nextProxy = nextProxy ? nextProxy.getNext() : null;
+            if (!nextProxy) {
+                var onComplete = _onComplete;
+                if (onComplete && onComplete.length > 0) {
+                    arrForEach(onComplete, function (completeDetails) {
+                        try {
+                            completeDetails.func.call(completeDetails.self, completeDetails.args);
+                        }
+                        catch (e) {
+                            core.logger.throwInternal(2 , 73 , "Unexpected Exception during onComplete - " + dumpObj(e));
+                        }
+                    });
+                    _onComplete = [];
                 }
-                return createProcessTelemetryContext(plugins || _nextProxy, config, core, startAt);
-            },
-            onComplete: function (onComplete) {
-                _onComplete = onComplete;
             }
-        };
+            return nextProxy;
+        }
         function _getExtCfg(identifier, defaultValue, mergeDefault) {
             if (defaultValue === void 0) { defaultValue = {}; }
             if (mergeDefault === void 0) { mergeDefault = 0 ; }
@@ -1229,29 +1327,53 @@
             }
             return !isNullOrUndefined(theValue) ? theValue : defaultValue;
         }
-        function _processChain(cb) {
-            var nextPlugin = _nextProxy;
-            if (nextPlugin) {
-                _nextProxy = nextPlugin.getNext();
-                cb(nextPlugin);
-            }
-            else {
-                if (_onComplete) {
-                    _onComplete();
-                    _onComplete = null;
+        function _iterateChain(cb) {
+            var nextPlugin;
+            while (!!(nextPlugin = context._next())) {
+                var plugin = nextPlugin.getPlugin();
+                if (plugin) {
+                    cb(plugin);
                 }
             }
         }
-        function _iterateChain(cb) {
-            while (_nextProxy) {
-                _processChain(function (nextPlugin) {
-                    var plugin = nextPlugin.getPlugin();
-                    if (plugin) {
-                        cb(plugin);
-                    }
-                });
+        return context;
+    }
+    function createProcessTelemetryContext(telemetryChain, config, core, startAt) {
+        var internalContext = _createInternalContext(telemetryChain, config, core, startAt);
+        var context = internalContext.ctx;
+        function _processNext(env) {
+            var nextPlugin = internalContext._next();
+            nextPlugin && nextPlugin.processTelemetry(env, context);
+            return !nextPlugin;
+        }
+        function _createNew(plugins, startAt) {
+            if (plugins === void 0) { plugins = null; }
+            if (isArray(plugins)) {
+                plugins = createTelemetryProxyChain(plugins, config, core, startAt);
+            }
+            return createProcessTelemetryContext(plugins || context.getNext(), config, core, startAt);
+        }
+        context.processNext = _processNext;
+        context.createNew = _createNew;
+        return context;
+    }
+    function createProcessTelemetryUnloadContext(telemetryChain, config, core, startAt) {
+        var internalContext = _createInternalContext(telemetryChain, config, core, startAt);
+        var context = internalContext.ctx;
+        function _processNext(unloadState) {
+            var nextPlugin = internalContext._next();
+            nextPlugin && nextPlugin.unload(context, unloadState);
+            return !nextPlugin;
+        }
+        function _createNew(plugins, startAt) {
+            if (plugins === void 0) { plugins = null; }
+            if (isArray(plugins)) {
+                plugins = createTelemetryProxyChain(plugins, config, core, startAt);
             }
+            return createProcessTelemetryUnloadContext(plugins || context.getNext(), config, core, startAt);
         }
+        context.processNext = _processNext;
+        context.createNew = _createNew;
         return context;
     }
     function createTelemetryProxyChain(plugins, config, core, startAt) {
@@ -1299,32 +1421,35 @@
                 return nextProxy;
             },
             processTelemetry: _processTelemetry,
+            unload: _unloadPlugin,
             _id: chainId,
             _setNext: function (nextPlugin) {
                 nextProxy = nextPlugin;
             }
         };
-        function _processChain(itemCtx, processPluginFn, processProxyFn, name, details, isAsync) {
+        function _getTelCtx() {
+            var itemCtx;
+            if (plugin && isFunction(plugin[strGetTelCtx])) {
+                itemCtx = plugin[strGetTelCtx]();
+            }
             if (!itemCtx) {
-                if (plugin && isFunction(plugin[strGetTelCtx])) {
-                    itemCtx = plugin[strGetTelCtx]();
-                }
-                if (!itemCtx) {
-                    itemCtx = createProcessTelemetryContext(proxyChain, config, core);
-                }
+                itemCtx = createProcessTelemetryContext(proxyChain, config, core);
             }
+            return itemCtx;
+        }
+        function _processChain(itemCtx, processPluginFn, name, details, isAsync) {
+            var hasRun = false;
             var identifier = plugin ? plugin.identifier : strTelemetryPluginChain;
             var hasRunContext = itemCtx[strHasRunFlags];
             if (!hasRunContext) {
                 hasRunContext = itemCtx[strHasRunFlags] = {};
             }
-            doPerf(itemCtx.core(), function () { return identifier + ":" + name; }, function () {
-                hasRunContext[chainId] = true;
-                var hasRun = false;
-                itemCtx.setNext(nextProxy);
-                if (plugin) {
+            itemCtx.setNext(nextProxy);
+            if (plugin) {
+                doPerf(itemCtx[strCore](), function () { return identifier + ":" + name; }, function () {
+                    hasRunContext[chainId] = true;
                     try {
-                        var nextId = nextProxy ? nextProxy._id : "";
+                        var nextId = nextProxy ? nextProxy._id : strEmpty$1;
                         if (nextId) {
                             hasRunContext[nextId] = false;
                         }
@@ -1336,18 +1461,21 @@
                             hasRun = true;
                         }
                         if (!nextProxy || !hasNextRun) {
-                            itemCtx.diagLog().throwInternal(LoggingSeverity.CRITICAL, _InternalMessageId.PluginException, "Plugin [" + plugin.identifier + "] failed during " + name + " - " + dumpObj(error) + ", run flags: " + dumpObj(hasRunContext));
+                            itemCtx.diagLog().throwInternal(1 , 73 , "Plugin [" + plugin.identifier + "] failed during " + name + " - " + dumpObj(error) + ", run flags: " + dumpObj(hasRunContext));
                         }
                     }
-                }
-                if (nextProxy && !hasRun) {
-                    processProxyFn(itemCtx);
-                }
-            }, details, isAsync);
+                }, details, isAsync);
+            }
+            return hasRun;
         }
         function _processTelemetry(env, itemCtx) {
-            _processChain(itemCtx, function (itemCtx) {
-                if (!hasProcessTelemetry) {
+            itemCtx = itemCtx || _getTelCtx();
+            function _callProcessTelemetry(itemCtx) {
+                if (!plugin || !hasProcessTelemetry) {
+                    return false;
+                }
+                var pluginState = _getPluginState(plugin);
+                if (pluginState[strTeardown] || pluginState[strDisabled]) {
                     return false;
                 }
                 if (hasSetNext) {
@@ -1355,15 +1483,61 @@
                 }
                 plugin.processTelemetry(env, itemCtx);
                 return true;
-            }, function (itemCtx) {
-                nextProxy.processTelemetry(env, itemCtx);
-            }, "processTelemetry", function () { return ({ item: env }); }, !(env.sync));
+            }
+            if (!_processChain(itemCtx, _callProcessTelemetry, "processTelemetry", function () { return ({ item: env }); }, !(env.sync))) {
+                itemCtx.processNext(env);
+            }
+        }
+        function _unloadPlugin(unloadCtx, unloadState) {
+            function _callTeardown() {
+                var hasRun = false;
+                if (plugin) {
+                    var pluginState = _getPluginState(plugin);
+                    var pluginCore = plugin[strCore] || pluginState.core;
+                    if (plugin && (!pluginCore || pluginCore === unloadCtx[strCore]()) && !pluginState[strTeardown]) {
+                        pluginState[strCore] = null;
+                        pluginState[strTeardown] = true;
+                        pluginState[strIsInitialized] = false;
+                        if (plugin[strTeardown] && plugin[strTeardown](unloadCtx, unloadState) === true) {
+                            hasRun = true;
+                        }
+                    }
+                }
+                return hasRun;
+            }
+            if (!_processChain(unloadCtx, _callTeardown, "unload", function () { }, unloadState.isAsync)) {
+                unloadCtx.processNext(unloadState);
+            }
         }
         return objFreeze(proxyChain);
     }
 
     var strExtensionConfig = "extensionConfig";
 
+    function createUnloadHandlerContainer() {
+        var handlers = [];
+        function _addHandler(handler) {
+            if (handler) {
+                handlers.push(handler);
+            }
+        }
+        function _runHandlers(unloadCtx, unloadState) {
+            arrForEach(handlers, function (handler) {
+                try {
+                    handler(unloadCtx, unloadState);
+                }
+                catch (e) {
+                    unloadCtx.diagLog().throwInternal(2 , 73 , "Unexpected error calling unload handler - " + dumpObj(e));
+                }
+            });
+            handlers = [];
+        }
+        return {
+            add: _addHandler,
+            run: _runHandlers
+        };
+    }
+
     var strGetPlugin = "getPlugin";
     var BaseTelemetryPlugin = /** @class */ (function () {
         function BaseTelemetryPlugin() {
@@ -1371,6 +1545,7 @@
             var _isinitialized;
             var _rootCtx;
             var _nextPlugin;
+            var _unloadHandlerContainer;
             var _hooks;
             _initDefaults();
             dynamicProto(BaseTelemetryPlugin, _self, function (_self) {
@@ -1378,6 +1553,39 @@
                     _setDefaults(config, core, pluginChain);
                     _isinitialized = true;
                 };
+                _self.teardown = function (unloadCtx, unloadState) {
+                    if (!_self.core || (unloadCtx && _self.core !== unloadCtx.core())) {
+                        return;
+                    }
+                    var result;
+                    var unloadDone = false;
+                    var theUnloadCtx = unloadCtx || createProcessTelemetryUnloadContext(null, {}, _self.core, _nextPlugin && _nextPlugin[strGetPlugin] ? _nextPlugin[strGetPlugin]() : _nextPlugin);
+                    var theUnloadState = unloadState || {
+                        reason: 0 ,
+                        isAsync: false
+                    };
+                    function _unloadCallback() {
+                        if (!unloadDone) {
+                            unloadDone = true;
+                            _unloadHandlerContainer.run(theUnloadCtx, unloadState);
+                            arrForEach(_hooks, function (fn) {
+                                fn.rm();
+                            });
+                            _hooks = [];
+                            if (result === true) {
+                                theUnloadCtx.processNext(theUnloadState);
+                            }
+                            _initDefaults();
+                        }
+                    }
+                    if (!_self[strDoTeardown] || _self[strDoTeardown](theUnloadCtx, theUnloadState, _unloadCallback) !== true) {
+                        _unloadCallback();
+                    }
+                    else {
+                        result = true;
+                    }
+                    return result;
+                };
                 _self._addHook = function (hooks) {
                     if (hooks) {
                         if (isArray(hooks)) {
@@ -1388,17 +1596,18 @@
                         }
                     }
                 };
+                proxyFunctionAs(_self, "_addUnloadCb", function () { return _unloadHandlerContainer; }, "add");
             });
             _self.diagLog = function (itemCtx) {
                 return _getTelCtx(itemCtx).diagLog();
             };
-            _self.isInitialized = function () {
+            _self[strIsInitialized] = function () {
                 return _isinitialized;
             };
             _self.setInitialized = function (isInitialized) {
                 _isinitialized = isInitialized;
             };
-            _self.setNextPlugin = function (next) {
+            _self[strSetNextPlugin] = function (next) {
                 _nextPlugin = next;
             };
             _self.processNext = function (env, itemCtx) {
@@ -1444,65 +1653,122 @@
                 _rootCtx = null;
                 _nextPlugin = null;
                 _hooks = [];
+                _unloadHandlerContainer = createUnloadHandlerContainer();
             }
         }
         return BaseTelemetryPlugin;
     }());
 
-    var UInt32Mask = 0x100000000;
-    var MaxUInt32 = 0xffffffff;
-    var _mwcSeeded = false;
-    var _mwcW = 123456789;
-    var _mwcZ = 987654321;
-    function _mwcSeed(seedValue) {
-        if (seedValue < 0) {
-            seedValue >>>= 0;
+    var strOnPrefix = "on";
+    var strAttachEvent = "attachEvent";
+    var strAddEventHelper = "addEventListener";
+    var strEvents = "events";
+    createUniqueNamespace("aiEvtPageHide");
+    createUniqueNamespace("aiEvtPageShow");
+    var _guid = 1;
+    var elmNodeData = createElmNodeData("events");
+    var eventNamespace = /^([^.]*)(?:\.(.+)|)/;
+    function _normalizeNamespace(name) {
+        if (name && name.replace) {
+            return name.replace(/^\s*\.*|\.*\s*$/g, "");
+        }
+        return name;
+    }
+    function _getEvtNamespace(eventName, namespaces) {
+        if (namespaces) {
+            var theNamespace_1 = "";
+            if (isArray(namespaces)) {
+                theNamespace_1 = "";
+                arrForEach(namespaces, function (name) {
+                    name = _normalizeNamespace(name);
+                    if (name) {
+                        if (name[0] !== ".") {
+                            name = "." + name;
+                        }
+                        theNamespace_1 += name;
+                    }
+                });
+            }
+            else {
+                theNamespace_1 = _normalizeNamespace(namespaces);
+            }
+            if (theNamespace_1) {
+                if (theNamespace_1[0] !== ".") {
+                    theNamespace_1 = "." + theNamespace_1;
+                }
+                eventName = (eventName || "") + theNamespace_1;
+            }
         }
-        _mwcW = (123456789 + seedValue) & MaxUInt32;
-        _mwcZ = (987654321 - seedValue) & MaxUInt32;
-        _mwcSeeded = true;
+        var parsedEvent = (eventNamespace.exec(eventName) || []);
+        return {
+            type: parsedEvent[1],
+            ns: ((parsedEvent[2] || "").split(".").sort()).join(".")
+        };
     }
-    function _autoSeedMwc() {
-        try {
-            var now = dateNow() & 0x7fffffff;
-            _mwcSeed(((Math.random() * UInt32Mask) ^ now) + now);
-        }
-        catch (e) {
+    function _getRegisteredEvents(target, evtName, addDefault) {
+        if (addDefault === void 0) { addDefault = true; }
+        var aiEvts = elmNodeData.get(target, strEvents, {}, addDefault);
+        var registeredEvents = aiEvts[evtName];
+        if (!registeredEvents) {
+            registeredEvents = aiEvts[evtName] = [];
         }
+        return registeredEvents;
     }
-    function random32(signed) {
-        var value = 0;
-        var c = getCrypto() || getMsCrypto();
-        if (c && c.getRandomValues) {
-            value = c.getRandomValues(new Uint32Array(1))[0] & MaxUInt32;
-        }
-        if (value === 0 && isIE()) {
-            if (!_mwcSeeded) {
-                _autoSeedMwc();
+    function _doAttach(obj, evtName, handlerRef, useCapture) {
+        var result = false;
+        if (obj && evtName && evtName.type && handlerRef) {
+            if (obj[strAddEventHelper]) {
+                obj[strAddEventHelper](evtName.type, handlerRef, useCapture);
+                result = true;
+            }
+            else if (obj[strAttachEvent]) {
+                obj[strAttachEvent](strOnPrefix + evtName.type, handlerRef);
+                result = true;
             }
-            value = mwcRandom32() & MaxUInt32;
         }
-        if (value === 0) {
-            value = Math.floor((UInt32Mask * Math.random()) | 0);
+        return result;
+    }
+    function mergeEvtNamespace(theNamespace, namespaces) {
+        var newNamespaces;
+        if (namespaces) {
+            if (isArray(namespaces)) {
+                newNamespaces = [theNamespace].concat(namespaces);
+            }
+            else {
+                newNamespaces = [theNamespace, namespaces];
+            }
         }
-        if (!signed) {
-            value >>>= 0;
+        else {
+            newNamespaces = theNamespace;
         }
-        return value;
+        return newNamespaces;
     }
-    function mwcRandom32(signed) {
-        _mwcZ = (36969 * (_mwcZ & 0xFFFF) + (_mwcZ >> 16)) & MaxUInt32;
-        _mwcW = (18000 * (_mwcW & 0xFFFF) + (_mwcW >> 16)) & MaxUInt32;
-        var value = (((_mwcZ << 16) + (_mwcW & 0xFFFF)) >>> 0) & MaxUInt32 | 0;
-        if (!signed) {
-            value >>>= 0;
+    function eventOn(target, eventName, handlerRef, evtNamespace, useCapture) {
+        if (useCapture === void 0) { useCapture = false; }
+        var result = false;
+        if (target) {
+            try {
+                var evtName = _getEvtNamespace(eventName, evtNamespace);
+                result = _doAttach(target, evtName, handlerRef, useCapture);
+                if (result && elmNodeData.accept(target)) {
+                    var registeredEvent = {
+                        guid: _guid++,
+                        evtName: evtName,
+                        handler: handlerRef,
+                        capture: useCapture
+                    };
+                    _getRegisteredEvents(target, evtName.type).push(registeredEvent);
+                }
+            }
+            catch (e) {
+            }
         }
-        return value;
+        return result;
     }
 
     function generateW3CId() {
         var hexValues = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
-        var oct = "", tmp;
+        var oct = strEmpty$1, tmp;
         for (var a = 0; a < 4; a++) {
             tmp = random32();
             oct +=
@@ -1519,6 +1785,95 @@
         return oct.substr(0, 8) + oct.substr(9, 4) + "4" + oct.substr(13, 3) + clockSequenceHi + oct.substr(16, 3) + oct.substr(19, 12);
     }
 
+    var LoggingSeverity = createEnumStyle({
+        CRITICAL: 1 ,
+        WARNING: 2
+    });
+    var _InternalMessageId = createEnumStyle({
+        BrowserDoesNotSupportLocalStorage: 0 ,
+        BrowserCannotReadLocalStorage: 1 ,
+        BrowserCannotReadSessionStorage: 2 ,
+        BrowserCannotWriteLocalStorage: 3 ,
+        BrowserCannotWriteSessionStorage: 4 ,
+        BrowserFailedRemovalFromLocalStorage: 5 ,
+        BrowserFailedRemovalFromSessionStorage: 6 ,
+        CannotSendEmptyTelemetry: 7 ,
+        ClientPerformanceMathError: 8 ,
+        ErrorParsingAISessionCookie: 9 ,
+        ErrorPVCalc: 10 ,
+        ExceptionWhileLoggingError: 11 ,
+        FailedAddingTelemetryToBuffer: 12 ,
+        FailedMonitorAjaxAbort: 13 ,
+        FailedMonitorAjaxDur: 14 ,
+        FailedMonitorAjaxOpen: 15 ,
+        FailedMonitorAjaxRSC: 16 ,
+        FailedMonitorAjaxSend: 17 ,
+        FailedMonitorAjaxGetCorrelationHeader: 18 ,
+        FailedToAddHandlerForOnBeforeUnload: 19 ,
+        FailedToSendQueuedTelemetry: 20 ,
+        FailedToReportDataLoss: 21 ,
+        FlushFailed: 22 ,
+        MessageLimitPerPVExceeded: 23 ,
+        MissingRequiredFieldSpecification: 24 ,
+        NavigationTimingNotSupported: 25 ,
+        OnError: 26 ,
+        SessionRenewalDateIsZero: 27 ,
+        SenderNotInitialized: 28 ,
+        StartTrackEventFailed: 29 ,
+        StopTrackEventFailed: 30 ,
+        StartTrackFailed: 31 ,
+        StopTrackFailed: 32 ,
+        TelemetrySampledAndNotSent: 33 ,
+        TrackEventFailed: 34 ,
+        TrackExceptionFailed: 35 ,
+        TrackMetricFailed: 36 ,
+        TrackPVFailed: 37 ,
+        TrackPVFailedCalc: 38 ,
+        TrackTraceFailed: 39 ,
+        TransmissionFailed: 40 ,
+        FailedToSetStorageBuffer: 41 ,
+        FailedToRestoreStorageBuffer: 42 ,
+        InvalidBackendResponse: 43 ,
+        FailedToFixDepricatedValues: 44 ,
+        InvalidDurationValue: 45 ,
+        TelemetryEnvelopeInvalid: 46 ,
+        CreateEnvelopeError: 47 ,
+        CannotSerializeObject: 48 ,
+        CannotSerializeObjectNonSerializable: 49 ,
+        CircularReferenceDetected: 50 ,
+        ClearAuthContextFailed: 51 ,
+        ExceptionTruncated: 52 ,
+        IllegalCharsInName: 53 ,
+        ItemNotInArray: 54 ,
+        MaxAjaxPerPVExceeded: 55 ,
+        MessageTruncated: 56 ,
+        NameTooLong: 57 ,
+        SampleRateOutOfRange: 58 ,
+        SetAuthContextFailed: 59 ,
+        SetAuthContextFailedAccountName: 60 ,
+        StringValueTooLong: 61 ,
+        StartCalledMoreThanOnce: 62 ,
+        StopCalledWithoutStart: 63 ,
+        TelemetryInitializerFailed: 64 ,
+        TrackArgumentsNotSpecified: 65 ,
+        UrlTooLong: 66 ,
+        SessionStorageBufferFull: 67 ,
+        CannotAccessCookie: 68 ,
+        IdTooLong: 69 ,
+        InvalidEvent: 70 ,
+        FailedMonitorAjaxSetRequestHeader: 71 ,
+        SendBrowserInfoOnUserInit: 72 ,
+        PluginException: 73 ,
+        NotificationException: 74 ,
+        SnippetScriptLoadFailure: 99 ,
+        InvalidInstrumentationKey: 100 ,
+        CannotParseAiBlobValue: 101 ,
+        InvalidContentBlob: 102 ,
+        TrackPageActionEventFailed: 103 ,
+        FailedAddingCustomDefinedRequestContext: 104 ,
+        InMemoryStorageBufferFull: 105
+    });
+
     var aiInstrumentHooks = "_aiHooks";
     var cbNames = [
         "req", "rsp", "hkErr", "fnErr"
@@ -1694,7 +2049,7 @@
             name = strTrim(name.toString());
             if (name.length > 150 ) {
                 nameTrunc = name.substring(0, 150 );
-                logger && logger.throwInternal(LoggingSeverity.WARNING, _InternalMessageId.NameTooLong, "name is too long.  It has been truncated to " + 150  + " characters.", { name: name }, true);
+                logger && logger.throwInternal(2 , _InternalMessageId.NameTooLong, "name is too long.  It has been truncated to " + 150  + " characters.", { name: name }, true);
             }
         }
         return nameTrunc || name;
@@ -1707,7 +2062,7 @@
             value = strTrim(value);
             if (value.toString().length > maxLength) {
                 valueTrunc = value.toString().substring(0, maxLength);
-                logger && logger.throwInternal(LoggingSeverity.WARNING, _InternalMessageId.StringValueTooLong, "string value is too long. It has been truncated to " + maxLength + " characters.", { value: value }, true);
+                logger && logger.throwInternal(2 , _InternalMessageId.StringValueTooLong, "string value is too long. It has been truncated to " + maxLength + " characters.", { value: value }, true);
             }
         }
         return valueTrunc || value;
@@ -1724,7 +2079,7 @@
                         value = getJSON().stringify(value);
                     }
                     catch (e) {
-                        logger && logger.throwInternal(LoggingSeverity.WARNING, _InternalMessageId.CannotSerializeObjectNonSerializable, "custom property is not valid", { exception: e }, true);
+                        logger && logger.throwInternal(2 , _InternalMessageId.CannotSerializeObjectNonSerializable, "custom property is not valid", { exception: e }, true);
                     }
                 }
                 value = dataSanitizeString(logger, value, 8192 );
@@ -1752,7 +2107,7 @@
             input = strTrim(input);
             if (input.length > maxLength) {
                 inputTrunc = input.substring(0, maxLength);
-                logger && logger.throwInternal(LoggingSeverity.WARNING, _msgId, "input is too long, it has been truncated to " + maxLength + " characters.", { data: input }, true);
+                logger && logger.throwInternal(2 , _msgId, "input is too long, it has been truncated to " + maxLength + " characters.", { data: input }, true);
             }
         }
         return inputTrunc || input;
@@ -1762,39 +2117,28 @@
         return s.substr(s.length - 3);
     }
 
+    var strEmpty = "";
     function msToTimeSpan(totalms) {
         if (isNaN(totalms) || totalms < 0) {
             totalms = 0;
         }
         totalms = Math.round(totalms);
-        var ms = "" + totalms % 1000;
-        var sec = "" + Math.floor(totalms / 1000) % 60;
-        var min = "" + Math.floor(totalms / (1000 * 60)) % 60;
-        var hour = "" + Math.floor(totalms / (1000 * 60 * 60)) % 24;
+        var ms = strEmpty + totalms % 1000;
+        var sec = strEmpty + Math.floor(totalms / 1000) % 60;
+        var min = strEmpty + Math.floor(totalms / (1000 * 60)) % 60;
+        var hour = strEmpty + Math.floor(totalms / (1000 * 60 * 60)) % 24;
         var days = Math.floor(totalms / (1000 * 60 * 60 * 24));
         ms = ms.length === 1 ? "00" + ms : ms.length === 2 ? "0" + ms : ms;
         sec = sec.length < 2 ? "0" + sec : sec;
         min = min.length < 2 ? "0" + min : min;
         hour = hour.length < 2 ? "0" + hour : hour;
-        return (days > 0 ? days + "." : "") + hour + ":" + min + ":" + sec + "." + ms;
+        return (days > 0 ? days + "." : strEmpty) + hour + ":" + min + ":" + sec + "." + ms;
     }
 
     var DisabledPropertyName = "Microsoft_ApplicationInsights_BypassAjaxInstrumentation";
     var strNotSpecified = "not_specified";
     var strIkey = "iKey";
 
-    var StorageType;
-    (function (StorageType) {
-        StorageType[StorageType["LocalStorage"] = 0] = "LocalStorage";
-        StorageType[StorageType["SessionStorage"] = 1] = "SessionStorage";
-    })(StorageType || (StorageType = {}));
-    var DistributedTracingModes;
-    (function (DistributedTracingModes) {
-        DistributedTracingModes[DistributedTracingModes["AI"] = 0] = "AI";
-        DistributedTracingModes[DistributedTracingModes["AI_AND_W3C"] = 1] = "AI_AND_W3C";
-        DistributedTracingModes[DistributedTracingModes["W3C"] = 2] = "W3C";
-    })(DistributedTracingModes || (DistributedTracingModes = {}));
-
     var _document = getDocument() || {};
     var _htmlAnchorIdx = 0;
     var _htmlAnchorElement = [null, null, null, null, null];
@@ -2419,19 +2763,21 @@
             var _enableAjaxPerfTracking = false;
             var _maxAjaxCallsPerView = 0;
             var _enableResponseHeaderTracking = false;
-            var _hooks = [];
             var _disabledUrls = {};
             var _excludeRequestFromAutoTrackingPatterns;
             var _addRequestContext;
-            dynamicProto(AjaxMonitor, _this, function (_self, base) {
+            var _evtNamespace;
+            dynamicProto(AjaxMonitor, _this, function (_self, _base) {
+                var _addHook = _base._addHook;
                 _self.initialize = function (config, core, extensions, pluginChain) {
                     if (!_self.isInitialized()) {
-                        base.initialize(config, core, extensions, pluginChain);
+                        _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;
@@ -2440,8 +2786,8 @@
                         _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;
+                        _isUsingAIHeaders = distributedTracingMode === 0  || distributedTracingMode === 1 ;
+                        _isUsingW3CHeaders = distributedTracingMode === 1  || distributedTracingMode === 2 ;
                         if (_enableAjaxPerfTracking) {
                             var iKey = config.instrumentationKey || "unkwn";
                             if (iKey.length > 5) {
@@ -2469,14 +2815,9 @@
                         }
                     }
                 };
-                _self.teardown = function () {
-                    arrForEach(_hooks, function (fn) {
-                        fn.rm();
-                    });
-                    _hooks = [];
+                _self._doTeardown = function () {
                     _fetchInitialized = false;
                     _xhrInitialized = false;
-                    _self.setInitialized(false);
                 };
                 _self.trackDependencyData = function (dependency, properties) {
                     _self[strTrackDependencyDataInternal](dependency, properties);
@@ -2543,8 +2884,8 @@
                 };
                 _self[strTrackDependencyDataInternal] = function (dependency, properties, systemProperties) {
                     if (_maxAjaxCallsPerView === -1 || _trackAjaxAttempts < _maxAjaxCallsPerView) {
-                        if ((_config.distributedTracingMode === DistributedTracingModes.W3C
-                            || _config.distributedTracingMode === DistributedTracingModes.AI_AND_W3C)
+                        if ((_config.distributedTracingMode === 2
+                            || _config.distributedTracingMode === 1 )
                             && typeof dependency.id === "string" && dependency.id[dependency.id.length - 1] !== ".") {
                             dependency.id += ".";
                         }
@@ -2579,7 +2920,7 @@
                     var global = getGlobal();
                     var isPolyfill = fetch.polyfill;
                     if (_config.disableFetchTracking === false) {
-                        _hooks.push(InstrumentFunc(global, strFetch, {
+                        _addHook(InstrumentFunc(global, strFetch, {
                             req: function (callDetails, input, init) {
                                 var fetchData;
                                 if (_fetchInitialized &&
@@ -2627,7 +2968,7 @@
                         _fetchInitialized = true;
                     }
                     else if (isPolyfill) {
-                        _hooks.push(InstrumentFunc(global, strFetch, {
+                        _addHook(InstrumentFunc(global, strFetch, {
                             req: function (callDetails, input, init) {
                                 _isDisabledRequest(null, input, init);
                             }
@@ -2638,7 +2979,7 @@
                     }
                 }
                 function _hookProto(target, funcName, callbacks) {
-                    _hooks.push(InstrumentProto(target, funcName, callbacks));
+                    _addHook(InstrumentProto(target, funcName, callbacks));
                 }
                 function _instrumentXhr() {
                     if (_supportsAjaxMonitoring(_self) && !_xhrInitialized) {
@@ -2760,7 +3101,7 @@
                     xhr[strAjaxData] = ajaxData;
                 }
                 function _attachToOnReadyStateChange(xhr) {
-                    xhr[strAjaxData].xhrMonitoringState.stateChangeAttached = attachEvent(xhr, "readystatechange", function () {
+                    xhr[strAjaxData].xhrMonitoringState.stateChangeAttached = eventOn(xhr, "readystatechange", function () {
                         try {
                             if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
                                 _onAjaxComplete(xhr);
@@ -2775,7 +3116,7 @@
                                 });
                             }
                         }
-                    });
+                    }, _evtNamespace);
                 }
                 function _getResponseText(xhr) {
                     try {
@@ -3060,7 +3401,7 @@
                 disableFetchTracking: true,
                 excludeRequestFromAutoTrackingPatterns: undefined,
                 disableCorrelationHeaders: false,
-                distributedTracingMode: DistributedTracingModes.AI_AND_W3C,
+                distributedTracingMode: 1 ,
                 correlationHeaderExcludedDomains: [
                     "*.blob.core.windows.net",
                     "*.blob.core.chinacloudapi.cn",