@microsoft/applicationinsights-clickanalytics-js 2.8.0-nightly.2202-06 → 2.8.0-nightly.2204-04

package/browser/ai.clck.2.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Click Analytics, 2.8.0-nightly.2202-06
+ * Application Insights JavaScript SDK - Click Analytics, 2.8.0-nightly.2204-04
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -75,7 +75,9 @@
     var __assignFn = ObjAssign || __objAssignFnImpl;
     var extendStaticsFn = function (d, b) {
         extendStaticsFn = ObjClass["setPrototypeOf"] ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            ({ __proto__: [] } instanceof Array && function (d, b) {
+                d.__proto__ = b;
+            }) ||
             function (d, b) {
                 for (var p in b) {
                     if (b[strShimHasOwnProperty](p)) {
@@ -90,7 +92,9 @@
             throwTypeError("Class extends value " + String(b) + " is not a constructor or null");
         }
         extendStaticsFn(d, b);
-        function __() { this.constructor = d; }
+        function __() {
+            this.constructor = d;
+        }
         d[strShimPrototype] = b === null ? objCreateFn(b) : (__[strShimPrototype] = b[strShimPrototype], new __());
     }
 
@@ -109,11 +113,11 @@
     var DynAllowInstChkTag = DynInstChkTag;
     var DynProtoDefaultOptions = '_dfOpts';
     var UnknownValue = '_unknown_';
-    var str__Proto = "__proto__";
+    var str__Proto$1 = "__proto__";
     var strUseBaseInst = 'useBaseInst';
     var strSetInstFuncs = 'setInstFuncs';
     var Obj = Object;
-    var _objGetPrototypeOf = Obj["getPrototypeOf"];
+    var _objGetPrototypeOf$1 = Obj["getPrototypeOf"];
     var _dynamicNames = 0;
     function _hasOwnProperty(obj, prop) {
         return obj && Obj[Prototype$1].hasOwnProperty.call(obj, prop);
@@ -124,12 +128,12 @@
     function _isObjectArrayOrFunctionPrototype(target) {
         return _isObjectOrArrayPrototype(target) || target === Function[Prototype$1];
     }
-    function _getObjProto(target) {
+    function _getObjProto$1(target) {
         if (target) {
-            if (_objGetPrototypeOf) {
-                return _objGetPrototypeOf(target);
+            if (_objGetPrototypeOf$1) {
+                return _objGetPrototypeOf$1(target);
             }
-            var newProto = target[str__Proto] || target[Prototype$1] || (target[Constructor] ? target[Constructor][Prototype$1] : null);
+            var newProto = target[str__Proto$1] || target[Prototype$1] || (target[Constructor] ? target[Constructor][Prototype$1] : null);
             if (newProto) {
                 return newProto;
             }
@@ -195,16 +199,16 @@
         _forEachProp(instFuncs, function (name) {
             baseFuncs[name] = _instFuncProxy(thisTarget, instFuncs, name);
         });
-        var baseProto = _getObjProto(classProto);
+        var baseProto = _getObjProto$1(classProto);
         var visited = [];
         while (baseProto && !_isObjectArrayOrFunctionPrototype(baseProto) && !_hasVisited(visited, baseProto)) {
             _forEachProp(baseProto, function (name) {
-                if (!baseFuncs[name] && _isDynamicCandidate(baseProto, name, !_objGetPrototypeOf)) {
+                if (!baseFuncs[name] && _isDynamicCandidate(baseProto, name, !_objGetPrototypeOf$1)) {
                     baseFuncs[name] = _instFuncProxy(thisTarget, baseProto, name);
                 }
             });
             visited.push(baseProto);
-            baseProto = _getObjProto(baseProto);
+            baseProto = _getObjProto$1(baseProto);
         }
         return baseFuncs;
     }
@@ -218,7 +222,7 @@
             }
             if (!instFunc[DynInstChkTag] && instFuncTable[DynAllowInstChkTag] !== false) {
                 var canAddInst = !_hasOwnProperty(target, funcName);
-                var objProto = _getObjProto(target);
+                var objProto = _getObjProto$1(target);
                 var visited = [];
                 while (canAddInst && objProto && !_isObjectArrayOrFunctionPrototype(objProto) && !_hasVisited(visited, objProto)) {
                     var protoFunc = objProto[funcName];
@@ -227,7 +231,7 @@
                         break;
                     }
                     visited.push(objProto);
-                    objProto = _getObjProto(objProto);
+                    objProto = _getObjProto$1(objProto);
                 }
                 try {
                     if (canAddInst) {
@@ -245,7 +249,7 @@
     function _getProtoFunc(funcName, proto, currentDynProtoProxy) {
         var protoFunc = proto[funcName];
         if (protoFunc === currentDynProtoProxy) {
-            protoFunc = _getObjProto(proto)[funcName];
+            protoFunc = _getObjProto$1(proto)[funcName];
         }
         if (typeof protoFunc !== strFunction) {
             _throwTypeError("[" + funcName + "] is not a " + strFunction);
@@ -279,15 +283,15 @@
         }
     }
     function _checkPrototype(classProto, thisTarget) {
-        if (_objGetPrototypeOf) {
+        if (_objGetPrototypeOf$1) {
             var visited = [];
-            var thisProto = _getObjProto(thisTarget);
+            var thisProto = _getObjProto$1(thisTarget);
             while (thisProto && !_isObjectArrayOrFunctionPrototype(thisProto) && !_hasVisited(visited, thisProto)) {
                 if (thisProto === classProto) {
                     return true;
                 }
                 visited.push(thisProto);
-                thisProto = _getObjProto(thisProto);
+                thisProto = _getObjProto$1(thisProto);
             }
         }
         return false;
@@ -323,7 +327,7 @@
         var instFuncs = _getInstanceFuncs(target);
         var baseFuncs = _getBaseFuncs(classProto, target, instFuncs, useBaseInst);
         delegateFunc(target, baseFuncs);
-        var setInstanceFunc = !!_objGetPrototypeOf && !!perfOptions[strSetInstFuncs];
+        var setInstanceFunc = !!_objGetPrototypeOf$1 && !!perfOptions[strSetInstFuncs];
         if (setInstanceFunc && options) {
             setInstanceFunc = !!options[strSetInstFuncs];
         }
@@ -335,105 +339,52 @@
     };
     dynamicProto[DynProtoDefaultOptions] = perfDefaults;
 
-    var LoggingSeverity;
-    (function (LoggingSeverity) {
-        LoggingSeverity[LoggingSeverity["CRITICAL"] = 1] = "CRITICAL";
-        LoggingSeverity[LoggingSeverity["WARNING"] = 2] = "WARNING";
-    })(LoggingSeverity || (LoggingSeverity = {}));
-    var _InternalMessageId = {
-        BrowserDoesNotSupportLocalStorage: 0,
-        BrowserCannotReadLocalStorage: 1,
-        BrowserCannotReadSessionStorage: 2,
-        BrowserCannotWriteLocalStorage: 3,
-        BrowserCannotWriteSessionStorage: 4,
-        BrowserFailedRemovalFromLocalStorage: 5,
-        BrowserFailedRemovalFromSessionStorage: 6,
-        CannotSendEmptyTelemetry: 7,
-        ClientPerformanceMathError: 8,
-        ErrorParsingAISessionCookie: 9,
-        ErrorPVCalc: 10,
-        ExceptionWhileLoggingError: 11,
-        FailedAddingTelemetryToBuffer: 12,
-        FailedMonitorAjaxAbort: 13,
-        FailedMonitorAjaxDur: 14,
-        FailedMonitorAjaxOpen: 15,
-        FailedMonitorAjaxRSC: 16,
-        FailedMonitorAjaxSend: 17,
-        FailedMonitorAjaxGetCorrelationHeader: 18,
-        FailedToAddHandlerForOnBeforeUnload: 19,
-        FailedToSendQueuedTelemetry: 20,
-        FailedToReportDataLoss: 21,
-        FlushFailed: 22,
-        MessageLimitPerPVExceeded: 23,
-        MissingRequiredFieldSpecification: 24,
-        NavigationTimingNotSupported: 25,
-        OnError: 26,
-        SessionRenewalDateIsZero: 27,
-        SenderNotInitialized: 28,
-        StartTrackEventFailed: 29,
-        StopTrackEventFailed: 30,
-        StartTrackFailed: 31,
-        StopTrackFailed: 32,
-        TelemetrySampledAndNotSent: 33,
-        TrackEventFailed: 34,
-        TrackExceptionFailed: 35,
-        TrackMetricFailed: 36,
-        TrackPVFailed: 37,
-        TrackPVFailedCalc: 38,
-        TrackTraceFailed: 39,
-        TransmissionFailed: 40,
-        FailedToSetStorageBuffer: 41,
-        FailedToRestoreStorageBuffer: 42,
-        InvalidBackendResponse: 43,
-        FailedToFixDepricatedValues: 44,
-        InvalidDurationValue: 45,
-        TelemetryEnvelopeInvalid: 46,
-        CreateEnvelopeError: 47,
-        CannotSerializeObject: 48,
-        CannotSerializeObjectNonSerializable: 49,
-        CircularReferenceDetected: 50,
-        ClearAuthContextFailed: 51,
-        ExceptionTruncated: 52,
-        IllegalCharsInName: 53,
-        ItemNotInArray: 54,
-        MaxAjaxPerPVExceeded: 55,
-        MessageTruncated: 56,
-        NameTooLong: 57,
-        SampleRateOutOfRange: 58,
-        SetAuthContextFailed: 59,
-        SetAuthContextFailedAccountName: 60,
-        StringValueTooLong: 61,
-        StartCalledMoreThanOnce: 62,
-        StopCalledWithoutStart: 63,
-        TelemetryInitializerFailed: 64,
-        TrackArgumentsNotSpecified: 65,
-        UrlTooLong: 66,
-        SessionStorageBufferFull: 67,
-        CannotAccessCookie: 68,
-        IdTooLong: 69,
-        InvalidEvent: 70,
-        FailedMonitorAjaxSetRequestHeader: 71,
-        SendBrowserInfoOnUserInit: 72,
-        PluginException: 73,
-        NotificationException: 74,
-        SnippetScriptLoadFailure: 99,
-        InvalidInstrumentationKey: 100,
-        CannotParseAiBlobValue: 101,
-        InvalidContentBlob: 102,
-        TrackPageActionEventFailed: 103,
-        FailedAddingCustomDefinedRequestContext: 104,
-        InMemoryStorageBufferFull: 105
-    };
+    var strEmpty = "";
+    var strSetNextPlugin = "setNextPlugin";
+    var strIsInitialized = "isInitialized";
+    var strTeardown = "teardown";
+    var strCore = "core";
+    var strUpdate = "update";
+    var strDisabled = "disabled";
+    var strDoTeardown = "_doTeardown";
 
-    var strOnPrefix = "on";
-    var strAttachEvent = "attachEvent";
-    var strAddEventHelper = "addEventListener";
+    var strToISOString = "toISOString";
+    var cStrEndsWith = "endsWith";
+    var cStrStartsWith = "startsWith";
+    var cStrTrim = "trim";
     var strToString = "toString";
-    var _objDefineProperty = ObjDefineProperty;
+    var str__Proto = "__proto__";
+    var strConstructor = "constructor";
+    var _objDefineProperty$1 = ObjDefineProperty;
+    var _objFreeze = ObjClass.freeze;
+    ObjClass.seal;
+    var _objKeys = ObjClass.keys;
+    var StringProto = String[strShimPrototype];
+    StringProto[cStrTrim];
+    StringProto[cStrEndsWith];
+    StringProto[cStrStartsWith];
+    var DateProto = Date[strShimPrototype];
+    DateProto[strToISOString];
     var _isArray = Array.isArray;
     var _objToString = ObjProto[strToString];
     var _fnToString = ObjHasOwnProperty[strToString];
-    _fnToString.call(ObjClass);
+    var _objFunctionString = _fnToString.call(ObjClass);
+    var rCamelCase = /-([a-z])/g;
+    var rNormalizeInvalid = /([^\w\d_$])/g;
+    var rLeadingNumeric = /^(\d+[\w\d_$])/;
+    var _objGetPrototypeOf = Object["getPrototypeOf"];
+    function _getObjProto(target) {
+        if (target) {
+            if (_objGetPrototypeOf) {
+                return _objGetPrototypeOf(target);
+            }
+            var newProto = target[str__Proto] || target[strShimPrototype] || target[strConstructor];
+            if (newProto) {
+                return newProto;
+            }
+        }
+        return null;
+    }
     function isUndefined(value) {
         return value === undefined || typeof value === strShimUndefined;
     }
@@ -443,27 +394,24 @@
     function hasOwnProperty(obj, prop) {
         return !!(obj && ObjHasOwnProperty.call(obj, prop));
     }
+    function isObject(value) {
+        return !!(value && typeof value === strShimObject);
+    }
     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) {
-            }
+    function normalizeJsName(name) {
+        var value = name;
+        if (value && isString(value)) {
+            value = value.replace(rCamelCase, function (_all, letter) {
+                return letter.toUpperCase();
+            });
+            value = value.replace(rNormalizeInvalid, "_");
+            value = value.replace(rLeadingNumeric, function (_all, match) {
+                return "_" + match;
+            });
         }
-        return result;
+        return value;
     }
     function objForEachKey(target, callbackfn) {
         if (target) {
@@ -474,6 +422,12 @@
             }
         }
     }
+    function strContains(value, search) {
+        if (value && search) {
+            return value.indexOf(search) !== -1;
+        }
+        return false;
+    }
     var isArray = _isArray || _isArrayPoly;
     function _isArrayPoly(obj) {
         return !!(obj && _objToString.call(obj) === "[object Array]");
@@ -481,6 +435,28 @@
     function isError(obj) {
         return !!(obj && _objToString.call(obj) === "[object Error]");
     }
+    function isString(value) {
+        return typeof value === "string";
+    }
+    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 arrForEach(arr, callbackfn, thisArg) {
         var len = arr.length;
         try {
@@ -495,8 +471,42 @@
         catch (e) {
         }
     }
+    var _objKeysHasDontEnumBug = !({ toString: null }).propertyIsEnumerable("toString");
+    var _objKeysDontEnums = [
+        "toString",
+        "toLocaleString",
+        "valueOf",
+        "hasOwnProperty",
+        "isPrototypeOf",
+        "propertyIsEnumerable",
+        "constructor"
+    ];
+    function objKeys(obj) {
+        var objType = typeof obj;
+        if (objType !== strShimFunction && (objType !== strShimObject || obj === null)) {
+            throwTypeError("objKeys called on non-object");
+        }
+        if (!_objKeysHasDontEnumBug && _objKeys) {
+            return _objKeys(obj);
+        }
+        var result = [];
+        for (var prop in obj) {
+            if (obj && ObjHasOwnProperty.call(obj, prop)) {
+                result.push(prop);
+            }
+        }
+        if (_objKeysHasDontEnumBug) {
+            var dontEnumsLength = _objKeysDontEnums.length;
+            for (var lp = 0; lp < dontEnumsLength; lp++) {
+                if (obj && ObjHasOwnProperty.call(obj, _objKeysDontEnums[lp])) {
+                    result.push(_objKeysDontEnums[lp]);
+                }
+            }
+        }
+        return result;
+    }
     function objDefineAccessors(target, prop, getProp, setProp) {
-        if (_objDefineProperty) {
+        if (_objDefineProperty$1) {
             try {
                 var descriptor = {
                     enumerable: true,
@@ -508,7 +518,7 @@
                 if (setProp) {
                     descriptor.set = setProp;
                 }
-                _objDefineProperty(target, prop, descriptor);
+                _objDefineProperty$1(target, prop, descriptor);
                 return true;
             }
             catch (e) {
@@ -516,6 +526,10 @@
         }
         return false;
     }
+    function _doNothing(value) {
+        return value;
+    }
+    var objFreeze = _objFreeze || _doNothing;
     function dateNow() {
         var dt = Date;
         return dt.now ? dt.now() : new dt().getTime();
@@ -524,7 +538,7 @@
         if (isError(object)) {
             return object.name;
         }
-        return "";
+        return strEmpty;
     }
     function setValue(target, field, value, valChk, srcChk) {
         var theValue = value;
@@ -537,13 +551,105 @@
         }
         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";
+    var strNavigator = "navigator";
     var strLocation = "location";
     var strConsole = "console";
     var strPerformance = "performance";
     var strJSON = "JSON";
+    var strCrypto = "crypto";
+    var strMsCrypto = "msCrypto";
+    var strMsie = "msie";
+    var strTrident = "trident/";
+    var _isTrident = null;
+    var _navUserAgentCheck = null;
     var _enableMocks = false;
     function getGlobalInst(name) {
         var gbl = getGlobal();
@@ -573,6 +679,15 @@
         }
         return getGlobalInst(strDocument);
     }
+    function hasNavigator() {
+        return Boolean(typeof navigator === strShimObject && navigator);
+    }
+    function getNavigator() {
+        if (hasNavigator()) {
+            return navigator;
+        }
+        return getGlobalInst(strNavigator);
+    }
     function getLocation(checkForMock) {
         if (checkForMock && _enableMocks) {
             var mockLocation = getGlobalInst("__mockLocation");
@@ -603,9 +718,24 @@
         }
         return null;
     }
+    function getCrypto() {
+        return getGlobalInst(strCrypto);
+    }
+    function getMsCrypto() {
+        return getGlobalInst(strMsCrypto);
+    }
+    function isIE() {
+        var nav = getNavigator();
+        if (nav && (nav.userAgent !== _navUserAgentCheck || _isTrident === null)) {
+            _navUserAgentCheck = nav.userAgent;
+            var userAgent = (_navUserAgentCheck || strEmpty).toLowerCase();
+            _isTrident = (strContains(userAgent, strMsie) || strContains(userAgent, strTrident));
+        }
+        return _isTrident;
+    }
     function dumpObj(object) {
         var objectTypeDump = Object[strShimPrototype].toString.call(object);
-        var propertyValueDump = "";
+        var propertyValueDump = strEmpty;
         if (objectTypeDump === "[object Error]") {
             propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
         }
@@ -638,9 +768,9 @@
     var strWarnToConsole = "warnToConsole";
     function _sanitizeDiagnosticText(text) {
         if (text) {
-            return "\"" + text.replace(/\"/g, "") + "\"";
+            return "\"" + text.replace(/\"/g, strEmpty) + "\"";
         }
-        return "";
+        return strEmpty;
     }
     function _logToConsole(func, message) {
         var theConsole = getConsole();
@@ -662,12 +792,12 @@
             _self.message =
                 (isUserAct ? AiUserActionablePrefix : AiNonUserActionablePrefix) +
                     msgId;
-            var strProps = "";
+            var strProps = strEmpty;
             if (hasJSON()) {
                 strProps = getJSON().stringify(properties);
             }
-            var diagnosticText = (msg ? " message:" + _sanitizeDiagnosticText(msg) : "") +
-                (properties ? " props:" + _sanitizeDiagnosticText(strProps) : "");
+            var diagnosticText = (msg ? " message:" + _sanitizeDiagnosticText(msg) : strEmpty) +
+                (properties ? " props:" + _sanitizeDiagnosticText(strProps) : strEmpty);
             _self.message += diagnosticText;
         }
         _InternalLogMessage.dataType = "MessageData";
@@ -697,7 +827,7 @@
                         throw message;
                     }
                     else {
-                        var logFunc = severity === LoggingSeverity.CRITICAL ? strErrorToConsole : strWarnToConsole;
+                        var logFunc = severity === 1  ? strErrorToConsole : strWarnToConsole;
                         if (!isUndefined(message.message)) {
                             var logLevel = _self.consoleLoggingLevel();
                             if (isUserAct) {
@@ -715,7 +845,7 @@
                             _self.logInternalMessage(severity, message);
                         }
                         else {
-                            _debugExtMsg("throw" + (severity === LoggingSeverity.CRITICAL ? "Critical" : "Warning"), message);
+                            _debugExtMsg("throw" + (severity === 1  ? "Critical" : "Warning"), message);
                         }
                     }
                 };
@@ -747,13 +877,13 @@
                         if (severity <= _self.telemetryLoggingLevel()) {
                             _self.queue.push(message);
                             _messageCount++;
-                            _debugExtMsg((severity === LoggingSeverity.CRITICAL ? "error" : "warn"), message);
+                            _debugExtMsg((severity === 1  ? "error" : "warn"), message);
                         }
                         if (_messageCount === _self.maxInternalMessageLimit()) {
                             var throttleLimitMessage = "Internal events throttle limit per PageView reached for this app.";
-                            var throttleMessage = new _InternalLogMessage(_InternalMessageId.MessageLimitPerPVExceeded, throttleLimitMessage, false);
+                            var throttleMessage = new _InternalLogMessage(23 , throttleLimitMessage, false);
                             _self.queue.push(throttleMessage);
-                            if (severity === LoggingSeverity.CRITICAL) {
+                            if (severity === 1 ) {
                                 _self.errorToConsole(throttleLimitMessage);
                             }
                             else {
@@ -782,6 +912,10 @@
         }
         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 () {
@@ -895,207 +1029,634 @@
         return func();
     }
 
-    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;
+    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;
+        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.8.0-nightly.2204-04";
+    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;
+                    }
                 }
-                var identifier = plugin ? plugin.identifier : "TelemetryPluginChain";
-                doPerf(itemCtx ? itemCtx.core() : null, function () { return identifier + ":processTelemetry"; }, function () {
-                    if (plugin && _hasProcessTelemetry) {
-                        _self._hasRun = true;
-                        try {
-                            itemCtx.setNext(_nextProxy);
-                            if (_hasSetNext) {
-                                plugin.setNextPlugin(_nextProxy);
-                            }
-                            _nextProxy && (_nextProxy._hasRun = false);
-                            plugin.processTelemetry(env, itemCtx);
-                        }
-                        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);
-                            }
-                        }
+            }
+            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];
                     }
-                    else if (_nextProxy) {
-                        _self._hasRun = true;
-                        _nextProxy.processTelemetry(env, itemCtx);
+                    catch (e) {
                     }
-                }, function () { return ({ item: env }); }, !(env.sync));
-            };
-        }
-        return TelemetryPluginChain;
-    }());
+                }
+            }
+        };
+        return data;
+    }
 
-    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);
+    var strDoUnload = "_doUnload";
+    var pluginStateData = createElmNodeData("plugin");
+    function _getPluginState(plugin) {
+        return pluginStateData.get(plugin, "state", {}, true);
+    }
+    function unloadComponents(components, unloadCtx, unloadState, asyncCallback) {
+        var idx = 0;
+        function _doUnload() {
+            while (idx < components.length) {
+                var component = components[idx++];
+                if (component) {
+                    var func = component[strDoUnload] || component[strDoTeardown];
+                    if (isFunction(func)) {
+                        if (func.call(component, unloadCtx, unloadState, _doUnload) === true) {
+                            return true;
+                        }
                     }
-                    lastProxy = newProxy;
                 }
             }
         }
-        return proxies.length > 0 ? proxies[0] : null;
+        return _doUnload();
     }
