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

package/browser/applicationinsights-dependencies-js.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.
  */
 (function (global, factory) {
@@ -75,9 +75,7 @@
     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)) {
@@ -92,14 +90,12 @@
             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 __());
     }
 
     /*!
-     * Microsoft Dynamic Proto Utility, 1.1.4
+     * Microsoft Dynamic Proto Utility, 1.1.5
      * Copyright (c) Microsoft and contributors. All rights reserved.
      */
     var Constructor = 'constructor';
@@ -112,6 +108,7 @@
     var DynInstChkTag = '_dynInstChk';
     var DynAllowInstChkTag = DynInstChkTag;
     var DynProtoDefaultOptions = '_dfOpts';
+    var DynProtoPolyProto = "_dynProto";
     var UnknownValue = '_unknown_';
     var str__Proto$1 = "__proto__";
     var strUseBaseInst = 'useBaseInst';
@@ -133,8 +130,11 @@
             if (_objGetPrototypeOf$1) {
                 return _objGetPrototypeOf$1(target);
             }
-            var newProto = target[str__Proto$1] || target[Prototype] || (target[Constructor] ? target[Constructor][Prototype] : null);
+            var newProto = target[DynProtoPolyProto] || target[str__Proto$1] || target[Prototype] || (target[Constructor] ? target[Constructor][Prototype] : null);
             if (newProto) {
+                if (!target[DynProtoPolyProto]) {
+                    target[DynProtoPolyProto] = newProto;
+                }
                 return newProto;
             }
         }
@@ -293,8 +293,9 @@
                 visited.push(thisProto);
                 thisProto = _getObjProto$1(thisProto);
             }
+            return false;
         }
