@microsoft/applicationinsights-properties-js 3.0.0-beta.2301-15 → 3.0.0-beta.2301-18

package/dist-esm/__DynamicConstants.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Properties Plugin, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Properties Plugin, 3.0.0-beta.2301-18
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
@@ -11,12 +11,12 @@
 // ###########################################################################################################################################
 // Note: DON'T Export these const from the package as we are still targeting IE this will export a mutable variables that someone could change
 // ###########################################################################################################################################
-export var _DYN_GET_TRACE_CTX = "getTraceCtx"; // Count: 3
-export var _DYN_TELEMETRY_TRACE = "telemetryTrace"; // Count: 3
 export var _DYN_SESSION_MANAGER = "sessionManager"; // Count: 3
 export var _DYN_UPDATE = "update"; // Count: 4
 export var _DYN_IS_USER_COOKIE_SET = "isUserCookieSet"; // Count: 4
 export var _DYN_IS_NEW_USER = "isNewUser"; // Count: 4
+export var _DYN_GET_TRACE_CTX = "getTraceCtx"; // Count: 3
+export var _DYN_TELEMETRY_TRACE = "telemetryTrace"; // Count: 3
 export var _DYN_APPLY_SESSION_CONTEX0 = "applySessionContext"; // Count: 2
 export var _DYN_APPLY_APPLICATION_CO1 = "applyApplicationContext"; // Count: 2
 export var _DYN_APPLY_DEVICE_CONTEXT = "applyDeviceContext"; // Count: 2