-    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);
+
+    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) {
+                        try {
+                            completeDetails.func.call(completeDetails.self, completeDetails.args);
+                        }
+                        catch (e) {
+                            _throwInternal(core.logger, 2 , 73 , "Unexpected Exception during onComplete - " + dumpObj(e));
+                        }
+                    });
+                    _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;
+                                }
+                            }
+                        });
+                    }
                 }
-                proxy = proxy.getNext();
             }
+            return theConfig;
         }
-        if (!add) {
-            plugins.push(startAt);
+        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;
+        }
+        function _iterateChain(cb) {
+            var nextPlugin;
+            while (!!(nextPlugin = context._next())) {
+                var plugin = nextPlugin.getPlugin();
+                if (plugin) {
+                    cb(plugin);
+                }
+            }
         }
-        return _createProxyChain(plugins, itemCtx);
+        return context;
     }
-    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 createProcessTelemetryContext(telemetryChain, config, core, startAt) {
+        var internalContext = _createInternalContext(telemetryChain, config, core, startAt);
+        var context = internalContext.ctx;
+        function _processNext(env) {
+            var nextPlugin = internalContext._next();
+            nextPlugin && nextPlugin.processTelemetry(env, context);
+            return !nextPlugin;
+        }
+        function _createNew(plugins, startAt) {
+            if (plugins === void 0) { plugins = null; }
+            if (isArray(plugins)) {
+                plugins = createTelemetryProxyChain(plugins, config, core, startAt);
+            }
+            return createProcessTelemetryContext(plugins || context.getNext(), config, core, startAt);
+        }
+        context.processNext = _processNext;
+        context.createNew = _createNew;
+        return context;
+    }
+    function createProcessTelemetryUnloadContext(telemetryChain, config, core, startAt) {
+        var internalContext = _createInternalContext(telemetryChain, config, core, startAt);
+        var context = internalContext.ctx;
+        function _processNext(unloadState) {
+            var nextPlugin = internalContext._next();
+            nextPlugin && nextPlugin.unload(context, unloadState);
+            return !nextPlugin;
+        }
+        function _createNew(plugins, startAt) {
+            if (plugins === void 0) { plugins = null; }
+            if (isArray(plugins)) {
+                plugins = createTelemetryProxyChain(plugins, config, core, startAt);
+            }
+            return createProcessTelemetryUnloadContext(plugins || context.getNext(), config, core, startAt);
+        }
+        context.processNext = _processNext;
+        context.createNew = _createNew;
+        return context;
+    }
+    function 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);
                 }
             });
         }
