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

package/src/JavaScriptSDK/EnvUtils.ts

@@ -1,13 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-"use strict";
-
-import {
-    getGlobal, strShimUndefined, strShimObject, strShimPrototype
-} from "@microsoft/applicationinsights-shims";
-import { strEmpty } from "./InternalConstants";
-import { isString, isUndefined, strContains } from "./HelperFuncs";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+"use strict";
+
+import { getGlobal, strShimObject, strShimPrototype, strShimUndefined } from "@microsoft/applicationinsights-shims";
+import { isString, isUndefined, strContains } from "./HelperFuncs";
+import { STR_EMPTY } from "./InternalConstants";
+
 // TypeScript removed this interface so we need to declare the global so we can check for it's existence.
 declare var XDomainRequest: any;
 
@@ -297,7 +295,7 @@ export function isIE() {
     if (nav && (nav.userAgent !== _navUserAgentCheck || _isTrident === null)) {
         // Added to support test mocking of the user agent
         _navUserAgentCheck = nav.userAgent;
-        let userAgent = (_navUserAgentCheck || strEmpty).toLowerCase();
+        let userAgent = (_navUserAgentCheck || STR_EMPTY).toLowerCase();
         _isTrident = (strContains(userAgent, strMsie) || strContains(userAgent, strTrident));
     }
 
@@ -310,10 +308,10 @@ export function isIE() {
 export function getIEVersion(userAgentStr: string = null): number {
     if (!userAgentStr) {
         let navigator = getNavigator() || ({} as Navigator);
-        userAgentStr = navigator ? (navigator.userAgent || strEmpty).toLowerCase() : strEmpty;
+        userAgentStr = navigator ? (navigator.userAgent || STR_EMPTY).toLowerCase() : STR_EMPTY;
     }
 
-    var ua = (userAgentStr || strEmpty).toLowerCase();
+    var ua = (userAgentStr || STR_EMPTY).toLowerCase();
     // Also check for documentMode in case X-UA-Compatible meta tag was included in HTML.
     if (strContains(ua, strMsie)) {
         let doc = getDocument() || {} as Document;
@@ -333,7 +331,7 @@ export function getIEVersion(userAgentStr: string = null): number {
  */
 export function dumpObj(object: any): string {
     const objectTypeDump: string = Object[strShimPrototype].toString.call(object);
-    let propertyValueDump: string = strEmpty;
+    let propertyValueDump: string = STR_EMPTY;
     if (objectTypeDump === "[object Error]") {
         propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
     } else if (hasJSON()) {
@@ -346,10 +344,10 @@ export function dumpObj(object: any): string {
 export function isSafari(userAgentStr ?: string) {
     if (!userAgentStr || !isString(userAgentStr)) {
         let navigator = getNavigator() || ({} as Navigator);
-        userAgentStr = navigator ? (navigator.userAgent || strEmpty).toLowerCase() : strEmpty;
+        userAgentStr = navigator ? (navigator.userAgent || STR_EMPTY).toLowerCase() : STR_EMPTY;
     }
 
-    var ua = (userAgentStr || strEmpty).toLowerCase();
+    var ua = (userAgentStr || STR_EMPTY).toLowerCase();
     return (ua.indexOf("safari") >= 0);
 }
 
@@ -455,4 +453,4 @@ export function findNamedServerTiming(name: string): any {
     }
 
     return value;
-}
+}

package/src/JavaScriptSDK/EventHelpers.ts

@@ -1,9 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { createElmNodeData, createUniqueNamespace } from "./DataCacheHelper";
-import { getDocument, getWindow } from "./EnvUtils";
-import { arrForEach, arrIndexOf, isArray, objForEachKey, objKeys } from "./HelperFuncs";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { createElmNodeData, createUniqueNamespace } from "./DataCacheHelper";
+import { getDocument, getWindow } from "./EnvUtils";
+import { arrForEach, arrIndexOf, isArray, objForEachKey, objKeys } from "./HelperFuncs";
+import { STR_EMPTY } from "./InternalConstants";
+
 // Added to help with minfication
 const strOnPrefix = "on";
 const strAttachEvent = "attachEvent";
@@ -46,7 +47,7 @@ const eventNamespace = /^([^.]*)(?:\.(.+)|)/
 
 function _normalizeNamespace(name: string) {
     if (name && name.replace) {
-        return name.replace(/^\s*\.*|\.*\s*$/g, "");
+        return name.replace(/^\s*\.*|\.*\s*$/g, STR_EMPTY);
     }
 
     return name;
@@ -54,9 +55,9 @@ function _normalizeNamespace(name: string) {
 
 function _getEvtNamespace(eventName: string | undefined, evtNamespace?: string | string[] | null): IEventDetails {
     if (evtNamespace) {
-        let theNamespace: string = "";
+        let theNamespace: string = STR_EMPTY;
         if (isArray(evtNamespace)) {
-            theNamespace = "";
+            theNamespace = STR_EMPTY;
             arrForEach(evtNamespace, (name) => {
                 name = _normalizeNamespace(name);
                 if (name) {
@@ -77,15 +78,15 @@ function _getEvtNamespace(eventName: string | undefined, evtNamespace?: string |
             }
 
             // We may only have the namespace and not an eventName
-            eventName = (eventName || "") + theNamespace;
+            eventName = (eventName || STR_EMPTY) + theNamespace;
         }
     }
 
-    let parsedEvent: any[] = (eventNamespace.exec(eventName || "") || []);
+    let parsedEvent: any[] = (eventNamespace.exec(eventName || STR_EMPTY) || []);
 
     return {
         type: parsedEvent[1],
-        ns: ((parsedEvent[2] || "").replace(rRemoveEmptyNs, ".").replace(rRemoveTrailingEmptyNs, "").split(".").sort()).join(".")
+        ns: ((parsedEvent[2] || STR_EMPTY).replace(rRemoveEmptyNs, ".").replace(rRemoveTrailingEmptyNs, STR_EMPTY).split(".").sort()).join(".")
     };
 }
 
@@ -113,7 +114,7 @@ export function __getRegisteredEvents(target: any, eventName?: string, evtNamesp
             if (!evtName.type || evtName.type === value.evtName.type) {
                 if (!evtName.ns || evtName.ns === evtName.ns) {
                     theEvents.push({
-                        name: value.evtName.type + (value.evtName.ns ? "." + value.evtName.ns : ""),
+                        name: value.evtName.type + (value.evtName.ns ? "." + value.evtName.ns : STR_EMPTY),
                         handler: value.handler
                     });
                 }
@@ -547,4 +548,4 @@ export function removePageShowEventListener(listener: any, evtNamespace?: string
     let newNamespaces = mergeEvtNamespace(strPageShowNamespace, evtNamespace);
     removeEventListeners([strPageShow], listener, newNamespaces);
     removeEventListeners([strVisibilityChangeEvt], null, newNamespaces);
-}
+}

package/src/JavaScriptSDK/HelperFuncs.ts

@@ -1,11 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import {
-    strShimUndefined, strShimObject, strShimFunction, throwTypeError,
-    ObjClass, ObjProto, ObjAssign, ObjHasOwnProperty, ObjDefineProperty, strShimPrototype
-} from "@microsoft/applicationinsights-shims";
-import { strEmpty } from "./InternalConstants";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import {
+    ObjAssign, ObjClass, ObjDefineProperty, ObjHasOwnProperty, ObjProto, strShimFunction, strShimObject, strShimPrototype, strShimUndefined,
+    throwTypeError
+} from "@microsoft/applicationinsights-shims";
+import { STR_EMPTY } from "./InternalConstants";
+
 // RESTRICT and AVOID circular dependencies you should not import other contained modules or export the contents of this file directly
 
 // Added to help with minfication
@@ -519,7 +519,7 @@ export function arrReduce<T, R>(arr: T[], callbackfn: (previousValue: T | R, cur
 export function strTrim(str: any): string {
     if (str) {
         // For Performance try and use the native instance, using string lookup of the function to easily pass the ES3 build checks and minification
-        str = (_strTrim && str[cStrTrim]) ? str[cStrTrim]() : (str.replace ? str.replace(/^\s+|\s+$/g, "") : str);
+        str = (_strTrim && str[cStrTrim]) ? str[cStrTrim]() : (str.replace ? str.replace(/^\s+|\s+$/g, STR_EMPTY) : str);
     }
     
     return str;
@@ -648,7 +648,7 @@ export function getExceptionName(object: any): string {
         return object.name;
     }
 
-    return strEmpty;
+    return STR_EMPTY;
 }
 
 /**
@@ -697,6 +697,15 @@ export function getSetValue<T, K extends keyof T>(target: T, field: K, defValue?
     return theValue;
 }
 
+/**
+ * Get the mapped config value, if null or undefined any supplied defaultValue will be returned.
+ * @param field - The name of the field as the named enum value (number) or the string name.
+ * @param defaultValue - The default value to return if the config field is not present, null or undefined.
+ */
+export function getCfgValue<V>(theValue: V, defaultValue?: V): V {
+    return !isNullOrUndefined(theValue) ? theValue : defaultValue;
+}
+
 export function isNotTruthy(value: any) {
     return !value;
 }
@@ -925,4 +934,4 @@ export function objExtend<T1, T2, T3, T4, T5, T6>(obj1?: T1 | any, obj2?: T2, ob
     }
 
     return extended;
-}
+}

package/src/JavaScriptSDK/InstrumentHooks.ts

@@ -1,14 +1,13 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import {
-    IInstrumentHooksCallbacks, IInstrumentHooks, IInstrumentHook, IInstrumentCallDetails, InstrumentorHooksCallback
-} from "../JavaScriptSDK.Interfaces/IInstrumentHooks";
-import { strShimFunction, strShimPrototype } from "@microsoft/applicationinsights-shims";
-import { hasOwnProperty, _getObjProto } from "./HelperFuncs";
-import { getGlobalInst } from "./EnvUtils";
-import { createElmNodeData } from "./DataCacheHelper";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { strShimFunction, strShimPrototype } from "@microsoft/applicationinsights-shims";
+import {
+    IInstrumentCallDetails, IInstrumentHook, IInstrumentHooks, IInstrumentHooksCallbacks, InstrumentorHooksCallback
+} from "../JavaScriptSDK.Interfaces/IInstrumentHooks";
+import { getGlobalInst } from "./EnvUtils";
+import { _getObjProto, hasOwnProperty } from "./HelperFuncs";
+
 const aiInstrumentHooks = "_aiHooks";
 
 const enum CallbackType {
@@ -275,5 +274,4 @@ export function InstrumentEvent(target: any, evtName: string, callbacks: IInstru
     }
 
     return null;
-}
-
+}

package/src/JavaScriptSDK/InternalConstants.ts

@@ -1,26 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 // Note: DON'T Export these const from the package as we are still targeting ES3 this will export a mutable variables that someone could change!!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-export const strEmpty = "";
-export const strProcessTelemetry = "processTelemetry";
-export const strPriority = "priority";
-export const strSetNextPlugin = "setNextPlugin";
-export const strIsInitialized = "isInitialized";
-export const strTeardown = "teardown";
-export const strCore = "core";
-export const strUpdate = "update";
-export const strDisabled = "disabled";
-export const strDoTeardown = "_doTeardown";
-export const strProcessNext = "processNext";
-export const strResume = "resume";
-export const strPause = "pause";
-export const strNotificationListener = "NotificationListener";
-export const strAddNotificationListener = "add" + strNotificationListener;
-export const strRemoveNotificationListener = "remove" + strNotificationListener;
+export const STR_EMPTY = "";
+export const STR_CHANNELS = "channels";
+export const STR_CORE = "core";
+export const STR_CREATE_PERF_MGR = "createPerfMgr";
+export const STR_DISABLED = "disabled";
+export const STR_EXTENSION_CONFIG = "extensionConfig";
+export const STR_EXTENSIONS = "extensions";
+export const STR_PROCESS_TELEMETRY = "processTelemetry";
+export const STR_PRIORITY = "priority";
 
-export const strEventsSent = "eventsSent";
-export const strEventsDiscarded = "eventsDiscarded";
-export const strEventsSendRequest = "eventsSendRequest";
-export const strPerfEvent = "perfEvent";
+export const STR_EVENTS_SENT = "eventsSent";
+export const STR_EVENTS_DISCARDED = "eventsDiscarded";
+export const STR_EVENTS_SEND_REQUEST = "eventsSendRequest";
+export const STR_PERF_EVENT = "perfEvent";
+
+export const STR_ERROR_TO_CONSOLE = "errorToConsole";
+export const STR_WARN_TO_CONSOLE = "warnToConsole";
+
+export const STR_GET_PERF_MGR = "getPerfMgr";

package/src/JavaScriptSDK/NotificationManager.ts

@@ -1,14 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
-import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
-import { INotificationListener } from "../JavaScriptSDK.Interfaces/INotificationListener";
-import { INotificationManager } from "../JavaScriptSDK.Interfaces/INotificationManager";
-import { IPerfEvent } from "../JavaScriptSDK.Interfaces/IPerfEvent";
-import dynamicProto from "@microsoft/dynamicproto-js";
-import { arrForEach, arrIndexOf } from "./HelperFuncs";
-import { strAddNotificationListener, strEventsDiscarded, strEventsSendRequest, strEventsSent, strPerfEvent, strRemoveNotificationListener } from "./InternalConstants";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import dynamicProto from "@microsoft/dynamicproto-js";
+import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
+import { INotificationListener } from "../JavaScriptSDK.Interfaces/INotificationListener";
+import { INotificationManager } from "../JavaScriptSDK.Interfaces/INotificationManager";
+import { IPerfEvent } from "../JavaScriptSDK.Interfaces/IPerfEvent";
+import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
+import { arrForEach, arrIndexOf } from "./HelperFuncs";
+import { STR_EVENTS_DISCARDED, STR_EVENTS_SEND_REQUEST, STR_EVENTS_SENT, STR_PERF_EVENT } from "./InternalConstants";
+
 function _runListeners(listeners: INotificationListener[], name: string, isAsync: boolean, callback: (listener: INotificationListener) => void) {
     arrForEach(listeners, (listener) => {
         if (listener && listener[name]) {
@@ -35,7 +35,7 @@ export class NotificationManager implements INotificationManager {
         let perfEvtsSendAll = !!(config ||{}).perfEvtsSendAll;
 
         dynamicProto(NotificationManager, this, (_self) => {
-            _self[strAddNotificationListener] = (listener: INotificationListener): void => {
+            _self.addNotificationListener = (listener: INotificationListener): void => {
                 _self.listeners.push(listener);
             };
 
@@ -43,7 +43,7 @@ export class NotificationManager implements INotificationManager {
              * Removes all instances of the listener.
              * @param {INotificationListener} listener - AWTNotificationListener to remove.
              */
-            _self[strRemoveNotificationListener] = (listener: INotificationListener): void => {
+            _self.removeNotificationListener = (listener: INotificationListener): void => {
                 let index: number = arrIndexOf(_self.listeners, listener);
                 while (index > -1) {
                     _self.listeners.splice(index, 1);
@@ -55,9 +55,9 @@ export class NotificationManager implements INotificationManager {
              * Notification for events sent.
              * @param {ITelemetryItem[]} events - The array of events that have been sent.
              */
-            _self[strEventsSent] = (events: ITelemetryItem[]): void => {
-                _runListeners(_self.listeners, strEventsSent, true, (listener) => {
-                    listener[strEventsSent](events);
+            _self.eventsSent = (events: ITelemetryItem[]): void => {
+                _runListeners(_self.listeners, STR_EVENTS_SENT, true, (listener) => {
+                    listener.eventsSent(events);
                 });
             };
 
@@ -67,9 +67,9 @@ export class NotificationManager implements INotificationManager {
              * @param {number} reason           - The reason for which the SDK discarded the events. The EventsDiscardedReason
              * constant should be used to check the different values.
              */
-            _self[strEventsDiscarded] = (events: ITelemetryItem[], reason: number): void => {
-                _runListeners(_self.listeners, strEventsDiscarded, true, (listener) => {
-                    listener[strEventsDiscarded](events, reason);
+            _self.eventsDiscarded = (events: ITelemetryItem[], reason: number): void => {
+                _runListeners(_self.listeners, STR_EVENTS_DISCARDED, true, (listener) => {
+                    listener.eventsDiscarded(events, reason);
                 });
             };
 
@@ -78,22 +78,22 @@ export class NotificationManager implements INotificationManager {
              * @param {number} sendReason - The reason why the event batch is being sent.
              * @param {boolean} isAsync   - A flag which identifies whether the requests are being sent in an async or sync manner.
              */
-            _self[strEventsSendRequest] = (sendReason: number, isAsync: boolean): void => {
-                _runListeners(_self.listeners, strEventsSendRequest, isAsync, (listener) => {
-                    listener[strEventsSendRequest](sendReason, isAsync);
+            _self.eventsSendRequest = (sendReason: number, isAsync: boolean): void => {
+                _runListeners(_self.listeners, STR_EVENTS_SEND_REQUEST, isAsync, (listener) => {
+                    listener.eventsSendRequest(sendReason, isAsync);
                 });
             };
 
-            _self[strPerfEvent] = (perfEvent?: IPerfEvent): void => {
+            _self.perfEvent = (perfEvent?: IPerfEvent): void => {
                 if (perfEvent) {
 
                     // Send all events or only parent events
                     if (perfEvtsSendAll || !perfEvent.isChildEvt()) {
-                        _runListeners(_self.listeners, strPerfEvent, false, (listener) => {
+                        _runListeners(_self.listeners, STR_PERF_EVENT, false, (listener) => {
                             if (perfEvent.isAsync) {
-                                setTimeout(() => listener[strPerfEvent](perfEvent), 0);
+                                setTimeout(() => listener.perfEvent(perfEvent), 0);
                             } else {
-                                listener[strPerfEvent](perfEvent);
+                                listener.perfEvent(perfEvent);
                             }
                         });
                     }
@@ -151,4 +151,4 @@ export class NotificationManager implements INotificationManager {
      * @param perfEvent
      */
     perfEvent?(perfEvent: IPerfEvent): void;
-}
+}

package/src/JavaScriptSDK/PerfManager.ts

@@ -1,13 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { INotificationManager } from "../JavaScriptSDK.Interfaces/INotificationManager";
-import { IPerfEvent } from "../JavaScriptSDK.Interfaces/IPerfEvent";
-import { IPerfManager, IPerfManagerProvider } from "../JavaScriptSDK.Interfaces/IPerfManager";
-
-import dynamicProto from "@microsoft/dynamicproto-js";
-import { dateNow, isArray, isFunction, objDefineAccessors } from "./HelperFuncs";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import dynamicProto from "@microsoft/dynamicproto-js";
+import { INotificationManager } from "../JavaScriptSDK.Interfaces/INotificationManager";
+import { IPerfEvent } from "../JavaScriptSDK.Interfaces/IPerfEvent";
+import { IPerfManager, IPerfManagerProvider } from "../JavaScriptSDK.Interfaces/IPerfManager";
+import { dateNow, isArray, isFunction, objDefineAccessors } from "./HelperFuncs";
+import { STR_GET_PERF_MGR } from "./InternalConstants";
+
 const strExecutionContextKey = "ctx";
+const strParentContextKey = "ParentContextKey";
+const strChildrenContextKey = "ChildrenContextKey";
 
 let _defaultPerfManager: IPerfManager = null;
 
@@ -85,7 +87,7 @@ export class PerfEvent implements IPerfEvent {
         _self.getCtx = (key: string): any | null | undefined => {
             if (key) {
                 // The parent and child links are located directly on the object (for better viewing in the DebugPlugin)
-                if (key === PerfEvent.ParentContextKey || key === PerfEvent.ChildrenContextKey) {
+                if (key === PerfEvent[strParentContextKey] || key === PerfEvent[strChildrenContextKey]) {
                     return _self[key];
                 }
 
@@ -98,13 +100,13 @@ export class PerfEvent implements IPerfEvent {
         _self.setCtx = (key: string, value: any) => {
             if (key) {
                 // Put the parent and child links directly on the object (for better viewing in the DebugPlugin)
-                if (key === PerfEvent.ParentContextKey) {
+                if (key === PerfEvent[strParentContextKey]) {
                     // Simple assumption, if we are setting a parent then we must be a child
                     if (!_self[key]) {
                         _self.isChildEvt = (): boolean => true;
                     }
                     _self[key] = value;
-                } else if (key === PerfEvent.ChildrenContextKey) {
+                } else if (key === PerfEvent[strChildrenContextKey]) {
                     _self[key] = value;
                 } else {
                     let ctx = _self[strExecutionContextKey] = _self[strExecutionContextKey] || {};
@@ -115,7 +117,7 @@ export class PerfEvent implements IPerfEvent {
 
         _self.complete = () => {
             let childTime = 0;
-            let childEvts = _self.getCtx(PerfEvent.ChildrenContextKey);
+            let childEvts = _self.getCtx(PerfEvent[strChildrenContextKey]);
             if (isArray<IPerfEvent>(childEvts)) {
                 for (let lp = 0; lp < childEvts.length; lp++) {
                     let childEvt: IPerfEvent = childEvts[lp];
@@ -227,9 +229,9 @@ const doPerfActiveKey = "CoreUtils.doPerf";
 export function doPerf<T>(mgrSource: IPerfManagerProvider | IPerfManager, getSource: () => string, func: (perfEvt?: IPerfEvent) => T, details?: () => any, isAsync?: boolean) {
     if (mgrSource) {
         let perfMgr: IPerfManager = mgrSource as IPerfManager;
-        if (isFunction(perfMgr["getPerfMgr"])) {
+        if (perfMgr[STR_GET_PERF_MGR]) {
             // Looks like a perf manager provider object
-            perfMgr = perfMgr["getPerfMgr"]();
+            perfMgr = perfMgr[STR_GET_PERF_MGR]();
         }
         
         if (perfMgr) {
@@ -239,12 +241,12 @@ export function doPerf<T>(mgrSource: IPerfManagerProvider | IPerfManager, getSou
                 perfEvt = perfMgr.create(getSource(), details, isAsync);
                 if (perfEvt) {
                     if (currentActive && perfEvt.setCtx) {
-                        perfEvt.setCtx(PerfEvent.ParentContextKey, currentActive);
+                        perfEvt.setCtx(PerfEvent[strParentContextKey], currentActive);
                         if (currentActive.getCtx && currentActive.setCtx) {
-                            let children: IPerfEvent[] = currentActive.getCtx(PerfEvent.ChildrenContextKey);
+                            let children: IPerfEvent[] = currentActive.getCtx(PerfEvent[strChildrenContextKey]);
                             if (!children) {
                                 children = [];
-                                currentActive.setCtx(PerfEvent.ChildrenContextKey, children);
+                                currentActive.setCtx(PerfEvent[strChildrenContextKey], children);
                             }
     
                             children.push(perfEvt);
@@ -288,4 +290,4 @@ export function setGblPerfMgr(perfManager: IPerfManager) {
  */
 export function getGblPerfMgr(): IPerfManager {
     return _defaultPerfManager;
-}
+}

package/src/JavaScriptSDK/ProcessTelemetryContext.ts

@@ -1,24 +1,28 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-"use strict";
-
-import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
-import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
-import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
-import { IPlugin, ITelemetryPlugin } from "../JavaScriptSDK.Interfaces/ITelemetryPlugin";
-import { GetExtCfgMergeType, IBaseProcessingContext, IProcessTelemetryContext, IProcessTelemetryUnloadContext, IProcessTelemetryUpdateContext } from "../JavaScriptSDK.Interfaces/IProcessTelemetryContext";
-import { ITelemetryPluginChain } from "../JavaScriptSDK.Interfaces/ITelemetryPluginChain";
-import { safeGetLogger, _throwInternal } from "./DiagnosticLogger";
-import { arrForEach, isArray, isFunction, isNullOrUndefined, isObject, isUndefined, objExtend, objForEachKey, objFreeze, objKeys, proxyFunctions } from "./HelperFuncs";
-import { doPerf } from "./PerfManager";
-import { eLoggingSeverity, _eInternalMessageId } from "../JavaScriptSDK.Enums/LoggingEnums";
-import { dumpObj } from "./EnvUtils";
-import { strCore, strDisabled, strEmpty, strIsInitialized, strTeardown, strUpdate } from "./InternalConstants";
-import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
-import { ITelemetryUnloadState } from "../JavaScriptSDK.Interfaces/ITelemetryUnloadState";
-import { ITelemetryUpdateState } from "../JavaScriptSDK.Interfaces/ITelemetryUpdateState";
-import { _getPluginState } from "./TelemetryHelpers";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+"use strict";
+
+import { _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 {
+    GetExtCfgMergeType, IBaseProcessingContext, IProcessTelemetryContext, IProcessTelemetryUnloadContext, IProcessTelemetryUpdateContext
+} from "../JavaScriptSDK.Interfaces/IProcessTelemetryContext";
+import { ITelemetryItem } from "../JavaScriptSDK.Interfaces/ITelemetryItem";
+import { IPlugin, ITelemetryPlugin } from "../JavaScriptSDK.Interfaces/ITelemetryPlugin";
+import { ITelemetryPluginChain } from "../JavaScriptSDK.Interfaces/ITelemetryPluginChain";
+import { ITelemetryUnloadState } from "../JavaScriptSDK.Interfaces/ITelemetryUnloadState";
+import { ITelemetryUpdateState } from "../JavaScriptSDK.Interfaces/ITelemetryUpdateState";
+import { _throwInternal, safeGetLogger } from "./DiagnosticLogger";
+import { dumpObj } from "./EnvUtils";
+import {
+    arrForEach, isArray, isFunction, isNullOrUndefined, isObject, isUndefined, objExtend, objForEachKey, objFreeze, objKeys, proxyFunctions
+} from "./HelperFuncs";
+import { STR_CORE, STR_DISABLED, STR_EMPTY } from "./InternalConstants";
+import { doPerf } from "./PerfManager";
+import { _getPluginState } from "./TelemetryHelpers";
+
 const strTelemetryPluginChain = "TelemetryPluginChain";
 const strHasRunFlags = "_hasRun";
 const strGetTelCtx = "_getTelCtx";
@@ -423,13 +427,13 @@ export function createTelemetryPluginProxy(plugin: ITelemetryPlugin, config: ICo
         itemCtx.setNext(nextProxy);
 
         if (plugin) {
-            doPerf(itemCtx[strCore](), () => identifier + ":" + name, () => {
+            doPerf(itemCtx.core(), () => identifier + ":" + name, () => {
                 // Mark this component as having run
                 hasRunContext[chainId] = true;
 
                 try {
                     // Set a flag on the next plugin so we know if it was attempted to be executed
-                    let nextId = nextProxy ? nextProxy._id : strEmpty;
+                    let nextId = nextProxy ? nextProxy._id : STR_EMPTY;
                     if (nextId) {
                         hasRunContext[nextId] = false;
                     }
@@ -468,7 +472,7 @@ export function createTelemetryPluginProxy(plugin: ITelemetryPlugin, config: ICo
             }
 
             let pluginState = _getPluginState(plugin);
-            if (pluginState.teardown || pluginState[strDisabled]) {
+            if (pluginState.teardown || pluginState[STR_DISABLED]) {
                 return false;
             }
 
@@ -500,15 +504,15 @@ export function createTelemetryPluginProxy(plugin: ITelemetryPlugin, config: ICo
             let hasRun = false;
             if (plugin) {
                 let pluginState = _getPluginState(plugin);
-                let pluginCore = plugin[strCore] || pluginState.core;
+                let pluginCore = plugin[STR_CORE] || pluginState.core;
                 // Only teardown the plugin if it was initialized by the current core (i.e. It's not a shared plugin)
-                if (plugin && (!pluginCore || pluginCore === unloadCtx[strCore]()) && !pluginState[strTeardown]) {
+                if (plugin && (!pluginCore || pluginCore === unloadCtx.core()) && !pluginState.teardown) {
                     // Handle plugins that don't extend from the BaseTelemetryPlugin
-                    pluginState[strCore] = null;
-                    pluginState[strTeardown] = true;
-                    pluginState[strIsInitialized] = false;
+                    pluginState.core = null;
+                    pluginState.teardown = true;
+                    pluginState.isInitialized = false;
     
-                    if (plugin[strTeardown] && plugin[strTeardown](unloadCtx, unloadState) === true) {
+                    if (plugin.teardown && plugin.teardown(unloadCtx, unloadState) === true) {
                         // plugin told us that it was going to (or has) call unloadCtx.processNext()
                         hasRun = true;
                     }
@@ -531,11 +535,11 @@ export function createTelemetryPluginProxy(plugin: ITelemetryPlugin, config: ICo
             let hasRun = false;
             if (plugin) {
                 let pluginState = _getPluginState(plugin);
-                let pluginCore = plugin[strCore] || pluginState.core;
+                let pluginCore = plugin[STR_CORE] || pluginState.core;
 
                 // Only update the plugin if it was initialized by the current core (i.e. It's not a shared plugin)
-                if (plugin && (!pluginCore || pluginCore === updateCtx[strCore]()) && !pluginState[strTeardown]) {
-                    if (plugin[strUpdate] && plugin[strUpdate](updateCtx, updateState) === true) {
+                if (plugin && (!pluginCore || pluginCore === updateCtx.core()) && !pluginState.teardown) {
+                    if (plugin.update && plugin.update(updateCtx, updateState) === true) {
                         // plugin told us that it was going to (or has) call unloadCtx.processNext()
                         hasRun = true;
                     }
@@ -638,4 +642,4 @@ export class ProcessTelemetryContext implements IProcessTelemetryContext {
         // Proxy all functions of the context to this object
         proxyFunctions(_self, context, objKeys(context) as any);
     }
-}
+}

package/src/JavaScriptSDK/RandomHelper.ts

@@ -1,9 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { getCrypto, getMsCrypto, isIE }  from "./EnvUtils";
-import { dateNow } from "./HelperFuncs";
-import { strEmpty } from "./InternalConstants";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { getCrypto, getMsCrypto, isIE } from "./EnvUtils";
+import { dateNow } from "./HelperFuncs";
+import { STR_EMPTY } from "./InternalConstants";
+
 const UInt32Mask = 0x100000000;
 const MaxUInt32 = 0xffffffff;
 
@@ -128,7 +128,7 @@ export function newId(maxLength = 22): string {
     // Start with an initial random number, consuming the value in reverse byte order
     let number = random32() >>> 0;  // Make sure it's a +ve number
     let chars = 0;
-    let result = strEmpty;
+    let result = STR_EMPTY;
     while (result.length < maxLength) {
         chars ++;
         result += base64chars.charAt(number & 0x3F);
@@ -142,5 +142,4 @@ export function newId(maxLength = 22): string {
     }
 
     return result;
-}
-
+}