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

package/src/JavaScriptSDK/BaseCore.ts

@@ -4,7 +4,7 @@
 
 import { objCreateFn } from "@microsoft/applicationinsights-shims";
 import dynamicProto from "@microsoft/dynamicproto-js";
-import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore"
+import { IAppInsightsCore, ILoadedPlugin } from "../JavaScriptSDK.Interfaces/IAppInsightsCore"
 import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
 import { IPlugin, ITelemetryPlugin } from "../JavaScriptSDK.Interfaces/ITelemetryPlugin";
 import { IChannelControls } from "../JavaScriptSDK.Interfaces/IChannelControls";
@@ -12,23 +12,36 @@ import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
 import { INotificationManager } from "../JavaScriptSDK.Interfaces/INotificationManager";
 import { INotificationListener } from "../JavaScriptSDK.Interfaces/INotificationListener";
 import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
-import { ChannelController } from "./ChannelController";
-import { IProcessTelemetryContext } from "../JavaScriptSDK.Interfaces/IProcessTelemetryContext";
-import { ProcessTelemetryContext } from "./ProcessTelemetryContext";
-import { initializePlugins, sortPlugins } from "./TelemetryHelpers";
-import { _InternalMessageId, LoggingSeverity } from "../JavaScriptSDK.Enums/LoggingEnums";
+import { IProcessTelemetryContext, IProcessTelemetryUpdateContext } from "../JavaScriptSDK.Interfaces/IProcessTelemetryContext";
+import { createProcessTelemetryContext, createProcessTelemetryUnloadContext, createProcessTelemetryUpdateContext, createTelemetryProxyChain } from "./ProcessTelemetryContext";
+import { initializePlugins, sortPlugins, _getPluginState } from "./TelemetryHelpers";
+import { eLoggingSeverity, _eInternalMessageId } from "../JavaScriptSDK.Enums/LoggingEnums";
 import { IPerfManager } from "../JavaScriptSDK.Interfaces/IPerfManager";
 import { getGblPerfMgr, PerfManager } from "./PerfManager";
 import { ICookieMgr } from "../JavaScriptSDK.Interfaces/ICookieMgr";
 import { createCookieMgr } from "./CookieMgr";
-import { arrForEach, isNullOrUndefined, toISOString, getSetValue, setValue, throwError, isNotTruthy, isFunction } from "./HelperFuncs";
+import { arrForEach, isNullOrUndefined, toISOString, getSetValue, setValue, throwError, isNotTruthy, isFunction, objFreeze, proxyFunctionAs, proxyFunctions } from "./HelperFuncs";
 import { strExtensionConfig, strIKey } from "./Constants";
-import { DiagnosticLogger } from "./DiagnosticLogger";
+import { DiagnosticLogger, _InternalLogMessage, _throwInternal } from "./DiagnosticLogger";
 import { getDebugListener } from "./DbgExtensionUtils";
-
-const validationError = "Extensions must provide callback to initialize";
-
+import { ITelemetryPluginChain } from "../JavaScriptSDK.Interfaces/ITelemetryPluginChain";
+import { ChannelControllerPriority, createChannelControllerPlugin, createChannelQueues, IChannelController, IInternalChannelController, _IInternalChannels } from "./ChannelController";
+import { ITelemetryInitializerHandler, TelemetryInitializerFunction } from "../JavaScriptSDK.Interfaces/ITelemetryInitializers";
+import { TelemetryInitializerPlugin } from "./TelemetryInitializerPlugin";
+import { createUniqueNamespace } from "./DataCacheHelper";
+import { createUnloadHandlerContainer, IUnloadHandlerContainer, UnloadHandler } from "./UnloadHandlerContainer";
+import { TelemetryUpdateReason } from "../JavaScriptSDK.Enums/TelemetryUpdateReason";
+import { ITelemetryUpdateState } from "../JavaScriptSDK.Interfaces/ITelemetryUpdateState";
+import { ITelemetryUnloadState } from "../JavaScriptSDK.Interfaces/ITelemetryUnloadState";
+import { TelemetryUnloadReason } from "../JavaScriptSDK.Enums/TelemetryUnloadReason";
+import { SendRequestReason } from "../JavaScriptSDK.Enums/SendRequestReason";
+import { strAddNotificationListener, strDisabled, strEventsDiscarded, strEventsSendRequest, strEventsSent, strRemoveNotificationListener, strTeardown } from "./InternalConstants";
+
+const strValidationError = "Plugins must provide initialize method";
 const strNotificationManager = "_notificationManager";