-        if (startAt && !add) {
-            if (!plugins) {
-                plugins = [];
+        function _createNew(plugins, startAt) {
+            if (plugins === void 0) { plugins = null; }
+            if (isArray(plugins)) {
+                plugins = createTelemetryProxyChain(plugins, config, core, startAt);
             }
-            plugins.push(startAt);
+            return createProcessTelemetryUpdateContext(plugins || context.getNext(), config, core, startAt);
         }
-        return _createProxyChain(plugins, itemCtx);
+        context.processNext = _processNext;
+        context.createNew = _createNew;
+        return context;
     }
-    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());
+    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;
                 }
-                else {
-                    if (startAt) {
-                        _nextProxy = _copyPluginChain(plugins, _self, startAt);
+                if (add && thePlugin && isFunction(thePlugin.processTelemetry)) {
+                    var newProxy = createTelemetryPluginProxy(thePlugin, config, core);
+                    if (!firstProxy) {
+                        firstProxy = newProxy;
                     }
-                    else if (isUndefined(startAt)) {
-                        _nextProxy = _createProxyChain(plugins, _self);
+                    if (lastProxy_1) {
+                        lastProxy_1._setNext(newProxy);
                     }
+                    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;
             }
-            _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];
+        };
+        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;
+                        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));
+                        }
                     }
+                }, details, isAsync);
+            }
+            return hasRun;
+        }
+        function _processTelemetry(env, itemCtx) {
+            itemCtx = itemCtx || _getTelCtx();
+            function _callProcessTelemetry(itemCtx) {
+                if (!plugin || !hasProcessTelemetry) {
+                    return false;
                 }
-                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];
+                var pluginState = _getPluginState(plugin);
+                if (pluginState[strTeardown] || pluginState[strDisabled]) {
+                    return false;
                 }
-                else if (config && !isNullOrUndefined(config[field])) {
-                    theValue = config[field];
+                if (hasSetNext) {
+                    plugin.setNextPlugin(nextProxy);
                 }
-                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);
+                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;
+                        }
+                    }
                 }
-            };
-            _self.createNew = function (plugins, startAt) {
-                if (plugins === void 0) { plugins = null; }
-                return new ProcessTelemetryContext(plugins || _nextProxy, config, core, startAt);
-            };
+                return hasRun;
+            }
+            if (!_processChain(unloadCtx, _callTeardown, "unload", function () { }, unloadState.isAsync)) {
+                unloadCtx.processNext(unloadState);
+            }
         }
-        return ProcessTelemetryContext;
-    }());
+        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 hasRun;
+            }
+            if (!_processChain(updateCtx, _callUpdate, "update", function () { }, false)) {
+                updateCtx.processNext(updateState);
+            }
+        }
+        return objFreeze(proxyChain);
+    }
 
     var strExtensionConfig = "extensionConfig";
 