package/dist-esm/__DynamicConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"__DynamicConstants.js.map","sources":["__DynamicConstants.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\n// @skip-file-minify\r\n// ##############################################################\r\n// AUTO GENERATED FILE: This file is Auto Generated during build.\r\n// ##############################################################\r\n// ###########################################################################################################################################\r\n// Note: DON'T Export these const from the package as we are still targeting IE this will export a mutable variables that someone could change\r\n// ###########################################################################################################################################\r\nexport var _DYN_GET_TRACE_CTX = \"getTraceCtx\"; // Count: 3\r\nexport var _DYN_TELEMETRY_TRACE = \"telemetryTrace\"; // Count: 3\r\nexport var _DYN_SESSION_MANAGER = \"sessionManager\"; // Count: 3\r\nexport var _DYN_UPDATE = \"update\"; // Count: 4\r\nexport var _DYN_IS_USER_COOKIE_SET = \"isUserCookieSet\"; // Count: 4\r\nexport var _DYN_IS_NEW_USER = \"isNewUser\"; // Count: 4\r\nexport var _DYN_APPLY_SESSION_CONTEX0 = \"applySessionContext\"; // Count: 2\r\nexport var _DYN_APPLY_APPLICATION_CO1 = \"applyApplicationContext\"; // Count: 2\r\nexport var _DYN_APPLY_DEVICE_CONTEXT = \"applyDeviceContext\"; // Count: 2\r\nexport var _DYN_APPLY_OPERATION_CONT2 = \"applyOperationContext\"; // Count: 2\r\nexport var _DYN_APPLY_USER_CONTEXT = \"applyUserContext\"; // Count: 2\r\nexport var _DYN_APPLY_OPERATING_SYST3 = \"applyOperatingSystemContxt\"; // Count: 2\r\nexport var _DYN_APPLY_LOCATION_CONTE4 = \"applyLocationContext\"; // Count: 2\r\nexport var _DYN_APPLY_INTERNAL_CONTE5 = \"applyInternalContext\"; // Count: 2\r\nexport var _DYN_ACCOUNT_ID = \"accountId\"; // Count: 7\r\nexport var _DYN_GET_SESSION_ID = \"getSessionId\"; // Count: 4\r\nexport var _DYN_NAME_PREFIX = \"namePrefix\"; // Count: 3\r\nexport var _DYN_SESSION_COOKIE_POSTF6 = \"sessionCookiePostfix\"; // Count: 2\r\nexport var _DYN_USER_COOKIE_POSTFIX = \"userCookiePostfix\"; // Count: 2\r\nexport var _DYN_ID_LENGTH = \"idLength\"; // Count: 4\r\nexport var _DYN_GET_NEW_ID = \"getNewId\"; // Count: 3\r\nexport var _DYN_LENGTH = \"length\"; // Count: 4\r\nexport var _DYN_AUTOMATIC_SESSION = \"automaticSession\"; // Count: 5\r\nexport var _DYN_AUTHENTICATED_ID = \"authenticatedId\"; // Count: 6\r\nexport var _DYN_ACQUISITION_DATE = \"acquisitionDate\"; // Count: 5\r\nexport var _DYN_RENEWAL_DATE = \"renewalDate\"; // Count: 4\r\nexport var _DYN_JOIN = \"join\"; // Count: 5\r\nexport var _DYN_COOKIE_SEPARATOR = \"cookieSeparator\"; // Count: 5\r\nexport var _DYN_AUTH_USER_COOKIE_NAM7 = \"authUserCookieName\"; // Count: 3\r\n//# sourceMappingURL=__DynamicConstants.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
+{"version":3,"file":"__DynamicConstants.js.map","sources":["__DynamicConstants.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\n// @skip-file-minify\r\n// ##############################################################\r\n// AUTO GENERATED FILE: This file is Auto Generated during build.\r\n// ##############################################################\r\n// ###########################################################################################################################################\r\n// Note: DON'T Export these const from the package as we are still targeting IE this will export a mutable variables that someone could change\r\n// ###########################################################################################################################################\r\nexport var _DYN_SESSION_MANAGER = \"sessionManager\"; // Count: 3\r\nexport var _DYN_UPDATE = \"update\"; // Count: 4\r\nexport var _DYN_IS_USER_COOKIE_SET = \"isUserCookieSet\"; // Count: 4\r\nexport var _DYN_IS_NEW_USER = \"isNewUser\"; // Count: 4\r\nexport var _DYN_GET_TRACE_CTX = \"getTraceCtx\"; // Count: 3\r\nexport var _DYN_TELEMETRY_TRACE = \"telemetryTrace\"; // Count: 3\r\nexport var _DYN_APPLY_SESSION_CONTEX0 = \"applySessionContext\"; // Count: 2\r\nexport var _DYN_APPLY_APPLICATION_CO1 = \"applyApplicationContext\"; // Count: 2\r\nexport var _DYN_APPLY_DEVICE_CONTEXT = \"applyDeviceContext\"; // Count: 2\r\nexport var _DYN_APPLY_OPERATION_CONT2 = \"applyOperationContext\"; // Count: 2\r\nexport var _DYN_APPLY_USER_CONTEXT = \"applyUserContext\"; // Count: 2\r\nexport var _DYN_APPLY_OPERATING_SYST3 = \"applyOperatingSystemContxt\"; // Count: 2\r\nexport var _DYN_APPLY_LOCATION_CONTE4 = \"applyLocationContext\"; // Count: 2\r\nexport var _DYN_APPLY_INTERNAL_CONTE5 = \"applyInternalContext\"; // Count: 2\r\nexport var _DYN_ACCOUNT_ID = \"accountId\"; // Count: 7\r\nexport var _DYN_GET_SESSION_ID = \"getSessionId\"; // Count: 4\r\nexport var _DYN_NAME_PREFIX = \"namePrefix\"; // Count: 3\r\nexport var _DYN_SESSION_COOKIE_POSTF6 = \"sessionCookiePostfix\"; // Count: 2\r\nexport var _DYN_USER_COOKIE_POSTFIX = \"userCookiePostfix\"; // Count: 2\r\nexport var _DYN_ID_LENGTH = \"idLength\"; // Count: 4\r\nexport var _DYN_GET_NEW_ID = \"getNewId\"; // Count: 3\r\nexport var _DYN_LENGTH = \"length\"; // Count: 4\r\nexport var _DYN_AUTOMATIC_SESSION = \"automaticSession\"; // Count: 5\r\nexport var _DYN_AUTHENTICATED_ID = \"authenticatedId\"; // Count: 6\r\nexport var _DYN_ACQUISITION_DATE = \"acquisitionDate\"; // Count: 5\r\nexport var _DYN_RENEWAL_DATE = \"renewalDate\"; // Count: 4\r\nexport var _DYN_JOIN = \"join\"; // Count: 5\r\nexport var _DYN_COOKIE_SEPARATOR = \"cookieSeparator\"; // Count: 5\r\nexport var _DYN_AUTH_USER_COOKIE_NAM7 = \"authUserCookieName\"; // Count: 3\r\n//# sourceMappingURL=__DynamicConstants.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/dist-esm/applicationinsights-properties-js.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Properties Plugin, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Properties Plugin, 3.0.0-beta.2301-18
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/applicationinsights-properties-js",
-    "version": "3.0.0-beta.2301-15",
+    "version": "3.0.0-beta.2301-18",
     "description": "Microsoft Application Insights properties (Part A) plugin",
     "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
     "author": "Microsoft Application Insights Team",
@@ -54,8 +54,8 @@
     "dependencies": {
         "@microsoft/dynamicproto-js": "^1.1.7",
         "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/applicationinsights-core-js": "3.0.0-beta.2301-15",
-        "@microsoft/applicationinsights-common": "3.0.0-beta.2301-15",
+        "@microsoft/applicationinsights-core-js": "3.0.0-beta.2301-18",
+        "@microsoft/applicationinsights-common": "3.0.0-beta.2301-18",
         "@nevware21/ts-utils": "^0.6.0"
     },
     "license": "MIT",

package/src/Context/Internal.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { IInternal } from "@microsoft/applicationinsights-common";
-import { onConfigChange } from "@microsoft/applicationinsights-core-js";
+import { IUnloadHookContainer, onConfigChange } from "@microsoft/applicationinsights-core-js";
 import { IPropertiesConfig } from "../Interfaces/IPropertiesConfig";
 
 const Version = "2.8.5";
@@ -37,11 +37,13 @@ export class Internal implements IInternal {
     /**
      * Constructs a new instance of the internal telemetry data class.
      */
-    constructor(config: IPropertiesConfig) {
+    constructor(config: IPropertiesConfig, unloadHookContainer?: IUnloadHookContainer) {
         
-        onConfigChange((config), () => {
+        let unloadHook = onConfigChange((config), () => {
             let prefix =  config.sdkExtension;
             this.sdkVersion = (prefix ? prefix + "_" : "") + "javascript:" + Version;
         });
+
+        unloadHookContainer && unloadHookContainer.add(unloadHook);
     }
 }

package/src/Context/Session.ts

@@ -4,8 +4,8 @@
 import dynamicProto from "@microsoft/dynamicproto-js";
 import { ISession, utlCanUseLocalStorage, utlGetLocalStorage, utlSetLocalStorage } from "@microsoft/applicationinsights-common";
 import {
-    IAppInsightsCore, ICookieMgr, IDiagnosticLogger, _eInternalMessageId, _throwInternal, dateNow, dumpObj, eLoggingSeverity,
-    getExceptionName, isFunction, newId, safeGetCookieMgr, safeGetLogger
+    IAppInsightsCore, ICookieMgr, IDiagnosticLogger, IUnloadHookContainer, _eInternalMessageId, _throwInternal, dateNow, dumpObj,
+    eLoggingSeverity, getExceptionName, isFunction, newId, onConfigChange, safeGetCookieMgr, safeGetLogger
 } from "@microsoft/applicationinsights-core-js";
 
 const SESSION_COOKIE_NAME = "ai_session";
@@ -51,11 +51,14 @@ export class _SessionManager {
 
     public automaticSession: Session;
 
-    constructor(config: ISessionConfig, core?: IAppInsightsCore) {
+    constructor(config: ISessionConfig, core?: IAppInsightsCore, unloadHookContainer?: IUnloadHookContainer) {
         let self = this;
+        let _storageNamePrefix: string;
         let _cookieUpdatedTimestamp: number;
         let _logger: IDiagnosticLogger = safeGetLogger(core);
         let _cookieManager: ICookieMgr = safeGetCookieMgr(core);
+        let _sessionExpirationMs: number;
+        let _sessionRenewalMs: number;
 
         dynamicProto(_SessionManager, self, (_self) => {
    
@@ -63,6 +66,18 @@ export class _SessionManager {
                 config = ({} as any);
             }
     
+            let unloadHook = onConfigChange(config, (details) => {
+                _sessionExpirationMs = config.sessionExpirationMs || ACQUISITION_SPAN;
+                _sessionRenewalMs = config.sessionRenewalMs || RENEWAL_SPAN;
+        
+                // sessionCookiePostfix takes the preference if it is configured, otherwise takes namePrefix if configured.
+                const sessionCookiePostfix = config.sessionCookiePostfix || config.namePrefix || "";
+    
+                _storageNamePrefix = SESSION_COOKIE_NAME + sessionCookiePostfix;
+            });
+
+            unloadHookContainer && unloadHookContainer.add(unloadHook);
+
             _self.automaticSession = new Session();
 
             _self.update = () => {
@@ -76,12 +91,12 @@ export class _SessionManager {
                     isExpired = !_initializeAutomaticSession(session, nowMs);
                 }
 
-                if (!isExpired && _sessionExpirationMs() > 0) {
+                if (!isExpired && _sessionExpirationMs > 0) {
                     const timeSinceAcqMs = nowMs - session.acquisitionDate;
                     const timeSinceRenewalMs = nowMs - session.renewalDate;
                     isExpired = timeSinceAcqMs < 0 || timeSinceRenewalMs < 0;           // expired if the acquisition or last renewal are in the future
-                    isExpired = isExpired || timeSinceAcqMs > _sessionExpirationMs();     // expired if the time since acquisition is more than session Expiration
-                    isExpired = isExpired || timeSinceRenewalMs > _sessionRenewalMs();    // expired if the time since last renewal is more than renewal period
+                    isExpired = isExpired || timeSinceAcqMs > _sessionExpirationMs;     // expired if the time since acquisition is more than session Expiration
+                    isExpired = isExpired || timeSinceRenewalMs > _sessionRenewalMs;    // expired if the time since last renewal is more than renewal period
                 }
         
                 // renew if acquisitionSpan or renewalSpan has elapsed
@@ -106,21 +121,6 @@ export class _SessionManager {
                 _setStorage(session.id, session.acquisitionDate, session.renewalDate);
             };
 
-            //TODO: move _storageNamePrefix, _sessionExpirationMs _sessionRenewalMs back to local variables after dynamic config fix
-            function _storageNamePrefix(): string {
-                // sessionCookiePostfix takes the preference if it is configured, otherwise takes namePrefix if configured.
-                let sessionCookiePostfix = config.sessionCookiePostfix || config.namePrefix || "";
-                return SESSION_COOKIE_NAME + sessionCookiePostfix;
-            }
-
-            function _sessionExpirationMs(): number {
-                return config.sessionExpirationMs || ACQUISITION_SPAN;
-            }
-
-            function _sessionRenewalMs(): number {
-                return config.sessionRenewalMs || RENEWAL_SPAN;
-            }
-        
             /**
              * Use config.namePrefix + ai_session cookie data or local storage data (when the cookie is unavailable) to
              * initialize the automatic session.
@@ -128,7 +128,7 @@ export class _SessionManager {
              */
             function _initializeAutomaticSession(session: ISession, now: number): boolean {
                 let isValid = false;
-                const cookieValue = _cookieManager.get(_storageNamePrefix());
+                const cookieValue = _cookieManager.get(_storageNamePrefix);
                 if (cookieValue && isFunction(cookieValue.split)) {
                     isValid = _initializeAutomaticSessionWithData(session, cookieValue);
                 } else {
@@ -136,7 +136,7 @@ export class _SessionManager {
                     // This can happen if the session expired or the user actively deleted the cookie
                     // We only want to recover data if the cookie is missing from expiry. We should respect the user's wishes if the cookie was deleted actively.
                     // The User class handles this for us and deletes our local storage object if the persistent user cookie was removed.
-                    const storageValue = utlGetLocalStorage(_logger, _storageNamePrefix());
+                    const storageValue = utlGetLocalStorage(_logger, _storageNamePrefix);
                     if (storageValue) {
                         isValid = _initializeAutomaticSessionWithData(session, storageValue);
                     }
@@ -210,11 +210,11 @@ export class _SessionManager {
                 let acq = session.acquisitionDate;
                 session.renewalDate = nowMs;
 
-                let renewalPeriodMs = _sessionRenewalMs();
+                let renewalPeriodMs = _sessionRenewalMs;
 
                 // Set cookie to expire after the session expiry time passes or the session renewal deadline, whichever is sooner
                 // Expiring the cookie will cause the session to expire even if the user isn't on the page
-                const acqTimeLeftMs = (acq +_sessionExpirationMs()) - nowMs;
+                const acqTimeLeftMs = (acq +_sessionExpirationMs) - nowMs;
                 const cookie = [session.id, acq, nowMs];
                 let maxAgeSec = 0;
         
@@ -229,7 +229,7 @@ export class _SessionManager {
                 // if sessionExpirationMs is set to 0, it means the expiry is set to 0 for this session cookie
                 // A cookie with 0 expiry in the session cookie will never expire for that browser session.  If the browser is closed the cookie expires.
                 // Depending on the browser, another instance does not inherit this cookie, however, another tab will
-                _cookieManager.set(_storageNamePrefix(), cookie.join("|"), _sessionExpirationMs() > 0 ? maxAgeSec : null, cookieDomain);
+                _cookieManager.set(_storageNamePrefix, cookie.join("|"), _sessionExpirationMs > 0 ? maxAgeSec : null, cookieDomain);
                 _cookieUpdatedTimestamp = nowMs;
             }
         
@@ -237,7 +237,7 @@ export class _SessionManager {
                 // Keep data in local storage to retain the last session id, allowing us to cleanly end the session when it expires
                 // Browsers that don't support local storage won't be able to end sessions cleanly from the client
                 // The server will notice this and end the sessions itself, with loss of accurate session duration
-                utlSetLocalStorage(_logger, _storageNamePrefix(), [guid, acq, renewal].join("|"));
+                utlSetLocalStorage(_logger, _storageNamePrefix, [guid, acq, renewal].join("|"));
             }
         });
     }

package/src/Context/User.ts

@@ -4,8 +4,8 @@
 import dynamicProto from "@microsoft/dynamicproto-js";
 import { IUserContext, utlRemoveStorage } from "@microsoft/applicationinsights-common";
 import {
-    IAppInsightsCore, ICookieMgr, _eInternalMessageId, _throwInternal, eLoggingSeverity, newId, onConfigChange, safeGetCookieMgr,
-    safeGetLogger, toISOString
+    IAppInsightsCore, ICookieMgr, IUnloadHookContainer, _eInternalMessageId, _throwInternal, eLoggingSeverity, newId, onConfigChange,
+    safeGetCookieMgr, safeGetLogger, toISOString
 } from "@microsoft/applicationinsights-core-js";
 import { objDefineProp } from "@nevware21/ts-utils";
 import { IPropertiesConfig } from "../Interfaces/IPropertiesConfig";
@@ -69,7 +69,7 @@ export class User implements IUserContext {
      */
     public isUserCookieSet = false;
 
-    constructor(config: IPropertiesConfig, core: IAppInsightsCore) {
+    constructor(config: IPropertiesConfig, core: IAppInsightsCore, unloadHookContainer?: IUnloadHookContainer) {
         let _logger = safeGetLogger(core);
         let _cookieManager: ICookieMgr = safeGetCookieMgr(core);
         let _storageNamePrefix: string;
@@ -82,7 +82,7 @@ export class User implements IUserContext {
                 get: () => config
             });
 
-            onConfigChange(config, () => {
+            let unloadHook = onConfigChange(config, () => {
 
                 const userCookiePostfix = config.userCookiePostfix || "";
                 _storageNamePrefix = User.userCookieName + userCookiePostfix;
@@ -131,6 +131,8 @@ export class User implements IUserContext {
                 }
             });
 
+            unloadHookContainer && unloadHookContainer.add(unloadHook);
+
             function _generateNewId() {
                 let theConfig = (config || {}) as IPropertiesConfig;
                 let getNewId = theConfig.getNewId || newId;

package/src/Interfaces/IPropertiesConfig.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 export interface IPropertiesConfig {
-    readonly instrumentationKey: string;
     readonly accountId: string;
     readonly sessionRenewalMs: number;
     readonly samplingPercentage: number;

package/src/PropertiesPlugin.ts

@@ -21,7 +21,6 @@ let undefString: string;
 const nullValue: any = null;
 
 const _defaultConfig: IConfigDefaults<IPropertiesConfig> = objDeepFreeze({
-    instrumentationKey: undefString,
     accountId: nullValue,
     sessionRenewalMs: 30 * 60 * 1000,
     samplingPercentage: 100,
@@ -68,14 +67,6 @@ export default class PropertiesPlugin extends BaseTelemetryPlugin implements IPr
             _self.initialize = (config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?:ITelemetryPluginChain) => {
                 _base.initialize(config, core, extensions, pluginChain);
                 _populateDefaults(config);
-                _previousTraceCtx = core.getTraceCtx(false);
-                _context = new TelemetryContext(core, _extensionConfig, _previousTraceCtx);
-                _distributedTraceCtx = createDistributedTraceContextFromTrace(_self.context.telemetryTrace, _previousTraceCtx);
-                core.setTraceCtx(_distributedTraceCtx);
-                _self.context.appId = () => {
-                    let breezeChannel = core.getPlugin<IPlugin>(BreezeChannelIdentifier);
-                    return breezeChannel ? breezeChannel.plugin["_appId"] : null;
-                };
             };
     
             /**
@@ -147,6 +138,16 @@ export default class PropertiesPlugin extends BaseTelemetryPlugin implements IPr
                     // Test hook to allow accessing the internal values -- explicitly not defined as an available property on the class
                     _self["_extConfig"] = _extensionConfig;
                 }));
+
+                // This is outside of the onConfigChange as we don't want to update (replace) these values whenever a referenced config item changes
+                _previousTraceCtx = core.getTraceCtx(false);
+                _context = new TelemetryContext(core, _extensionConfig, _previousTraceCtx, _self._unloadHooks);
+                _distributedTraceCtx = createDistributedTraceContextFromTrace(_self.context.telemetryTrace, _previousTraceCtx);
+                core.setTraceCtx(_distributedTraceCtx);
+                _self.context.appId = () => {
+                    let breezeChannel = core.getPlugin<IPlugin>(BreezeChannelIdentifier);
+                    return breezeChannel ? breezeChannel.plugin["_appId"] : null;
+                };
             }
 
             function _processTelemetryInternal(evt: ITelemetryItem, itemCtx: IProcessTelemetryContext) {

package/src/TelemetryContext.ts

@@ -9,8 +9,8 @@ import {
     PageView
 } from "@microsoft/applicationinsights-common";
 import {
-    IAppInsightsCore, IDistributedTraceContext, IProcessTelemetryContext, ITelemetryItem, _InternalLogMessage, getSetValue, hasWindow,
-    isNullOrUndefined, isString, objKeys, setValue
+    IAppInsightsCore, IDistributedTraceContext, IProcessTelemetryContext, ITelemetryItem, IUnloadHookContainer, _InternalLogMessage,
+    getSetValue, hasWindow, isNullOrUndefined, isString, objKeys, setValue
 } from "@microsoft/applicationinsights-core-js";
 import { Application } from "./Context/Application";
 import { Device } from "./Context/Device";
@@ -50,19 +50,19 @@ export class TelemetryContext implements IPropTelemetryContext {
     public appId: () => string;
     public getSessionId: () => string;
 
-    constructor(core: IAppInsightsCore, defaultConfig: IPropertiesConfig, previousTraceCtx?: IDistributedTraceContext) {
+    constructor(core: IAppInsightsCore, defaultConfig: IPropertiesConfig, previousTraceCtx?: IDistributedTraceContext, unloadHookContainer?: IUnloadHookContainer) {
         let logger = core.logger
 
         dynamicProto(TelemetryContext, this, (_self) => {
             _self.appId = _nullResult;
             _self.getSessionId = _nullResult;
             _self.application = new Application();
-            _self.internal = new Internal(defaultConfig);
+            _self.internal = new Internal(defaultConfig, unloadHookContainer);
             if (hasWindow()) {
-                _self.sessionManager = new _SessionManager(defaultConfig, core);
+                _self.sessionManager = new _SessionManager(defaultConfig, core, unloadHookContainer);
                 _self.device = new Device();
                 _self.location = new Location();
-                _self.user = new User(defaultConfig, core);
+                _self.user = new User(defaultConfig, core, unloadHookContainer);
 
                 let traceId: string;
                 let parentId: string;

package/src/__DynamicConstants.ts

@@ -10,12 +10,12 @@
 // Note: DON'T Export these const from the package as we are still targeting IE this will export a mutable variables that someone could change
 // ###########################################################################################################################################
 
-export const _DYN_GET_TRACE_CTX = "getTraceCtx";  // Count: 3
-export const _DYN_TELEMETRY_TRACE = "telemetryTrace";  // Count: 3
 export const _DYN_SESSION_MANAGER = "sessionManager";  // Count: 3
 export const _DYN_UPDATE = "update";  // Count: 4
 export const _DYN_IS_USER_COOKIE_SET = "isUserCookieSet";  // Count: 4
 export const _DYN_IS_NEW_USER = "isNewUser";  // Count: 4
+export const _DYN_GET_TRACE_CTX = "getTraceCtx";  // Count: 3
+export const _DYN_TELEMETRY_TRACE = "telemetryTrace";  // Count: 3
 export const _DYN_APPLY_SESSION_CONTEX0 = "applySessionContext";  // Count: 2
 export const _DYN_APPLY_APPLICATION_CO1 = "applyApplicationContext";  // Count: 2
 export const _DYN_APPLY_DEVICE_CONTEXT = "applyDeviceContext";  // Count: 2

package/types/Context/Internal.d.ts

@@ -1,4 +1,5 @@
 import { IInternal } from "@microsoft/applicationinsights-common";
+import { IUnloadHookContainer } from "@microsoft/applicationinsights-core-js";
 import { IPropertiesConfig } from "../Interfaces/IPropertiesConfig";
 export declare class Internal implements IInternal {
     /**
@@ -25,5 +26,5 @@ export declare class Internal implements IInternal {
     /**
      * Constructs a new instance of the internal telemetry data class.
      */
-    constructor(config: IPropertiesConfig);
+    constructor(config: IPropertiesConfig, unloadHookContainer?: IUnloadHookContainer);
 }

package/types/Context/Session.d.ts

@@ -1,5 +1,5 @@
 import { ISession } from "@microsoft/applicationinsights-common";
-import { IAppInsightsCore } from "@microsoft/applicationinsights-core-js";
+import { IAppInsightsCore, IUnloadHookContainer } from "@microsoft/applicationinsights-core-js";
 export interface ISessionConfig {
     readonly sessionRenewalMs?: number;
     readonly sessionExpirationMs?: number;
@@ -31,7 +31,7 @@ export declare class Session implements ISession {
 }
 export declare class _SessionManager {
     automaticSession: Session;
-    constructor(config: ISessionConfig, core?: IAppInsightsCore);
+    constructor(config: ISessionConfig, core?: IAppInsightsCore, unloadHookContainer?: IUnloadHookContainer);
     update(): void;
     /**
      *  Record the current state of the automatic session and store it in our cookie string format

package/types/Context/User.d.ts

@@ -1,5 +1,5 @@
 import { IUserContext } from "@microsoft/applicationinsights-common";
-import { IAppInsightsCore } from "@microsoft/applicationinsights-core-js";
+import { IAppInsightsCore, IUnloadHookContainer } from "@microsoft/applicationinsights-core-js";
 import { IPropertiesConfig } from "../Interfaces/IPropertiesConfig";
 export declare class User implements IUserContext {
     static cookieSeparator: string;
@@ -37,7 +37,7 @@ export declare class User implements IUserContext {
      * A flag indicating whether the user cookie has been set
      */
     isUserCookieSet: boolean;
-    constructor(config: IPropertiesConfig, core: IAppInsightsCore);
+    constructor(config: IPropertiesConfig, core: IAppInsightsCore, unloadHookContainer?: IUnloadHookContainer);
     /**
     * Sets the authenticated user id and the account id in this session.
     *

package/types/Interfaces/IPropertiesConfig.d.ts

@@ -1,5 +1,4 @@
 export interface IPropertiesConfig {
-    readonly instrumentationKey: string;
     readonly accountId: string;
     readonly sessionRenewalMs: number;
     readonly samplingPercentage: number;

package/types/TelemetryContext.d.ts

@@ -3,7 +3,7 @@
 * @copyright Microsoft 2018
 */
 import { IApplication, IDevice, IInternal, ILocation, IOperatingSystem, ISession, ITelemetryTrace, IUserContext, IWeb } from "@microsoft/applicationinsights-common";
-import { IAppInsightsCore, IDistributedTraceContext, IProcessTelemetryContext, ITelemetryItem } from "@microsoft/applicationinsights-core-js";
+import { IAppInsightsCore, IDistributedTraceContext, IProcessTelemetryContext, ITelemetryItem, IUnloadHookContainer } from "@microsoft/applicationinsights-core-js";
 import { _SessionManager } from "./Context/Session";
 import { IPropTelemetryContext } from "./Interfaces/IPropTelemetryContext";
 import { IPropertiesConfig } from "./Interfaces/IPropertiesConfig";
@@ -20,7 +20,7 @@ export declare class TelemetryContext implements IPropTelemetryContext {
     web: IWeb;
     appId: () => string;
     getSessionId: () => string;
-    constructor(core: IAppInsightsCore, defaultConfig: IPropertiesConfig, previousTraceCtx?: IDistributedTraceContext);
+    constructor(core: IAppInsightsCore, defaultConfig: IPropertiesConfig, previousTraceCtx?: IDistributedTraceContext, unloadHookContainer?: IUnloadHookContainer);
     applySessionContext(evt: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void;
     applyOperatingSystemContxt(event: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void;
     applyApplicationContext(event: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void;

package/types/__DynamicConstants.d.ts

@@ -1,9 +1,9 @@
-export declare const _DYN_GET_TRACE_CTX = "getTraceCtx";
-export declare const _DYN_TELEMETRY_TRACE = "telemetryTrace";
 export declare const _DYN_SESSION_MANAGER = "sessionManager";
 export declare const _DYN_UPDATE = "update";
 export declare const _DYN_IS_USER_COOKIE_SET = "isUserCookieSet";
 export declare const _DYN_IS_NEW_USER = "isNewUser";
+export declare const _DYN_GET_TRACE_CTX = "getTraceCtx";
+export declare const _DYN_TELEMETRY_TRACE = "telemetryTrace";
 export declare const _DYN_APPLY_SESSION_CONTEX0 = "applySessionContext";
 export declare const _DYN_APPLY_APPLICATION_CO1 = "applyApplicationContext";
 export declare const _DYN_APPLY_DEVICE_CONTEXT = "applyDeviceContext";