@microsoft/applicationinsights-core-js 2.8.5-nightly.2206-03 → 2.8.5-nightly.2207-01

package/src/JavaScriptSDK/ChannelController.ts

@@ -1,24 +1,26 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// // Licensed under the MIT License.
-
-import { SendRequestReason } from "../JavaScriptSDK.Enums/SendRequestReason";
-import { TelemetryUnloadReason } from "../JavaScriptSDK.Enums/TelemetryUnloadReason";
-import { TelemetryUpdateReason } from "../JavaScriptSDK.Enums/TelemetryUpdateReason";
-import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
-import { IChannelControls } from "../JavaScriptSDK.Interfaces/IChannelControls";
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
-import { IBaseProcessingContext, IProcessTelemetryContext, IProcessTelemetryUnloadContext, IProcessTelemetryUpdateContext } from "../JavaScriptSDK.Interfaces/IProcessTelemetryContext";
-import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
-import { IPlugin } from "../JavaScriptSDK.Interfaces/ITelemetryPlugin";
-import { ITelemetryPluginChain } from "../JavaScriptSDK.Interfaces/ITelemetryPluginChain";
-import { ITelemetryUnloadState } from "../JavaScriptSDK.Interfaces/ITelemetryUnloadState";
-import { ITelemetryUpdateState } from "../JavaScriptSDK.Interfaces/ITelemetryUpdateState";
-import { arrForEach, isArray, objFreeze, throwError } from "./HelperFuncs";
-import { strPause, strProcessNext, strResume, strTeardown } from "./InternalConstants";
-import { createProcessTelemetryContext, createTelemetryProxyChain } from "./ProcessTelemetryContext";
-import { initializePlugins } from "./TelemetryHelpers";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// // Licensed under the MIT License.
+
+import { SendRequestReason } from "../JavaScriptSDK.Enums/SendRequestReason";
+import { TelemetryUnloadReason } from "../JavaScriptSDK.Enums/TelemetryUnloadReason";
+import { TelemetryUpdateReason } from "../JavaScriptSDK.Enums/TelemetryUpdateReason";
+import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
+import { IChannelControls } from "../JavaScriptSDK.Interfaces/IChannelControls";
+import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
+import {
+    IBaseProcessingContext, IProcessTelemetryContext, IProcessTelemetryUnloadContext, IProcessTelemetryUpdateContext
+} from "../JavaScriptSDK.Interfaces/IProcessTelemetryContext";
+import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
+import { IPlugin } from "../JavaScriptSDK.Interfaces/ITelemetryPlugin";
+import { ITelemetryPluginChain } from "../JavaScriptSDK.Interfaces/ITelemetryPluginChain";
+import { ITelemetryUnloadState } from "../JavaScriptSDK.Interfaces/ITelemetryUnloadState";
+import { ITelemetryUpdateState } from "../JavaScriptSDK.Interfaces/ITelemetryUpdateState";
+import { arrForEach, isArray, objFreeze, throwError } from "./HelperFuncs";
+import { createProcessTelemetryContext, createTelemetryProxyChain } from "./ProcessTelemetryContext";
+import { initializePlugins } from "./TelemetryHelpers";
+
 export const ChannelControllerPriority = 500;