+    function createUnloadHandlerContainer() {
+        var handlers = [];
+        function _addHandler(handler) {
+            if (handler) {
+                handlers.push(handler);
+            }
+        }
+        function _runHandlers(unloadCtx, unloadState) {
+            arrForEach(handlers, function (handler) {
+                try {
+                    handler(unloadCtx, unloadState);
+                }
+                catch (e) {
+                    _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 = false;
-            var _rootCtx = null;
-            var _nextPlugin = null;
-            _self.core = null;
-            _self.diagLog = function (itemCtx) {
-                return _self._getTelCtx(itemCtx).diagLog();
-            };
-            _self.isInitialized = function () {
-                return _isinitialized;
-            };
-            _self.setInitialized = function (isInitialized) {
-                _isinitialized = isInitialized;
+            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");
+            });
+            _self.diagLog = function (itemCtx) {
+                return _getTelCtx(itemCtx).diagLog();
             };
-            _self.setNextPlugin = function (next) {
+            _self[strIsInitialized] = function () {
+                return _isinitialized;
+            };
+            _self.setInitialized = function (isInitialized) {
+                _isinitialized = isInitialized;
+            };
+            _self[strSetNextPlugin] = function (next) {
                 _nextPlugin = next;
             };
             _self.processNext = function (env, itemCtx) {
@@ -1106,11 +1667,12 @@
                     _nextPlugin.processTelemetry(env, null);
                 }
             };
-            _self._getTelCtx = function (currentCtx) {
+            _self._getTelCtx = _getTelCtx;
+            function _getTelCtx(currentCtx) {
                 if (currentCtx === void 0) { currentCtx = null; }
                 var itemCtx = currentCtx;
                 if (!itemCtx) {
-                    var rootCtx = _rootCtx || new ProcessTelemetryContext(null, {}, _self.core);
+                    var rootCtx = _rootCtx || createProcessTelemetryContext(null, {}, _self.core);
                     if (_nextPlugin && _nextPlugin[strGetPlugin]) {
                         itemCtx = rootCtx.createNew(null, _nextPlugin[strGetPlugin]);
                     }
@@ -1119,8 +1681,8 @@
                     }
                 }
                 return itemCtx;
-            };
-            _self._baseTelInit = function (config, core, extensions, pluginChain) {
+            }
+            function _setDefaults(config, core, pluginChain) {
                 if (config) {
                     setValue(config, strExtensionConfig, [], null, isNullOrUndefined);
                 }
@@ -1132,16 +1694,280 @@
                     nextPlugin = _nextPlugin[strGetPlugin]();
                 }
                 _self.core = core;
-                _rootCtx = new ProcessTelemetryContext(pluginChain, config, core, nextPlugin);
-                _isinitialized = true;
-            };
+                _rootCtx = createProcessTelemetryContext(pluginChain, config, core, nextPlugin);
+            }
+            function _initDefaults() {
+                _isinitialized = false;
+                _self.core = null;
+                _rootCtx = null;
+                _nextPlugin = null;
+                _hooks = [];
+                _unloadHandlerContainer = createUnloadHandlerContainer();
+            }
         }
-        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 strDetachEvent = "detachEvent";
+    var strRemoveEventListener = "removeEventListener";
+    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 parsedEvent = (eventNamespace.exec(eventName || "") || []);
+        return {
+            type: parsedEvent[1],
+            ns: ((parsedEvent[2] || "").replace(rRemoveEmptyNs, ".").replace(rRemoveTrailingEmptyNs, "").split(".").sort()).join(".")
+        };
+    }
+    function _getRegisteredEvents(target, evtName, addDefault) {
+        if (addDefault === void 0) { addDefault = true; }
+        var aiEvts = elmNodeData.get(target, strEvents, {}, addDefault);
+        var registeredEvents = aiEvts[evtName];
+        if (!registeredEvents) {
+            registeredEvents = aiEvts[evtName] = [];
+        }
+        return registeredEvents;
+    }
+    function _doDetach(obj, evtName, handlerRef, useCapture) {
+        if (obj && evtName && evtName.type) {
+            if (obj[strRemoveEventListener]) {
+                obj[strRemoveEventListener](evtName.type, handlerRef, useCapture);
+            }
+            else if (obj[strDetachEvent]) {
+                obj[strDetachEvent](strOnPrefix + evtName.type, handlerRef);
+            }
+        }
+    }
+    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;
+            }
+        }
+        return result;
+    }
+    function _doUnregister(target, events, evtName, unRegFn) {
+        var idx = events.length;
+        while (idx--) {
+            var theEvent = events[idx];
+            if (theEvent) {
+                if (!evtName.ns || evtName.ns === theEvent.evtName.ns) {
+                    if (!unRegFn || unRegFn(theEvent)) {
+                        _doDetach(target, theEvent.evtName, theEvent.handler, theEvent.capture);
+                        events.splice(idx, 1);
+                    }
+                }
+            }
+        }
+    }
+    function _unregisterEvents(target, evtName, unRegFn) {
+        if (evtName.type) {
+            _doUnregister(target, _getRegisteredEvents(target, evtName.type), evtName, unRegFn);
+        }
+        else {
+            var eventCache = elmNodeData.get(target, strEvents, {});
+            objForEachKey(eventCache, function (evtType, events) {
+                _doUnregister(target, events, evtName, unRegFn);
+            });
+            if (objKeys(eventCache).length === 0) {
+                elmNodeData.kill(target, strEvents);
+            }
+        }
+    }
+    function mergeEvtNamespace(theNamespace, namespaces) {
+        var newNamespaces;
+        if (namespaces) {
+            if (isArray(namespaces)) {
+                newNamespaces = [theNamespace].concat(namespaces);
+            }
+            else {
+                newNamespaces = [theNamespace, namespaces];
+            }
+            newNamespaces = (_getEvtNamespace("xx", newNamespaces).ns).split(".");
+        }
+        else {
+            newNamespaces = theNamespace;
+        }
+        return newNamespaces;
+    }
+    function eventOn(target, eventName, handlerRef, evtNamespace, useCapture) {
+        if (useCapture === void 0) { useCapture = false; }
+        var result = false;
+        if (target) {
+            try {
+                var evtName = _getEvtNamespace(eventName, evtNamespace);
+                result = _doAttach(target, evtName, handlerRef, useCapture);
+                if (result && elmNodeData.accept(target)) {
+                    var registeredEvent = {
+                        guid: _guid++,
+                        evtName: evtName,
+                        handler: handlerRef,
+                        capture: useCapture
+                    };
+                    _getRegisteredEvents(target, evtName.type).push(registeredEvent);
+                }
+            }
+            catch (e) {
+            }
+        }
+        return result;
+    }
+    function eventOff(target, eventName, handlerRef, evtNamespace, useCapture) {
+        if (useCapture === void 0) { useCapture = false; }
+        if (target) {
+            try {
+                var evtName_1 = _getEvtNamespace(eventName, evtNamespace);
+                var found_1 = false;
+                _unregisterEvents(target, evtName_1, function (regEvent) {
+                    if ((evtName_1.ns && !handlerRef) || regEvent.handler === handlerRef) {
+                        found_1 = true;
+                        return true;
+                    }
+                    return false;
+                });
+                if (!found_1) {
+                    _doDetach(target, evtName_1, handlerRef, useCapture);
+                }
+            }
+            catch (e) {
+            }
+        }
+    }
+
+    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 strNotSpecified = "not_specified";
 
     var PropertiesPluginIdentifier = "AppInsightsPropertiesPlugin";