+const strSdkUnloadingError = "SDK is still unloading...";
+const strSdkNotInitialized = "SDK is not initialized";
+// const strPluginUnloadFailed = "Failed to unload plugin";
 
 /**
  * Helper to create the default performance manager
@@ -39,6 +52,68 @@ function _createPerfManager (core: IAppInsightsCore, notificationMgr: INotificat
     return new PerfManager(notificationMgr);
 }
 
+function _validateExtensions(logger: IDiagnosticLogger, channelPriority: number, allExtensions: IPlugin[]): { all: IPlugin[]; core: ITelemetryPlugin[] } {
+    // Concat all available extensions
+    let coreExtensions: ITelemetryPlugin[] = [];
+
+    // Check if any two extensions have the same priority, then warn to console
+    // And extract the local extensions from the
+    let extPriorities = {};
+
+    // Extension validation
+    arrForEach(allExtensions, (ext: ITelemetryPlugin) => {
+        if (isNullOrUndefined(ext) || isNullOrUndefined(ext.initialize)) {
+            throwError(strValidationError);
+        }
+
+        const extPriority = ext.priority;
+        const identifier = ext.identifier;
+
+        if (ext && extPriority) {
+            if (!isNullOrUndefined(extPriorities[extPriority])) {
+                logger.warnToConsole("Two extensions have same priority #" + extPriority + " - " + extPriorities[extPriority] + ", " + identifier);
+            } else {
+                // set a value
+                extPriorities[extPriority] = identifier;
+            }
+        }
+
+        // Split extensions to core and channelController
+        if (!extPriority || extPriority < channelPriority) {
+            // Add to core extension that will be managed by BaseCore
+            coreExtensions.push(ext);
+        }
+    });
+
+    return {
+        all: allExtensions,
+        core: coreExtensions
+    };
+}
+
+function _isPluginPresent(thePlugin: IPlugin, plugins: IPlugin[]) {
+    let exists = false;
+
+    arrForEach(plugins, (plugin) => {
+        if (plugin === thePlugin) {
+            exists = true;
+            return -1;
+        }
+    });
+
+    return exists;
+}
+
+function _createDummyNotificationManager(): INotificationManager {
+    return objCreateFn({
+        [strAddNotificationListener]: (listener: INotificationListener) => { },
+        [strRemoveNotificationListener]: (listener: INotificationListener) => { },
+        [strEventsSent]: (events: ITelemetryItem[]) => { },
+        [strEventsDiscarded]: (events: ITelemetryItem[], reason: number) => { },
+        [strEventsSendRequest]: (sendReason: number, isAsync: boolean) => { }
+    });
+}
+
 export class BaseCore implements IAppInsightsCore {
     public static defaultConfig: IConfiguration;
     public config: IConfiguration;
@@ -48,28 +123,48 @@ export class BaseCore implements IAppInsightsCore {
     public isInitialized: () => boolean;
 
     constructor() {
-        let _isInitialized = false;
+        // NOTE!: DON'T set default values here, instead set them in the _initDefaults() function as it is also called during teardown()
+        let _isInitialized: boolean;
         let _eventQueue: ITelemetryItem[];
-        let _channelController: ChannelController;
-        let _notificationManager: INotificationManager;
-        let _perfManager: IPerfManager;
-        let _cookieManager: ICookieMgr;
-    
+        let _notificationManager: INotificationManager | null | undefined;
+        let _perfManager: IPerfManager | null;
+        let _cfgPerfManager: IPerfManager | null;
+        let _cookieManager: ICookieMgr | null;
+        let _pluginChain: ITelemetryPluginChain | null;
+        let _configExtensions: IPlugin[];
+        let _coreExtensions: ITelemetryPlugin[] | null;
+        let _channelControl: IChannelController | null;
+        let _channelConfig: IChannelControls[][] | null | undefined;
+        let _channelQueue: _IInternalChannels[] | null;
+        let _isUnloading: boolean;
+        let _telemetryInitializerPlugin: TelemetryInitializerPlugin;
+        let _internalLogsEventName: string | null;
+        let _evtNamespace: string;
+        let _unloadHandlers: IUnloadHandlerContainer;
+        let _debugListener: INotificationListener | null;
+
+        /**
+         * Internal log poller
+         */
+        let _internalLogPoller: number = 0;
+
         dynamicProto(BaseCore, this, (_self) => {
-            _self._extensions = new Array<IPlugin>();
-            _channelController = new ChannelController();
-            // Use a default logger so initialization errors are not dropped on the floor with full logging
-            _self.logger = new DiagnosticLogger({ loggingLevelConsole: LoggingSeverity.CRITICAL });
-            
-            _eventQueue = [];
+
+            // Set the default values (also called during teardown)
+            _initDefaults();
+
             _self.isInitialized = () => _isInitialized;
 
             _self.initialize = (config: IConfiguration, extensions: IPlugin[], logger?: IDiagnosticLogger, notificationManager?: INotificationManager): void => {
+                if (_isUnloading) {
+                    throwError(strSdkUnloadingError);
+                }
+        
                 // Make sure core is only initialized once
                 if (_self.isInitialized()) {
                     throwError("Core should not be initialized more than once");
                 }
-        
+
                 if (!config || isNullOrUndefined(config.instrumentationKey)) {
                     throwError("Please provide instrumentation key");
                 }
@@ -80,83 +175,26 @@ export class BaseCore implements IAppInsightsCore {
                 _self[strNotificationManager] = notificationManager;
                 _self.config = config || {};
 
-                if (notificationManager && _self.config.disableDbgExt !== true) {
-                    notificationManager.addNotificationListener(getDebugListener(config));
-                }
-
-                if (_self.config.enablePerfMgr) {
-                    // Set the performance manager creation function if not defined
-                    setValue(_self.config, "createPerfMgr", _createPerfManager);
-                }
+                _initDebugListener(config);
+                _initPerfManager(config);
 
                 config.extensions = isNullOrUndefined(config.extensions) ? [] : config.extensions;
         
                 // add notification to the extensions in the config so other plugins can access it
-                let extConfig = getSetValue(config, strExtensionConfig);
-                extConfig.NotificationManager = notificationManager;
+                _initExtConfig(config);
 
                 if (logger) {
                     _self.logger = logger;
                 }
 
-                // Concat all available extensions
-                let allExtensions = [];
-                allExtensions.push(...extensions, ...config.extensions);
-                allExtensions = sortPlugins(allExtensions);
-        
-                let coreExtensions: any[] = [];
-                let channelExtensions: any[] = [];
-        
-                // Check if any two extensions have the same priority, then warn to console
-                // And extract the local extensions from the
-                const extPriorities = {};
-        
                 // Extension validation
-                arrForEach(allExtensions, (ext: ITelemetryPlugin) => {
-                    if (isNullOrUndefined(ext) || isNullOrUndefined(ext.initialize)) {
-                        throwError(validationError);
-                    }
-        
-                    const extPriority = ext.priority;
-                    const identifier = ext.identifier;
-        
-                    if (ext && extPriority) {
-                        if (!isNullOrUndefined(extPriorities[extPriority])) {
-                            logger.warnToConsole("Two extensions have same priority #" + extPriority + " - " + extPriorities[extPriority] + ", " + identifier);
-                        } else {
-                            // set a value
-                            extPriorities[extPriority] = identifier;
-                        }
-                    }
-        
-                    // Split extensions to core and channelController
-                    if (!extPriority || extPriority < _channelController.priority) {
-                        // Add to core extension that will be managed by BaseCore
-                        coreExtensions.push(ext);
-                    } else {
-                        // Add all other extensions to be managed by the channel controller
-                        channelExtensions.push(ext);
-                    }
-                });
-                // Validation complete
-        
-                // Add the channelController to the complete extension collection and
-                // to the end of the core extensions
-                allExtensions.push(_channelController);
-                coreExtensions.push(_channelController);
-        
-                // Sort the complete set of extensions by priority
-                allExtensions = sortPlugins(allExtensions);
-                _self._extensions = allExtensions;
-        
-                // initialize channel controller first, this will initialize all channel plugins
-                initializePlugins(new ProcessTelemetryContext([_channelController], config, _self), allExtensions);
-                initializePlugins(new ProcessTelemetryContext(coreExtensions, config, _self), allExtensions);
-        
-                // Now reset the extensions to just those being managed by Basecore
-                _self._extensions = coreExtensions;
-        
-                if (_self.getTransmissionControls().length === 0) {
+                _configExtensions = [];
+                _configExtensions.push(...extensions, ...config.extensions);
+                _channelConfig = (config||{}).channels;
+
+                _initPluginChain(config, null);
+
+                if (!_channelQueue || _channelQueue.length === 0) {
                     throwError("No channels available");
                 }
         
@@ -165,7 +203,14 @@ export class BaseCore implements IAppInsightsCore {
             };
         
             _self.getTransmissionControls = (): IChannelControls[][] => {
-                return _channelController.getChannelControls();
+                let controls: IChannelControls[][] = [];
+                if (_channelQueue) {
+                    arrForEach(_channelQueue, (channels) => {
+                        controls.push(channels.queue);
+                    });
+                }
+
+                return objFreeze(controls);
             };
         
             _self.track = (telemetryItem: ITelemetryItem) => {
@@ -178,38 +223,21 @@ export class BaseCore implements IAppInsightsCore {
                 // Common Schema 4.0
                 setValue(telemetryItem, "ver", "4.0", null, isNullOrUndefined);
         
-                if (_self.isInitialized()) {
+                if (!_isUnloading && _self.isInitialized()) {
                     // Process the telemetry plugin chain
-                    _self.getProcessTelContext().processNext(telemetryItem);
+                    _createTelCtx().processNext(telemetryItem);
                 } else {
                     // Queue events until all extensions are initialized
                     _eventQueue.push(telemetryItem);
                 }
             };
         
-            _self.getProcessTelContext = (): IProcessTelemetryContext => {
-                let extensions = _self._extensions;
-                let thePlugins: IPlugin[] = extensions;
-        
-                // invoke any common telemetry processors before sending through pipeline
-                if (!extensions || extensions.length === 0) {
-                    // Pass to Channel controller so data is sent to correct channel queues
-                    thePlugins = [_channelController];
-                }
-        
-                return new ProcessTelemetryContext(thePlugins, _self.config, _self);
-            };
+            _self.getProcessTelContext = _createTelCtx;
 
             _self.getNotifyMgr = (): INotificationManager => {
                 if (!_notificationManager) {
                     // Create Dummy notification manager
-                    _notificationManager = objCreateFn({
-                        addNotificationListener: (listener: INotificationListener) => { },
-                        removeNotificationListener: (listener: INotificationListener) => { },
-                        eventsSent: (events: ITelemetryItem[]) => { },
-                        eventsDiscarded: (events: ITelemetryItem[], reason: number) => { },
-                        eventsSendRequest: (sendReason: number, isAsync: boolean) => { }
-                    });
+                    _notificationManager = _createDummyNotificationManager();
 
                     // For backward compatibility only
                     _self[strNotificationManager] = _notificationManager;
@@ -217,6 +245,28 @@ export class BaseCore implements IAppInsightsCore {
 
                 return _notificationManager;
             };
+
+            /**
+             * Adds a notification listener. The SDK calls methods on the listener when an appropriate notification is raised.
+             * The added plugins must raise notifications. If the plugins do not implement the notifications, then no methods will be
+             * called.
+             * @param {INotificationListener} listener - An INotificationListener object.
+             */
+            _self[strAddNotificationListener] = (listener: INotificationListener): void => {
+                if (_notificationManager) {
+                    _notificationManager[strAddNotificationListener](listener);
+                }
+            };
+        
+            /**
+             * Removes all instances of the listener.
+             * @param {INotificationListener} listener - INotificationListener to remove.
+             */
+            _self[strRemoveNotificationListener] = (listener: INotificationListener): void => {
+                if (_notificationManager) {
+                    _notificationManager[strRemoveNotificationListener](listener);
+                }
+            }
         
             _self.getCookieMgr = (): ICookieMgr => {
                 if (!_cookieManager) {
@@ -231,13 +281,13 @@ export class BaseCore implements IAppInsightsCore {
             };
 
             _self.getPerfMgr = (): IPerfManager => {
-                if (!_perfManager) {
+                if (!_perfManager && !_cfgPerfManager) {
                     if (_self.config && _self.config.enablePerfMgr && isFunction(_self.config.createPerfMgr)) {
-                        _perfManager = _self.config.createPerfMgr(_self, _self.getNotifyMgr());
+                        _cfgPerfManager = _self.config.createPerfMgr(_self, _self.getNotifyMgr());
                     }
                 }
 
-                return _perfManager || getGblPerfMgr();
+                return _perfManager || _cfgPerfManager || getGblPerfMgr();
             };
 
             _self.setPerfMgr = (perfMgr: IPerfManager) => {
@@ -249,14 +299,428 @@ export class BaseCore implements IAppInsightsCore {
             };
 
             _self.releaseQueue = () => {
-                if (_eventQueue.length > 0) {
-                    arrForEach(_eventQueue, (event: ITelemetryItem) => {
-                        _self.getProcessTelContext().processNext(event);
+                if (_isInitialized && _eventQueue.length > 0) {
+                    let eventQueue = _eventQueue;
+                    _eventQueue = [];
+
+                    arrForEach(eventQueue, (event: ITelemetryItem) => {
+                        _createTelCtx().processNext(event);
                     });
+                }
+            };
 
-                    _eventQueue = [];
+            /**
+             * Periodically check logger.queue for log messages to be flushed
+             */
+            _self.pollInternalLogs = (eventName?: string): number => {
+                _internalLogsEventName = eventName || null;
+
+                let interval = _self.config.diagnosticLogInterval;
+                if (!interval || !(interval > 0)) {
+                    interval = 10000;
+                }
+                if(_internalLogPoller) {
+                    clearInterval(_internalLogPoller);
+                }
+                _internalLogPoller = setInterval(() => {
+                    _flushInternalLogs();
+                }, interval) as any;
+
+                return _internalLogPoller;
+            }
+
+            /**
+             * Stop polling log messages from logger.queue
+             */
+            _self.stopPollingInternalLogs = (): void => {
+                if(_internalLogPoller) {
+                    clearInterval(_internalLogPoller);
+                    _internalLogPoller = 0;
+                    _flushInternalLogs();
+                }
+            }
+
+            // Add addTelemetryInitializer
+            proxyFunctions(_self, () => _telemetryInitializerPlugin, [ "addTelemetryInitializer" ]);
+
+            _self.unload = (isAsync: boolean = true, unloadComplete?: (unloadState: ITelemetryUnloadState) => void, cbTimeout?: number): void => {
+                if (!_isInitialized) {
+                    // The SDK is not initialized
+                    throwError(strSdkNotInitialized);
+                }
+
+                // Check if the SDK still unloading so throw
+                if (_isUnloading) {
+                    // The SDK is already unloading
+                    throwError(strSdkUnloadingError);
+                }
+
+                let unloadState: ITelemetryUnloadState = {
+                    reason: TelemetryUnloadReason.SdkUnload,
+                    isAsync: isAsync,
+                    flushComplete: false
+                }
+
+                let processUnloadCtx = createProcessTelemetryUnloadContext(_getPluginChain(), _self.config, _self);
+                processUnloadCtx.onComplete(() => {
+                    _initDefaults();
+                    unloadComplete && unloadComplete(unloadState);
+                }, _self);
+
+                function _doUnload(flushComplete: boolean) {
+                    unloadState.flushComplete = flushComplete;
+                    _isUnloading = true;
+
+                    // Run all of the unload handlers first (before unloading the plugins)
+                    _unloadHandlers.run(processUnloadCtx, unloadState);
+                    
+                    // Stop polling the internal logs
+                    _self.stopPollingInternalLogs();
+
+                    // Start unloading the components, from this point onwards the SDK should be considered to be in an unstable state
+                    processUnloadCtx.processNext(unloadState);
+                }
+
+                if (!_flushChannels(isAsync, _doUnload, SendRequestReason.SdkUnload, cbTimeout)) {
+                    _doUnload(false);
                 }
             };
+
+            _self.getPlugin = _getPlugin;
+
+            _self.addPlugin = <T extends IPlugin = ITelemetryPlugin>(plugin: T, replaceExisting?: boolean, isAsync?: boolean, addCb?: (added?: boolean) => void): void => {
+                if (!plugin) {
+                    addCb && addCb(false);
+                    _logOrThrowError(strValidationError);
+                    return;
+                }
+
+                let existingPlugin = _getPlugin(plugin.identifier);
+                if (existingPlugin && !replaceExisting) {
+                    addCb && addCb(false);
+
+                    _logOrThrowError("Plugin [" + plugin.identifier + "] is already loaded!");
+                    return;
+                }
+
+                let updateState: ITelemetryUpdateState = {
+                    reason: TelemetryUpdateReason.PluginAdded
+                };
+
+                function _addPlugin(removed: boolean) {
+                    _configExtensions.push(plugin);
+                    updateState.added = [plugin];
+
+                    // Re-Initialize the plugin chain
+                    _initPluginChain(_self.config, updateState);
+                    addCb && addCb(true);
+                }
+
+                if (existingPlugin) {
+                    let removedPlugins: IPlugin[] = [existingPlugin.plugin];
+                    let unloadState: ITelemetryUnloadState = {
+                        reason: TelemetryUnloadReason.PluginReplace,
+                        isAsync: !!isAsync
+                    };
+
+                    _removePlugins(removedPlugins, unloadState, (removed) => {
+                        if (!removed) {
+                            // Previous plugin was successfully removed or was not installed
+                            addCb && addCb(false);
+                        } else {
+                            updateState.removed = removedPlugins
+                            updateState.reason |= TelemetryUpdateReason.PluginRemoved;
+                            _addPlugin(true);
+                        }
+                    });
+                } else {
+                    _addPlugin(false);
+                }
+            };
+
+            _self.evtNamespace = (): string => {
+                return _evtNamespace;
+            };
+
+            _self.flush = _flushChannels;
+        
+            // Create the addUnloadCb
+            proxyFunctionAs(_self, "addUnloadCb", () => _unloadHandlers, "add");
+
+            function _initDefaults() {
+                _isInitialized = false;
+
+                // Use a default logger so initialization errors are not dropped on the floor with full logging
+                _self.logger = new DiagnosticLogger({ loggingLevelConsole: eLoggingSeverity.CRITICAL });
+                _self.config = {};
+                _self._extensions = [];
+
+                _telemetryInitializerPlugin = new TelemetryInitializerPlugin();
+                _eventQueue = [];
+                _notificationManager = null;
+                _perfManager = null;
+                _cfgPerfManager = null;
+                _cookieManager = null;
+                _pluginChain = null;
+                _coreExtensions = null;
+                _configExtensions = [];
+                _channelControl = null;
+                _channelConfig = null;
+                _channelQueue = null;
+                _isUnloading = false;
+                _internalLogsEventName = null;
+                _evtNamespace = createUniqueNamespace("AIBaseCore", true);
+                _unloadHandlers = createUnloadHandlerContainer();
+            }
+
+            function _createTelCtx(): IProcessTelemetryContext {
+                return createProcessTelemetryContext(_getPluginChain(), _self.config, _self);
+            }
+
+            // Initialize or Re-initialize the plugins
+            function _initPluginChain(config: IConfiguration, updateState: ITelemetryUpdateState | null) {
+                // Extension validation
+                let theExtensions = _validateExtensions(_self.logger, ChannelControllerPriority, _configExtensions);
+            
+                _coreExtensions = theExtensions.core;
+                _pluginChain = null;
+            
+                // Sort the complete set of extensions by priority
+                let allExtensions = theExtensions.all;
+
+                // Initialize the Channel Queues and the channel plugins first
+                _channelQueue = objFreeze(createChannelQueues(_channelConfig, allExtensions, config, _self));
+                if (_channelControl) {
+                    // During add / remove of a plugin this may get called again, so don't re-add if already present
+                    // But we also want the controller as the last, so remove if already present
+                    // And reusing the existing instance, just in case an installed plugin has a reference and
+                    // is using it.
+                    let idx = allExtensions.indexOf(_channelControl);
+                    if (idx !== -1) {
+                        allExtensions.splice(idx, 1);
+                    }
+
+                    idx = _coreExtensions.indexOf(_channelControl);
+                    if (idx !== -1) {
+                        _coreExtensions.splice(idx, 1);
+                    }
+
+                    (_channelControl as IInternalChannelController)._setQueue(_channelQueue);
+                } else {
+                    _channelControl = createChannelControllerPlugin(_channelQueue, _self);
+                }
+
+                // Add on "channelController" as the last "plugin"
+                allExtensions.push(_channelControl);
+                _coreExtensions.push(_channelControl);
+
+                // Required to allow plugins to call core.getPlugin() during their own initialization
+                _self._extensions = sortPlugins(allExtensions);
+
+                // Initialize the controls
+                _channelControl.initialize(config, _self, allExtensions);
+                
+                initializePlugins(_createTelCtx(), allExtensions);
+
+                // Now reset the extensions to just those being managed by Basecore
+                _self._extensions = objFreeze(sortPlugins(_coreExtensions || [])).slice();
+
+                if (updateState) {
+                    _doUpdate(updateState);
+                }
+            }
+
+            function _getPlugin<T extends IPlugin = IPlugin>(pluginIdentifier: string): ILoadedPlugin<T> {
+                let theExt: ILoadedPlugin<T> = null;
+                let thePlugin: IPlugin = null;
+
+                arrForEach(_self._extensions, (ext: any) => {
+                    if (ext.identifier === pluginIdentifier && ext !== _channelControl && ext !== _telemetryInitializerPlugin) {
+                        thePlugin = ext;
+                        return -1;
+                    }
+                });
+
+                if (!thePlugin && _channelControl) {
+                    // Check the channel Controller
+                    thePlugin = _channelControl.getChannel(pluginIdentifier);
+                }
+
+                if (thePlugin) {
+                    theExt = {
+                        plugin: thePlugin as T,
+                        setEnabled: (enabled: boolean) => {
+                            _getPluginState(thePlugin)[strDisabled] = !enabled;
+                        },
+                        isEnabled: () => {
+                            let pluginState = _getPluginState(thePlugin);
+                            return !pluginState[strTeardown] && !pluginState[strDisabled];
+                        },
+                        remove: (isAsync: boolean = true, removeCb?: (removed?: boolean) => void): void => {
+                            let pluginsToRemove: IPlugin[] = [thePlugin];
+                            let unloadState: ITelemetryUnloadState = {
+                                reason: TelemetryUnloadReason.PluginUnload,
+                                isAsync: isAsync
+                            };
+
+                            _removePlugins(pluginsToRemove, unloadState, (removed) => {
+                                if (removed) {
+                                    // Re-Initialize the plugin chain
+                                    _initPluginChain(_self.config, {
+                                        reason: TelemetryUpdateReason.PluginRemoved,
+                                        removed: pluginsToRemove
+                                    });
+                                }
+
+                                removeCb && removeCb(removed);
+                            });
+                        }
+                    }
+                }
+
+                return theExt;
+            }
+
+            function _getPluginChain() {
+                if (!_pluginChain) {
+                    // copy the collection of extensions
+                    let extensions = (_coreExtensions || []).slice();
+
+                    // During add / remove this may get called again, so don't readd if already present
+                    if (extensions.indexOf(_telemetryInitializerPlugin) === -1) {
+                        extensions.push(_telemetryInitializerPlugin);
+                    }
+
+                    _pluginChain = createTelemetryProxyChain(sortPlugins(extensions), _self.config, _self);
+                }
+
+                return _pluginChain;
+            }
+
+            function _removePlugins(thePlugins: IPlugin[], unloadState: ITelemetryUnloadState, removeComplete: (removed: boolean) => void) {
+
+                if (thePlugins && thePlugins.length > 0) {
+                    let unloadChain = createTelemetryProxyChain(thePlugins, _self.config, _self);
+                    let unloadCtx = createProcessTelemetryUnloadContext(unloadChain, _self.config, _self);
+
+                    unloadCtx.onComplete(() => {
+                        let removed = false;
+
+                        // Remove the listed config extensions
+                        let newConfigExtensions: IPlugin[] = [];
+                        arrForEach(_configExtensions, (plugin, idx) => {
+                            if (!_isPluginPresent(plugin, thePlugins)) {
+                                newConfigExtensions.push(plugin);
+                            } else {
+                                removed = true;
+                            }
+                        });
+
+                        _configExtensions = newConfigExtensions;
+
+                        // Re-Create the channel config
+                        let newChannelConfig: IChannelControls[][] = [];
+                        if (_channelConfig) {
+                            arrForEach(_channelConfig, (queue, idx) => {
+                                let newQueue: IChannelControls[] = [];
+                                arrForEach(queue, (channel) => {
+                                    if (!_isPluginPresent(channel, thePlugins)) {
+                                        newQueue.push(channel);
+                                    } else {
+                                        removed = true;
+                                    }
+                                });
+
+                                newChannelConfig.push(newQueue);
+                            });
+
+                            _channelConfig = newChannelConfig;
+                        }
+
+                        removeComplete && removeComplete(removed);
+                    });
+
+                    unloadCtx.processNext(unloadState);
+                } else {
+                    removeComplete(false);
+                }
+            }
+
+            function _flushInternalLogs() {
+                let queue: _InternalLogMessage[] = _self.logger ? _self.logger.queue : [];
+                if (queue) {
+                    arrForEach(queue, (logMessage: _InternalLogMessage) => {
+                        const item: ITelemetryItem = {
+                            name: _internalLogsEventName ? _internalLogsEventName : "InternalMessageId: " + logMessage.messageId,
+                            iKey: _self.config.instrumentationKey,
+                            time: toISOString(new Date()),
+                            baseType: _InternalLogMessage.dataType,
+                            baseData: { message: logMessage.message }
+                        };
+                        _self.track(item);
+                    });
+
+                    queue.length = 0;
+                }
+            }
+
+            function _flushChannels(isAsync?: boolean, callBack?: (flushComplete?: boolean) => void, sendReason?: SendRequestReason, cbTimeout?: number) {
+                if (_channelControl) {
+                    return _channelControl.flush(isAsync, callBack, sendReason || SendRequestReason.SdkUnload, cbTimeout);
+                }
+
+                callBack && callBack(false);
+                return true;
+            }
+
+            function _initDebugListener(config: IConfiguration) {
+
+                if (config.disableDbgExt === true && _debugListener) {
+                    // Remove any previously loaded debug listener
+                    _notificationManager[strRemoveNotificationListener](_debugListener);
+                    _debugListener = null;
+                }
+
+                if (_notificationManager && !_debugListener && config.disableDbgExt !== true) {
+                    _debugListener = getDebugListener(config);
+                    _notificationManager[strAddNotificationListener](_debugListener);
+                }
+            }
+
+            function _initPerfManager(config: IConfiguration) {
+                if (!config.enablePerfMgr && _cfgPerfManager) {
+                    // Remove any existing config based performance manager
+                    _cfgPerfManager = null;
+                }
+
+                if (config.enablePerfMgr) {
+                    // Set the performance manager creation function if not defined
+                    setValue(_self.config, "createPerfMgr", _createPerfManager);
+                }
+            }
+
+            function _initExtConfig(config: IConfiguration) {
+                let extConfig = getSetValue(config, strExtensionConfig);
+                extConfig.NotificationManager = _notificationManager;
+            }
+
+            function _doUpdate(updateState: ITelemetryUpdateState): void {
+                let updateCtx = createProcessTelemetryUpdateContext(_getPluginChain(), _self.config, _self);
+
+                if (!_self._updateHook || _self._updateHook(updateCtx, updateState) !== true) {
+                    updateCtx.processNext(updateState);
+                }
+            }
+
+            function _logOrThrowError(message: string) {
+                let logger = _self.logger;
+                if (logger) {
+                    // there should always be a logger
+                    _throwInternal(logger, eLoggingSeverity.WARNING, _eInternalMessageId.PluginException, message);
+                } else {
+                    throwError(message);
+                }
+            }
         });
     }
 
@@ -283,6 +747,24 @@ export class BaseCore implements IAppInsightsCore {
         return null;
     }
 
+    /**
+     * Adds a notification listener. The SDK calls methods on the listener when an appropriate notification is raised.
+     * The added plugins must raise notifications. If the plugins do not implement the notifications, then no methods will be
+     * called.
+     * @param {INotificationListener} listener - An INotificationListener object.
+     */
+    public addNotificationListener(listener: INotificationListener): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    /**
+     * Removes all instances of the listener.
+     * @param {INotificationListener} listener - INotificationListener to remove.
+     */
+    public removeNotificationListener(listener: INotificationListener): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
     /**
      * Get the current cookie manager for this instance
      */
@@ -313,7 +795,101 @@ export class BaseCore implements IAppInsightsCore {
         return 0;
     }
 
+    /**
+     * Periodically check logger.queue for
+     */
+    public pollInternalLogs(eventName?: string): number {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+        return 0;
+    }
+
+    /**
+     * Periodically check logger.queue for
+     */
+    public stopPollingInternalLogs(): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    /**
+     * Add a telemetry processor to decorate or drop telemetry events.
+     * @param telemetryInitializer - The Telemetry Initializer function
+     * @returns - A ITelemetryInitializerHandler to enable the initializer to be removed
+     */
+    public addTelemetryInitializer(telemetryInitializer: TelemetryInitializerFunction): ITelemetryInitializerHandler | void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    /**
+     * Unload and Tear down the SDK and any initialized plugins, after calling this the SDK will be considered
+     * to be un-initialized and non-operational, re-initializing the SDK should only be attempted if the previous
+     * unload call return `true` stating that all plugins reported that they also unloaded, the recommended
+     * approach is to create a new instance and initialize that instance.
+     * This is due to possible unexpected side effects caused by plugins not supporting unload / teardown, unable
+     * to successfully remove any global references or they may just be completing the unload process asynchronously.
+     * @param isAsync - Can the unload be performed asynchronously (default)
+     * @param unloadComplete - An optional callback that will be called once the unload has completed
+     * @param cbTimeout - An optional timeout to wait for any flush operations to complete before proceeding with the unload. Defaults to 5 seconds.
+     */
+    public unload(isAsync?: boolean, unloadComplete?: (unloadState: ITelemetryUnloadState) => void, cbTimeout?: number): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    public getPlugin<T extends IPlugin = IPlugin>(pluginIdentifier: string): ILoadedPlugin<T> {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+        return null;
+    }
+
+    /**
+     * Add a new plugin to the installation
+     * @param plugin - The new plugin to add
+     * @param replaceExisting - should any existing plugin be replaced, default is false
+     * @param doAsync - Should the add be performed asynchronously
+     * @param addCb - [Optional] callback to call after the plugin has been added
+     */
+    public addPlugin<T extends IPlugin = ITelemetryPlugin>(plugin: T, replaceExisting?: boolean, doAsync?: boolean, addCb?: (added?: boolean) => void): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    /**
+     * Returns the unique event namespace that should be used
+     */
+    public evtNamespace(): string {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+        return null;
+    }
+
+    /**
+     * Add an unload handler that will be called when the SDK is being unloaded
+     * @param handler - the handler
+     */
+    public addUnloadCb(handler: UnloadHandler): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    /**
+     * Flush and send any batched / cached data immediately
+     * @param async - send data asynchronously when true (defaults to true)
+     * @param callBack - if specified, notify caller when send is complete, the channel should return true to indicate to the caller that it will be called.
+     * If the caller doesn't return true the caller should assume that it may never be called.
+     * @param sendReason - specify the reason that you are calling "flush" defaults to ManualFlush (1) if not specified
+     * @returns - true if the callback will be return after the flush is complete otherwise the caller should assume that any provided callback will never be called
+     */
+    public flush(isAsync?: boolean, callBack?: (flushComplete?: boolean) => void, sendReason?: SendRequestReason): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
     protected releaseQueue() {
         // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
     }
+
+    /**
+     * Hook for Core extensions to allow them to update their own configuration before updating all of the plugins.
+     * @param updateCtx - The plugin update context
+     * @param updateState - The Update State
+     * @returns boolean - True means the extension class will call updateState otherwise the Core will
+     */
+    protected _updateHook?(updateCtx: IProcessTelemetryUpdateContext, updateState: ITelemetryUpdateState): void | boolean {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+        return false;
+    }
 }