+
 const ChannelValidationMessage = "Channel has invalid priority - ";
 
 export interface IChannelController extends IChannelControls {
@@ -36,7 +38,7 @@ export interface _IInternalChannels {
     chain: ITelemetryPluginChain;
 }
 
-function _addChannelQueue(channelQueue: _IInternalChannels[], queue: IChannelControls[], config: IConfiguration, core: IAppInsightsCore) {
+function _addChannelQueue(channelQueue: _IInternalChannels[], queue: IChannelControls[], core: IAppInsightsCore) {
     if (queue && isArray(queue) && queue.length > 0) {
         queue = queue.sort((a, b) => { // sort based on priority within each queue
             return a.priority - b.priority;
@@ -50,7 +52,7 @@ function _addChannelQueue(channelQueue: _IInternalChannels[], queue: IChannelCon
 
         channelQueue.push({
             queue: objFreeze(queue),
-            chain: createTelemetryProxyChain(queue, config, core)
+            chain: createTelemetryProxyChain(queue, core.config, core)
         });
     }
 }
@@ -98,9 +100,9 @@ export function createChannelControllerPlugin(channelQueue: _IInternalChannels[]
         };
 
         _processChannelQueue(channelQueue, updateCtx, (chainCtx: IProcessTelemetryUpdateContext) => {
-            chainCtx[strProcessNext](theUpdateState);
+            chainCtx.processNext(theUpdateState);
         }, () => {
-            updateCtx[strProcessNext](theUpdateState);
+            updateCtx.processNext(theUpdateState);
         });
 
         return true;
@@ -113,9 +115,9 @@ export function createChannelControllerPlugin(channelQueue: _IInternalChannels[]
         };
 
         _processChannelQueue(channelQueue, unloadCtx, (chainCtx: IProcessTelemetryUnloadContext) => {
-            chainCtx[strProcessNext](theUnloadState);
+            chainCtx.processNext(theUnloadState);
         }, () => {
-            unloadCtx[strProcessNext](theUnloadState);
+            unloadCtx.processNext(theUnloadState);
             isInitialized = false;
         });
 
@@ -165,27 +167,27 @@ export function createChannelControllerPlugin(channelQueue: _IInternalChannels[]
         },
         processTelemetry: (item: ITelemetryItem, itemCtx: IProcessTelemetryContext) => {
             _processChannelQueue(channelQueue, itemCtx || _getTelCtx(), (chainCtx: IProcessTelemetryContext) => {
-                chainCtx[strProcessNext](item);
+                chainCtx.processNext(item);
             }, () => {
-                itemCtx[strProcessNext](item);
+                itemCtx.processNext(item);
             });
         },
         update: _doUpdate,
-        [strPause]: () => {
+        pause: () => {
             _processChannelQueue(channelQueue, _getTelCtx(), (chainCtx: IProcessTelemetryContext) => {
                 chainCtx.iterate<IChannelControls>((plugin) => {
-                    plugin[strPause] && plugin[strPause]();
+                    plugin.pause && plugin.pause();
                 });
             }, null);
         },
-        [strResume]: () => {
+        resume: () => {
             _processChannelQueue(channelQueue, _getTelCtx(), (chainCtx: IProcessTelemetryContext) => {
                 chainCtx.iterate<IChannelControls>((plugin) => {
-                    plugin[strResume] && plugin[strResume]();
+                    plugin.resume && plugin.resume();
                 });
             }, null);
         },
-        [strTeardown]: _doTeardown,
+        teardown: _doTeardown,
         getChannel: _getChannel,
         flush: (isAsync: boolean, callBack: (flushComplete?: boolean) => void, sendReason: SendRequestReason, cbTimeout?: number) => {
             // Setting waiting to one so that we don't call the callBack until we finish iterating
@@ -250,12 +252,12 @@ export function createChannelControllerPlugin(channelQueue: _IInternalChannels[]
     return channelController;
 }
 
-export function createChannelQueues(channels: IChannelControls[][], extensions: IPlugin[], config: IConfiguration, core: IAppInsightsCore) {
+export function createChannelQueues(channels: IChannelControls[][], extensions: IPlugin[], core: IAppInsightsCore) {
     let channelQueue: _IInternalChannels[] = [];
 
     if (channels) {
         // Add and sort the configuration channel queues
-        arrForEach(channels, queue => _addChannelQueue(channelQueue, queue, config, core));
+        arrForEach(channels, queue => _addChannelQueue(channelQueue, queue, core));
     }
 
     if (extensions) {
@@ -267,8 +269,8 @@ export function createChannelQueues(channels: IChannelControls[][], extensions:
             }
         });
     
-        _addChannelQueue(channelQueue, extensionQueue, config, core);
+        _addChannelQueue(channelQueue, extensionQueue, core);
     }
 
     return channelQueue;
-}
+}

package/src/JavaScriptSDK/CookieMgr.ts

@@ -1,18 +1,18 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
-import { ICookieMgr, ICookieMgrConfig } from "../JavaScriptSDK.Interfaces/ICookieMgr";
-import { _eInternalMessageId, eLoggingSeverity } from "../JavaScriptSDK.Enums/LoggingEnums";
-import { dumpObj, getDocument, getLocation, getNavigator, isIE } from "./EnvUtils";
-import {
-    arrForEach, dateNow, getExceptionName, isFunction, isNotNullOrUndefined, isNullOrUndefined, isString, isTruthy, isUndefined,
-    objForEachKey, setValue, strContains, strEndsWith, strTrim
-} from "./HelperFuncs";
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
-import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
-import { strEmpty } from "./InternalConstants";
-import { _throwInternal } from "./DiagnosticLogger";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { _eInternalMessageId, eLoggingSeverity } from "../JavaScriptSDK.Enums/LoggingEnums";
+import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
+import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
+import { ICookieMgr, ICookieMgrConfig } from "../JavaScriptSDK.Interfaces/ICookieMgr";
+import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
+import { _throwInternal } from "./DiagnosticLogger";
+import { dumpObj, getDocument, getLocation, getNavigator, isIE } from "./EnvUtils";
+import {
+    arrForEach, dateNow, getExceptionName, isFunction, isNotNullOrUndefined, isNullOrUndefined, isString, isTruthy, isUndefined,
+    objForEachKey, setValue, strContains, strEndsWith, strTrim
+} from "./HelperFuncs";
+import { STR_EMPTY } from "./InternalConstants";
+
 const strToGMTString = "toGMTString";
 const strToUTCString = "toUTCString";
 const strCookie = "cookie";
@@ -140,7 +140,7 @@ export function createCookieMgr(rootConfig?: IConfiguration, logger?: IDiagnosti
             let result = false;
             if (_isMgrEnabled(cookieMgr)) {
                 let values: any = {};
-                let theValue = strTrim(value || strEmpty);
+                let theValue = strTrim(value || STR_EMPTY);
                 let idx = theValue.indexOf(";");
                 if (idx !== -1) {
                     theValue = strTrim(value.substring(0, idx));
@@ -162,14 +162,14 @@ export function createCookieMgr(rootConfig?: IConfiguration, logger?: IDiagnosti
                             let expiry = new Date();
                             expiry.setTime(expireMs);
                             setValue(values, strExpires,
-                                _formatDate(expiry, !_isIE ? strToUTCString : strToGMTString) || _formatDate(expiry, _isIE ? strToGMTString : strToUTCString) || strEmpty,
+                                _formatDate(expiry, !_isIE ? strToUTCString : strToGMTString) || _formatDate(expiry, _isIE ? strToGMTString : strToUTCString) || STR_EMPTY,
                                 isTruthy);
                         }
                     }
             
                     if (!_isIE) {
                         // Only replace if not already present
-                        setValue(values, "max-age", strEmpty + maxAgeSec, null, isUndefined);
+                        setValue(values, "max-age", STR_EMPTY + maxAgeSec, null, isUndefined);
                     }
                 }
             
@@ -197,7 +197,7 @@ export function createCookieMgr(rootConfig?: IConfiguration, logger?: IDiagnosti
             return result;
         },
         get: (name: string): string => {
-            let value = strEmpty
+            let value = STR_EMPTY
             if (_isMgrEnabled(cookieMgr)) {
                 value = (cookieMgrConfig.getCookie || _getCookieValue)(name);
             }
@@ -228,7 +228,7 @@ export function createCookieMgr(rootConfig?: IConfiguration, logger?: IDiagnosti
                 }
 
                 let delCookie = cookieMgrConfig.delCookie || _setCookieValue;
-                delCookie(name, _formatCookieValue(strEmpty, values));
+                delCookie(name, _formatCookieValue(STR_EMPTY, values));
                 result = true;
             }
 
@@ -270,7 +270,7 @@ function _extractParts(theValue: string) {
     if (theValue && theValue.length) {
         let parts = strTrim(theValue).split(";");
         arrForEach(parts, (thePart) => {
-            thePart = strTrim(thePart || strEmpty);
+            thePart = strTrim(thePart || STR_EMPTY);
             if (thePart) {
                 let idx = thePart.indexOf("=");
                 if (idx === -1) {
@@ -294,24 +294,24 @@ function _formatDate(theDate: Date, func: string) {
 }
 
 function _formatCookieValue(value: string, values: any) {
-    let cookieValue = value || strEmpty;
+    let cookieValue = value || STR_EMPTY;
     objForEachKey(values, (name, theValue) => {
-        cookieValue += "; " + name + (!isNullOrUndefined(theValue) ? "=" + theValue : strEmpty);
+        cookieValue += "; " + name + (!isNullOrUndefined(theValue) ? "=" + theValue : STR_EMPTY);
     });
 
     return cookieValue;
 }
 
 function _getCookieValue(name: string) {
-    let cookieValue = strEmpty;
+    let cookieValue = STR_EMPTY;
     if (_doc) {
-        let theCookie = _doc[strCookie] || strEmpty;
+        let theCookie = _doc[strCookie] || STR_EMPTY;
         if (_parsedCookieValue !== theCookie) {
             _cookieCache = _extractParts(theCookie);
             _parsedCookieValue = theCookie;
         }
 
-        cookieValue = strTrim(_cookieCache[name] || strEmpty);
+        cookieValue = strTrim(_cookieCache[name] || STR_EMPTY);
     }
 
     return cookieValue;
@@ -380,4 +380,4 @@ export function uaDisallowsSameSiteNone(userAgent: string) {
     }
 
     return false;
-}
+}

package/src/JavaScriptSDK/CoreUtils.ts

@@ -1,21 +1,20 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-"use strict";
-import { objCreateFn, strShimUndefined } from "@microsoft/applicationinsights-shims";
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
-import { ICookieMgr } from "../JavaScriptSDK.Interfaces/ICookieMgr";
-import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
-import { _gblCookieMgr } from "./CookieMgr";
-import { getPerformance, isIE }  from "./EnvUtils";
-import {
-    arrForEach, arrIndexOf, arrMap, arrReduce, dateNow, hasOwnProperty,
-    isArray, isBoolean, isDate, isError, isFunction, isNullOrUndefined, isNumber, isObject, isString, isTypeof,
-    isUndefined, objDefineAccessors, objKeys, strTrim, toISOString
-} from "./HelperFuncs";
-import { addEventHandler, attachEvent, detachEvent } from "./EventHelpers";
-import { randomValue, random32, mwcRandomSeed, mwcRandom32, newId } from "./RandomHelper";
-import { strEmpty } from "./InternalConstants";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+"use strict";
+import { objCreateFn, strShimUndefined } from "@microsoft/applicationinsights-shims";
+import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
+import { ICookieMgr } from "../JavaScriptSDK.Interfaces/ICookieMgr";
+import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
+import { _gblCookieMgr } from "./CookieMgr";
+import { getPerformance, isIE } from "./EnvUtils";
+import { addEventHandler, attachEvent, detachEvent } from "./EventHelpers";
+import {
+    arrForEach, arrIndexOf, arrMap, arrReduce, dateNow, hasOwnProperty, isArray, isBoolean, isDate, isError, isFunction, isNullOrUndefined,
+    isNumber, isObject, isString, isTypeof, isUndefined, objDefineAccessors, objKeys, strTrim, toISOString
+} from "./HelperFuncs";
+import { STR_EMPTY } from "./InternalConstants";
+import { mwcRandom32, mwcRandomSeed, newId, random32, randomValue } from "./RandomHelper";
+
 let _cookieMgrs: ICookieMgr[] = null;
 let _canUseCookies: boolean;    // legacy supported config
 
@@ -68,7 +67,7 @@ export function generateW3CId(): string {
     const hexValues = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
 
     // rfc4122 version 4 UUID without dashes and with lowercase letters
-    let oct = strEmpty, tmp;
+    let oct = STR_EMPTY, tmp;
     for (let a = 0; a < 4; a++) {
         tmp = random32();
         oct +=
@@ -486,4 +485,4 @@ export function setCookie(logger: IDiagnosticLogger, name: string, value: string
  */
 export function deleteCookie(logger: IDiagnosticLogger, name: string) {
     return _legacyCookieMgr(null, logger).del(name);
-}
+}

package/src/JavaScriptSDK/DataCacheHelper.ts

@@ -1,13 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import { ObjDefineProperty } from "@microsoft/applicationinsights-shims";
-import { normalizeJsName } from "./HelperFuncs";
-import { newId } from "./RandomHelper";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { ObjDefineProperty } from "@microsoft/applicationinsights-shims";
+import { normalizeJsName } from "./HelperFuncs";
+import { STR_EMPTY } from "./InternalConstants";
+import { newId } from "./RandomHelper";
+
 const _objDefineProperty = ObjDefineProperty;
 
-const version = "2.8.5-nightly.2206-03";
+const version = "#version#";
 let instanceName = "." + newId(6);
 let _dataUid = 0;
 
@@ -67,13 +68,13 @@ function _getCache(data: IDataCache, target: Node) {
 }
 
 export function createUniqueNamespace(name: string, includeVersion: boolean = false): string {
-    return normalizeJsName(name + (_dataUid++) + (includeVersion ? "." + version : "") + instanceName);
+    return normalizeJsName(name + (_dataUid++) + (includeVersion ? "." + version : STR_EMPTY) + instanceName);
 }
 
 export function createElmNodeData(name?: string) {
 
     let data = {
-        id: createUniqueNamespace("_aiData-" + (name || "") + "." + version),
+        id: createUniqueNamespace("_aiData-" + (name || STR_EMPTY) + "." + version),
         accept: function (target: any) {
             return _canAcceptData(target);
         },
@@ -103,4 +104,4 @@ export function createElmNodeData(name?: string) {
     };
 
     return data;
-}
+}

package/src/JavaScriptSDK/DbgExtensionUtils.ts

@@ -1,11 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
-import { IDbgExtension } from "../JavaScriptSDK.Interfaces/IDbgExtension";
-import { INotificationListener } from "../JavaScriptSDK.Interfaces/INotificationListener";
-import { getGlobalInst } from "./EnvUtils";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
+import { IDbgExtension } from "../JavaScriptSDK.Interfaces/IDbgExtension";
+import { INotificationListener } from "../JavaScriptSDK.Interfaces/INotificationListener";
+import { getGlobalInst } from "./EnvUtils";
+
 const listenerFuncs = [ "eventsSent", "eventsDiscarded", "eventsSendRequest", "perfEvent" ];
 
 let _aiNamespace: any = null;
@@ -52,4 +52,4 @@ export function getDebugListener(config: IConfiguration): INotificationListener
     }
 
     return _debugListener;
-}
+}

package/src/JavaScriptSDK/DiagnosticLogger.ts

@@ -1,16 +1,16 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-"use strict"
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration"
-import { _InternalMessageId, _eInternalMessageId, LoggingSeverity, eLoggingSeverity } from "../JavaScriptSDK.Enums/LoggingEnums";
-import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
-import { hasJSON, getJSON, getConsole, dumpObj } from "./EnvUtils";
-import dynamicProto from "@microsoft/dynamicproto-js";
-import { isFunction, isNullOrUndefined, isUndefined } from "./HelperFuncs";
-import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
-import { getDebugExt } from "./DbgExtensionUtils";
-import { strEmpty } from "./InternalConstants";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+"use strict"
+import dynamicProto from "@microsoft/dynamicproto-js";
+import { LoggingSeverity, _InternalMessageId, _eInternalMessageId, eLoggingSeverity } from "../JavaScriptSDK.Enums/LoggingEnums";
+import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
+import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
+import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
+import { getDebugExt } from "./DbgExtensionUtils";
+import { dumpObj, getConsole, getJSON, hasJSON } from "./EnvUtils";
+import { getCfgValue, isFunction, isUndefined } from "./HelperFuncs";
+import { STR_EMPTY, STR_ERROR_TO_CONSOLE, STR_WARN_TO_CONSOLE } from "./InternalConstants";
+
 /**
  * For user non actionable traces use AI Internal prefix.
  */
@@ -26,15 +26,12 @@ const AiUserActionablePrefix = "AI: ";
  */
 const AIInternalMessagePrefix = "AITR_";
 
-const strErrorToConsole = "errorToConsole";
-const strWarnToConsole = "warnToConsole";
-
 function _sanitizeDiagnosticText(text: string) {
     if (text) {
-        return "\"" + text.replace(/\"/g, strEmpty) + "\"";
+        return "\"" + text.replace(/\"/g, STR_EMPTY) + "\"";
     }
 
-    return strEmpty;
+    return STR_EMPTY;
 }
 
 function _logToConsole(func: string, message: string) {
@@ -65,14 +62,14 @@ export class _InternalLogMessage{
             (isUserAct ? AiUserActionablePrefix : AiNonUserActionablePrefix) +
             msgId;
 
-        let strProps:string = strEmpty;
+        let strProps:string = STR_EMPTY;
         if (hasJSON()) {
             strProps = getJSON().stringify(properties);
         }
 
         const diagnosticText =
-            (msg ? " message:" + _sanitizeDiagnosticText(msg) : strEmpty) +
-            (properties ? " props:" + _sanitizeDiagnosticText(strProps) : strEmpty);
+            (msg ? " message:" + _sanitizeDiagnosticText(msg) : STR_EMPTY) +
+            (properties ? " props:" + _sanitizeDiagnosticText(strProps) : STR_EMPTY);
 
         _self.message += diagnosticText;
     }
@@ -94,25 +91,28 @@ export class DiagnosticLogger implements IDiagnosticLogger {
         /**
          * Count of internal messages sent
          */
-        let _messageCount = 0;
+        let _messageCount: number = 0;
 
         /**
          * Holds information about what message types were already logged to console or sent to server.
          */
         let _messageLogged: { [msg: number]: boolean } = {};
 
+        let _loggingLevelConsole: number;
+        let _loggingLevelTelemetry: number;
+        let _maxInternalMessageLimit: number;
+        let _enableDebugExceptions: boolean;
+
         dynamicProto(DiagnosticLogger, this, (_self) => {
-            if (isNullOrUndefined(config)) {
-                config = {};
-            }
+            _setDefaultsFromConfig(config || {});
 
-            _self.consoleLoggingLevel = () => _getConfigValue("loggingLevelConsole", 0);
+            _self.consoleLoggingLevel = () => _loggingLevelConsole;
             
-            _self.telemetryLoggingLevel = () => _getConfigValue("loggingLevelTelemetry", 1);
+            _self.telemetryLoggingLevel = () => _loggingLevelTelemetry;
 
-            _self.maxInternalMessageLimit = () => _getConfigValue("maxMessageLimit", 25);
+            _self.maxInternalMessageLimit = () => _maxInternalMessageLimit;
 
-            _self.enableDebugExceptions = () => _getConfigValue("enableDebugExceptions", false);
+            _self.enableDebugExceptions = () => _enableDebugExceptions;
             
             /**
              * This method will throw exceptions in debug mode or attempt to log the error as a console warning.
@@ -122,30 +122,29 @@ export class DiagnosticLogger implements IDiagnosticLogger {
             _self.throwInternal = (severity: LoggingSeverity, msgId: _InternalMessageId, msg: string, properties?: Object, isUserAct = false) => {
                 const message = new _InternalLogMessage(msgId, msg, isUserAct, properties);
 
-                if (_self.enableDebugExceptions()) {
+                if (_enableDebugExceptions) {
                     throw dumpObj(message);
                 } else {
                     // Get the logging function and fallback to warnToConsole of for some reason errorToConsole doesn't exist
-                    let logFunc = severity === eLoggingSeverity.CRITICAL ? strErrorToConsole : strWarnToConsole;
+                    let logFunc = severity === eLoggingSeverity.CRITICAL ? STR_ERROR_TO_CONSOLE : STR_WARN_TO_CONSOLE;
 
                     if (!isUndefined(message.message)) {
-                        const logLevel = _self.consoleLoggingLevel();
                         if (isUserAct) {
                             // check if this message type was already logged to console for this page view and if so, don't log it again
                             const messageKey: number = +message.messageId;
 
-                            if (!_messageLogged[messageKey] && logLevel >= severity) {
+                            if (!_messageLogged[messageKey] && _loggingLevelConsole >= severity) {
                                 _self[logFunc](message.message);
                                 _messageLogged[messageKey] = true;
                             }
                         } else {
                             // Only log traces if the console Logging Level is >= the throwInternal severity level
-                            if (logLevel >= severity) {
+                            if (_loggingLevelConsole >= severity) {
                                 _self[logFunc](message.message);
                             }
                         }
 
-                        _self.logInternalMessage(severity, message);
+                        _logInternalMessage(severity, message);
                     } else {
                         _debugExtMsg("throw" + (severity === eLoggingSeverity.CRITICAL ? "Critical" : "Warning"), message);
                     }
@@ -183,7 +182,9 @@ export class DiagnosticLogger implements IDiagnosticLogger {
              * @param severity {LoggingSeverity} - The severity of the log message
              * @param message {_InternalLogMessage} - The message to log.
              */
-            _self.logInternalMessage = (severity: LoggingSeverity, message: _InternalLogMessage): void => {
+            _self.logInternalMessage = _logInternalMessage;
+            
+            function _logInternalMessage(severity: LoggingSeverity, message: _InternalLogMessage): void {
                 if (_areInternalMessagesThrottled()) {
                     return;
                 }
@@ -201,14 +202,14 @@ export class DiagnosticLogger implements IDiagnosticLogger {
 
                 if (logMessage) {
                     // Push the event in the internal queue
-                    if (severity <= _self.telemetryLoggingLevel()) {
+                    if (severity <= _loggingLevelTelemetry) {
                         _self.queue.push(message);
                         _messageCount++;
                         _debugExtMsg((severity === eLoggingSeverity.CRITICAL ? "error" : "warn"), message);
                     }
 
                     // When throttle limit reached, send a special event
-                    if (_messageCount === _self.maxInternalMessageLimit()) {
+                    if (_messageCount === _maxInternalMessageLimit) {
                         const throttleLimitMessage = "Internal events throttle limit per PageView reached for this app.";
                         const throttleMessage = new _InternalLogMessage(_eInternalMessageId.MessageLimitPerPVExceeded, throttleLimitMessage, false);
                         _self.queue.push(throttleMessage);
@@ -219,23 +220,21 @@ export class DiagnosticLogger implements IDiagnosticLogger {
                         }
                     }
                 }
-            };
-
-            function _getConfigValue<T>(name: keyof IConfiguration, defValue: T): T {
-                let value = config[name] as T;
-                if (!isNullOrUndefined(value)) {
-                    return value;
-                }
+            }
 
-                return defValue;
+            function _setDefaultsFromConfig(config: IConfiguration) {
+                _loggingLevelConsole = getCfgValue(config.loggingLevelConsole, 0);
+                _loggingLevelTelemetry = getCfgValue(config.loggingLevelTelemetry, 1)
+                _maxInternalMessageLimit = getCfgValue(config.maxMessageLimit, 25);
+                _enableDebugExceptions =  getCfgValue(config.enableDebugExceptions, false);
             }
 
             function _areInternalMessagesThrottled(): boolean {
-                return _messageCount >= _self.maxInternalMessageLimit();
+                return _messageCount >= _maxInternalMessageLimit;
             }
 
             function _debugExtMsg(name: string, data: any) {
-                let dbgExt = getDebugExt(config);
+                let dbgExt = getDebugExt(config || {});
                 if (dbgExt && dbgExt.diagLog) {
                     dbgExt.diagLog(name, data);
                 }
@@ -335,7 +334,7 @@ function _getLogger(logger: IDiagnosticLogger) {
  * @param message {_InternalLogMessage} - The log message.
  */
 export function _throwInternal(logger: IDiagnosticLogger, severity: LoggingSeverity, msgId: _InternalMessageId, msg: string, properties?: Object, isUserAct = false) {
-    (logger || new DiagnosticLogger()).throwInternal(severity, msgId, msg, properties, isUserAct);
+    _getLogger(logger).throwInternal(severity, msgId, msg, properties, isUserAct);
 }
 
 /**
@@ -355,4 +354,4 @@ export function _warnToConsole(logger: IDiagnosticLogger, message: string) {
  */
 export function _logInternalMessage(logger: IDiagnosticLogger, severity: LoggingSeverity, message: _InternalLogMessage) {
     _getLogger(logger).logInternalMessage(severity, message);
-}
+}