@@ -1436,188 +2262,200 @@
     }
 
     var WebEvent = /** @class */ (function () {
-        function WebEvent(_clickAnalyticsPlugin, _config, _contentHandler, _pageTagsCallback, _metaTags, _traceLogger) {
-            this._clickAnalyticsPlugin = _clickAnalyticsPlugin;
-            this._config = _config;
-            this._contentHandler = _contentHandler;
-            this._pageTagsCallback = _pageTagsCallback;
-            this._metaTags = _metaTags;
-            this._traceLogger = _traceLogger;
-            this._pageTags = {};
-        }
-        WebEvent.prototype.setBasicProperties = function (event, overrideValues) {
-            if (!isValueAssigned(event.name)) {
-                event.pageName = getPageName(this._config, overrideValues);
-            }
-            if (!isValueAssigned(event.uri) && hasWindow) {
-                event.uri = getUri(this._config, getLocation());
-            }
-        };
-        WebEvent.prototype.setCommonProperties = function (event, overrideValues) {
-            this.setBasicProperties(event, overrideValues);
-            this._setPageTags(event, overrideValues);
-            this._pageTypeMetaTag = this._getMetaData(this._metaTags, this._config.coreData, "pageType");
-            this._behaviorMetaTag = this._getMetaData(this._metaTags, this._config.coreData, "behavior");
-            if (isValueAssigned(overrideValues.pageType)) {
-                event.pageType = overrideValues.pageType;
-            }
-            if (isValueAssigned(this._pageTypeMetaTag) && !isValueAssigned(event.pageType)) {
-                event.pageType = this._pageTypeMetaTag;
-            }
-        };
-        WebEvent.prototype._setPageTags = function (event, overrideValues) {
-            if (this._pageTagsCallback) {
-                this._pageTags = extend(true, this._pageTags, this._pageTagsCallback());
-            }
-            if (isValueAssigned(overrideValues.pageTags)) {
-                this._pageTags = extend(true, this._pageTags, overrideValues.pageTags);
-            }
-            if (this._metaTags) {
-                this._pageTags.metaTags = {};
-                for (var metaTag in this._metaTags) {
-                    if (metaTag != "behavior" && metaTag != "market" && metaTag != "pageType") {
-                        this._pageTags.metaTags[metaTag] = this._metaTags[metaTag];
+        function WebEvent(clickAnalyticsPlugin, config, contentHandler, pageTagsCallback, metaTags, traceLogger) {
+            dynamicProto(WebEvent, this, function (_self) {
+                _initDefaults();
+                function _initDefaults() {
+                    _self._pageTags = {};
+                    _self._clickAnalyticsPlugin = clickAnalyticsPlugin;
+                    _self._config = config;
+                    _self._contentHandler = contentHandler;
+                    _self._pageTagsCallback = pageTagsCallback;
+                    _self._metaTags = metaTags;
+                    _self._traceLogger = traceLogger;
+                }
+                _self.setBasicProperties = function (event, overrideValues) {
+                    if (!isValueAssigned(event.name)) {
+                        event.pageName = getPageName(_self._config, overrideValues);
+                    }
+                    if (!isValueAssigned(event.uri) && hasWindow) {
+                        event.uri = getUri(_self._config, getLocation());
+                    }
+                };
+                _self.setCommonProperties = function (event, overrideValues) {
+                    _self.setBasicProperties(event, overrideValues);
+                    _self._setPageTags(event, overrideValues);
+                    _self._pageTypeMetaTag = _getMetaData(_self._metaTags, _self._config.coreData, "pageType");
+                    _self._behaviorMetaTag = _getMetaData(_self._metaTags, _self._config.coreData, "behavior");
+                    if (isValueAssigned(overrideValues.pageType)) {
+                        event.pageType = overrideValues.pageType;
                     }
+                    if (isValueAssigned(_self._pageTypeMetaTag) && !isValueAssigned(event.pageType)) {
+                        event.pageType = _self._pageTypeMetaTag;
+                    }
+                };
+                _self._setPageTags = function (event, overrideValues) {
+                    if (_self._pageTagsCallback) {
+                        _self._pageTags = extend(true, _self._pageTags, _self._pageTagsCallback());
+                    }
+                    if (isValueAssigned(overrideValues.pageTags)) {
+                        _self._pageTags = extend(true, _self._pageTags, overrideValues.pageTags);
+                    }
+                    if (_self._metaTags) {
+                        _self._pageTags.metaTags = {};
+                        for (var metaTag in _self._metaTags) {
+                            if (metaTag != "behavior" && metaTag != "market" && metaTag != "pageType") {
+                                _self._pageTags.metaTags[metaTag] = _self._metaTags[metaTag];
+                            }
+                        }
+                    }
+                    event.properties = event.properties || {};
+                    event.properties["pageTags"] = _self._pageTags;
+                };
+                _self._getBehavior = function (overrideValues) {
+                    var behavior;
+                    if (overrideValues && isValueAssigned(overrideValues.behavior)) {
+                        behavior = overrideValues.behavior;
+                    }
+                    else if (isValueAssigned(_self._behaviorMetaTag)) {
+                        behavior = _self._behaviorMetaTag;
+                    }
+                    return _self._getValidBehavior(behavior);
+                };
+                _self._getValidBehavior = function (behavior) {
+                    return _self._config.behaviorValidator(behavior);
+                };
+                _self._doUnload = function (unloadCtx, unloadState, asyncCallback) {
+                    _initDefaults();
+                };
+                function _getMetaData(metaTags, coreData, metaTagName) {
+                    if (coreData && coreData[metaTagName]) {
+                        return coreData[metaTagName];
+                    }
+                    if (metaTags) {
+                        return metaTags[metaTagName];
+                    }
+                    return "";
                 }
-            }
-            event.properties = event.properties || {};
-            event.properties["pageTags"] = this._pageTags;
-        };
-        WebEvent.prototype._getBehavior = function (overrideValues) {
-            var behavior;
-            if (overrideValues && isValueAssigned(overrideValues.behavior)) {
-                behavior = overrideValues.behavior;
-            }
-            else if (isValueAssigned(this._behaviorMetaTag)) {
-                behavior = this._behaviorMetaTag;
-            }
-            return this._getValidBehavior(behavior);
-        };
-        WebEvent.prototype._getValidBehavior = function (behavior) {
-            return this._config.behaviorValidator(behavior);
-        };
-        WebEvent.prototype._getMetaData = function (metaTags, coreData, metaTagName) {
-            if (coreData && coreData[metaTagName]) {
-                return coreData[metaTagName];
-            }
-            else if (metaTags) {
-                return metaTags[metaTagName];
-            }
-            return "";
-        };
+            });
+        }
         return WebEvent;
     }());
 
     var PageAction = /** @class */ (function (_super) {
         __extendsFn(PageAction, _super);
-        function PageAction() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        PageAction.prototype.trackPageAction = function (pageActionEvent, properties) {
-            var _this = this;
-            var ext = {};
-            ext["web"] = {};
-            var event = {
-                name: "Microsoft.ApplicationInsights.{0}.Event",
-                baseType: "EventData",
-                ext: ext,
-                data: {},
-                baseData: {}
-            };
-            this._populateEventDataIfPresent(event.baseData, "name", pageActionEvent.name);
-            this._populateEventDataIfPresent(event.data, "baseTypeSource", "ClickEvent");
-            this._populateEventDataIfPresent(event.data, "uri", pageActionEvent.uri);
-            this._populateEventDataIfPresent(event.data, "pageType", pageActionEvent.pageType);
-            this._populateEventDataIfPresent(event.data, "properties", pageActionEvent.properties);
-            this._populateEventDataIfPresent(event.data, "actionType", pageActionEvent.actionType);
-            this._populateEventDataIfPresent(event.data, "behavior", pageActionEvent.behavior);
-            this._populateEventDataIfPresent(event.data, "clickCoordinates", pageActionEvent.clickCoordinates);
-            this._populateEventDataIfPresent(event.data, "content", pageActionEvent.content);
-            this._populateEventDataIfPresent(event.data, "targetUri", pageActionEvent.targetUri);
-            this._populateEventDataIfPresent(event.data, "timeToAction", pageActionEvent.timeToAction);
-            this._populateEventDataIfPresent(event.data, "refUri", pageActionEvent.refUri);
-            this._populateEventDataIfPresent(event.data, "pageName", pageActionEvent.pageName);
-            this._populateEventDataIfPresent(event.data, "parentId", pageActionEvent.parentId);
-            if (properties) {
-                objForEachKey(properties, function (property, value) {
-                    if (!event.data[property]) {
-                        _this._populateEventDataIfPresent(event.data, property, value);
+        function PageAction(clickAnalyticsPlugin, config, contentHandler, pageTagsCallback, metaTags, traceLogger) {
+            var _this = _super.call(this, clickAnalyticsPlugin, config, contentHandler, pageTagsCallback, metaTags, traceLogger) || this;
+            dynamicProto(PageAction, _this, function (_self, _base) {
+                _self.trackPageAction = function (pageActionEvent, properties) {
+                    var ext = {};
+                    ext["web"] = {};
+                    var event = {
+                        name: "Microsoft.ApplicationInsights.{0}.Event",
+                        baseType: "EventData",
+                        ext: ext,
+                        data: {},
+                        baseData: {}
+                    };
+                    _populateEventDataIfPresent(event.baseData, "name", pageActionEvent.name);
+                    _populateEventDataIfPresent(event.data, "baseTypeSource", "ClickEvent");
+                    _populateEventDataIfPresent(event.data, "uri", pageActionEvent.uri);
+                    _populateEventDataIfPresent(event.data, "pageType", pageActionEvent.pageType);
+                    _populateEventDataIfPresent(event.data, "properties", pageActionEvent.properties);
+                    _populateEventDataIfPresent(event.data, "actionType", pageActionEvent.actionType);
+                    _populateEventDataIfPresent(event.data, "behavior", pageActionEvent.behavior);
+                    _populateEventDataIfPresent(event.data, "clickCoordinates", pageActionEvent.clickCoordinates);
+                    _populateEventDataIfPresent(event.data, "content", pageActionEvent.content);
+                    _populateEventDataIfPresent(event.data, "targetUri", pageActionEvent.targetUri);
+                    _populateEventDataIfPresent(event.data, "timeToAction", pageActionEvent.timeToAction);
+                    _populateEventDataIfPresent(event.data, "refUri", pageActionEvent.refUri);
+                    _populateEventDataIfPresent(event.data, "pageName", pageActionEvent.pageName);
+                    _populateEventDataIfPresent(event.data, "parentId", pageActionEvent.parentId);
+                    if (properties) {
+                        objForEachKey(properties, function (property, value) {
+                            if (!event.data[property]) {
+                                _populateEventDataIfPresent(event.data, property, value);
+                            }
+                        });
                     }
-                });
-            }
-            this._clickAnalyticsPlugin.core.track(event);
-        };
-        PageAction.prototype.capturePageAction = function (element, overrideValues, customProperties, isRightClick) {
-            overrideValues = !isValueAssigned(overrideValues) ? {} : overrideValues;
-            var pageActionEvent = { name: "" };
-            var pageActionProperties = isValueAssigned(customProperties) ? customProperties : {};
-            this.setCommonProperties(pageActionEvent, overrideValues);
-            pageActionEvent.behavior = this._getBehavior(overrideValues);
-            var elementContent = {};
-            if (isRightClick) {
-                pageActionEvent.behavior = this._config.defaultRightClickBhvr;
-            }
-            if (element) {
-                pageActionEvent.targetUri = getClickTarget(element);
-                elementContent = this._contentHandler.getElementContent(element);
-                if (elementContent.bhvr && !isValueAssigned(overrideValues.behavior)) {
-                    var currentBehavior = extractFieldFromObject(elementContent, "bhvr");
-                    pageActionEvent.behavior = this._getValidBehavior(currentBehavior);
-                }
-                if (!isValueAssigned(elementContent.id) && !isValueAssigned(elementContent.contentName)) {
-                    this._traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, "Missing attributes id or contentName in click event. Click event information will still be collected!");
-                }
-            }
-            pageActionEvent.name = elementContent.id || elementContent.contentName || strNotSpecified;
-            pageActionEvent.parentId = elementContent.parentid || elementContent.parentName || strNotSpecified;
-            if (isValueAssigned(overrideValues.actionType)) {
-                pageActionEvent.actionType = overrideValues.actionType;
-            }
-            if (isValueAssigned(overrideValues.clickCoordinateX) && isValueAssigned(overrideValues.clickCoordinateY)) {
-                pageActionEvent.clickCoordinates = overrideValues.clickCoordinateX + "X" + overrideValues.clickCoordinateY;
-            }
-            this._sanitizePageActionEventContent(elementContent);
-            pageActionEvent.content = bracketIt(JSON.stringify(extend(elementContent, overrideValues && overrideValues.contentTags ? overrideValues.contentTags : {})));
-            pageActionEvent.timeToAction = this._getTimeToClick();
-            pageActionEvent.refUri = isValueAssigned(overrideValues.refUri) ? overrideValues.refUri : this._config.coreData.referrerUri;
-            if (this._isUndefinedEvent(pageActionEvent))
-                return;
-            this.trackPageAction(pageActionEvent, pageActionProperties);
-        };
-        PageAction.prototype._getTimeToClick = function () {
-            var perf = getPerformance();
-            if (perf && perf.timing) {
-                var isNavigationStart = perf.timing.navigationStart;
-                if (isNavigationStart && isNavigationStart !== 0) {
-                    return new Date().getTime() - isNavigationStart;
+                    _self._clickAnalyticsPlugin.core.track(event);
+                };
+                _self.capturePageAction = function (element, overrideValues, customProperties, isRightClick) {
+                    overrideValues = !isValueAssigned(overrideValues) ? {} : overrideValues;
+                    var pageActionEvent = { name: "" };
+                    var pageActionProperties = isValueAssigned(customProperties) ? customProperties : {};
+                    _self.setCommonProperties(pageActionEvent, overrideValues);
+                    pageActionEvent.behavior = _self._getBehavior(overrideValues);
+                    var elementContent = {};
+                    if (isRightClick) {
+                        pageActionEvent.behavior = _self._config.defaultRightClickBhvr;
+                    }
+                    if (element) {
+                        pageActionEvent.targetUri = getClickTarget(element);
+                        elementContent = _self._contentHandler.getElementContent(element);
+                        if (elementContent.bhvr && !isValueAssigned(overrideValues.behavior)) {
+                            var currentBehavior = extractFieldFromObject(elementContent, "bhvr");
+                            pageActionEvent.behavior = _self._getValidBehavior(currentBehavior);
+                        }
+                        if (!isValueAssigned(elementContent.id) && !isValueAssigned(elementContent.contentName)) {
+                            _self._traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, "Missing attributes id or contentName in click event. Click event information will still be collected!");
+                        }
+                    }
+                    pageActionEvent.name = elementContent.id || elementContent.contentName || strNotSpecified;
+                    pageActionEvent.parentId = elementContent.parentid || elementContent.parentName || strNotSpecified;
+                    if (isValueAssigned(overrideValues.actionType)) {
+                        pageActionEvent.actionType = overrideValues.actionType;
+                    }
+                    if (isValueAssigned(overrideValues.clickCoordinateX) && isValueAssigned(overrideValues.clickCoordinateY)) {
+                        pageActionEvent.clickCoordinates = overrideValues.clickCoordinateX + "X" + overrideValues.clickCoordinateY;
+                    }
+                    _sanitizePageActionEventContent(elementContent);
+                    pageActionEvent.content = bracketIt(JSON.stringify(extend(elementContent, overrideValues && overrideValues.contentTags ? overrideValues.contentTags : {})));
+                    pageActionEvent.timeToAction = _getTimeToClick();
+                    pageActionEvent.refUri = isValueAssigned(overrideValues.refUri) ? overrideValues.refUri : _self._config.coreData.referrerUri;
+                    if (_isUndefinedEvent(pageActionEvent)) {
+                        return;
+                    }
+                    _self.trackPageAction(pageActionEvent, pageActionProperties);
+                };
+                function _getTimeToClick() {
+                    var perf = getPerformance();
+                    if (perf && perf.timing) {
+                        var isNavigationStart = perf.timing.navigationStart;
+                        if (isNavigationStart && isNavigationStart !== 0) {
+                            return new Date().getTime() - isNavigationStart;
+                        }
+                    }
+                    return -1;
                 }
-            }
-            return -1;
-        };
-        PageAction.prototype._populateEventDataIfPresent = function (obj, property, value) {
-            if (isValueAssigned(value)) {
-                obj[property] = value;
-            }
-        };
-        PageAction.prototype._sanitizePageActionEventContent = function (pageActionContent) {
-            if (pageActionContent) {
-                delete pageActionContent.id;
-                delete pageActionContent.parentid;
-                delete pageActionContent.parentname;
-                if (this._config && this._config.dataTags && isValueAssigned(this._config.dataTags.parentDataTag)) {
-                    delete pageActionContent[this._config.dataTags.parentDataTag];
+                function _populateEventDataIfPresent(obj, property, value) {
+                    if (isValueAssigned(value)) {
+                        obj[property] = value;
+                    }
                 }
-            }
-        };
-        PageAction.prototype._isUndefinedEvent = function (pageActionEvent) {
-            if (this._config.dropInvalidEvents) {
-                if (pageActionEvent.name === strNotSpecified
-                    && pageActionEvent.parentId === strNotSpecified
-                    && pageActionEvent.content === "[{}]")
-                    return true;
-            }
-            return false;
-        };
+                function _sanitizePageActionEventContent(pageActionContent) {
+                    if (pageActionContent) {
+                        delete pageActionContent.id;
+                        delete pageActionContent.parentid;
+                        delete pageActionContent.parentname;
+                        if (_self._config && _self._config.dataTags && isValueAssigned(_self._config.dataTags.parentDataTag)) {
+                            delete pageActionContent[_self._config.dataTags.parentDataTag];
+                        }
+                    }
+                }
+                function _isUndefinedEvent(pageActionEvent) {
+                    if (_self._config.dropInvalidEvents) {
+                        if (pageActionEvent.name === strNotSpecified
+                            && pageActionEvent.parentId === strNotSpecified
+                            && pageActionEvent.content === "[{}]") {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            });
+            return _this;
+        }
         return PageAction;
     }(WebEvent));
 
@@ -1640,77 +2478,83 @@
             this._config = _config;
             this._pageAction = _pageAction;
             this._traceLogger = _traceLogger;
-        }
-        AutoCaptureHandler.prototype.click = function () {
-            var _this = this;
-            var win = getWindow();
-            var doc = getDocument();
-            if (win) {
-                var event_1 = (navigator.appVersion.indexOf("MSIE") !== -1) ? "click" : "mousedown";
-                attachEvent(win, event_1, function (evt) { _this._processClick(evt); });
-                attachEvent(win, "keyup", function (evt) { _this._processClick(evt); });
-            }
-            else if (doc) {
-                attachEvent(doc, "click", function (evt) { _this._processClick(evt); });
-                attachEvent(doc, "keyup", function (evt) { _this._processClick(evt); });
-            }
-        };
-        AutoCaptureHandler.prototype.capturePageAction = function (element, overrideValues, customProperties, isRightClick) {
-            var donotTrackTag = this._config.dataTags.customDataPrefix + this._config.dataTags.dntDataTag;
-            if (!isElementDnt(element, donotTrackTag)) {
-                this._pageAction.capturePageAction(element, overrideValues, customProperties, isRightClick);
-            }
-        };
-        AutoCaptureHandler.prototype._processClick = function (clickEvent) {
-            var clickCaptureElements = { A: true, BUTTON: true, AREA: true, INPUT: true };
-            var win = getWindow();
-            if (isNullOrUndefined(clickEvent) && win) {
-                clickEvent = win.event;
-            }
-            if (clickEvent) {
-                var element = clickEvent.srcElement || clickEvent.target;
-                var overrideValues = {
-                    clickCoordinateX: clickEvent.pageX,
-                    clickCoordinateY: clickEvent.pageY
+            var _evtNamespace = mergeEvtNamespace(createUniqueNamespace("AutoCaptureHandler"), _analyticsPlugin._evtNamespace);
+            dynamicProto(AutoCaptureHandler, this, function (_self) {
+                _self.click = function () {
+                    var win = getWindow();
+                    var doc = getDocument();
+                    if (win) {
+                        var event_1 = (navigator.appVersion.indexOf("MSIE") !== -1) ? "click" : "mousedown";
+                        eventOn(win, event_1, _processClick, _evtNamespace);
+                        eventOn(win, "keyup", _processClick, _evtNamespace);
+                    }
+                    else if (doc) {
+                        eventOn(doc, "click", _processClick, _evtNamespace);
+                        eventOn(doc, "keyup", _processClick, _evtNamespace);
+                    }
                 };
-                var isRightClickObj = isRightClick(clickEvent);
-                if (isRightClickObj) {
-                    overrideValues.actionType = ActionType.CLICKRIGHT;
-                }
-                else if (isLeftClick(clickEvent)) {
-                    overrideValues.actionType = ActionType.CLICKLEFT;
-                }
-                else if (isKeyboardEnter(clickEvent)) {
-                    overrideValues.actionType = ActionType.KEYBOARDENTER;
-                }
-                else if (isKeyboardSpace(clickEvent)) {
-                    overrideValues.actionType = ActionType.KEYBOARDSPACE;
-                }
-                else if (isMiddleClick(clickEvent)) {
-                    overrideValues.actionType = ActionType.CLICKMIDDLE;
-                }
-                else {
-                    return;
-                }
-                while (element && element.tagName) {
-                    if (element.control && clickCaptureElements[element.control.tagName.toUpperCase()]) {
-                        element = element.control;
+                _self._doUnload = function (unloadCtx, unloadState, asyncCallback) {
+                    eventOff(getWindow(), null, null, _evtNamespace);
+                    eventOff(getDocument(), null, null, _evtNamespace);
+                };
+                function _capturePageAction(element, overrideValues, customProperties, isRightClick) {
+                    var donotTrackTag = _self._config.dataTags.customDataPrefix + _self._config.dataTags.dntDataTag;
+                    if (!isElementDnt(element, donotTrackTag)) {
+                        _self._pageAction.capturePageAction(element, overrideValues, customProperties, isRightClick);
                     }
-                    var tagNameUpperCased = element.tagName.toUpperCase();
-                    if (!clickCaptureElements[tagNameUpperCased]) {
-                        element = element.parentElement || element.parentNode;
-                        continue;
+                }
+                function _processClick(clickEvent) {
+                    var clickCaptureElements = { A: true, BUTTON: true, AREA: true, INPUT: true };
+                    var win = getWindow();
+                    if (isNullOrUndefined(clickEvent) && win) {
+                        clickEvent = win.event;
                     }
-                    else {
-                        var sendEvent = tagNameUpperCased === "INPUT" ? clickCaptureInputTypes[element.type.toUpperCase()] : true;
-                        if (sendEvent) {
-                            this.capturePageAction(element, overrideValues, {}, isRightClickObj);
+                    if (clickEvent) {
+                        var element = clickEvent.srcElement || clickEvent.target;
+                        var overrideValues = {
+                            clickCoordinateX: clickEvent.pageX,
+                            clickCoordinateY: clickEvent.pageY
+                        };
+                        var isRightClickObj = isRightClick(clickEvent);
+                        if (isRightClickObj) {
+                            overrideValues.actionType = ActionType.CLICKRIGHT;
+                        }
+                        else if (isLeftClick(clickEvent)) {
+                            overrideValues.actionType = ActionType.CLICKLEFT;
+                        }
+                        else if (isKeyboardEnter(clickEvent)) {
+                            overrideValues.actionType = ActionType.KEYBOARDENTER;
+                        }
+                        else if (isKeyboardSpace(clickEvent)) {
+                            overrideValues.actionType = ActionType.KEYBOARDSPACE;
+                        }
+                        else if (isMiddleClick(clickEvent)) {
+                            overrideValues.actionType = ActionType.CLICKMIDDLE;
+                        }
+                        else {
+                            return;
+                        }
+                        while (element && element.tagName) {
+                            if (element.control && clickCaptureElements[element.control.tagName.toUpperCase()]) {
+                                element = element.control;
+                            }
+                            var tagNameUpperCased = element.tagName.toUpperCase();
+                            if (!clickCaptureElements[tagNameUpperCased]) {
+                                element = element.parentElement || element.parentNode;
+                                continue;
+                            }
+                            else {
+                                var sendEvent = tagNameUpperCased === "INPUT" ? clickCaptureInputTypes[element.type.toUpperCase()] : true;
+                                if (sendEvent) {
+                                    _capturePageAction(element, overrideValues, {}, isRightClickObj);
+                                }
+                                break;
+                            }
                         }
-                        break;
                     }
                 }
-            }
-        };
+            });
+        }
         return AutoCaptureHandler;
     }());
 
@@ -1719,285 +2563,318 @@
         function DomContentHandler(_config, _traceLogger) {
             this._config = _config;
             this._traceLogger = _traceLogger;
-        }
-        DomContentHandler.prototype.getMetadata = function () {
-            var metaTags = {};
-            if (hasDocument) {
-                metaTags = isValueAssigned(this._config.dataTags.metaDataPrefix) ? this._getMetaDataFromDOM(this._config.dataTags.captureAllMetaDataContent, this._config.dataTags.metaDataPrefix, false) :
-                    this._getMetaDataFromDOM(this._config.dataTags.captureAllMetaDataContent, "", false);
-            }
-            return metaTags;
-        };
-        DomContentHandler.prototype.getElementContent = function (element) {
-            if (!element) {
-                return {};
-            }
-            var elementContent = {};
-            var biBlobValue;
-            var parentDataTagPrefix;
-            var dataTagPrefix = this._config.dataTags.customDataPrefix;
-            var aiBlobAttributeTag = dataTagPrefix + this._config.dataTags.aiBlobAttributeTag;
-            if (isValueAssigned(this._config.dataTags.parentDataTag)) {
-                parentDataTagPrefix = dataTagPrefix + this._config.dataTags.parentDataTag;
-            }
-            if (!this._isTracked(element, dataTagPrefix, aiBlobAttributeTag)) {
-                biBlobValue = element.getAttribute(aiBlobAttributeTag);
-                if (biBlobValue) {
-                    try {
-                        elementContent = JSON.parse(biBlobValue);
+            dynamicProto(DomContentHandler, this, function (_self) {
+                _self.getMetadata = function () {
+                    var dataTags = (_self._config || {}).dataTags;
+                    var metaTags = {};
+                    if (hasDocument) {
+                        metaTags = isValueAssigned(dataTags.metaDataPrefix) ? _getMetaDataFromDOM(dataTags.captureAllMetaDataContent, dataTags.metaDataPrefix, false) :
+                            _getMetaDataFromDOM(dataTags.captureAllMetaDataContent, "", false);
                     }
-                    catch (e) {
-                        this._traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, "Can not parse " + biBlobValue);
+                    return metaTags;
+                };
+                _self.getElementContent = function (element) {
+                    if (!element) {
+                        return {};
                     }
-                }
-                else {
-                    elementContent = extend(elementContent, this._populateElementContent(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));
-                }
-            }
-            else {
-                elementContent = extend(elementContent, this._populateElementContentwithDataTag(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));
-            }
-            removeInvalidElements(elementContent);
-            if (parentDataTagPrefix) {
-                elementContent = extend(elementContent, this._getParentDetails(element, elementContent, dataTagPrefix, aiBlobAttributeTag));
-            }
-            return elementContent;
-        };
-        DomContentHandler.prototype._captureElementContentWithDataTag = function (contentElement, elementContent, dataTagPrefix) {
-            for (var i = 0, attrib; i < contentElement.attributes.length; i++) {
-                attrib = contentElement.attributes[i];
-                if (attrib.name.indexOf(dataTagPrefix) !== 0) {
-                    continue;
-                }
-                var attribName = attrib.name.replace(dataTagPrefix, "");
-                elementContent[attribName] = attrib.value;
-            }
-        };
-        DomContentHandler.prototype._walkUpDomChainCaptureData = function (el, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {
-            var element = el;
-            var parentDataTagFound = false;
-            var elementLevelFlag = false;
-            while (!isNullOrUndefined(element) && !isNullOrUndefined(element.attributes)) {
-                var attributes = element.attributes;
-                for (var i = 0; i < attributes.length; i++) {
-                    var attrib = attributes[i];
-                    if (attrib.name.indexOf(dataTagPrefix) !== 0) {
-                        continue;
-                    }
-                    if (attrib.name.indexOf(parentDataTagPrefix) === 0) {
-                        parentDataTagFound = true;
-                    }
-                    if (attrib.name.indexOf(aiBlobAttributeTag) === 0) {
-                        continue;
-                    }
-                    var attribName = attrib.name.replace(dataTagPrefix, "");
-                    if (elementLevelFlag && attribName === "id")
-                        continue;
-                    if (!isValueAssigned(elementContent[attribName])) {
+                    var dataTags = (_self._config || {}).dataTags;
+                    var elementContent = {};
+                    var biBlobValue;
+                    var parentDataTagPrefix;
+                    var dataTagPrefix = dataTags.customDataPrefix;
+                    var aiBlobAttributeTag = dataTagPrefix + dataTags.aiBlobAttributeTag;
+                    if (isValueAssigned(dataTags.parentDataTag)) {
+                        parentDataTagPrefix = dataTagPrefix + dataTags.parentDataTag;
+                    }
+                    if (!_isTracked(element, dataTagPrefix, aiBlobAttributeTag)) {
+                        biBlobValue = element.getAttribute(aiBlobAttributeTag);
+                        if (biBlobValue) {
+                            try {
+                                elementContent = JSON.parse(biBlobValue);
+                            }
+                            catch (e) {
+                                _self._traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, "Can not parse " + biBlobValue);
+                            }
+                        }
+                        else {
+                            elementContent = extend(elementContent, _populateElementContent(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));
+                        }
+                    }
+                    else {
+                        elementContent = extend(elementContent, _populateElementContentwithDataTag(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));
+                    }
+                    removeInvalidElements(elementContent);
+                    if (parentDataTagPrefix) {
+                        elementContent = extend(elementContent, _getParentDetails(element, elementContent, dataTagPrefix, aiBlobAttributeTag));
+                    }
+                    return elementContent;
+                };
+                function _captureElementContentWithDataTag(contentElement, elementContent, dataTagPrefix) {
+                    for (var i = 0, attrib; i < contentElement.attributes.length; i++) {
+                        attrib = contentElement.attributes[i];
+                        if (attrib.name.indexOf(dataTagPrefix) !== 0) {
+                            continue;
+                        }
+                        var attribName = attrib.name.replace(dataTagPrefix, "");
                         elementContent[attribName] = attrib.value;
                     }
                 }
-                if (parentDataTagFound) {
-                    break;
-                }
-                elementLevelFlag = true;
-                element = element.parentNode;
-            }
-        };
-        DomContentHandler.prototype._populateElementContent = function (element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {
-            var elementContent = {};
-            if (!element)
-                return elementContent;
-            var htmlContent = this._getHtmlIdAndContentName(element);
-            elementContent = {
-                id: htmlContent.id || "",
-                contentName: htmlContent.contentName || ""
-            };
-            if (isValueAssigned(parentDataTagPrefix)) {
-                this._walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);
-            }
-            if (!elementContent.id && !elementContent.contentName) {
-                this._traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, "Invalid content blob.  Missing required attributes (id, contentName. " +
-                    " Content information will still be collected!");
-            }
-            return elementContent;
-        };
-        DomContentHandler.prototype._populateElementContentwithDataTag = function (element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {
-            var elementContent = {};
-            if (!element)
-                return elementContent;
-            var htmlContent = this._getHtmlIdAndContentName(element);
-            if (isValueAssigned(parentDataTagPrefix)) {
-                this._walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);
-            }
-            else {
-                this._captureElementContentWithDataTag(element, elementContent, dataTagPrefix);
-            }
-            if (this._config.dataTags.useDefaultContentNameOrId) {
-                if (!isValueAssigned(elementContent.id)) {
-                    elementContent.id = htmlContent.id || "";
-                }
-                elementContent.contentName = htmlContent.contentName || "";
-            }
-            if (!elementContent.id && !elementContent.contentName) {
-                this._traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, "Invalid content blob.  Missing required attributes (id, contentName. " +
-                    " Content information will still be collected!");
-            }
-            return elementContent;
-        };
-        DomContentHandler.prototype._getMetaDataFromDOM = function (captureAllMetaDataContent, prefix, removePrefix) {
-            var metaElements;
-            var metaData = {};
-            if (hasDocument) {
-                metaElements = document.querySelectorAll("meta");
-                for (var i = 0; i < metaElements.length; i++) {
-                    var meta = metaElements[i];
-                    if (meta.name) {
-                        if (captureAllMetaDataContent || meta.name.indexOf(prefix) === 0) {
-                            var name_1 = removePrefix ? meta.name.replace(prefix, "") : meta.name;
-                            metaData[name_1] = meta.content;
+                function _walkUpDomChainCaptureData(el, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {
+                    var element = el;
+                    var parentDataTagFound = false;
+                    var elementLevelFlag = false;
+                    while (!isNullOrUndefined(element) && !isNullOrUndefined(element.attributes)) {
+                        var attributes = element.attributes;
+                        for (var i = 0; i < attributes.length; i++) {
+                            var attrib = attributes[i];
+                            if (attrib.name.indexOf(dataTagPrefix) !== 0) {
+                                continue;
+                            }
+                            if (attrib.name.indexOf(parentDataTagPrefix) === 0) {
+                                parentDataTagFound = true;
+                            }
+                            if (attrib.name.indexOf(aiBlobAttributeTag) === 0) {
+                                continue;
+                            }
+                            var attribName = attrib.name.replace(dataTagPrefix, "");
+                            if (elementLevelFlag && attribName === "id") {
+                                continue;
+                            }
+                            if (!isValueAssigned(elementContent[attribName])) {
+                                elementContent[attribName] = attrib.value;
+                            }
                         }
+                        if (parentDataTagFound) {
+                            break;
+                        }
+                        elementLevelFlag = true;
+                        element = element.parentNode;
                     }
                 }
-            }
-            return metaData;
-        };
-        DomContentHandler.prototype._getDefaultContentName = function (element, useDefaultContentName) {
-            if (useDefaultContentName === false || !element.tagName) {
-                return "";
-            }
-            var doc = getDocument() || {};
-            var contentName;
-            switch (element.tagName) {
-                case "A":
-                    contentName = doc.all ? element.innerText || element.innerHTML : element.text || element.innerHTML;
-                    break;
-                case "IMG":
-                case "AREA":
-                    contentName = element.alt;
-                    break;
-                default:
-                    contentName = element.value || element.name || element.alt || element.innerText || element.id;
-            }
-            return contentName.substring(0, MAX_CONTENTNAME_LENGTH);
-        };
-        DomContentHandler.prototype._isTracked = function (element, dataTag, aiBlobAttributeTag) {
-            var attrs = element.attributes;
-            var dataTagFound = false;
-            for (var i = 0; i < attrs.length; i++) {
-                var attributeName = attrs[i].name;
-                if (attributeName === aiBlobAttributeTag) {
-                    return false;
-                }
-                else if (attributeName.indexOf(dataTag) === 0) {
-                    dataTagFound = true;
+                function _populateElementContent(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {
+                    var elementContent = {};
+                    if (!element) {
+                        return elementContent;
+                    }
+                    var htmlContent = _getHtmlIdAndContentName(element);
+                    elementContent = {
+                        id: htmlContent.id || "",
+                        contentName: htmlContent.contentName || ""
+                    };
+                    if (isValueAssigned(parentDataTagPrefix)) {
+                        _walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);
+                    }
+                    if (!elementContent.id && !elementContent.contentName) {
+                        _traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, "Invalid content blob.  Missing required attributes (id, contentName. " +
+                            " Content information will still be collected!");
+                    }
+                    return elementContent;
                 }
-            }
-            return dataTagFound;
-        };
-        DomContentHandler.prototype._getHtmlIdAndContentName = function (element) {
-            var htmlContent = {};
-            if (!element)
-                return htmlContent;
-            if (this._config.dataTags.useDefaultContentNameOrId) {
-                var customizedContentName = this._config.callback.contentName ? this._config.callback.contentName(element, this._config.dataTags.useDefaultContentNameOrId) : "";
-                var defaultContentName = this._getDefaultContentName(element, this._config.dataTags.useDefaultContentNameOrId);
-                htmlContent = {
-                    id: element.id,
-                    contentName: customizedContentName || defaultContentName || element.getAttribute("alt")
-                };
-            }
-            return htmlContent;
-        };
-        DomContentHandler.prototype._getParentDetails = function (element, elementContent, dataTagPrefix, aiBlobAttributeTag) {
-            var parentId = elementContent["parentid"];
-            var parentName = elementContent["parentname"];
-            var parentInfo = {};
-            if (parentId || parentName || !element) {
-                return parentInfo;
-            }
-            return this._populateParentInfo(element, dataTagPrefix, aiBlobAttributeTag);
-        };
-        DomContentHandler.prototype._populateParentInfo = function (element, dataTagPrefix, aiBlobAttributeTag) {
-            var parentInfo = {};
-            var parentId;
-            var closestParentElement = walkUpDomChainWithElementValidation(element.parentElement, this._isTracked, dataTagPrefix);
-            if (closestParentElement) {
-                var dataAttr = closestParentElement.getAttribute(aiBlobAttributeTag) || element[aiBlobAttributeTag];
-                if (dataAttr) {
-                    try {
-                        var telemetryObject = JSON.parse(dataAttr);
+                function _populateElementContentwithDataTag(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {
+                    var dataTags = (_self._config || {}).dataTags;
+                    var elementContent = {};
+                    if (!element) {
+                        return elementContent;
                     }
-                    catch (e) {
-                        this._traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, "Can not parse " + dataAttr);
+                    var htmlContent = _getHtmlIdAndContentName(element);
+                    if (isValueAssigned(parentDataTagPrefix)) {
+                        _walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);
                     }
-                    if (telemetryObject) {
-                        parentId = telemetryObject.id;
+                    else {
+                        _captureElementContentWithDataTag(element, elementContent, dataTagPrefix);
+                    }
+                    if (dataTags.useDefaultContentNameOrId) {
+                        if (!isValueAssigned(elementContent.id)) {
+                            elementContent.id = htmlContent.id || "";
+                        }
+                        elementContent.contentName = htmlContent.contentName || "";
                     }
+                    if (!elementContent.id && !elementContent.contentName) {
+                        _traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, "Invalid content blob.  Missing required attributes (id, contentName. " +
+                            " Content information will still be collected!");
+                    }
+                    return elementContent;
+                }
+                function _getMetaDataFromDOM(captureAllMetaDataContent, prefix, removePrefix) {
+                    var metaElements;
+                    var metaData = {};
+                    if (hasDocument) {
+                        metaElements = document.querySelectorAll("meta");
+                        for (var i = 0; i < metaElements.length; i++) {
+                            var meta = metaElements[i];
+                            if (meta.name) {
+                                if (captureAllMetaDataContent || meta.name.indexOf(prefix) === 0) {
+                                    var name_1 = removePrefix ? meta.name.replace(prefix, "") : meta.name;
+                                    metaData[name_1] = meta.content;
+                                }
+                            }
+                        }
+                    }
+                    return metaData;
                 }
-                else {
-                    parentId = closestParentElement.getAttribute(dataTagPrefix + "id");
+                function _getDefaultContentName(element, useDefaultContentName) {
+                    if (useDefaultContentName === false || !element.tagName) {
+                        return "";
+                    }
+                    var doc = getDocument() || {};
+                    var contentName;
+                    switch (element.tagName) {
+                        case "A":
+                            contentName = doc.all ? element.innerText || element.innerHTML : element.text || element.innerHTML;
+                            break;
+                        case "IMG":
+                        case "AREA":
+                            contentName = element.alt;
+                            break;
+                        default:
+                            contentName = element.value || element.name || element.alt || element.innerText || element.id;
+                    }
+                    return contentName.substring(0, MAX_CONTENTNAME_LENGTH);
+                }
+                function _isTracked(element, dataTag, aiBlobAttributeTag) {
+                    var attrs = element.attributes;
+                    var dataTagFound = false;
+                    for (var i = 0; i < attrs.length; i++) {
+                        var attributeName = attrs[i].name;
+                        if (attributeName === aiBlobAttributeTag) {
+                            return false;
+                        }
+                        else if (attributeName.indexOf(dataTag) === 0) {
+                            dataTagFound = true;
+                        }
+                    }
+                    return dataTagFound;
+                }
+                function _getHtmlIdAndContentName(element) {
+                    var dataTags = (_self._config || {}).dataTags;
+                    var callback = (_self._config || {}).callback;
+                    var htmlContent = {};
+                    if (!element) {
+                        return htmlContent;
+                    }
+                    if (dataTags.useDefaultContentNameOrId) {
+                        var customizedContentName = callback.contentName ? callback.contentName(element, dataTags.useDefaultContentNameOrId) : "";
+                        var defaultContentName = _getDefaultContentName(element, dataTags.useDefaultContentNameOrId);
+                        htmlContent = {
+                            id: element.id,
+                            contentName: customizedContentName || defaultContentName || element.getAttribute("alt")
+                        };
+                    }
+                    return htmlContent;
+                }
+                function _getParentDetails(element, elementContent, dataTagPrefix, aiBlobAttributeTag) {
+                    var parentId = elementContent["parentid"];
+                    var parentName = elementContent["parentname"];
+                    var parentInfo = {};
+                    if (parentId || parentName || !element) {
+                        return parentInfo;
+                    }
+                    return _populateParentInfo(element, dataTagPrefix, aiBlobAttributeTag);
+                }
+                function _populateParentInfo(element, dataTagPrefix, aiBlobAttributeTag) {
+                    var parentInfo = {};
+                    var parentId;
+                    var closestParentElement = walkUpDomChainWithElementValidation(element.parentElement, _isTracked, dataTagPrefix);
+                    if (closestParentElement) {
+                        var dataAttr = closestParentElement.getAttribute(aiBlobAttributeTag) || element[aiBlobAttributeTag];
+                        if (dataAttr) {
+                            try {
+                                var telemetryObject = JSON.parse(dataAttr);
+                            }
+                            catch (e) {
+                                _traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, "Can not parse " + dataAttr);
+                            }
+                            if (telemetryObject) {
+                                parentId = telemetryObject.id;
+                            }
+                        }
+                        else {
+                            parentId = closestParentElement.getAttribute(dataTagPrefix + "id");
+                        }
+                    }
+                    if (parentId) {
+                        parentInfo["parentid"] = parentId;
+                    }
+                    else {
+                        var htmlContent = _getHtmlIdAndContentName(element.parentElement);
+                        parentInfo["parentid"] = htmlContent.id;
+                        parentInfo["parentname"] = htmlContent.contentName;
+                    }
+                    return parentInfo;
                 }
-            }
-            if (parentId) {
-                parentInfo["parentid"] = parentId;
-            }
-            else {
-                var htmlContent = this._getHtmlIdAndContentName(element.parentElement);
-                parentInfo["parentid"] = htmlContent.id;
-                parentInfo["parentname"] = htmlContent.contentName;
-            }
-            return parentInfo;
-        };
+            });
+        }
         return DomContentHandler;
     }());
 
     var ClickAnalyticsPlugin = /** @class */ (function (_super) {
         __extendsFn(ClickAnalyticsPlugin, _super);
         function ClickAnalyticsPlugin() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
+            var _this = _super.call(this) || this;
             _this.identifier = "ClickAnalyticsPlugin";
             _this.priority = 181;
-            return _this;
-        }
-        ClickAnalyticsPlugin.prototype.initialize = function (config, core, extensions, pluginChain) {
-            if (isNullOrUndefined(core)) {
-                throw Error("Error initializing");
-            }
-            config.extensionConfig = config.extensionConfig || [];
-            config.extensionConfig[this.identifier] = config.extensionConfig[this.identifier] || {};
-            this._config = mergeConfig(config.extensionConfig[this.identifier]);
-            _super.prototype.initialize.call(this, config, core, extensions, pluginChain);
-            this._contentHandler = this._contentHandler ? this._contentHandler : new DomContentHandler(this._config, this.diagLog());
-            var metaTags = this._contentHandler.getMetadata();
-            this.pageAction = new PageAction(this, this._config, this._contentHandler, this._config.callback.pageActionPageTags, metaTags, this.diagLog());
-            this._autoCaptureHandler = this._autoCaptureHandler ? this._autoCaptureHandler : new AutoCaptureHandler(this, this._config, this.pageAction, this.diagLog());
-            if (this._config.autoCapture) {
-                this._autoCaptureHandler.click();
-            }
-            var _propertiesExtension;
-            arrForEach(extensions, function (extension) {
-                if (extension.identifier === PropertiesPluginIdentifier) {
-                    _propertiesExtension = extension;
-                }
+            var _config;
+            var _pageAction;
+            var _autoCaptureHandler;
+            var _contentHandler;
+            dynamicProto(ClickAnalyticsPlugin, _this, function (_self, _base) {
+                var _identifier = _self.identifier;
+                _initDefaults();
+                _self.initialize = function (config, core, extensions, pluginChain) {
+                    if (isNullOrUndefined(core)) {
+                        throwError("Error initializing");
+                    }
+                    config.extensionConfig = config.extensionConfig || [];
+                    config.extensionConfig[_identifier] = config.extensionConfig[_identifier] || {};
+                    _config = mergeConfig(config.extensionConfig[_identifier]);
+                    _super.prototype.initialize.call(_this, config, core, extensions, pluginChain);
+                    var logger = _self.diagLog();
+                    _contentHandler = _contentHandler ? _contentHandler : new DomContentHandler(_config, logger);
+                    var metaTags = _contentHandler.getMetadata();
+                    _pageAction = new PageAction(_this, _config, _contentHandler, _config.callback.pageActionPageTags, metaTags, logger);
+                    _autoCaptureHandler = _autoCaptureHandler ? _autoCaptureHandler : new AutoCaptureHandler(_self, _config, _pageAction, logger);
+                    if (_config.autoCapture) {
+                        _autoCaptureHandler.click();
+                    }
+                    var _propertiesExtension;
+                    arrForEach(extensions, function (extension) {
+                        if (extension.identifier === PropertiesPluginIdentifier) {
+                            _propertiesExtension = extension;
+                        }
+                    });
+                    if (_propertiesExtension && _propertiesExtension.context &&
+                        _propertiesExtension.context.internal && _propertiesExtension.context.internal.sdkVersion) {
+                        _propertiesExtension.context.internal.sdkVersion += "_ClickPlugin" + ClickAnalyticsPlugin.Version;
+                    }
+                };
+                _self.processTelemetry = function (env, itemCtx) {
+                    _self.processNext(env, itemCtx);
+                };
+                _self.trackPageAction = function (pageAction, customProperties) {
+                    try {
+                        _pageAction.trackPageAction(pageAction, customProperties);
+                    }
+                    catch (e) {
+                        _throwInternal(_self.diagLog(), LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.TrackPageActionEventFailed, "trackPageAction failed, page action event will not be collected: " + getExceptionName(e), { exception: dumpObj(e) });
+                    }
+                };
+                _self._doTeardown = function (unloadCtx, unloadState, asyncCallback) {
+                    return unloadComponents([
+                        _autoCaptureHandler,
+                        _contentHandler,
+                        _pageAction
+                    ], unloadCtx, unloadState);
+                };
             });
-            if (_propertiesExtension && _propertiesExtension.context &&
-                _propertiesExtension.context.internal && _propertiesExtension.context.internal.sdkVersion) {
-                _propertiesExtension.context.internal.sdkVersion += "_ClickPlugin" + ClickAnalyticsPlugin.Version;
-            }
-        };
-        ClickAnalyticsPlugin.prototype.processTelemetry = function (env, itemCtx) {
-            this.processNext(env, itemCtx);
-        };
-        ClickAnalyticsPlugin.prototype.trackPageAction = function (pageAction, customProperties) {
-            try {
-                this.pageAction.trackPageAction(pageAction, customProperties);
+            function _initDefaults() {
+                _config = null;
+                _pageAction = null;
+                _autoCaptureHandler = null;
+                _contentHandler = null;
             }
-            catch (e) {
-                this.diagLog().throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.TrackPageActionEventFailed, "trackPageAction failed, page action event will not be collected: " + getExceptionName(e), { exception: dumpObj(e) });
-            }
-        };
-        ClickAnalyticsPlugin.Version = "2.8.0-nightly.2202-06";
+            return _this;
+        }
+        ClickAnalyticsPlugin.Version = "2.8.0-nightly.2204-04";
         return ClickAnalyticsPlugin;
     }(BaseTelemetryPlugin));