-        return false;
+        return true;
     }
     function _getObjName(target, unknownValue) {
         if (_hasOwnProperty(target, Prototype)) {
@@ -339,22 +340,106 @@
     };
     dynamicProto[DynProtoDefaultOptions] = perfDefaults;
 
-    var strEmpty$1 = "";
-    var strSetNextPlugin = "setNextPlugin";
-    var strIsInitialized = "isInitialized";
-    var strTeardown = "teardown";
-    var strCore = "core";
-    var strUpdate = "update";
-    var strDisabled = "disabled";
-    var strDoTeardown = "_doTeardown";
+    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 strOnPrefix = "on";
+    var strAttachEvent = "attachEvent";
+    var strAddEventHelper = "addEventListener";
     var strToISOString = "toISOString";
+    var strIndexOf = "indexOf";
     var cStrTrim = "trim";
     var strToString = "toString";
     var str__Proto = "__proto__";
     var strConstructor = "constructor";
-    var _objDefineProperty$1 = ObjDefineProperty;
-    var _objFreeze = ObjClass.freeze;
+    var _objDefineProperty = ObjDefineProperty;
     var _objKeys = ObjClass.keys;
     var StringProto = String[strShimPrototype];
     var _strTrim = StringProto[cStrTrim];
@@ -363,7 +448,7 @@
     var _isArray = Array.isArray;
     var _objToString = ObjProto[strToString];
     var _fnToString = ObjHasOwnProperty[strToString];
-    var _objFunctionString = _fnToString.call(ObjClass);
+    _fnToString.call(ObjClass);
     var rCamelCase = /-([a-z])/g;
     var rNormalizeInvalid = /([^\w\d_$])/g;
     var rLeadingNumeric = /^(\d+[\w\d_$])/;
@@ -395,6 +480,25 @@
     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)) {
@@ -433,25 +537,6 @@
     function isNumber(value) {
         return typeof value === "number";
     }
-    function isBoolean(value) {
-        return typeof value === "boolean";
-    }
-    function isPlainObject(value) {
-        var result = false;
-        if (value && typeof value === "object") {
-            var proto = _objGetPrototypeOf ? _objGetPrototypeOf(value) : _getObjProto(value);
-            if (!proto) {
-                result = true;
-            }
-            else {
-                if (proto[strConstructor] && ObjHasOwnProperty.call(proto, strConstructor)) {
-                    proto = proto[strConstructor];
-                }
-                result = typeof proto === strShimFunction && _fnToString.call(proto) === _objFunctionString;
-            }
-        }
-        return result;
-    }
     function toISOString(date) {
         if (date) {
             return _dataToISOString ? date[strToISOString]() : _toISOStringPoly(date);
@@ -490,6 +575,25 @@
         catch (e) {
         }
     }
+    function arrIndexOf(arr, searchElement, fromIndex) {
+        if (arr) {
+            if (arr[strIndexOf]) {
+                return arr[strIndexOf](searchElement, fromIndex);
+            }
+            var len = arr.length;
+            var from = fromIndex || 0;
+            try {
+                for (var lp = Math.max(from >= 0 ? from : len - Math.abs(from), 0); lp < len; lp++) {
+                    if (lp in arr && arr[lp] === searchElement) {
+                        return lp;
+                    }
+                }
+            }
+            catch (e) {
+            }
+        }
+        return -1;
+    }
     function strTrim(str) {
         if (str) {
             str = (_strTrim && str[cStrTrim]) ? str[cStrTrim]() : (str.replace ? str.replace(/^\s+|\s+$/g, "") : str);
@@ -531,7 +635,7 @@
         return result;
     }
     function objDefineAccessors(target, prop, getProp, setProp) {
-        if (_objDefineProperty$1) {
+        if (_objDefineProperty) {
             try {
                 var descriptor = {
                     enumerable: true,
@@ -543,7 +647,7 @@
                 if (setProp) {
                     descriptor.set = setProp;
                 }
-                _objDefineProperty$1(target, prop, descriptor);
+                _objDefineProperty(target, prop, descriptor);
                 return true;
             }
             catch (e) {
@@ -551,10 +655,6 @@
         }
         return false;
     }
-    function _doNothing(value) {
-        return value;
-    }
-    var objFreeze = _objFreeze || _doNothing;
     function dateNow() {
         var dt = Date;
         return dt.now ? dt.now() : new dt().getTime();
@@ -570,91 +670,6 @@
         }
         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(obj1, obj2, obj3, obj4, obj5, obj6) {
-        var theArgs = arguments;
-        var extended = theArgs[0] || {};
-        var argLen = theArgs.length;
-        var deep = false;
-        var idx = 1;
-        if (argLen > 0 && isBoolean(extended)) {
-            deep = extended;
-            extended = theArgs[idx] || {};
-            idx++;
-        }
-        if (!isObject(extended)) {
-            extended = {};
-        }
-        for (; idx < argLen; idx++) {
-            var arg = theArgs[idx];
-            var isArgArray = isArray(arg);
-            var isArgObj = isObject(arg);
-            for (var prop in arg) {
-                var propOk = (isArgArray && (prop in arg)) || (isArgObj && (ObjHasOwnProperty.call(arg, prop)));
-                if (!propOk) {
-                    continue;
-                }
-                var newValue = arg[prop];
-                var isNewArray = void 0;
-                if (deep && newValue && ((isNewArray = isArray(newValue)) || isPlainObject(newValue))) {
-                    var clone = extended[prop];
-                    if (isNewArray) {
-                        if (!isArray(clone)) {
-                            clone = [];
-                        }
-                    }
-                    else if (!isPlainObject(clone)) {
-                        clone = {};
-                    }
-                    newValue = objExtend(deep, clone, newValue);
-                }
-                if (newValue !== undefined) {
-                    extended[prop] = newValue;
-                }
-            }
-        }
-        return extended;
-    }
 
     var strWindow = "window";
     var strDocument = "document";
@@ -668,7 +683,6 @@
     var strMsCrypto = "msCrypto";
     var strMsie = "msie";
     var strTrident = "trident/";
-    var strXMLHttpRequest = "XMLHttpRequest";
     var _isTrident = null;
     var _navUserAgentCheck = null;
     var _enableMocks = false;
@@ -743,7 +757,7 @@
         var nav = getNavigator();
         if (nav && (nav.userAgent !== _navUserAgentCheck || _isTrident === null)) {
             _navUserAgentCheck = nav.userAgent;
-            var userAgent = (_navUserAgentCheck || strEmpty$1).toLowerCase();
+            var userAgent = (_navUserAgentCheck || "").toLowerCase();
             _isTrident = (strContains(userAgent, strMsie) || strContains(userAgent, strTrident));
         }
         return _isTrident;
@@ -752,9 +766,9 @@
         if (userAgentStr === void 0) { userAgentStr = null; }
         if (!userAgentStr) {
             var navigator_1 = getNavigator() || {};
-            userAgentStr = navigator_1 ? (navigator_1.userAgent || strEmpty$1).toLowerCase() : strEmpty$1;
+            userAgentStr = navigator_1 ? (navigator_1.userAgent || "").toLowerCase() : "";
         }
-        var ua = (userAgentStr || strEmpty$1).toLowerCase();
+        var ua = (userAgentStr || "").toLowerCase();
         if (strContains(ua, strMsie)) {
             var doc = getDocument() || {};
             return Math.max(parseInt(ua.split(strMsie)[1]), (doc[strDocumentMode] || 0));
@@ -769,7 +783,7 @@
     }
     function dumpObj(object) {
         var objectTypeDump = Object[strShimPrototype].toString.call(object);
-        var propertyValueDump = strEmpty$1;
+        var propertyValueDump = "";
         if (objectTypeDump === "[object Error]") {
             propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
         }
@@ -781,7 +795,7 @@
     function isXhrSupported() {
         var isSupported = false;
         try {
-            var xmlHttpRequest = getGlobalInst(strXMLHttpRequest);
+            var xmlHttpRequest = getGlobalInst("XMLHttpRequest");
             isSupported = !!xmlHttpRequest;
         }
         catch (e) {
@@ -812,9 +826,9 @@
     var strWarnToConsole = "warnToConsole";
     function _sanitizeDiagnosticText(text) {
         if (text) {
-            return "\"" + text.replace(/\"/g, strEmpty$1) + "\"";
+            return "\"" + text.replace(/\"/g, "") + "\"";
         }
-        return strEmpty$1;
+        return "";
     }
     function _logToConsole(func, message) {
         var theConsole = getConsole();
@@ -836,12 +850,12 @@
             _self.message =
                 (isUserAct ? AiUserActionablePrefix : AiNonUserActionablePrefix) +
                     msgId;
-            var strProps = strEmpty$1;
+            var strProps = "";
             if (hasJSON()) {
                 strProps = getJSON().stringify(properties);
             }
-            var diagnosticText = (msg ? " message:" + _sanitizeDiagnosticText(msg) : strEmpty$1) +
-                (properties ? " props:" + _sanitizeDiagnosticText(strProps) : strEmpty$1);
+            var diagnosticText = (msg ? " message:" + _sanitizeDiagnosticText(msg) : "") +
+                (properties ? " props:" + _sanitizeDiagnosticText(strProps) : "");
             _self.message += diagnosticText;
         }
         _InternalLogMessage.dataType = "MessageData";
@@ -868,10 +882,10 @@
                     if (isUserAct === void 0) { isUserAct = false; }
                     var message = new _InternalLogMessage(msgId, msg, isUserAct, properties);
                     if (_self.enableDebugExceptions()) {
-                        throw message;
+                        throw dumpObj(message);
                     }
                     else {
-                        var logFunc = severity === 1  ? strErrorToConsole : strWarnToConsole;
+                        var logFunc = severity === LoggingSeverity.CRITICAL ? strErrorToConsole : strWarnToConsole;
                         if (!isUndefined(message.message)) {
                             var logLevel = _self.consoleLoggingLevel();
                             if (isUserAct) {
@@ -889,7 +903,7 @@
                             _self.logInternalMessage(severity, message);
                         }
                         else {
-                            _debugExtMsg("throw" + (severity === 1  ? "Critical" : "Warning"), message);
+                            _debugExtMsg("throw" + (severity === LoggingSeverity.CRITICAL ? "Critical" : "Warning"), message);
                         }
                     }
                 };
@@ -921,13 +935,13 @@
                         if (severity <= _self.telemetryLoggingLevel()) {
                             _self.queue.push(message);
                             _messageCount++;
-                            _debugExtMsg((severity === 1  ? "error" : "warn"), message);
+                            _debugExtMsg((severity === LoggingSeverity.CRITICAL ? "error" : "warn"), message);
                         }
                         if (_messageCount === _self.maxInternalMessageLimit()) {
                             var throttleLimitMessage = "Internal events throttle limit per PageView reached for this app.";
-                            var throttleMessage = new _InternalLogMessage(23 , throttleLimitMessage, false);
+                            var throttleMessage = new _InternalLogMessage(_InternalMessageId.MessageLimitPerPVExceeded, throttleLimitMessage, false);
                             _self.queue.push(throttleMessage);
-                            if (severity === 1 ) {
+                            if (severity === LoggingSeverity.CRITICAL) {
                                 _self.errorToConsole(throttleLimitMessage);
                             }
                             else {
@@ -956,10 +970,6 @@
         }
         return DiagnosticLogger;
     }());
-    function _throwInternal(logger, severity, msgId, msg, properties, isUserAct) {
-        if (isUserAct === void 0) { isUserAct = false; }
-        (logger || new DiagnosticLogger()).throwInternal(severity, msgId, msg, properties, isUserAct);
-    }
 
     var strExecutionContextKey = "ctx";
     var PerfEvent = /** @class */ (function () {
@@ -1073,616 +1083,207 @@
         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.5-nightly.2203-03";
-    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) {
-                    }
+    var TelemetryPluginChain = /** @class */ (function () {
+        function TelemetryPluginChain(plugin, defItemCtx) {
+            var _self = this;
+            var _nextProxy = null;
+            var _hasProcessTelemetry = isFunction(plugin.processTelemetry);
+            var _hasSetNext = isFunction(plugin.setNextPlugin);
+            _self._hasRun = false;
+            _self.getPlugin = function () {
+                return plugin;
+            };
+            _self.getNext = function () {
+                return _nextProxy;
+            };
+            _self.setNext = function (nextPlugin) {
+                _nextProxy = nextPlugin;
+            };
+            _self.processTelemetry = function (env, itemCtx) {
+                if (!itemCtx) {
+                    itemCtx = defItemCtx;
                 }
-            }
-        };
-        return data;
-    }
-
-    var pluginStateData = createElmNodeData("plugin");
-    function _getPluginState(plugin) {
-        return pluginStateData.get(plugin, "state", {}, true);
-    }
-
-    var strTelemetryPluginChain = "TelemetryPluginChain";
-    var strHasRunFlags = "_hasRun";
-    var strGetTelCtx = "_getTelCtx";
-    var _chainId = 0;
-    function _getNextProxyStart(proxy, config, core, startAt) {
-        while (proxy) {
-            if (proxy.getPlugin() === startAt) {
-                return proxy;
-            }
-            proxy = proxy.getNext();
-        }
-        return createTelemetryProxyChain([startAt], config, core);
-    }
-    function _createInternalContext(telemetryChain, config, core, startAt) {
-        var _nextProxy = null;
-        var _onComplete = [];
-        if (startAt !== null) {
-            _nextProxy = startAt ? _getNextProxyStart(telemetryChain, config, core, startAt) : telemetryChain;
-        }
-        var 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
-                });
-            }
-        }
-        function _moveNext() {
-            var nextProxy = _nextProxy;
-            _nextProxy = nextProxy ? nextProxy.getNext() : null;
-            if (!nextProxy) {
-                var onComplete = _onComplete;
-                if (onComplete && onComplete.length > 0) {
-                    arrForEach(onComplete, function (completeDetails) {
+                var identifier = plugin ? plugin.identifier : "TelemetryPluginChain";
+                doPerf(itemCtx ? itemCtx.core() : null, function () { return identifier + ":processTelemetry"; }, function () {
+                    if (plugin && _hasProcessTelemetry) {
+                        _self._hasRun = true;
                         try {
-                            completeDetails.func.call(completeDetails.self, completeDetails.args);
-                        }
-                        catch (e) {
-                            _throwInternal(core.logger, 2 , 73 , "Unexpected Exception during onComplete - " + dumpObj(e));
+                            itemCtx.setNext(_nextProxy);
+                            if (_hasSetNext) {
+                                plugin.setNextPlugin(_nextProxy);
+                            }
+                            _nextProxy && (_nextProxy._hasRun = false);
+                            plugin.processTelemetry(env, itemCtx);
                         }
-                    });
-                    _onComplete = [];
-                }
-            }
-            return nextProxy;
-        }
-        function _getExtCfg(identifier, defaultValue, mergeDefault) {
-            if (defaultValue === void 0) { defaultValue = {}; }
-            if (mergeDefault === void 0) { mergeDefault = 0 ; }
-            var theConfig;
-            if (config) {
-                var extConfig = config.extensionConfig;
-                if (extConfig && identifier) {
-                    theConfig = extConfig[identifier];
-                }
-            }
-            if (!theConfig) {
-                theConfig = defaultValue;
-            }
-            else if (isObject(defaultValue)) {
-                if (mergeDefault !== 0 ) {
-                    var newConfig_1 = objExtend(true, defaultValue, theConfig);
-                    if (config && mergeDefault === 2 ) {
-                        objForEachKey(defaultValue, function (field) {
-                            if (isNullOrUndefined(newConfig_1[field])) {
-                                var cfgValue = config[field];
-                                if (!isNullOrUndefined(cfgValue)) {
-                                    newConfig_1[field] = cfgValue;
-                                }
+                        catch (error) {
+                            var hasRun = _nextProxy && _nextProxy._hasRun;
+                            if (!_nextProxy || !hasRun) {
+                                itemCtx.diagLog().throwInternal(LoggingSeverity.CRITICAL, _InternalMessageId.PluginException, "Plugin [" + plugin.identifier + "] failed during processTelemetry - " + dumpObj(error));
                             }
-                        });
+                            if (_nextProxy && !hasRun) {
+                                _nextProxy.processTelemetry(env, itemCtx);
+                            }
+                        }
                     }
-                }
-            }
-            return theConfig;
-        }
-        function _getConfig(identifier, field, defaultValue) {
-            if (defaultValue === void 0) { defaultValue = false; }
-            var theValue;
-            var extConfig = _getExtCfg(identifier, null);
-            if (extConfig && !isNullOrUndefined(extConfig[field])) {
-                theValue = extConfig[field];
-            }
-            else if (config && !isNullOrUndefined(config[field])) {
-                theValue = config[field];
-            }
-            return !isNullOrUndefined(theValue) ? theValue : defaultValue;
+                    else if (_nextProxy) {
+                        _self._hasRun = true;
+                        _nextProxy.processTelemetry(env, itemCtx);
+                    }
+                }, function () { return ({ item: env }); }, !(env.sync));
+            };
         }
-        function _iterateChain(cb) {
-            var nextPlugin;
-            while (!!(nextPlugin = context._next())) {
-                var plugin = nextPlugin.getPlugin();
-                if (plugin) {
-                    cb(plugin);
+        return TelemetryPluginChain;
+    }());
+
+    function _createProxyChain(plugins, itemCtx) {
+        var proxies = [];
+        if (plugins && plugins.length > 0) {
+            var lastProxy = null;
+            for (var idx = 0; idx < plugins.length; idx++) {
+                var thePlugin = plugins[idx];
+                if (thePlugin && isFunction(thePlugin.processTelemetry)) {
+                    var newProxy = new TelemetryPluginChain(thePlugin, itemCtx);
+                    proxies.push(newProxy);
+                    if (lastProxy) {
+                        lastProxy.setNext(newProxy);
+                    }
+                    lastProxy = newProxy;
                 }
             }
         }
-        return context;
+        return proxies.length > 0 ? proxies[0] : null;
     }
-    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);
+    function _copyProxyChain(proxy, itemCtx, startAt) {
+        var plugins = [];
+        var add = startAt ? false : true;
+        if (proxy) {
+            while (proxy) {
+                var thePlugin = proxy.getPlugin();
+                if (add || thePlugin === startAt) {
+                    add = true;
+                    plugins.push(thePlugin);
+                }
+                proxy = proxy.getNext();
             }
-            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);
+        if (!add) {
+            plugins.push(startAt);
         }
-        context.processNext = _processNext;
-        context.createNew = _createNew;
-        return context;
+        return _createProxyChain(plugins, itemCtx);
     }
-    function createProcessTelemetryUpdateContext(telemetryChain, config, core, startAt) {
-        var internalContext = _createInternalContext(telemetryChain, config, core, startAt);
-        var context = internalContext.ctx;
-        function _processNext(updateState) {
-            return context.iterate(function (plugin) {
-                if (isFunction(plugin[strUpdate])) {
-                    plugin[strUpdate](context, updateState);
+    function _copyPluginChain(srcPlugins, itemCtx, startAt) {
+        var plugins = srcPlugins;
+        var add = false;
+        if (startAt && srcPlugins) {
+            plugins = [];
+            arrForEach(srcPlugins, function (thePlugin) {
+                if (add || thePlugin === startAt) {
+                    add = true;
+                    plugins.push(thePlugin);
                 }
             });
         }
-        function _createNew(plugins, startAt) {
-            if (plugins === void 0) { plugins = null; }
-            if (isArray(plugins)) {
-                plugins = createTelemetryProxyChain(plugins, config, core, startAt);
+        if (startAt && !add) {
+            if (!plugins) {
+                plugins = [];
             }
-            return createProcessTelemetryUpdateContext(plugins || context.getNext(), config, core, startAt);
+            plugins.push(startAt);
         }
-        context.processNext = _processNext;
-        context.createNew = _createNew;
-        return context;
+        return _createProxyChain(plugins, itemCtx);
     }
-    function createTelemetryProxyChain(plugins, config, core, startAt) {
-        var firstProxy = null;
-        var add = startAt ? false : true;
-        if (isArray(plugins) && plugins.length > 0) {
-            var lastProxy_1 = null;
-            arrForEach(plugins, function (thePlugin) {
-                if (!add && startAt === thePlugin) {
-                    add = true;
+    var ProcessTelemetryContext = /** @class */ (function () {
+        function ProcessTelemetryContext(plugins, config, core, startAt) {
+            var _self = this;
+            var _nextProxy = null;
+            if (startAt !== null) {
+                if (plugins && isFunction(plugins.getPlugin)) {
+                    _nextProxy = _copyProxyChain(plugins, _self, startAt || plugins.getPlugin());
                 }
-                if (add && thePlugin && isFunction(thePlugin.processTelemetry)) {
-                    var newProxy = createTelemetryPluginProxy(thePlugin, config, core);
-                    if (!firstProxy) {
-                        firstProxy = newProxy;
+                else {
+                    if (startAt) {
+                        _nextProxy = _copyPluginChain(plugins, _self, startAt);
                     }
-                    if (lastProxy_1) {
-                        lastProxy_1._setNext(newProxy);
+                    else if (isUndefined(startAt)) {
+                        _nextProxy = _createProxyChain(plugins, _self);
                     }
-                    lastProxy_1 = newProxy;
                 }
-            });
-        }
-        if (startAt && !firstProxy) {
-            return createTelemetryProxyChain([startAt], config, core);
-        }
-        return firstProxy;
-    }
-    function createTelemetryPluginProxy(plugin, config, core) {
-        var nextProxy = null;
-        var hasProcessTelemetry = isFunction(plugin.processTelemetry);
-        var hasSetNext = isFunction(plugin.setNextPlugin);
-        var chainId;
-        if (plugin) {
-            chainId = plugin.identifier + "-" + plugin.priority + "-" + _chainId++;
-        }
-        else {
-            chainId = "Unknown-0-" + _chainId++;
-        }
-        var proxyChain = {
-            getPlugin: function () {
-                return plugin;
-            },
-            getNext: function () {
-                return nextProxy;
-            },
-            processTelemetry: _processTelemetry,
-            unload: _unloadPlugin,
-            update: _updatePlugin,
-            _id: chainId,
-            _setNext: function (nextPlugin) {
-                nextProxy = nextPlugin;
             }
-        };
-        function _getTelCtx() {
-            var itemCtx;
-            if (plugin && isFunction(plugin[strGetTelCtx])) {
-                itemCtx = plugin[strGetTelCtx]();
-            }
-            if (!itemCtx) {
-                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] = {};
-            }
-            itemCtx.setNext(nextProxy);
-            if (plugin) {
-                doPerf(itemCtx[strCore](), function () { return identifier + ":" + name; }, function () {
-                    hasRunContext[chainId] = true;
-                    try {
-                        var nextId = nextProxy ? nextProxy._id : strEmpty$1;
-                        if (nextId) {
-                            hasRunContext[nextId] = false;
-                        }
-                        hasRun = processPluginFn(itemCtx);
-                    }
-                    catch (error) {
-                        var hasNextRun = nextProxy ? hasRunContext[nextProxy._id] : true;
-                        if (hasNextRun) {
-                            hasRun = true;
-                        }
-                        if (!nextProxy || !hasNextRun) {
-                            _throwInternal(itemCtx.diagLog(), 1 , 73 , "Plugin [" + plugin.identifier + "] failed during " + name + " - " + dumpObj(error) + ", run flags: " + dumpObj(hasRunContext));
-                        }
+            _self.core = function () {
+                return core;
+            };
+            _self.diagLog = function () {
+                return safeGetLogger(core, config);
+            };
+            _self.getCfg = function () {
+                return config;
+            };
+            _self.getExtCfg = function (identifier, defaultValue) {
+                if (defaultValue === void 0) { defaultValue = {}; }
+                var theConfig;
+                if (config) {
+                    var extConfig = config.extensionConfig;
+                    if (extConfig && identifier) {
+                        theConfig = extConfig[identifier];
                     }
-                }, details, isAsync);
-            }
-            return hasRun;
-        }
-        function _processTelemetry(env, itemCtx) {
-            itemCtx = itemCtx || _getTelCtx();
-            function _callProcessTelemetry(itemCtx) {
-                if (!plugin || !hasProcessTelemetry) {
-                    return false;
                 }
-                var pluginState = _getPluginState(plugin);
-                if (pluginState[strTeardown] || pluginState[strDisabled]) {
-                    return false;
-                }
-                if (hasSetNext) {
-                    plugin.setNextPlugin(nextProxy);
+                return (theConfig ? theConfig : defaultValue);
+            };
+            _self.getConfig = function (identifier, field, defaultValue) {
+                if (defaultValue === void 0) { defaultValue = false; }
+                var theValue;
+                var extConfig = _self.getExtCfg(identifier, null);
+                if (extConfig && !isNullOrUndefined(extConfig[field])) {
+                    theValue = extConfig[field];
                 }
-                plugin.processTelemetry(env, itemCtx);
-                return true;
-            }
-            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;
-                        }
-                    }
+                else if (config && !isNullOrUndefined(config[field])) {
+                    theValue = config[field];
                 }
-                return hasRun;
-            }
-            if (!_processChain(unloadCtx, _callTeardown, "unload", function () { }, unloadState.isAsync)) {
-                unloadCtx.processNext(unloadState);
-            }
-        }
-        function _updatePlugin(updateCtx, updateState) {
-            function _callUpdate() {
-                var hasRun = false;
-                if (plugin) {
-                    var pluginState = _getPluginState(plugin);
-                    var pluginCore = plugin[strCore] || pluginState.core;
-                    if (plugin && (!pluginCore || pluginCore === updateCtx[strCore]()) && !pluginState[strTeardown]) {
-                        if (plugin[strUpdate] && plugin[strUpdate](updateCtx, updateState) === true) {
-                            hasRun = true;
-                        }
-                    }
+                return !isNullOrUndefined(theValue) ? theValue : defaultValue;
+            };
+            _self.hasNext = function () {
+                return _nextProxy != null;
+            };
+            _self.getNext = function () {
+                return _nextProxy;
+            };
+            _self.setNext = function (nextPlugin) {
+                _nextProxy = nextPlugin;
+            };
+            _self.processNext = function (env) {
+                var nextPlugin = _nextProxy;
+                if (nextPlugin) {
+                    _nextProxy = nextPlugin.getNext();
+                    nextPlugin.processTelemetry(env, _self);
                 }
-                return hasRun;
-            }
-            if (!_processChain(updateCtx, _callUpdate, "update", function () { }, false)) {
-                updateCtx.processNext(updateState);
-            }
+            };
+            _self.createNew = function (plugins, startAt) {
+                if (plugins === void 0) { plugins = null; }
+                return new ProcessTelemetryContext(plugins || _nextProxy, config, core, startAt);
+            };
         }
-        return objFreeze(proxyChain);
-    }
+        return ProcessTelemetryContext;
+    }());
 
     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) {
-                    _throwInternal(unloadCtx.diagLog(), 2 , 73 , "Unexpected error calling unload handler - " + dumpObj(e));
-                }
-            });
-            handlers = [];
-        }
-        return {
-            add: _addHandler,
-            run: _runHandlers
-        };
-    }
-
     var strGetPlugin = "getPlugin";
     var BaseTelemetryPlugin = /** @class */ (function () {
         function BaseTelemetryPlugin() {
             var _self = this;
-            var _isinitialized;
-            var _rootCtx;
-            var _nextPlugin;
-            var _unloadHandlerContainer;
-            var _hooks;
-            _initDefaults();
-            dynamicProto(BaseTelemetryPlugin, _self, function (_self) {
-                _self.initialize = function (config, core, extensions, pluginChain) {
-                    _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.update = function (updateCtx, updateState) {
-                    if (!_self.core || (updateCtx && _self.core !== updateCtx.core())) {
-                        return;
-                    }
-                    var result;
-                    var updateDone = false;
-                    var theUpdateCtx = updateCtx || createProcessTelemetryUpdateContext(null, {}, _self.core, _nextPlugin && _nextPlugin[strGetPlugin] ? _nextPlugin[strGetPlugin]() : _nextPlugin);
-                    var theUpdateState = updateState || {
-                        reason: 0
-                    };
-                    function _updateCallback() {
-                        if (!updateDone) {
-                            updateDone = true;
-                            _setDefaults(theUpdateCtx.getCfg(), theUpdateCtx.core(), theUpdateCtx.getNext());
-                        }
-                    }
-                    if (!_self._doUpdate || _self._doUpdate(theUpdateCtx, theUpdateState, _updateCallback) !== true) {
-                        _updateCallback();
-                    }
-                    else {
-                        result = true;
-                    }
-                    return result;
-                };
-                _self._addHook = function (hooks) {
-                    if (hooks) {
-                        if (isArray(hooks)) {
-                            _hooks = _hooks.concat(hooks);
-                        }
-                        else {
-                            _hooks.push(hooks);
-                        }
-                    }
-                };
-                proxyFunctionAs(_self, "_addUnloadCb", function () { return _unloadHandlerContainer; }, "add");
-            });
+            var _isinitialized = false;
+            var _rootCtx = null;
+            var _nextPlugin = null;
+            _self.core = null;
             _self.diagLog = function (itemCtx) {
-                return _getTelCtx(itemCtx).diagLog();
+                return _self._getTelCtx(itemCtx).diagLog();
             };
-            _self[strIsInitialized] = function () {
+            _self.isInitialized = function () {
                 return _isinitialized;
             };
             _self.setInitialized = function (isInitialized) {
                 _isinitialized = isInitialized;
             };
-            _self[strSetNextPlugin] = function (next) {
+            _self.setNextPlugin = function (next) {
                 _nextPlugin = next;
             };
             _self.processNext = function (env, itemCtx) {
@@ -1693,12 +1294,11 @@
                     _nextPlugin.processTelemetry(env, null);
                 }
             };
-            _self._getTelCtx = _getTelCtx;
-            function _getTelCtx(currentCtx) {
+            _self._getTelCtx = function (currentCtx) {
                 if (currentCtx === void 0) { currentCtx = null; }
                 var itemCtx = currentCtx;
                 if (!itemCtx) {
-                    var rootCtx = _rootCtx || createProcessTelemetryContext(null, {}, _self.core);
+                    var rootCtx = _rootCtx || new ProcessTelemetryContext(null, {}, _self.core);
                     if (_nextPlugin && _nextPlugin[strGetPlugin]) {
                         itemCtx = rootCtx.createNew(null, _nextPlugin[strGetPlugin]);
                     }
@@ -1707,8 +1307,8 @@
                     }
                 }
                 return itemCtx;
-            }
-            function _setDefaults(config, core, pluginChain) {
+            };
+            _self._baseTelInit = function (config, core, extensions, pluginChain) {
                 if (config) {
                     setValue(config, strExtensionConfig, [], null, isNullOrUndefined);
                 }
@@ -1720,133 +1320,70 @@
                     nextPlugin = _nextPlugin[strGetPlugin]();
                 }
                 _self.core = core;
-                _rootCtx = createProcessTelemetryContext(pluginChain, config, core, nextPlugin);
-            }
-            function _initDefaults() {
-                _isinitialized = false;
-                _self.core = null;
-                _rootCtx = null;
-                _nextPlugin = null;
-                _hooks = [];
-                _unloadHandlerContainer = createUnloadHandlerContainer();
-            }
+                _rootCtx = new ProcessTelemetryContext(pluginChain, config, core, nextPlugin);
+                _isinitialized = true;
+            };
         }
+        BaseTelemetryPlugin.prototype.initialize = function (config, core, extensions, pluginChain) {
+            this._baseTelInit(config, core, extensions, pluginChain);
+        };
         return BaseTelemetryPlugin;
     }());
 
-    var strOnPrefix = "on";
-    var strAttachEvent = "attachEvent";
-    var strAddEventHelper = "addEventListener";
-    var strEvents = "events";
-    createUniqueNamespace("aiEvtPageHide");
-    createUniqueNamespace("aiEvtPageShow");
-    var rRemoveEmptyNs = /\.[\.]+/g;
-    var rRemoveTrailingEmptyNs = /[\.]+$/;
-    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, evtNamespace) {
-        if (evtNamespace) {
-            var theNamespace_1 = "";
-            if (isArray(evtNamespace)) {
-                theNamespace_1 = "";
-                arrForEach(evtNamespace, function (name) {
-                    name = _normalizeNamespace(name);
-                    if (name) {
-                        if (name[0] !== ".") {
-                            name = "." + name;
-                        }
-                        theNamespace_1 += name;
-                    }
-                });
-            }
-            else {
-                theNamespace_1 = _normalizeNamespace(evtNamespace);
-            }
-            if (theNamespace_1) {
-                if (theNamespace_1[0] !== ".") {
-                    theNamespace_1 = "." + theNamespace_1;
-                }
-                eventName = (eventName || "") + theNamespace_1;
-            }
+    var UInt32Mask = 0x100000000;
+    var MaxUInt32 = 0xffffffff;
+    var _mwcSeeded = false;
+    var _mwcW = 123456789;
+    var _mwcZ = 987654321;
+    function _mwcSeed(seedValue) {
+        if (seedValue < 0) {
+            seedValue >>>= 0;
         }
-        var parsedEvent = (eventNamespace.exec(eventName || "") || []);
-        return {
-            type: parsedEvent[1],
-            ns: ((parsedEvent[2] || "").replace(rRemoveEmptyNs, ".").replace(rRemoveTrailingEmptyNs, "").split(".").sort()).join(".")
-        };
+        _mwcW = (123456789 + seedValue) & MaxUInt32;
+        _mwcZ = (987654321 - seedValue) & MaxUInt32;
+        _mwcSeeded = true;
     }
-    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] = [];
+    function _autoSeedMwc() {
+        try {
+            var now = dateNow() & 0x7fffffff;
+            _mwcSeed(((Math.random() * UInt32Mask) ^ now) + now);
         }
-        return registeredEvents;
-    }
-    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;
-            }
+        catch (e) {
         }
-        return result;
     }
-    function mergeEvtNamespace(theNamespace, namespaces) {
-        var newNamespaces;
-        if (namespaces) {
-            if (isArray(namespaces)) {
-                newNamespaces = [theNamespace].concat(namespaces);
-            }
-            else {
-                newNamespaces = [theNamespace, namespaces];
+    function random32(signed) {
+        var value;
+        var c = getCrypto() || getMsCrypto();
+        if (c && c.getRandomValues) {
+            value = c.getRandomValues(new Uint32Array(1))[0] & MaxUInt32;
+        }
+        else if (isIE()) {
+            if (!_mwcSeeded) {
+                _autoSeedMwc();
             }
-            newNamespaces = (_getEvtNamespace("xx", newNamespaces).ns).split(".");
+            value = mwcRandom32() & MaxUInt32;
         }
         else {
-            newNamespaces = theNamespace;
+            value = Math.floor((UInt32Mask * Math.random()) | 0);
         }
-        return newNamespaces;
+        if (!signed) {
+            value >>>= 0;
+        }
+        return value;
     }
-    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) {
-            }
+    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 result;
+        return value;
     }
 
     function generateW3CId() {
         var hexValues = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
-        var oct = strEmpty$1, tmp;
+        var oct = "", tmp;
         for (var a = 0; a < 4; a++) {
             tmp = random32();
             oct +=
@@ -1863,95 +1400,6 @@
         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"
@@ -2010,7 +1458,6 @@
             };
             var hookCtx = [];
             var cbArgs = _createArgs([funcArgs], orgArgs);
-            funcArgs.evt = getGlobalInst("event");
             function _createArgs(target, theArgs) {
                 _arrLoop(theArgs, function (arg) {
                     target.push(arg);
@@ -2127,7 +1574,7 @@
             name = strTrim(name.toString());
             if (name.length > 150 ) {
                 nameTrunc = name.substring(0, 150 );
-                _throwInternal(logger, 2 , _InternalMessageId.NameTooLong, "name is too long.  It has been truncated to " + 150  + " characters.", { name: name }, true);
+                logger && logger.throwInternal(LoggingSeverity.WARNING, _InternalMessageId.NameTooLong, "name is too long.  It has been truncated to " + 150  + " characters.", { name: name }, true);
             }
         }
         return nameTrunc || name;
@@ -2140,7 +1587,7 @@
             value = strTrim(value);
             if (value.toString().length > maxLength) {
                 valueTrunc = value.toString().substring(0, maxLength);
-                _throwInternal(logger, 2 , _InternalMessageId.StringValueTooLong, "string value is too long. It has been truncated to " + maxLength + " characters.", { value: value }, true);
+                logger && logger.throwInternal(LoggingSeverity.WARNING, _InternalMessageId.StringValueTooLong, "string value is too long. It has been truncated to " + maxLength + " characters.", { value: value }, true);
             }
         }
         return valueTrunc || value;
@@ -2157,7 +1604,7 @@
                         value = getJSON().stringify(value);
                     }
                     catch (e) {
-                        _throwInternal(logger, 2 , _InternalMessageId.CannotSerializeObjectNonSerializable, "custom property is not valid", { exception: e }, true);
+                        logger && logger.throwInternal(LoggingSeverity.WARNING, _InternalMessageId.CannotSerializeObjectNonSerializable, "custom property is not valid", { exception: e }, true);
                     }
                 }
                 value = dataSanitizeString(logger, value, 8192 );
@@ -2185,7 +1632,7 @@
             input = strTrim(input);
             if (input.length > maxLength) {
                 inputTrunc = input.substring(0, maxLength);
-                _throwInternal(logger, 2 , _msgId, "input is too long, it has been truncated to " + maxLength + " characters.", { data: input }, true);
+                logger && logger.throwInternal(LoggingSeverity.WARNING, _msgId, "input is too long, it has been truncated to " + maxLength + " characters.", { data: input }, true);
             }
         }
         return inputTrunc || input;
@@ -2195,28 +1642,39 @@
         return s.substr(s.length - 3);
     }
 
-    var strEmpty = "";
     function msToTimeSpan(totalms) {
         if (isNaN(totalms) || totalms < 0) {
             totalms = 0;
         }
         totalms = Math.round(totalms);
-        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 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 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 + "." : strEmpty) + hour + ":" + min + ":" + sec + "." + ms;
+        return (days > 0 ? days + "." : "") + 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];
@@ -2290,7 +1748,7 @@
         "https://dc-int.services.visualstudio.com/v2/track"
     ];
     function isInternalApplicationInsightsEndpoint(endpointUrl) {
-        return _internalEndpoints.indexOf(endpointUrl.toLowerCase()) !== -1;
+        return arrIndexOf(_internalEndpoints, endpointUrl.toLowerCase()) !== -1;
     }
     var CorrelationIdHelper = {
         correlationIdPrefix: "cid-v1:",
@@ -2746,7 +2204,6 @@
     var strAjaxData = "ajaxData";
     var strThrowInternal = "throwInternal";
     var strFetch = "fetch";
-    var strTrackDependencyDataInternal = "trackDependencyDataInternal";
     var _markCount = 0;
     function _supportsFetch() {
         var _global = getGlobal();
@@ -2826,41 +2283,80 @@
             var _this = _super.call(this) || this;
             _this.identifier = AjaxMonitor.identifier;
             _this.priority = 120;
-            var _fetchInitialized;
-            var _xhrInitialized;
-            var _currentWindowHost;
-            var _config;
-            var _enableRequestHeaderTracking;
-            var _enableAjaxErrorStatusText;
-            var _trackAjaxAttempts;
+            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 _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;
+                            }
+                        }
                     }
                 };
-                _self._doTeardown = function () {
-                    _initDefaults();
+                _self.teardown = function () {
+                    arrForEach(_hooks, function (fn) {
+                        fn.rm();
+                    });
+                    _hooks = [];
+                    _fetchInitialized = false;
+                    _xhrInitialized = false;
+                    _self.setInitialized(false);
                 };
                 _self.trackDependencyData = function (dependency, properties) {
                     _self[strTrackDependencyDataInternal](dependency, properties);
@@ -2927,8 +2423,8 @@
                 };
                 _self[strTrackDependencyDataInternal] = function (dependency, properties, systemProperties) {
                     if (_maxAjaxCallsPerView === -1 || _trackAjaxAttempts < _maxAjaxCallsPerView) {
-                        if ((_config.distributedTracingMode === 2
-                            || _config.distributedTracingMode === 1 )
+                        if ((_config.distributedTracingMode === DistributedTracingModes.W3C
+                            || _config.distributedTracingMode === DistributedTracingModes.AI_AND_W3C)
                             && typeof dependency.id === "string" && dependency.id[dependency.id.length - 1] !== ".") {
                             dependency.id += ".";
                         }
@@ -2943,64 +2439,6 @@
                     }
                     ++_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) {
@@ -3020,12 +2458,11 @@
                     }
                     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, {
                             req: function (callDetails, input, init) {
                                 var fetchData;
-                                if (!_disableFetchTracking && _fetchInitialized &&
+                                if (_fetchInitialized &&
                                     !_isDisabledRequest(null, input, init) &&
                                     !(isPolyfill && _xhrInitialized)) {
                                     var ctx = callDetails.ctx();
@@ -3038,33 +2475,31 @@
                                 }
                             },
                             rsp: function (callDetails, input) {
-                                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;
+                                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;
                                         });
-                                    }
+                                        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.")
@@ -3072,8 +2507,7 @@
                         _fetchInitialized = true;
                     }
                     else if (isPolyfill) {
-                        _addHook(InstrumentFunc(global, strFetch, {
-                            ns: _evtNamespace,
+                        _hooks.push(InstrumentFunc(global, strFetch, {
                             req: function (callDetails, input, init) {
                                 _isDisabledRequest(null, input, init);
                             }
@@ -3084,68 +2518,58 @@
                     }
                 }
                 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) {
                         _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) {
-                                            _openHandler(xhr, method, url, async);
-                                        }
-                                        _attachToOnReadyStateChange(xhr);
+                                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);
                                 }
                             },
                             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) {
-                                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.")
                         });
                         _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.")
                         });
-                        _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;
                     }
                 }
@@ -3216,7 +2640,7 @@
                     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);
@@ -3231,7 +2655,7 @@
                                 });
                             }
                         }
-                    }, _evtNamespace);
+                    });
                 }
                 function _getResponseText(xhr) {
                     try {
@@ -3516,7 +2940,7 @@
                 disableFetchTracking: true,
                 excludeRequestFromAutoTrackingPatterns: undefined,
                 disableCorrelationHeaders: false,
-                distributedTracingMode: 1 ,
+                distributedTracingMode: DistributedTracingModes.AI_AND_W3C,
                 correlationHeaderExcludedDomains: [
                     "*.blob.core.windows.net",
                     "*.blob.core.chinacloudapi.cn",