@azure/msal-common 9.1.1 → 11.0.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v9.1.1 2023-01-19 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 'use strict';
 'use strict';
 
@@ -486,6 +486,7 @@ var JsonTypes;
 (function (JsonTypes) {
     JsonTypes["Jwt"] = "JWT";
     JsonTypes["Jwk"] = "JWK";
+    JsonTypes["Pop"] = "pop";
 })(JsonTypes || (JsonTypes = {}));
 var ONE_DAY_IN_MS = 86400000;
 
@@ -818,6 +819,14 @@ var ClientAuthErrorMessage = {
     keyIdMissing: {
         code: "key_id_missing",
         desc: "A keyId value is missing from the requested bound token's cache record and is required to match the token to it's stored binding key."
+    },
+    noNetworkConnectivity: {
+        code: "no_network_connectivity",
+        desc: "No network connectivity. Check your internet connection."
+    },
+    userCanceledError: {
+        code: "user_canceled",
+        desc: "User canceled the flow."
     }
 };
 /**
@@ -1106,6 +1115,18 @@ var ClientAuthError = /** @class */ (function (_super) {
     ClientAuthError.createKeyIdMissingError = function () {
         return new ClientAuthError(ClientAuthErrorMessage.keyIdMissing.code, ClientAuthErrorMessage.keyIdMissing.desc);
     };
+    /**
+     * Create an error when the client does not have network connectivity
+     */
+    ClientAuthError.createNoNetworkConnectivityError = function () {
+        return new ClientAuthError(ClientAuthErrorMessage.noNetworkConnectivity.code, ClientAuthErrorMessage.noNetworkConnectivity.desc);
+    };
+    /**
+     * Create an error when the user cancels the flow
+     */
+    ClientAuthError.createUserCanceledError = function () {
+        return new ClientAuthError(ClientAuthErrorMessage.userCanceledError.code, ClientAuthErrorMessage.userCanceledError.desc);
+    };
     return ClientAuthError;
 }(AuthError));
 
@@ -1422,7 +1443,7 @@ var Logger = /** @class */ (function () {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-common";
-var version = "9.1.1";
+var version = "11.0.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1473,6 +1494,25 @@ exports.AzureCloudInstance = void 0;
 var CredentialEntity = /** @class */ (function () {
     function CredentialEntity() {
     }
+    /**
+     * Initializes a map with credential {CredentialType} regular expressions.
+     */
+    CredentialEntity._initRegex = function () {
+        var separator = Separators.CACHE_KEY_SEPARATOR;
+        CredentialEntity.credentialRegexMap = new Map();
+        for (var _i = 0, _a = Object.keys(exports.CredentialType); _i < _a.length; _i++) {
+            var credKey = _a[_i];
+            var credVal = exports.CredentialType[credKey].toLowerCase();
+            try {
+                // Verify credential type is preceded by a valid host name (environment) using lookbehind
+                CredentialEntity.credentialRegexMap.set(exports.CredentialType[credKey], new RegExp("(?<=" + separator + CredentialEntity.credentialDomainRegex + ")" + separator + credVal + separator));
+            }
+            catch (err) {
+                // Lookbehind is not supported (Safari or older versions of IE) - removing it
+                CredentialEntity.credentialRegexMap.set(exports.CredentialType[credKey], new RegExp("" + separator + CredentialEntity.credentialDomainRegex + separator + credVal + separator));
+            }
+        }
+    };
     /**
      * Generate Account Id key component as per the schema: <home_account_id>-<environment>
      */
@@ -1519,14 +1559,10 @@ var CredentialEntity = /** @class */ (function () {
      * @param key
      */
     CredentialEntity.getCredentialType = function (key) {
-        var separator = Separators.CACHE_KEY_SEPARATOR;
-        // Match host names like "login.microsoftonline.com", "https://accounts.google.com:4000", etc.
-        var domainRe = "(https?:\\/\\/)?([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,63}))(\\:[0-9]{4,5})?";
-        for (var _i = 0, _a = Object.keys(exports.CredentialType); _i < _a.length; _i++) {
-            var credKey = _a[_i];
-            var credVal = exports.CredentialType[credKey].toLowerCase();
-            // Verify credential type is preceded by a valid host name (environment)
-            if (key.toLowerCase().search("" + separator + domainRe + separator + credVal + separator) !== -1) {
+        var _a;
+        for (var _i = 0, _b = Object.keys(exports.CredentialType); _i < _b.length; _i++) {
+            var credKey = _b[_i];
+            if ((_a = this.credentialRegexMap.get(exports.CredentialType[credKey])) === null || _a === void 0 ? void 0 : _a.test(key.toLowerCase())) {
                 return exports.CredentialType[credKey];
             }
         }
@@ -1595,8 +1631,14 @@ var CredentialEntity = /** @class */ (function () {
          */
         return (tokenType && tokenType.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? tokenType.toLowerCase() : Constants.EMPTY_STRING;
     };
+    /*
+     * Match host names like "login.microsoftonline.com", "https://accounts.google.com:4000", https://localhost:5000,
+     * "login.microsoftonline.com/common", "login.microsoftonline.com:4000/common", etc
+     */
+    CredentialEntity.credentialDomainRegex = "(https?:\\/\\/)?((([\\w-]+\\.)*([\\w-]{1,63})(\\.(\\w{2,63})))|(localhost))(\\:[0-9]{4,5})?(\\/[\\w-]+)?";
     return CredentialEntity;
-}());
+}());
+CredentialEntity._initRegex();
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2871,7 +2913,7 @@ var CacheManager = /** @class */ (function () {
         else if (accounts.length > 1) {
             throw ClientAuthError.createMultipleMatchingAccountsInCacheError();
         }
-        return accountCache[0];
+        return accounts[0];
     };
     /**
      * Retrieve IdTokenEntity from cache
@@ -3255,8 +3297,7 @@ var DefaultStorageClass = /** @class */ (function (_super) {
 var DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 var DEFAULT_SYSTEM_OPTIONS = {
     tokenRenewalOffsetSeconds: DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
-    preventCorsPreflight: false,
-    proxyUrl: Constants.EMPTY_STRING
+    preventCorsPreflight: false
 };
 var DEFAULT_LOGGER_IMPLEMENTATION = {
     loggerCallback: function () {
@@ -3508,95 +3549,6 @@ exports.CcsCredentialType = void 0;
     CcsCredentialType["UPN"] = "UPN";
 })(exports.CcsCredentialType || (exports.CcsCredentialType = {}));
 
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * Base application class which will construct requests to send to and handle responses from the Microsoft STS using the authorization code flow.
- */
-var BaseClient = /** @class */ (function () {
-    function BaseClient(configuration, performanceClient) {
-        // Set the configuration
-        this.config = buildClientConfiguration(configuration);
-        // Initialize the logger
-        this.logger = new Logger(this.config.loggerOptions, name, version);
-        // Initialize crypto
-        this.cryptoUtils = this.config.cryptoInterface;
-        // Initialize storage interface
-        this.cacheManager = this.config.storageInterface;
-        // Set the network interface
-        this.networkClient = this.config.networkInterface;
-        // Set the NetworkManager
-        this.networkManager = new NetworkManager(this.networkClient, this.cacheManager);
-        // Set TelemetryManager
-        this.serverTelemetryManager = this.config.serverTelemetryManager;
-        // set Authority
-        this.authority = this.config.authOptions.authority;
-        // set performance telemetry client
-        this.performanceClient = performanceClient;
-    }
-    /**
-     * Creates default headers for requests to token endpoint
-     */
-    BaseClient.prototype.createTokenRequestHeaders = function (ccsCred) {
-        var headers = {};
-        headers[exports.HeaderNames.CONTENT_TYPE] = Constants.URL_FORM_CONTENT_TYPE;
-        if (!this.config.systemOptions.preventCorsPreflight && ccsCred) {
-            switch (ccsCred.type) {
-                case exports.CcsCredentialType.HOME_ACCOUNT_ID:
-                    try {
-                        var clientInfo = buildClientInfoFromHomeAccountId(ccsCred.credential);
-                        headers[exports.HeaderNames.CCS_HEADER] = "Oid:" + clientInfo.uid + "@" + clientInfo.utid;
-                    }
-                    catch (e) {
-                        this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
-                    }
-                    break;
-                case exports.CcsCredentialType.UPN:
-                    headers[exports.HeaderNames.CCS_HEADER] = "UPN: " + ccsCred.credential;
-                    break;
-            }
-        }
-        return headers;
-    };
-    /**
-     * Http post to token endpoint
-     * @param tokenEndpoint
-     * @param queryString
-     * @param headers
-     * @param thumbprint
-     */
-    BaseClient.prototype.executePostToTokenEndpoint = function (tokenEndpoint, queryString, headers, thumbprint) {
-        return __awaiter(this, void 0, void 0, function () {
-            var response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers, proxyUrl: this.config.systemOptions.proxyUrl })];
-                    case 1:
-                        response = _a.sent();
-                        if (this.config.serverTelemetryManager && response.status < 500 && response.status !== 429) {
-                            // Telemetry data successfully logged by server, clear Telemetry cache
-                            this.config.serverTelemetryManager.clearTelemetryCache();
-                        }
-                        return [2 /*return*/, response];
-                }
-            });
-        });
-    };
-    /**
-     * Updates the authority object of the client. Endpoint discovery must be completed.
-     * @param updatedAuthority
-     */
-    BaseClient.prototype.updateAuthority = function (updatedAuthority) {
-        if (!updatedAuthority.discoveryComplete()) {
-            throw ClientAuthError.createEndpointDiscoveryIncompleteError("Updated authority has not completed endpoint discovery.");
-        }
-        this.authority = updatedAuthority;
-    };
-    return BaseClient;
-}());
-
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3663,7 +3615,7 @@ var RequestValidator = /** @class */ (function () {
         }
     };
     /**
-     * Removes unnecessary or duplicate query parameters from extraQueryParameters
+     * Removes unnecessary, duplicate, and empty string query parameters from extraQueryParameters
      * @param request
      */
     RequestValidator.sanitizeEQParams = function (eQParams, queryParams) {
@@ -3676,7 +3628,12 @@ var RequestValidator = /** @class */ (function () {
                 delete eQParams[key];
             }
         });
-        return eQParams;
+        // remove empty string parameters
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        return Object.fromEntries(Object.entries(eQParams).filter(function (_a) {
+            _a[0]; var value = _a[1];
+            return value !== "";
+        }));
     };
     return RequestValidator;
 }());
@@ -3956,13 +3913,13 @@ var RequestParameterBuilder = /** @class */ (function () {
     };
     /**
      * add extraQueryParams
-     * @param eQparams
+     * @param eQParams
      */
-    RequestParameterBuilder.prototype.addExtraQueryParameters = function (eQparams) {
+    RequestParameterBuilder.prototype.addExtraQueryParameters = function (eQParams) {
         var _this = this;
-        RequestValidator.sanitizeEQParams(eQparams, this.parameters);
-        Object.keys(eQparams).forEach(function (key) {
-            _this.parameters.set(key, eQparams[key]);
+        var sanitizedEQParams = RequestValidator.sanitizeEQParams(eQParams, this.parameters);
+        Object.keys(sanitizedEQParams).forEach(function (key) {
+            _this.parameters.set(key, eQParams[key]);
         });
     };
     RequestParameterBuilder.prototype.addClientCapabilitiesToClaims = function (claims, clientCapabilities) {
@@ -4057,6 +4014,106 @@ var RequestParameterBuilder = /** @class */ (function () {
     return RequestParameterBuilder;
 }());
 
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * Base application class which will construct requests to send to and handle responses from the Microsoft STS using the authorization code flow.
+ */
+var BaseClient = /** @class */ (function () {
+    function BaseClient(configuration, performanceClient) {
+        // Set the configuration
+        this.config = buildClientConfiguration(configuration);
+        // Initialize the logger
+        this.logger = new Logger(this.config.loggerOptions, name, version);
+        // Initialize crypto
+        this.cryptoUtils = this.config.cryptoInterface;
+        // Initialize storage interface
+        this.cacheManager = this.config.storageInterface;
+        // Set the network interface
+        this.networkClient = this.config.networkInterface;
+        // Set the NetworkManager
+        this.networkManager = new NetworkManager(this.networkClient, this.cacheManager);
+        // Set TelemetryManager
+        this.serverTelemetryManager = this.config.serverTelemetryManager;
+        // set Authority
+        this.authority = this.config.authOptions.authority;
+        // set performance telemetry client
+        this.performanceClient = performanceClient;
+    }
+    /**
+     * Creates default headers for requests to token endpoint
+     */
+    BaseClient.prototype.createTokenRequestHeaders = function (ccsCred) {
+        var headers = {};
+        headers[exports.HeaderNames.CONTENT_TYPE] = Constants.URL_FORM_CONTENT_TYPE;
+        if (!this.config.systemOptions.preventCorsPreflight && ccsCred) {
+            switch (ccsCred.type) {
+                case exports.CcsCredentialType.HOME_ACCOUNT_ID:
+                    try {
+                        var clientInfo = buildClientInfoFromHomeAccountId(ccsCred.credential);
+                        headers[exports.HeaderNames.CCS_HEADER] = "Oid:" + clientInfo.uid + "@" + clientInfo.utid;
+                    }
+                    catch (e) {
+                        this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
+                    }
+                    break;
+                case exports.CcsCredentialType.UPN:
+                    headers[exports.HeaderNames.CCS_HEADER] = "UPN: " + ccsCred.credential;
+                    break;
+            }
+        }
+        return headers;
+    };
+    /**
+     * Http post to token endpoint
+     * @param tokenEndpoint
+     * @param queryString
+     * @param headers
+     * @param thumbprint
+     */
+    BaseClient.prototype.executePostToTokenEndpoint = function (tokenEndpoint, queryString, headers, thumbprint) {
+        return __awaiter(this, void 0, void 0, function () {
+            var response;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers })];
+                    case 1:
+                        response = _a.sent();
+                        if (this.config.serverTelemetryManager && response.status < 500 && response.status !== 429) {
+                            // Telemetry data successfully logged by server, clear Telemetry cache
+                            this.config.serverTelemetryManager.clearTelemetryCache();
+                        }
+                        return [2 /*return*/, response];
+                }
+            });
+        });
+    };
+    /**
+     * Updates the authority object of the client. Endpoint discovery must be completed.
+     * @param updatedAuthority
+     */
+    BaseClient.prototype.updateAuthority = function (updatedAuthority) {
+        if (!updatedAuthority.discoveryComplete()) {
+            throw ClientAuthError.createEndpointDiscoveryIncompleteError("Updated authority has not completed endpoint discovery.");
+        }
+        this.authority = updatedAuthority;
+    };
+    /**
+     * Creates query string for the /token request
+     * @param request
+     */
+    BaseClient.prototype.createTokenQueryParameters = function (request) {
+        var parameterBuilder = new RequestParameterBuilder();
+        if (request.tokenQueryParameters) {
+            parameterBuilder.addExtraQueryParameters(request.tokenQueryParameters);
+        }
+        return parameterBuilder.createQueryString();
+    };
+    return BaseClient;
+}());
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4382,10 +4439,14 @@ var InteractionRequiredAuthErrorMessage = {
  */
 var InteractionRequiredAuthError = /** @class */ (function (_super) {
     __extends(InteractionRequiredAuthError, _super);
-    function InteractionRequiredAuthError(errorCode, errorMessage, subError) {
+    function InteractionRequiredAuthError(errorCode, errorMessage, subError, timestamp, traceId, correlationId, claims) {
         var _this = _super.call(this, errorCode, errorMessage, subError) || this;
-        _this.name = "InteractionRequiredAuthError";
         Object.setPrototypeOf(_this, InteractionRequiredAuthError.prototype);
+        _this.timestamp = timestamp || Constants.EMPTY_STRING;
+        _this.traceId = traceId || Constants.EMPTY_STRING;
+        _this.correlationId = correlationId || Constants.EMPTY_STRING;
+        _this.claims = claims || Constants.EMPTY_STRING;
+        _this.name = "InteractionRequiredAuthError";
         return _this;
     }
     /**
@@ -4738,54 +4799,290 @@ var UrlString = /** @class */ (function () {
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-var KeyLocation;
-(function (KeyLocation) {
-    KeyLocation["SW"] = "sw";
-    KeyLocation["UHW"] = "uhw";
-})(KeyLocation || (KeyLocation = {}));
-var PopTokenGenerator = /** @class */ (function () {
-    function PopTokenGenerator(cryptoUtils) {
-        this.cryptoUtils = cryptoUtils;
-    }
+/**
+ * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
+ *
+ * @export
+ * @enum {number}
+ */
+exports.PerformanceEvents = void 0;
+(function (PerformanceEvents) {
     /**
-     * Generates the req_cnf validated at the RP in the POP protocol for SHR parameters
-     * and returns an object containing the keyid, the full req_cnf string and the req_cnf string hash
-     * @param request
-     * @returns
+     * acquireTokenByCode API (msal-browser and msal-node).
+     * Used to acquire tokens by trading an authorization code against the token endpoint.
      */
-    PopTokenGenerator.prototype.generateCnf = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var reqCnf, reqCnfString, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.generateKid(request)];
-                    case 1:
-                        reqCnf = _b.sent();
-                        reqCnfString = this.cryptoUtils.base64Encode(JSON.stringify(reqCnf));
-                        _a = {
-                            kid: reqCnf.kid,
-                            reqCnfString: reqCnfString
-                        };
-                        return [4 /*yield*/, this.cryptoUtils.hashString(reqCnfString)];
-                    case 2: return [2 /*return*/, (_a.reqCnfHash = _b.sent(),
-                            _a)];
-                }
-            });
-        });
-    };
+    PerformanceEvents["AcquireTokenByCode"] = "acquireTokenByCode";
     /**
-     * Generates key_id for a SHR token request
-     * @param request
-     * @returns
+     * acquireTokenByRefreshToken API (msal-browser and msal-node).
+     * Used to renew an access token using a refresh token against the token endpoint.
+     */
+    PerformanceEvents["AcquireTokenByRefreshToken"] = "acquireTokenByRefreshToken";
+    /**
+     * acquireTokenSilent API (msal-browser and msal-node).
+     * Used to silently acquire a new access token (from the cache or the network).
+     */
+    PerformanceEvents["AcquireTokenSilent"] = "acquireTokenSilent";
+    /**
+     * acquireTokenSilentAsync (msal-browser).
+     * Internal API for acquireTokenSilent.
+     */
+    PerformanceEvents["AcquireTokenSilentAsync"] = "acquireTokenSilentAsync";
+    /**
+     * acquireTokenPopup (msal-browser).
+     * Used to acquire a new access token interactively through pop ups
+     */
+    PerformanceEvents["AcquireTokenPopup"] = "acquireTokenPopup";
+    /**
+     * getPublicKeyThumbprint API in CryptoOpts class (msal-browser).
+     * Used to generate a public/private keypair and generate a public key thumbprint for pop requests.
+     */
+    PerformanceEvents["CryptoOptsGetPublicKeyThumbprint"] = "cryptoOptsGetPublicKeyThumbprint";
+    /**
+     * signJwt API in CryptoOpts class (msal-browser).
+     * Used to signed a pop token.
+     */
+    PerformanceEvents["CryptoOptsSignJwt"] = "cryptoOptsSignJwt";
+    /**
+     * acquireToken API in the SilentCacheClient class (msal-browser).
+     * Used to read access tokens from the cache.
+     */
+    PerformanceEvents["SilentCacheClientAcquireToken"] = "silentCacheClientAcquireToken";
+    /**
+     * acquireToken API in the SilentIframeClient class (msal-browser).
+     * Used to acquire a new set of tokens from the authorize endpoint in a hidden iframe.
+     */
+    PerformanceEvents["SilentIframeClientAcquireToken"] = "silentIframeClientAcquireToken";
+    /**
+     * acquireToken API in SilentRereshClient (msal-browser).
+     * Used to acquire a new set of tokens from the token endpoint using a refresh token.
+     */
+    PerformanceEvents["SilentRefreshClientAcquireToken"] = "silentRefreshClientAcquireToken";
+    /**
+     * ssoSilent API (msal-browser).
+     * Used to silently acquire an authorization code and set of tokens using a hidden iframe.
+     */
+    PerformanceEvents["SsoSilent"] = "ssoSilent";
+    /**
+     * getDiscoveredAuthority API in StandardInteractionClient class (msal-browser).
+     * Used to load authority metadata for a request.
+     */
+    PerformanceEvents["StandardInteractionClientGetDiscoveredAuthority"] = "standardInteractionClientGetDiscoveredAuthority";
+    /**
+     * acquireToken APIs in msal-browser.
+     * Used to make an /authorize endpoint call with native brokering enabled.
+     */
+    PerformanceEvents["FetchAccountIdWithNativeBroker"] = "fetchAccountIdWithNativeBroker";
+    /**
+     * acquireToken API in NativeInteractionClient class (msal-browser).
+     * Used to acquire a token from Native component when native brokering is enabled.
+     */
+    PerformanceEvents["NativeInteractionClientAcquireToken"] = "nativeInteractionClientAcquireToken";
+    /**
+     * Time spent creating default headers for requests to token endpoint
+     */
+    PerformanceEvents["BaseClientCreateTokenRequestHeaders"] = "baseClientCreateTokenRequestHeaders";
+    /**
+     * Used to measure the time taken for completing embedded-broker handshake (PW-Broker).
+     */
+    PerformanceEvents["BrokerHandhshake"] = "brokerHandshake";
+    /**
+     * acquireTokenByRefreshToken API in BrokerClientApplication (PW-Broker) .
+     */
+    PerformanceEvents["AcquireTokenByRefreshTokenInBroker"] = "acquireTokenByRefreshTokenInBroker";
+    /**
+     * Time taken for token acquisition by broker
+     */
+    PerformanceEvents["AcquireTokenByBroker"] = "acquireTokenByBroker";
+    /**
+     * Time spent on the network for refresh token acquisition
+     */
+    PerformanceEvents["RefreshTokenClientExecuteTokenRequest"] = "refreshTokenClientExecuteTokenRequest";
+    /**
+     * Time taken for acquiring refresh token , records RT size
+     */
+    PerformanceEvents["RefreshTokenClientAcquireToken"] = "refreshTokenClientAcquireToken";
+    /**
+     * Time taken for acquiring cached refresh token
+     */
+    PerformanceEvents["RefreshTokenClientAcquireTokenWithCachedRefreshToken"] = "refreshTokenClientAcquireTokenWithCachedRefreshToken";
+    /**
+     * acquireTokenByRefreshToken API in RefreshTokenClient (msal-common).
+     */
+    PerformanceEvents["RefreshTokenClientAcquireTokenByRefreshToken"] = "refreshTokenClientAcquireTokenByRefreshToken";
+    /**
+     * Helper function to create token request body in RefreshTokenClient (msal-common).
+     */
+    PerformanceEvents["RefreshTokenClientCreateTokenRequestBody"] = "refreshTokenClientCreateTokenRequestBody";
+    /**
+     * acquireTokenFromCache (msal-browser).
+     * Internal API for acquiring token from cache
+     */
+    PerformanceEvents["AcquireTokenFromCache"] = "acquireTokenFromCache";
+    /**
+     * acquireTokenBySilentIframe (msal-browser).
+     * Internal API for acquiring token by silent Iframe
+     */
+    PerformanceEvents["AcquireTokenBySilentIframe"] = "acquireTokenBySilentIframe";
+    /**
+     * Internal API for initializing base request in BaseInteractionClient (msal-browser)
+     */
+    PerformanceEvents["InitializeBaseRequest"] = "initializeBaseRequest";
+    /**
+     * Internal API for initializing silent request in SilentCacheClient (msal-browser)
+     */
+    PerformanceEvents["InitializeSilentRequest"] = "initializeSilentRequest";
+    PerformanceEvents["InitializeClientApplication"] = "initializeClientApplication";
+    /**
+     * Helper function in SilentIframeClient class (msal-browser).
+     */
+    PerformanceEvents["SilentIframeClientTokenHelper"] = "silentIframeClientTokenHelper";
+    /**
+     * SilentHandler
+     */
+    PerformanceEvents["SilentHandlerInitiateAuthRequest"] = "silentHandlerInitiateAuthRequest";
+    PerformanceEvents["SilentHandlerMonitorIframeForHash"] = "silentHandlerMonitorIframeForHash";
+    PerformanceEvents["SilentHandlerLoadFrame"] = "silentHandlerLoadFrame";
+    /**
+     * Helper functions in StandardInteractionClient class (msal-browser)
+     */
+    PerformanceEvents["StandardInteractionClientCreateAuthCodeClient"] = "standardInteractionClientCreateAuthCodeClient";
+    PerformanceEvents["StandardInteractionClientGetClientConfiguration"] = "standardInteractionClientGetClientConfiguration";
+    PerformanceEvents["StandardInteractionClientInitializeAuthorizationRequest"] = "standardInteractionClientInitializeAuthorizationRequest";
+    PerformanceEvents["StandardInteractionClientInitializeAuthorizationCodeRequest"] = "standardInteractionClientInitializeAuthorizationCodeRequest";
+    /**
+     * getAuthCodeUrl API (msal-browser and msal-node).
+     */
+    PerformanceEvents["GetAuthCodeUrl"] = "getAuthCodeUrl";
+    /**
+     * Functions from InteractionHandler (msal-browser)
+     */
+    PerformanceEvents["HandleCodeResponseFromServer"] = "handleCodeResponseFromServer";
+    PerformanceEvents["HandleCodeResponseFromHash"] = "handleCodeResponseFromHash";
+    PerformanceEvents["UpdateTokenEndpointAuthority"] = "updateTokenEndpointAuthority";
+    /**
+     * APIs in Authorization Code Client (msal-common)
+     */
+    PerformanceEvents["AuthClientAcquireToken"] = "authClientAcquireToken";
+    PerformanceEvents["AuthClientExecuteTokenRequest"] = "authClientExecuteTokenRequest";
+    PerformanceEvents["AuthClientCreateTokenRequestBody"] = "authClientCreateTokenRequestBody";
+    PerformanceEvents["AuthClientCreateQueryString"] = "authClientCreateQueryString";
+    /**
+     * Generate functions in PopTokenGenerator (msal-common)
+     */
+    PerformanceEvents["PopTokenGenerateCnf"] = "popTokenGenerateCnf";
+    PerformanceEvents["PopTokenGenerateKid"] = "popTokenGenerateKid";
+    /**
+     * handleServerTokenResponse API in ResponseHandler (msal-common)
+     */
+    PerformanceEvents["HandleServerTokenResponse"] = "handleServerTokenResponse";
+    /**
+     * Authority functions
+     */
+    PerformanceEvents["AuthorityFactoryCreateDiscoveredInstance"] = "authorityFactoryCreateDiscoveredInstance";
+    PerformanceEvents["AuthorityResolveEndpointsAsync"] = "authorityResolveEndpointsAsync";
+    PerformanceEvents["AuthorityGetCloudDiscoveryMetadataFromNetwork"] = "authorityGetCloudDiscoveryMetadataFromNetwork";
+    PerformanceEvents["AuthorityUpdateCloudDiscoveryMetadata"] = "authorityUpdateCloudDiscoveryMetadata";
+    PerformanceEvents["AuthorityGetEndpointMetadataFromNetwork"] = "authorityGetEndpointMetadataFromNetwork";
+    PerformanceEvents["AuthorityUpdateEndpointMetadata"] = "authorityUpdateEndpointMetadata";
+    PerformanceEvents["AuthorityUpdateMetadataWithRegionalInformation"] = "authorityUpdateMetadataWithRegionalInformation";
+    /**
+     * Region Discovery functions
+     */
+    PerformanceEvents["RegionDiscoveryDetectRegion"] = "regionDiscoveryDetectRegion";
+    PerformanceEvents["RegionDiscoveryGetRegionFromIMDS"] = "regionDiscoveryGetRegionFromIMDS";
+    PerformanceEvents["RegionDiscoveryGetCurrentVersion"] = "regionDiscoveryGetCurrentVersion";
+    PerformanceEvents["AcquireTokenByCodeAsync"] = "acquireTokenByCodeAsync";
+    PerformanceEvents["GetEndpointMetadataFromNetwork"] = "getEndpointMetadataFromNetwork";
+    PerformanceEvents["GetCloudDiscoveryMetadataFromNetworkMeasurement"] = "getCloudDiscoveryMetadataFromNetworkMeasurement";
+    PerformanceEvents["HandleRedirectPromiseMeasurement"] = "handleRedirectPromiseMeasurement";
+    PerformanceEvents["UpdateCloudDiscoveryMetadataMeasurement"] = "updateCloudDiscoveryMetadataMeasurement";
+    PerformanceEvents["UsernamePasswordClientAcquireToken"] = "usernamePasswordClientAcquireToken";
+    PerformanceEvents["NativeMessageHandlerHandshake"] = "nativeMessageHandlerHandshake";
+})(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
+/**
+ * State of the performance event.
+ *
+ * @export
+ * @enum {number}
+ */
+exports.PerformanceEventStatus = void 0;
+(function (PerformanceEventStatus) {
+    PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
+    PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
+    PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
+})(exports.PerformanceEventStatus || (exports.PerformanceEventStatus = {}));
+var IntFields = new Set([
+    "accessTokenSize",
+    "durationMs",
+    "idTokenSize",
+    "matsSilentStatus",
+    "matsHttpStatus",
+    "refreshTokenSize",
+    "queuedTimeMs",
+    "startTimeMs",
+    "status",
+]);
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var KeyLocation;
+(function (KeyLocation) {
+    KeyLocation["SW"] = "sw";
+    KeyLocation["UHW"] = "uhw";
+})(KeyLocation || (KeyLocation = {}));
+var PopTokenGenerator = /** @class */ (function () {
+    function PopTokenGenerator(cryptoUtils, performanceClient) {
+        this.cryptoUtils = cryptoUtils;
+        this.performanceClient = performanceClient;
+    }
+    /**
+     * Generates the req_cnf validated at the RP in the POP protocol for SHR parameters
+     * and returns an object containing the keyid, the full req_cnf string and the req_cnf string hash
+     * @param request
+     * @returns
+     */
+    PopTokenGenerator.prototype.generateCnf = function (request) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var reqCnf, reqCnfString, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.PopTokenGenerateCnf, request.correlationId);
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.PopTokenGenerateKid, request.correlationId);
+                        return [4 /*yield*/, this.generateKid(request)];
+                    case 1:
+                        reqCnf = _d.sent();
+                        reqCnfString = this.cryptoUtils.base64Encode(JSON.stringify(reqCnf));
+                        _c = {
+                            kid: reqCnf.kid,
+                            reqCnfString: reqCnfString
+                        };
+                        return [4 /*yield*/, this.cryptoUtils.hashString(reqCnfString)];
+                    case 2: return [2 /*return*/, (_c.reqCnfHash = _d.sent(),
+                            _c)];
+                }
+            });
+        });
+    };
+    /**
+     * Generates key_id for a SHR token request
+     * @param request
+     * @returns
      */
     PopTokenGenerator.prototype.generateKid = function (request) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var kidThumbprint;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cryptoUtils.getPublicKeyThumbprint(request)];
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.PopTokenGenerateKid, request.correlationId);
+                        return [4 /*yield*/, this.cryptoUtils.getPublicKeyThumbprint(request)];
                     case 1:
-                        kidThumbprint = _a.sent();
+                        kidThumbprint = _b.sent();
                         return [2 /*return*/, {
                                 kid: kidThumbprint,
                                 xms_ksl: KeyLocation.SW
@@ -4944,13 +5241,14 @@ var AppMetadataEntity = /** @class */ (function () {
  * Class that handles response parsing.
  */
 var ResponseHandler = /** @class */ (function () {
-    function ResponseHandler(clientId, cacheStorage, cryptoObj, logger, serializableCache, persistencePlugin) {
+    function ResponseHandler(clientId, cacheStorage, cryptoObj, logger, serializableCache, persistencePlugin, performanceClient) {
         this.clientId = clientId;
         this.cacheStorage = cacheStorage;
         this.cryptoObj = cryptoObj;
         this.logger = logger;
         this.serializableCache = serializableCache;
         this.persistencePlugin = persistencePlugin;
+        this.performanceClient = performanceClient;
     }
     /**
      * Function which validates server authorization code response.
@@ -4968,7 +5266,7 @@ var ResponseHandler = /** @class */ (function () {
         // Check for error
         if (serverResponseHash.error || serverResponseHash.error_description || serverResponseHash.suberror) {
             if (InteractionRequiredAuthError.isInteractionRequiredError(serverResponseHash.error, serverResponseHash.error_description, serverResponseHash.suberror)) {
-                throw new InteractionRequiredAuthError(serverResponseHash.error || Constants.EMPTY_STRING, serverResponseHash.error_description, serverResponseHash.suberror);
+                throw new InteractionRequiredAuthError(serverResponseHash.error || Constants.EMPTY_STRING, serverResponseHash.error_description, serverResponseHash.suberror, serverResponseHash.timestamp || Constants.EMPTY_STRING, serverResponseHash.trace_id || Constants.EMPTY_STRING, serverResponseHash.correlation_id || Constants.EMPTY_STRING, serverResponseHash.claims || Constants.EMPTY_STRING);
             }
             throw new ServerError(serverResponseHash.error || Constants.EMPTY_STRING, serverResponseHash.error_description, serverResponseHash.suberror);
         }
@@ -4984,7 +5282,7 @@ var ResponseHandler = /** @class */ (function () {
         // Check for error
         if (serverResponse.error || serverResponse.error_description || serverResponse.suberror) {
             if (InteractionRequiredAuthError.isInteractionRequiredError(serverResponse.error, serverResponse.error_description, serverResponse.suberror)) {
-                throw new InteractionRequiredAuthError(serverResponse.error, serverResponse.error_description, serverResponse.suberror);
+                throw new InteractionRequiredAuthError(serverResponse.error, serverResponse.error_description, serverResponse.suberror, serverResponse.timestamp || Constants.EMPTY_STRING, serverResponse.trace_id || Constants.EMPTY_STRING, serverResponse.correlation_id || Constants.EMPTY_STRING, serverResponse.claims || Constants.EMPTY_STRING);
             }
             var errString = serverResponse.error_codes + " - [" + serverResponse.timestamp + "]: " + serverResponse.error_description + " - Correlation ID: " + serverResponse.correlation_id + " - Trace ID: " + serverResponse.trace_id;
             throw new ServerError(serverResponse.error, errString, serverResponse.suberror);
@@ -4996,11 +5294,13 @@ var ResponseHandler = /** @class */ (function () {
      * @param authority
      */
     ResponseHandler.prototype.handleServerTokenResponse = function (serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse, serverRequestId) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var idTokenObj, authTime, requestStateObj, cacheRecord, cacheContext, key, account;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.HandleServerTokenResponse, serverTokenResponse.correlation_id);
                         if (serverTokenResponse.id_token) {
                             idTokenObj = new AuthToken(serverTokenResponse.id_token || Constants.EMPTY_STRING, this.cryptoObj);
                             // token nonce check (TODO: Add a warning if no nonce is given?)
@@ -5026,16 +5326,16 @@ var ResponseHandler = /** @class */ (function () {
                         // Add keyId from request to serverTokenResponse if defined
                         serverTokenResponse.key_id = serverTokenResponse.key_id || request.sshKid || undefined;
                         cacheRecord = this.generateCacheRecord(serverTokenResponse, authority, reqTimestamp, request, idTokenObj, userAssertionHash, authCodePayload);
-                        _a.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _a.trys.push([1, , 5, 8]);
+                        _b.trys.push([1, , 5, 8]);
                         if (!(this.persistencePlugin && this.serializableCache)) return [3 /*break*/, 3];
                         this.logger.verbose("Persistence enabled, calling beforeCacheAccess");
                         cacheContext = new TokenCacheContext(this.serializableCache, true);
                         return [4 /*yield*/, this.persistencePlugin.beforeCacheAccess(cacheContext)];
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _b.sent();
+                        _b.label = 3;
                     case 3:
                         /*
                          * When saving a refreshed tokens to the cache, it is expected that the account that was used is present in the cache.
@@ -5053,17 +5353,17 @@ var ResponseHandler = /** @class */ (function () {
                         }
                         return [4 /*yield*/, this.cacheStorage.saveCacheRecord(cacheRecord)];
                     case 4:
-                        _a.sent();
+                        _b.sent();
                         return [3 /*break*/, 8];
                     case 5:
                         if (!(this.persistencePlugin && this.serializableCache && cacheContext)) return [3 /*break*/, 7];
                         this.logger.verbose("Persistence enabled, calling afterCacheAccess");
                         return [4 /*yield*/, this.persistencePlugin.afterCacheAccess(cacheContext)];
                     case 6:
-                        _a.sent();
-                        _a.label = 7;
+                        _b.sent();
+                        _b.label = 7;
                     case 7: return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, serverTokenResponse.spa_code, serverRequestId)];
+                    case 8: return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, serverTokenResponse, serverRequestId)];
                 }
             });
         });
@@ -5149,7 +5449,7 @@ var ResponseHandler = /** @class */ (function () {
      * @param fromTokenCache
      * @param stateString
      */
-    ResponseHandler.generateAuthenticationResult = function (cryptoObj, authority, cacheRecord, fromTokenCache, request, idTokenObj, requestState, code, requestId) {
+    ResponseHandler.generateAuthenticationResult = function (cryptoObj, authority, cacheRecord, fromTokenCache, request, idTokenObj, requestState, serverTokenResponse, requestId) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var accessToken, responseScopes, expiresOn, extExpiresOn, familyId, popTokenGenerator, _d, secret, keyId, uid, tid;
@@ -5185,6 +5485,10 @@ var ResponseHandler = /** @class */ (function () {
                         }
                         uid = (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.oid) || (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.sub) || Constants.EMPTY_STRING;
                         tid = (idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims.tid) || Constants.EMPTY_STRING;
+                        // for hybrid + native bridge enablement, send back the native account Id
+                        if ((serverTokenResponse === null || serverTokenResponse === void 0 ? void 0 : serverTokenResponse.spa_accountid) && !!cacheRecord.account) {
+                            cacheRecord.account.nativeAccountId = serverTokenResponse === null || serverTokenResponse === void 0 ? void 0 : serverTokenResponse.spa_accountid;
+                        }
                         return [2 /*return*/, {
                                 authority: authority.canonicalAuthority,
                                 uniqueId: uid,
@@ -5204,7 +5508,7 @@ var ResponseHandler = /** @class */ (function () {
                                 state: requestState ? requestState.userRequestState : Constants.EMPTY_STRING,
                                 cloudGraphHostName: ((_b = cacheRecord.account) === null || _b === void 0 ? void 0 : _b.cloudGraphHostName) || Constants.EMPTY_STRING,
                                 msGraphHost: ((_c = cacheRecord.account) === null || _c === void 0 ? void 0 : _c.msGraphHost) || Constants.EMPTY_STRING,
-                                code: code,
+                                code: serverTokenResponse === null || serverTokenResponse === void 0 ? void 0 : serverTokenResponse.spa_code,
                                 fromNativeBroker: false,
                             }];
                 }
@@ -5240,13 +5544,17 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      * @param request
      */
     AuthorizationCodeClient.prototype.getAuthCodeUrl = function (request) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var queryString;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.createAuthCodeUrlQueryString(request)];
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.GetAuthCodeUrl, request.correlationId);
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthClientCreateQueryString, request.correlationId);
+                        return [4 /*yield*/, this.createAuthCodeUrlQueryString(request)];
                     case 1:
-                        queryString = _a.sent();
+                        queryString = _c.sent();
                         return [2 /*return*/, UrlString.appendQueryString(this.authority.authorizationEndpoint, queryString)];
                 }
             });
@@ -5258,32 +5566,35 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      * @param request
      */
     AuthorizationCodeClient.prototype.acquireToken = function (request, authCodePayload) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function () {
             var atsMeasurement, reqTimestamp, response, requestId, httpVerAuthority, responseHandler;
             var _this = this;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
-                        atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement("AuthCodeClientAcquireToken", request.correlationId);
-                        this.logger.info("in acquireToken call in auth-code client");
-                        if (!request || StringUtils.isEmpty(request.code)) {
+                        if (!request || !request.code) {
                             throw ClientAuthError.createTokenRequestCannotBeMadeError();
                         }
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientAcquireToken, request.correlationId);
+                        atsMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement("AuthCodeClientAcquireToken", request.correlationId);
+                        this.logger.info("in acquireToken call in auth-code client");
                         reqTimestamp = TimeUtils.nowSeconds();
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.AuthClientExecuteTokenRequest, request.correlationId);
                         return [4 /*yield*/, this.executeTokenRequest(this.authority, request)];
                     case 1:
-                        response = _d.sent();
-                        requestId = (_b = response.headers) === null || _b === void 0 ? void 0 : _b[exports.HeaderNames.X_MS_REQUEST_ID];
-                        httpVerAuthority = (_c = response.headers) === null || _c === void 0 ? void 0 : _c[exports.HeaderNames.X_MS_HTTP_VERSION];
+                        response = _g.sent();
+                        requestId = (_d = response.headers) === null || _d === void 0 ? void 0 : _d[exports.HeaderNames.X_MS_REQUEST_ID];
+                        httpVerAuthority = (_e = response.headers) === null || _e === void 0 ? void 0 : _e[exports.HeaderNames.X_MS_HTTP_VERSION];
                         if (httpVerAuthority) {
                             atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
                                 httpVerAuthority: httpVerAuthority
                             });
                         }
-                        responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
+                        responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin, this.performanceClient);
                         // Validate response. This function throws a server error if an error is returned by the server.
                         responseHandler.validateTokenResponse(response.body);
+                        (_f = this.performanceClient) === null || _f === void 0 ? void 0 : _f.setPreQueueTime(exports.PerformanceEvents.HandleServerTokenResponse, request.correlationId);
                         return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, authCodePayload, undefined, undefined, undefined, requestId).then(function (result) {
                                 atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.endMeasurement({
                                     success: true
@@ -5345,26 +5656,19 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      * @param request
      */
     AuthorizationCodeClient.prototype.executeTokenRequest = function (authority, request) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var thumbprint, requestBody, queryParameters, ccsCredential, clientInfo, headers, endpoint;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParametersString, endpoint, requestBody, ccsCredential, clientInfo, headers, thumbprint;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        thumbprint = {
-                            clientId: this.config.authOptions.clientId,
-                            authority: authority.canonicalAuthority,
-                            scopes: request.scopes,
-                            claims: request.claims,
-                            authenticationScheme: request.authenticationScheme,
-                            resourceRequestMethod: request.resourceRequestMethod,
-                            resourceRequestUri: request.resourceRequestUri,
-                            shrClaims: request.shrClaims,
-                            sshKid: request.sshKid
-                        };
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientExecuteTokenRequest, request.correlationId);
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthClientCreateTokenRequestBody, request.correlationId);
+                        queryParametersString = this.createTokenQueryParameters(request);
+                        endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
                         return [4 /*yield*/, this.createTokenRequestBody(request)];
                     case 1:
-                        requestBody = _a.sent();
-                        queryParameters = this.createTokenQueryParameters(request);
+                        requestBody = _c.sent();
                         ccsCredential = undefined;
                         if (request.clientInfo) {
                             try {
@@ -5379,34 +5683,35 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                             }
                         }
                         headers = this.createTokenRequestHeaders(ccsCredential || request.ccsCredential);
-                        endpoint = StringUtils.isEmpty(queryParameters) ? authority.tokenEndpoint : authority.tokenEndpoint + "?" + queryParameters;
+                        thumbprint = {
+                            clientId: this.config.authOptions.clientId,
+                            authority: authority.canonicalAuthority,
+                            scopes: request.scopes,
+                            claims: request.claims,
+                            authenticationScheme: request.authenticationScheme,
+                            resourceRequestMethod: request.resourceRequestMethod,
+                            resourceRequestUri: request.resourceRequestUri,
+                            shrClaims: request.shrClaims,
+                            sshKid: request.sshKid
+                        };
                         return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
                 }
             });
         });
     };
-    /**
-     * Creates query string for the /token request
-     * @param request
-     */
-    AuthorizationCodeClient.prototype.createTokenQueryParameters = function (request) {
-        var parameterBuilder = new RequestParameterBuilder();
-        if (request.tokenQueryParameters) {
-            parameterBuilder.addExtraQueryParameters(request.tokenQueryParameters);
-        }
-        return parameterBuilder.createQueryString();
-    };
     /**
      * Generates a map for all the params to be sent to the service
      * @param request
      */
     AuthorizationCodeClient.prototype.createTokenRequestBody = function (request) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var parameterBuilder, clientAssertion, popTokenGenerator, reqCnfData, correlationId, ccsCred, clientInfo, clientInfo;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientCreateTokenRequestBody, request.correlationId);
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
                         /*
@@ -5447,10 +5752,11 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         parameterBuilder.addGrantType(GrantType.AUTHORIZATION_CODE_GRANT);
                         parameterBuilder.addClientInfo();
                         if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
-                        popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
+                        popTokenGenerator = new PopTokenGenerator(this.cryptoUtils, this.performanceClient);
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.PopTokenGenerateCnf, request.correlationId);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        reqCnfData = _b.sent();
+                        reqCnfData = _d.sent();
                         // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
                         parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                         return [3 /*break*/, 3];
@@ -5463,7 +5769,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                                 throw ClientConfigurationError.createMissingSshJwkError();
                             }
                         }
-                        _b.label = 3;
+                        _d.label = 3;
                     case 3:
                         correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
                         parameterBuilder.addCorrelationId(correlationId);
@@ -5508,9 +5814,9 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         }
                         // Add hybrid spa parameters if not already provided
                         if (request.enableSpaAuthorizationCode && (!request.tokenBodyParameters || !request.tokenBodyParameters[exports.AADServerParamKeys.RETURN_SPA_CODE])) {
-                            parameterBuilder.addExtraQueryParameters((_a = {},
-                                _a[exports.AADServerParamKeys.RETURN_SPA_CODE] = "1",
-                                _a));
+                            parameterBuilder.addExtraQueryParameters((_c = {},
+                                _c[exports.AADServerParamKeys.RETURN_SPA_CODE] = "1",
+                                _c));
                         }
                         return [2 /*return*/, parameterBuilder.createQueryString()];
                 }
@@ -5522,11 +5828,13 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      * @param request
      */
     AuthorizationCodeClient.prototype.createAuthCodeUrlQueryString = function (request) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var parameterBuilder, requestScopes, correlationId, accountSid, accountLoginHintClaim, clientInfo, clientInfo, clientInfo, popTokenGenerator, reqCnfData;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthClientCreateQueryString, request.correlationId);
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
                         requestScopes = __spreadArrays(request.scopes || [], request.extraScopesToConsent || []);
@@ -5637,9 +5945,9 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        reqCnfData = _a.sent();
+                        reqCnfData = _b.sent();
                         parameterBuilder.addPopToken(reqCnfData.reqCnfHash);
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2: return [2 /*return*/, parameterBuilder.createQueryString()];
                 }
             });
@@ -5731,8 +6039,10 @@ var DeviceCodeClient = /** @class */ (function (_super) {
      */
     DeviceCodeClient.prototype.getDeviceCode = function (request) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryString, headers, thumbprint;
+            var queryParametersString, endpoint, queryString, headers, thumbprint;
             return __generator(this, function (_a) {
+                queryParametersString = this.createExtraQueryParameters(request);
+                endpoint = UrlString.appendQueryString(this.authority.deviceCodeEndpoint, queryParametersString);
                 queryString = this.createQueryString(request);
                 headers = this.createTokenRequestHeaders();
                 thumbprint = {
@@ -5746,10 +6056,21 @@ var DeviceCodeClient = /** @class */ (function (_super) {
                     shrClaims: request.shrClaims,
                     sshKid: request.sshKid
                 };
-                return [2 /*return*/, this.executePostRequestToDeviceCodeEndpoint(this.authority.deviceCodeEndpoint, queryString, headers, thumbprint)];
+                return [2 /*return*/, this.executePostRequestToDeviceCodeEndpoint(endpoint, queryString, headers, thumbprint)];
             });
         });
     };
+    /**
+     * Creates query string for the device code request
+     * @param request
+     */
+    DeviceCodeClient.prototype.createExtraQueryParameters = function (request) {
+        var parameterBuilder = new RequestParameterBuilder();
+        if (request.extraQueryParameters) {
+            parameterBuilder.addExtraQueryParameters(request.extraQueryParameters);
+        }
+        return parameterBuilder.createQueryString();
+    };
     /**
      * Executes POST request to device code endpoint
      * @param deviceCodeEndpoint
@@ -5763,8 +6084,7 @@ var DeviceCodeClient = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, deviceCodeEndpoint, {
                             body: queryString,
-                            headers: headers,
-                            proxyUrl: this.config.systemOptions.proxyUrl
+                            headers: headers
                         })];
                     case 1:
                         _a = (_b.sent()).body, userCode = _a.user_code, deviceCode = _a.device_code, verificationUri = _a.verification_uri, expiresIn = _a.expires_in, interval = _a.interval, message = _a.message;
@@ -5787,6 +6107,9 @@ var DeviceCodeClient = /** @class */ (function (_super) {
         var parameterBuilder = new RequestParameterBuilder();
         parameterBuilder.addScopes(request.scopes);
         parameterBuilder.addClientId(this.config.authOptions.clientId);
+        if (request.extraQueryParameters) {
+            parameterBuilder.addExtraQueryParameters(request.extraQueryParameters);
+        }
         if (!StringUtils.isEmpty(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
             parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
         }
@@ -5823,10 +6146,12 @@ var DeviceCodeClient = /** @class */ (function (_super) {
      */
     DeviceCodeClient.prototype.acquireTokenWithDeviceCode = function (request, deviceCodeResponse) {
         return __awaiter(this, void 0, void 0, function () {
-            var requestBody, headers, userSpecifiedTimeout, deviceCodeExpirationTime, pollingIntervalMilli, thumbprint, response;
+            var queryParametersString, endpoint, requestBody, headers, userSpecifiedTimeout, deviceCodeExpirationTime, pollingIntervalMilli, thumbprint, response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        queryParametersString = this.createTokenQueryParameters(request);
+                        endpoint = UrlString.appendQueryString(this.authority.tokenEndpoint, queryParametersString);
                         requestBody = this.createTokenRequestBody(request, deviceCodeResponse);
                         headers = this.createTokenRequestHeaders();
                         userSpecifiedTimeout = request.timeout ? TimeUtils.nowSeconds() + request.timeout : undefined;
@@ -5846,7 +6171,7 @@ var DeviceCodeClient = /** @class */ (function (_super) {
                             shrClaims: request.shrClaims,
                             sshKid: request.sshKid
                         };
-                        return [4 /*yield*/, this.executePostToTokenEndpoint(this.authority.tokenEndpoint, requestBody, headers, thumbprint)];
+                        return [4 /*yield*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
                     case 2:
                         response = _a.sent();
                         if (!(response.body && response.body.error)) return [3 /*break*/, 6];
@@ -5872,167 +6197,37 @@ var DeviceCodeClient = /** @class */ (function (_super) {
                          */
                         this.logger.error("Polling stopped for unknown reasons.");
                         throw ClientAuthError.createDeviceCodeUnknownError();
-                }
-            });
-        });
-    };
-    /**
-     * Creates query parameters and converts to string.
-     * @param request
-     * @param deviceCodeResponse
-     */
-    DeviceCodeClient.prototype.createTokenRequestBody = function (request, deviceCodeResponse) {
-        var requestParameters = new RequestParameterBuilder();
-        requestParameters.addScopes(request.scopes);
-        requestParameters.addClientId(this.config.authOptions.clientId);
-        requestParameters.addGrantType(GrantType.DEVICE_CODE_GRANT);
-        requestParameters.addDeviceCode(deviceCodeResponse.deviceCode);
-        var correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
-        requestParameters.addCorrelationId(correlationId);
-        requestParameters.addClientInfo();
-        requestParameters.addLibraryInfo(this.config.libraryInfo);
-        requestParameters.addApplicationTelemetry(this.config.telemetry.application);
-        requestParameters.addThrottling();
-        if (this.serverTelemetryManager) {
-            requestParameters.addServerTelemetry(this.serverTelemetryManager);
-        }
-        if (!StringUtils.isEmptyObj(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
-            requestParameters.addClaims(request.claims, this.config.authOptions.clientCapabilities);
-        }
-        return requestParameters.createQueryString();
-    };
-    return DeviceCodeClient;
-}(BaseClient));
-
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
- *
- * @export
- * @enum {number}
- */
-exports.PerformanceEvents = void 0;
-(function (PerformanceEvents) {
-    /**
-     * acquireTokenByCode API (msal-browser and msal-node).
-     * Used to acquire tokens by trading an authorization code against the token endpoint.
-     */
-    PerformanceEvents["AcquireTokenByCode"] = "acquireTokenByCode";
-    /**
-     * acquireTokenByRefreshToken API (msal-browser and msal-node).
-     * Used to renew an access token using a refresh token against the token endpoint.
-     */
-    PerformanceEvents["AcquireTokenByRefreshToken"] = "acquireTokenByRefreshToken";
-    /**
-     * acquireTokenSilent API (msal-browser and msal-node).
-     * Used to silently acquire a new access token (from the cache or the network).
-     */
-    PerformanceEvents["AcquireTokenSilent"] = "acquireTokenSilent";
-    /**
-     * acquireTokenSilentAsync (msal-browser).
-     * Internal API for acquireTokenSilent.
-     */
-    PerformanceEvents["AcquireTokenSilentAsync"] = "acquireTokenSilentAsync";
-    /**
-     * acquireTokenPopup (msal-browser).
-     * Used to acquire a new access token interactively through pop ups
-     */
-    PerformanceEvents["AcquireTokenPopup"] = "acquireTokenPopup";
-    /**
-     * getPublicKeyThumbprint API in CryptoOpts class (msal-browser).
-     * Used to generate a public/private keypair and generate a public key thumbprint for pop requests.
-     */
-    PerformanceEvents["CryptoOptsGetPublicKeyThumbprint"] = "cryptoOptsGetPublicKeyThumbprint";
-    /**
-     * signJwt API in CryptoOpts class (msal-browser).
-     * Used to signed a pop token.
-     */
-    PerformanceEvents["CryptoOptsSignJwt"] = "cryptoOptsSignJwt";
-    /**
-     * acquireToken API in the SilentCacheClient class (msal-browser).
-     * Used to read access tokens from the cache.
-     */
-    PerformanceEvents["SilentCacheClientAcquireToken"] = "silentCacheClientAcquireToken";
-    /**
-     * acquireToken API in the SilentIframeClient class (msal-browser).
-     * Used to acquire a new set of tokens from the authorize endpoint in a hidden iframe.
-     */
-    PerformanceEvents["SilentIframeClientAcquireToken"] = "silentIframeClientAcquireToken";
-    /**
-     * acquireToken API in SilentRereshClient (msal-browser).
-     * Used to acquire a new set of tokens from the token endpoint using a refresh token.
-     */
-    PerformanceEvents["SilentRefreshClientAcquireToken"] = "silentRefreshClientAcquireToken";
-    /**
-     * ssoSilent API (msal-browser).
-     * Used to silently acquire an authorization code and set of tokens using a hidden iframe.
-     */
-    PerformanceEvents["SsoSilent"] = "ssoSilent";
-    /**
-     * getDiscoveredAuthority API in StandardInteractionClient class (msal-browser).
-     * Used to load authority metadata for a request.
-     */
-    PerformanceEvents["StandardInteractionClientGetDiscoveredAuthority"] = "standardInteractionClientGetDiscoveredAuthority";
-    /**
-     * acquireToken APIs in msal-browser.
-     * Used to make an /authorize endpoint call with native brokering enabled.
-     */
-    PerformanceEvents["FetchAccountIdWithNativeBroker"] = "fetchAccountIdWithNativeBroker";
-    /**
-     * acquireToken API in NativeInteractionClient class (msal-browser).
-     * Used to acquire a token from Native component when native brokering is enabled.
-     */
-    PerformanceEvents["NativeInteractionClientAcquireToken"] = "nativeInteractionClientAcquireToken";
-    /**
-     * Time spent creating default headers for requests to token endpoint
-     */
-    PerformanceEvents["BaseClientCreateTokenRequestHeaders"] = "baseClientCreateTokenRequestHeaders";
-    /**
-     * Used to measure the time taken for completing embedded-broker handshake (PW-Broker).
-     */
-    PerformanceEvents["BrokerHandhshake"] = "brokerHandshake";
-    /**
-     * acquireTokenByRefreshToken API in BrokerClientApplication (PW-Broker) .
-     */
-    PerformanceEvents["AcquireTokenByRefreshTokenInBroker"] = "acquireTokenByRefreshTokenInBroker";
-    /**
-     * Time taken for token acquisition by broker
-     */
-    PerformanceEvents["AcquireTokenByBroker"] = "acquireTokenByBroker";
-    /**
-     * Time spent on the network for refresh token acquisition
-     */
-    PerformanceEvents["RefreshTokenClientExecuteTokenRequest"] = "refreshTokenClientExecuteTokenRequest";
-    /**
-     * Time taken for acquiring refresh token , records RT size
-     */
-    PerformanceEvents["RefreshTokenClientAcquireToken"] = "refreshTokenClientAcquireToken";
-    /**
-     * Time taken for acquiring cached refresh token
-     */
-    PerformanceEvents["RefreshTokenClientAcquireTokenWithCachedRefreshToken"] = "refreshTokenClientAcquireTokenWithCachedRefreshToken";
-    PerformanceEvents["AcquireTokenByCodeAsync"] = "acquireTokenByCodeAsync";
-    PerformanceEvents["GetEndpointMetadataFromNetwork"] = "getEndpointMetadataFromNetwork";
-    PerformanceEvents["GetCloudDiscoveryMetadataFromNetworkMeasurement"] = "getCloudDiscoveryMetadataFromNetworkMeasurement";
-    PerformanceEvents["HandleRedirectPromiseMeasurement"] = "handleRedirectPromiseMeasurement";
-    PerformanceEvents["UpdateCloudDiscoveryMetadataMeasurement"] = "updateCloudDiscoveryMetadataMeasurement";
-    PerformanceEvents["UsernamePasswordClientAcquireToken"] = "usernamePasswordClientAcquireToken";
-})(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
-/**
- * State of the performance event.
- *
- * @export
- * @enum {number}
- */
-exports.PerformanceEventStatus = void 0;
-(function (PerformanceEventStatus) {
-    PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
-    PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
-    PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
-})(exports.PerformanceEventStatus || (exports.PerformanceEventStatus = {}));
+                }
+            });
+        });
+    };
+    /**
+     * Creates query parameters and converts to string.
+     * @param request
+     * @param deviceCodeResponse
+     */
+    DeviceCodeClient.prototype.createTokenRequestBody = function (request, deviceCodeResponse) {
+        var requestParameters = new RequestParameterBuilder();
+        requestParameters.addScopes(request.scopes);
+        requestParameters.addClientId(this.config.authOptions.clientId);
+        requestParameters.addGrantType(GrantType.DEVICE_CODE_GRANT);
+        requestParameters.addDeviceCode(deviceCodeResponse.deviceCode);
+        var correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
+        requestParameters.addCorrelationId(correlationId);
+        requestParameters.addClientInfo();
+        requestParameters.addLibraryInfo(this.config.libraryInfo);
+        requestParameters.addApplicationTelemetry(this.config.telemetry.application);
+        requestParameters.addThrottling();
+        if (this.serverTelemetryManager) {
+            requestParameters.addServerTelemetry(this.serverTelemetryManager);
+        }
+        if (!StringUtils.isEmptyObj(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
+            requestParameters.addClaims(request.claims, this.config.authOptions.clientCapabilities);
+        }
+        return requestParameters.createQueryString();
+    };
+    return DeviceCodeClient;
+}(BaseClient));
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6047,31 +6242,34 @@ var RefreshTokenClient = /** @class */ (function (_super) {
         return _super.call(this, configuration, performanceClient) || this;
     }
     RefreshTokenClient.prototype.acquireToken = function (request) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function () {
             var atsMeasurement, reqTimestamp, response, httpVerToken, requestId, responseHandler;
             var _this = this;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
-                        atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
+                        atsMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
                         this.logger.verbose("RefreshTokenClientAcquireToken called", request.correlationId);
                         reqTimestamp = TimeUtils.nowSeconds();
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
                         return [4 /*yield*/, this.executeTokenRequest(request, this.authority)];
                     case 1:
-                        response = _e.sent();
-                        httpVerToken = (_b = response.headers) === null || _b === void 0 ? void 0 : _b[exports.HeaderNames.X_MS_HTTP_VERSION];
+                        response = _h.sent();
+                        httpVerToken = (_d = response.headers) === null || _d === void 0 ? void 0 : _d[exports.HeaderNames.X_MS_HTTP_VERSION];
                         atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
-                            refreshTokenSize: ((_c = response.body.refresh_token) === null || _c === void 0 ? void 0 : _c.length) || 0,
+                            refreshTokenSize: ((_e = response.body.refresh_token) === null || _e === void 0 ? void 0 : _e.length) || 0,
                         });
                         if (httpVerToken) {
                             atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.addStaticFields({
                                 httpVerToken: httpVerToken,
                             });
                         }
-                        requestId = (_d = response.headers) === null || _d === void 0 ? void 0 : _d[exports.HeaderNames.X_MS_REQUEST_ID];
+                        requestId = (_f = response.headers) === null || _f === void 0 ? void 0 : _f[exports.HeaderNames.X_MS_REQUEST_ID];
                         responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
                         responseHandler.validateTokenResponse(response.body);
+                        (_g = this.performanceClient) === null || _g === void 0 ? void 0 : _g.setPreQueueTime(exports.PerformanceEvents.HandleServerTokenResponse, request.correlationId);
                         return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId).then(function (result) {
                                 atsMeasurement === null || atsMeasurement === void 0 ? void 0 : atsMeasurement.endMeasurement({
                                     success: true
@@ -6096,13 +6294,15 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param request
      */
     RefreshTokenClient.prototype.acquireTokenByRefreshToken = function (request) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
             var isFOCI, noFamilyRTInCache, clientMismatchErrorWithFamilyRT;
-            return __generator(this, function (_a) {
+            return __generator(this, function (_e) {
                 // Cannot renew token if no request object is given.
                 if (!request) {
                     throw ClientConfigurationError.createEmptyTokenRequestError();
                 }
+                (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, request.correlationId);
                 // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
                 if (!request.account) {
                     throw ClientAuthError.createNoAccountInSilentRequestError();
@@ -6111,6 +6311,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                 // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
                 if (isFOCI) {
                     try {
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                         return [2 /*return*/, this.acquireTokenWithCachedRefreshToken(request, true)];
                     }
                     catch (e) {
@@ -6118,6 +6319,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         clientMismatchErrorWithFamilyRT = e instanceof ServerError && e.errorCode === Errors.INVALID_GRANT_ERROR && e.subError === Errors.CLIENT_MISMATCH_ERROR;
                         // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
                         if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
+                            (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                             return [2 /*return*/, this.acquireTokenWithCachedRefreshToken(request, false)];
                             // throw in all other cases
                         }
@@ -6127,6 +6329,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                     }
                 }
                 // fall back to application refresh token acquisition
+                (_d = this.performanceClient) === null || _d === void 0 ? void 0 : _d.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                 return [2 /*return*/, this.acquireTokenWithCachedRefreshToken(request, false)];
             });
         });
@@ -6136,11 +6339,12 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param request
      */
     RefreshTokenClient.prototype.acquireTokenWithCachedRefreshToken = function (request, foci) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var atsMeasurement, refreshToken, refreshTokenRequest;
-            return __generator(this, function (_b) {
-                atsMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
+            return __generator(this, function (_d) {
+                (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
+                atsMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
                 this.logger.verbose("RefreshTokenClientAcquireTokenWithCachedRefreshToken called", request.correlationId);
                 refreshToken = this.cacheManager.readRefreshTokenFromCache(this.config.authOptions.clientId, request.account, foci);
                 if (!refreshToken) {
@@ -6155,6 +6359,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         credential: request.account.homeAccountId,
                         type: exports.CcsCredentialType.HOME_ACCOUNT_ID
                     } });
+                (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
                 return [2 /*return*/, this.acquireToken(refreshTokenRequest)];
             });
         });
@@ -6165,17 +6370,20 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param authority
      */
     RefreshTokenClient.prototype.executeTokenRequest = function (request, authority) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var acquireTokenMeasurement, requestBody, queryParameters, headers, thumbprint, endpoint;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var acquireTokenMeasurement, queryParametersString, endpoint, requestBody, headers, thumbprint;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                        acquireTokenMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, request.correlationId);
+                        queryParametersString = this.createTokenQueryParameters(request);
+                        endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
                         return [4 /*yield*/, this.createTokenRequestBody(request)];
                     case 1:
-                        requestBody = _b.sent();
-                        queryParameters = this.createTokenQueryParameters(request);
+                        requestBody = _d.sent();
                         headers = this.createTokenRequestHeaders(request.ccsCredential);
                         thumbprint = {
                             clientId: this.config.authOptions.clientId,
@@ -6188,7 +6396,6 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                             shrClaims: request.shrClaims,
                             sshKid: request.sshKid
                         };
-                        endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParameters);
                         return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)
                                 .then(function (result) {
                                 acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
@@ -6206,30 +6413,20 @@ var RefreshTokenClient = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * Creates query string for the /token request
-     * @param request
-     */
-    RefreshTokenClient.prototype.createTokenQueryParameters = function (request) {
-        var parameterBuilder = new RequestParameterBuilder();
-        if (request.tokenQueryParameters) {
-            parameterBuilder.addExtraQueryParameters(request.tokenQueryParameters);
-        }
-        return parameterBuilder.createQueryString();
-    };
     /**
      * Helper function to create the token request body
      * @param request
      */
     RefreshTokenClient.prototype.createTokenRequestBody = function (request) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var correlationId, acquireTokenMeasurement, parameterBuilder, clientAssertion, popTokenGenerator, reqCnfData, clientInfo;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, request.correlationId);
                         correlationId = request.correlationId;
-                        acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
+                        acquireTokenMeasurement = (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.startMeasurement(exports.PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
                         parameterBuilder.addScopes(request.scopes);
@@ -6252,10 +6449,11 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                             parameterBuilder.addClientAssertionType(clientAssertion.assertionType);
                         }
                         if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
-                        popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
+                        popTokenGenerator = new PopTokenGenerator(this.cryptoUtils, this.performanceClient);
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.PopTokenGenerateCnf, request.correlationId);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        reqCnfData = _b.sent();
+                        reqCnfData = _d.sent();
                         // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
                         parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                         return [3 /*break*/, 3];
@@ -6271,7 +6469,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                                 throw ClientConfigurationError.createMissingSshJwkError();
                             }
                         }
-                        _b.label = 3;
+                        _d.label = 3;
                     case 3:
                         if (!StringUtils.isEmptyObj(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
                             parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
@@ -6403,7 +6601,7 @@ var ClientCredentialClient = /** @class */ (function (_super) {
      */
     ClientCredentialClient.prototype.executeTokenRequest = function (request, authority) {
         return __awaiter(this, void 0, void 0, function () {
-            var serverTokenResponse, reqTimestamp, appTokenPropviderParameters, appTokenProviderResult, requestBody, headers, thumbprint, response, responseHandler, tokenResponse;
+            var serverTokenResponse, reqTimestamp, appTokenPropviderParameters, appTokenProviderResult, queryParametersString, endpoint, requestBody, headers, thumbprint, response, responseHandler, tokenResponse;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6427,6 +6625,8 @@ var ClientCredentialClient = /** @class */ (function (_super) {
                         };
                         return [3 /*break*/, 4];
                     case 2:
+                        queryParametersString = this.createTokenQueryParameters(request);
+                        endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
                         requestBody = this.createTokenRequestBody(request);
                         headers = this.createTokenRequestHeaders();
                         thumbprint = {
@@ -6441,7 +6641,7 @@ var ClientCredentialClient = /** @class */ (function (_super) {
                             sshKid: request.sshKid
                         };
                         reqTimestamp = TimeUtils.nowSeconds();
-                        return [4 /*yield*/, this.executePostToTokenEndpoint(authority.tokenEndpoint, requestBody, headers, thumbprint)];
+                        return [4 /*yield*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
                     case 3:
                         response = _a.sent();
                         serverTokenResponse = response.body;
@@ -6657,10 +6857,12 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
      */
     OnBehalfOfClient.prototype.executeTokenRequest = function (request, authority, userAssertionHash) {
         return __awaiter(this, void 0, void 0, function () {
-            var requestBody, headers, thumbprint, reqTimestamp, response, responseHandler, tokenResponse;
+            var queryParametersString, endpoint, requestBody, headers, thumbprint, reqTimestamp, response, responseHandler, tokenResponse;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        queryParametersString = this.createTokenQueryParameters(request);
+                        endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
                         requestBody = this.createTokenRequestBody(request);
                         headers = this.createTokenRequestHeaders();
                         thumbprint = {
@@ -6675,7 +6877,7 @@ var OnBehalfOfClient = /** @class */ (function (_super) {
                             sshKid: request.sshKid
                         };
                         reqTimestamp = TimeUtils.nowSeconds();
-                        return [4 /*yield*/, this.executePostToTokenEndpoint(authority.tokenEndpoint, requestBody, headers, thumbprint)];
+                        return [4 /*yield*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
                     case 1:
                         response = _a.sent();
                         responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
@@ -6897,8 +7099,15 @@ var UsernamePasswordClient = /** @class */ (function (_super) {
      */
     UsernamePasswordClient.prototype.executeTokenRequest = function (authority, request) {
         return __awaiter(this, void 0, void 0, function () {
-            var thumbprint, requestBody, headers;
+            var queryParametersString, endpoint, requestBody, headers, thumbprint;
             return __generator(this, function (_a) {
+                queryParametersString = this.createTokenQueryParameters(request);
+                endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
+                requestBody = this.createTokenRequestBody(request);
+                headers = this.createTokenRequestHeaders({
+                    credential: request.username,
+                    type: exports.CcsCredentialType.UPN
+                });
                 thumbprint = {
                     clientId: this.config.authOptions.clientId,
                     authority: authority.canonicalAuthority,
@@ -6910,12 +7119,7 @@ var UsernamePasswordClient = /** @class */ (function (_super) {
                     shrClaims: request.shrClaims,
                     sshKid: request.sshKid
                 };
-                requestBody = this.createTokenRequestBody(request);
-                headers = this.createTokenRequestHeaders({
-                    credential: request.username,
-                    type: exports.CcsCredentialType.UPN
-                });
-                return [2 /*return*/, this.executePostToTokenEndpoint(authority.tokenEndpoint, requestBody, headers, thumbprint)];
+                return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
             });
         });
     };
@@ -7089,61 +7293,65 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
  * Licensed under the MIT License.
  */
 var RegionDiscovery = /** @class */ (function () {
-    function RegionDiscovery(networkInterface) {
+    function RegionDiscovery(networkInterface, performanceClient, correlationId) {
         this.networkInterface = networkInterface;
+        this.performanceClient = performanceClient;
+        this.correlationId = correlationId;
     }
     /**
      * Detect the region from the application's environment.
      *
      * @returns Promise<string | null>
      */
-    RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata, proxyUrl) {
+    RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
             var autodetectedRegionName, options, localIMDSVersionResponse, currentIMDSVersion, currentIMDSVersionResponse;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
                         autodetectedRegionName = environmentRegion;
                         if (!!autodetectedRegionName) return [3 /*break*/, 8];
                         options = RegionDiscovery.IMDS_OPTIONS;
-                        if (proxyUrl) {
-                            options.proxyUrl = proxyUrl;
-                        }
-                        _a.label = 1;
+                        _e.label = 1;
                     case 1:
-                        _a.trys.push([1, 6, , 7]);
+                        _e.trys.push([1, 6, , 7]);
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryGetRegionFromIMDS, this.correlationId);
                         return [4 /*yield*/, this.getRegionFromIMDS(Constants.IMDS_VERSION, options)];
                     case 2:
-                        localIMDSVersionResponse = _a.sent();
+                        localIMDSVersionResponse = _e.sent();
                         if (localIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
                             autodetectedRegionName = localIMDSVersionResponse.body;
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.IMDS;
                         }
                         if (!(localIMDSVersionResponse.status === ResponseCodes.httpBadRequest)) return [3 /*break*/, 5];
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryGetCurrentVersion, this.correlationId);
                         return [4 /*yield*/, this.getCurrentVersion(options)];
                     case 3:
-                        currentIMDSVersion = _a.sent();
+                        currentIMDSVersion = _e.sent();
                         if (!currentIMDSVersion) {
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.FAILED_AUTO_DETECTION;
                             return [2 /*return*/, null];
                         }
+                        (_d = this.performanceClient) === null || _d === void 0 ? void 0 : _d.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryGetRegionFromIMDS, this.correlationId);
                         return [4 /*yield*/, this.getRegionFromIMDS(currentIMDSVersion, options)];
                     case 4:
-                        currentIMDSVersionResponse = _a.sent();
+                        currentIMDSVersionResponse = _e.sent();
                         if (currentIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
                             autodetectedRegionName = currentIMDSVersionResponse.body;
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.IMDS;
                         }
-                        _a.label = 5;
+                        _e.label = 5;
                     case 5: return [3 /*break*/, 7];
                     case 6:
-                        _a.sent();
+                        _e.sent();
                         regionDiscoveryMetadata.region_source = RegionDiscoverySources.FAILED_AUTO_DETECTION;
                         return [2 /*return*/, null];
                     case 7: return [3 /*break*/, 9];
                     case 8:
                         regionDiscoveryMetadata.region_source = RegionDiscoverySources.ENVIRONMENT_VARIABLE;
-                        _a.label = 9;
+                        _e.label = 9;
                     case 9:
                         // If no region was auto detected from the environment or from the IMDS endpoint, mark the attempt as a FAILED_AUTO_DETECTION
                         if (!autodetectedRegionName) {
@@ -7161,8 +7369,10 @@ var RegionDiscovery = /** @class */ (function () {
      * @returns Promise<NetworkResponse<string>>
      */
     RegionDiscovery.prototype.getRegionFromIMDS = function (version, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+            return __generator(this, function (_b) {
+                (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RegionDiscoveryGetRegionFromIMDS, this.correlationId);
                 return [2 /*return*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?api-version=" + version + "&format=text", options, Constants.IMDS_TIMEOUT)];
             });
         });
@@ -7173,24 +7383,28 @@ var RegionDiscovery = /** @class */ (function () {
      * @returns Promise<string | null>
      */
     RegionDiscovery.prototype.getCurrentVersion = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", options)];
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.RegionDiscoveryGetCurrentVersion, this.correlationId);
+                        _b.label = 1;
                     case 1:
-                        response = _a.sent();
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", options)];
+                    case 2:
+                        response = _b.sent();
                         // When IMDS endpoint is called without the api version query param, bad request response comes back with latest version.
                         if (response.status === ResponseCodes.httpBadRequest && response.body && response.body["newest-versions"] && response.body["newest-versions"].length > 0) {
                             return [2 /*return*/, response.body["newest-versions"][0]];
                         }
                         return [2 /*return*/, null];
-                    case 2:
-                        _a.sent();
+                    case 3:
+                        _b.sent();
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -7213,16 +7427,17 @@ var RegionDiscovery = /** @class */ (function () {
  * endpoint. It will store the pertinent config data in this object for use during token calls.
  */
 var Authority = /** @class */ (function () {
-    function Authority(authority, networkInterface, cacheManager, authorityOptions, logger, proxyUrl) {
+    function Authority(authority, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
         this.canonicalAuthority = authority;
         this._canonicalAuthority.validateAsUri();
         this.networkInterface = networkInterface;
         this.cacheManager = cacheManager;
         this.authorityOptions = authorityOptions;
-        this.regionDiscovery = new RegionDiscovery(networkInterface);
         this.regionDiscoveryMetadata = { region_used: undefined, region_source: undefined, region_outcome: undefined };
-        this.proxyUrl = proxyUrl || Constants.EMPTY_STRING;
         this.logger = logger;
+        this.performanceClient = performanceClient;
+        this.correlationId = correlationId;
+        this.regionDiscovery = new RegionDiscovery(networkInterface, this.performanceClient, this.correlationId);
     }
     Object.defineProperty(Authority.prototype, "authorityType", {
         // See above for AuthorityType
@@ -7459,23 +7674,27 @@ var Authority = /** @class */ (function () {
      * and the /authorize, /token and logout endpoints.
      */
     Authority.prototype.resolveEndpointsAsync = function () {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var metadataEntity, cloudDiscoverySource, endpointSource, cacheKey;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityResolveEndpointsAsync, this.correlationId);
                         metadataEntity = this.cacheManager.getAuthorityMetadataByAlias(this.hostnameAndPort);
                         if (!metadataEntity) {
                             metadataEntity = new AuthorityMetadataEntity();
                             metadataEntity.updateCanonicalAuthority(this.canonicalAuthority);
                         }
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateCloudDiscoveryMetadata, this.correlationId);
                         return [4 /*yield*/, this.updateCloudDiscoveryMetadata(metadataEntity)];
                     case 1:
-                        cloudDiscoverySource = _a.sent();
+                        cloudDiscoverySource = _d.sent();
                         this.canonicalAuthority = this.canonicalAuthority.replace(this.hostnameAndPort, metadataEntity.preferred_network);
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateEndpointMetadata, this.correlationId);
                         return [4 /*yield*/, this.updateEndpointMetadata(metadataEntity)];
                     case 2:
-                        endpointSource = _a.sent();
+                        endpointSource = _d.sent();
                         if (cloudDiscoverySource !== AuthorityMetadataSource.CACHE && endpointSource !== AuthorityMetadataSource.CACHE) {
                             // Reset the expiration time unless both values came from a successful cache lookup
                             metadataEntity.resetExpiresAt();
@@ -7494,12 +7713,13 @@ var Authority = /** @class */ (function () {
      * @param metadataEntity
      */
     Authority.prototype.updateEndpointMetadata = function (metadataEntity) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function () {
             var metadata, harcodedMetadata;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateEndpointMetadata, this.correlationId);
                         metadata = this.getEndpointMetadataFromConfig();
                         if (metadata) {
                             metadataEntity.updateEndpointMetadata(metadata, false);
@@ -7510,25 +7730,28 @@ var Authority = /** @class */ (function () {
                             return [2 /*return*/, AuthorityMetadataSource.CACHE];
                         }
                         harcodedMetadata = this.getEndpointMetadataFromHardcodedValues();
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthorityGetEndpointMetadataFromNetwork, this.correlationId);
                         return [4 /*yield*/, this.getEndpointMetadataFromNetwork()];
                     case 1:
-                        metadata = _c.sent();
+                        metadata = _g.sent();
                         if (!metadata) return [3 /*break*/, 4];
-                        if (!((_a = this.authorityOptions.azureRegionConfiguration) === null || _a === void 0 ? void 0 : _a.azureRegion)) return [3 /*break*/, 3];
+                        if (!((_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.azureRegion)) return [3 /*break*/, 3];
+                        (_d = this.performanceClient) === null || _d === void 0 ? void 0 : _d.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
                         return [4 /*yield*/, this.updateMetadataWithRegionalInformation(metadata)];
                     case 2:
-                        metadata = _c.sent();
-                        _c.label = 3;
+                        metadata = _g.sent();
+                        _g.label = 3;
                     case 3:
                         metadataEntity.updateEndpointMetadata(metadata, true);
                         return [2 /*return*/, AuthorityMetadataSource.NETWORK];
                     case 4:
                         if (!(harcodedMetadata && !this.authorityOptions.skipAuthorityMetadataCache)) return [3 /*break*/, 7];
-                        if (!((_b = this.authorityOptions.azureRegionConfiguration) === null || _b === void 0 ? void 0 : _b.azureRegion)) return [3 /*break*/, 6];
+                        if (!((_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion)) return [3 /*break*/, 6];
+                        (_f = this.performanceClient) === null || _f === void 0 ? void 0 : _f.setPreQueueTime(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
                         return [4 /*yield*/, this.updateMetadataWithRegionalInformation(harcodedMetadata)];
                     case 5:
-                        harcodedMetadata = _c.sent();
-                        _c.label = 6;
+                        harcodedMetadata = _g.sent();
+                        _g.label = 6;
                     case 6:
                         metadataEntity.updateEndpointMetadata(harcodedMetadata, false);
                         return [2 /*return*/, AuthorityMetadataSource.HARDCODED_VALUES];
@@ -7568,25 +7791,24 @@ var Authority = /** @class */ (function () {
      * @param hasHardcodedMetadata boolean
      */
     Authority.prototype.getEndpointMetadataFromNetwork = function () {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var options, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityGetEndpointMetadataFromNetwork, this.correlationId);
                         options = {};
-                        if (this.proxyUrl) {
-                            options.proxyUrl = this.proxyUrl;
-                        }
-                        _a.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _b.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this.networkInterface.
                                 sendGetRequestAsync(this.defaultOpenIdConfigurationEndpoint, options)];
                     case 2:
-                        response = _a.sent();
+                        response = _b.sent();
                         return [2 /*return*/, isOpenIdConfigResponse(response.body) ? response.body : null];
                     case 3:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/];
                 }
@@ -7606,25 +7828,28 @@ var Authority = /** @class */ (function () {
      * Update the retrieved metadata with regional information.
      */
     Authority.prototype.updateMetadataWithRegionalInformation = function (metadata) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function () {
             var autodetectedRegionName, azureRegion;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0: return [4 /*yield*/, this.regionDiscovery.detectRegion((_a = this.authorityOptions.azureRegionConfiguration) === null || _a === void 0 ? void 0 : _a.environmentRegion, this.regionDiscoveryMetadata, this.proxyUrl)];
+            return __generator(this, function (_h) {
+                switch (_h.label) {
+                    case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
+                        return [4 /*yield*/, this.regionDiscovery.detectRegion((_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.environmentRegion, this.regionDiscoveryMetadata)];
                     case 1:
-                        autodetectedRegionName = _f.sent();
-                        azureRegion = ((_b = this.authorityOptions.azureRegionConfiguration) === null || _b === void 0 ? void 0 : _b.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
+                        autodetectedRegionName = _h.sent();
+                        azureRegion = ((_d = this.authorityOptions.azureRegionConfiguration) === null || _d === void 0 ? void 0 : _d.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
                             ? autodetectedRegionName
-                            : (_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.azureRegion;
-                        if (((_d = this.authorityOptions.azureRegionConfiguration) === null || _d === void 0 ? void 0 : _d.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
+                            : (_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion;
+                        if (((_f = this.authorityOptions.azureRegionConfiguration) === null || _f === void 0 ? void 0 : _f.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
                             this.regionDiscoveryMetadata.region_outcome = autodetectedRegionName ?
                                 RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL :
                                 RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
                         }
                         else {
                             if (autodetectedRegionName) {
-                                this.regionDiscoveryMetadata.region_outcome = (((_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion) === autodetectedRegionName) ?
+                                this.regionDiscoveryMetadata.region_outcome = (((_g = this.authorityOptions.azureRegionConfiguration) === null || _g === void 0 ? void 0 : _g.azureRegion) === autodetectedRegionName) ?
                                     RegionDiscoveryOutcomes.CONFIGURED_MATCHES_DETECTED :
                                     RegionDiscoveryOutcomes.CONFIGURED_NOT_DETECTED;
                             }
@@ -7648,11 +7873,13 @@ var Authority = /** @class */ (function () {
      * @param newMetadata
      */
     Authority.prototype.updateCloudDiscoveryMetadata = function (metadataEntity) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var metadata, metadataEntityExpired, harcodedMetadata;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateCloudDiscoveryMetadata, this.correlationId);
                         this.logger.verbose("Attempting to get cloud discovery metadata in the config");
                         this.logger.verbosePii("Known Authorities: " + (this.authorityOptions.knownAuthorities || Constants.NOT_APPLICABLE));
                         this.logger.verbosePii("Authority Metadata: " + (this.authorityOptions.authorityMetadata || Constants.NOT_APPLICABLE));
@@ -7675,9 +7902,10 @@ var Authority = /** @class */ (function () {
                             this.logger.verbose("The metadata entity is expired.");
                         }
                         this.logger.verbose("Did not find cloud discovery metadata in the cache... Attempting to get cloud discovery metadata from the network.");
+                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.AuthorityGetCloudDiscoveryMetadataFromNetwork, this.correlationId);
                         return [4 /*yield*/, this.getCloudDiscoveryMetadataFromNetwork()];
                     case 1:
-                        metadata = _a.sent();
+                        metadata = _c.sent();
                         if (metadata) {
                             this.logger.verbose("cloud discovery metadata was successfully returned from getCloudDiscoveryMetadataFromNetwork()");
                             metadataEntity.updateCloudDiscoveryMetadata(metadata, true);
@@ -7735,23 +7963,22 @@ var Authority = /** @class */ (function () {
      * @param hasHardcodedMetadata boolean
      */
     Authority.prototype.getCloudDiscoveryMetadataFromNetwork = function () {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var instanceDiscoveryEndpoint, options, match, response, typedResponseBody, metadata, error_1, typedError;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityGetCloudDiscoveryMetadataFromNetwork, this.correlationId);
                         instanceDiscoveryEndpoint = "" + Constants.AAD_INSTANCE_DISCOVERY_ENDPT + this.canonicalAuthority + "oauth2/v2.0/authorize";
                         options = {};
-                        if (this.proxyUrl) {
-                            options.proxyUrl = this.proxyUrl;
-                        }
                         match = null;
-                        _a.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _b.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(instanceDiscoveryEndpoint, options)];
                     case 2:
-                        response = _a.sent();
+                        response = _b.sent();
                         typedResponseBody = void 0;
                         metadata = void 0;
                         if (isCloudInstanceDiscoveryResponse(response.body)) {
@@ -7779,7 +8006,7 @@ var Authority = /** @class */ (function () {
                         match = Authority.getCloudDiscoveryMetadataFromNetworkResponse(metadata, this.hostnameAndPort);
                         return [3 /*break*/, 4];
                     case 3:
-                        error_1 = _a.sent();
+                        error_1 = _b.sent();
                         if (error_1 instanceof AuthError) {
                             this.logger.error("There was a network error while attempting to get the cloud discovery instance metadata.\nError: " + error_1.errorCode + "\nError Description: " + error_1.errorMessage);
                         }
@@ -7941,16 +8168,18 @@ var AuthorityFactory = /** @class */ (function () {
      * @param networkClient
      * @param protocolMode
      */
-    AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions, logger, proxyUrl) {
+    AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
         return __awaiter(this, void 0, void 0, function () {
             var acquireTokenAuthority, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions, logger, proxyUrl);
+                        performanceClient === null || performanceClient === void 0 ? void 0 : performanceClient.addQueueMeasurement(exports.PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance, correlationId);
+                        acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions, logger, performanceClient, correlationId);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
+                        performanceClient === null || performanceClient === void 0 ? void 0 : performanceClient.setPreQueueTime(exports.PerformanceEvents.AuthorityResolveEndpointsAsync, correlationId);
                         return [4 /*yield*/, acquireTokenAuthority.resolveEndpointsAsync()];
                     case 2:
                         _a.sent();
@@ -7973,12 +8202,12 @@ var AuthorityFactory = /** @class */ (function () {
      * @param networkInterface
      * @param protocolMode
      */
-    AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions, logger, proxyUrl) {
+    AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId) {
         // Throw error if authority url is empty
         if (StringUtils.isEmpty(authorityUrl)) {
             throw ClientConfigurationError.createUrlEmptyError();
         }
-        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, logger, proxyUrl);
+        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, logger, performanceClient, correlationId);
     };
     return AuthorityFactory;
 }());
@@ -8124,8 +8353,8 @@ var JoseHeader = /** @class */ (function () {
             throw JoseHeaderError.createMissingAlgError();
         }
         var shrHeader = new JoseHeader({
-            // Access Token PoP headers must have type JWT, but the type header can be overriden for special cases
-            typ: shrHeaderOptions.typ || JsonTypes.Jwt,
+            // Access Token PoP headers must have type pop, but the type header can be overriden for special cases
+            typ: shrHeaderOptions.typ || JsonTypes.Pop,
             kid: shrHeaderOptions.kid,
             alg: shrHeaderOptions.alg
         });
@@ -8376,9 +8605,8 @@ var PerformanceClient = /** @class */ (function () {
         this.logger = logger;
         this.callbacks = new Map();
         this.eventsByCorrelationId = new Map();
-        this.staticFieldsByCorrelationId = new Map();
-        this.measurementsById = new Map();
-        this.countersByCorrelationId = new Map();
+        this.queueMeasurements = new Map();
+        this.preQueueTimeByCorrelationId = new Map();
     }
     /**
      * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
@@ -8404,6 +8632,93 @@ var PerformanceClient = /** @class */ (function () {
     PerformanceClient.prototype.startPerformanceMeasuremeant = function (measureName, correlationId) {
         return {};
     };
+    /**
+     * Get integral fields.
+     * Override to change the set.
+     */
+    PerformanceClient.prototype.getIntFields = function () {
+        return IntFields;
+    };
+    /**
+     * Gets map of pre-queue times by correlation Id
+     *
+     * @param {PerformanceEvents} eventName
+     * @param {string} correlationId
+     * @returns {number}
+     */
+    PerformanceClient.prototype.getPreQueueTime = function (eventName, correlationId) {
+        var preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
+        if (!preQueueEvent) {
+            this.logger.trace("PerformanceClient.getPreQueueTime: no pre-queue times found for correlationId: " + correlationId + ", unable to add queue measurement");
+            return;
+        }
+        else if (preQueueEvent.name !== eventName) {
+            this.logger.trace("PerformanceClient.getPreQueueTime: no pre-queue time found for " + eventName + ", unable to add queue measurement");
+            return;
+        }
+        return preQueueEvent.time;
+    };
+    /**
+     * Calculates the difference between current time and time when function was queued.
+     * Note: It is possible to have 0 as the queue time if the current time and the queued time was the same.
+     *
+     * @param {number} preQueueTime
+     * @param {number} currentTime
+     * @returns {number}
+     */
+    PerformanceClient.prototype.calculateQueuedTime = function (preQueueTime, currentTime) {
+        if (preQueueTime < 1) {
+            this.logger.trace("PerformanceClient: preQueueTime should be a positive integer and not " + preQueueTime);
+            return 0;
+        }
+        if (currentTime < 1) {
+            this.logger.trace("PerformanceClient: currentTime should be a positive integer and not " + currentTime);
+            return 0;
+        }
+        if (currentTime < preQueueTime) {
+            this.logger.trace("PerformanceClient: currentTime is less than preQueueTime, check how time is being retrieved");
+            return 0;
+        }
+        return currentTime - preQueueTime;
+    };
+    /**
+     * Adds queue measurement time to QueueMeasurements array for given correlation ID.
+     *
+     * @param {PerformanceEvents} eventName
+     * @param {?string} correlationId
+     * @param {?number} queueTime
+     * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
+     * @returns
+     */
+    PerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime, manuallyCompleted) {
+        if (!correlationId) {
+            this.logger.trace("PerformanceClient.addQueueMeasurement: correlationId not provided for " + eventName + ", cannot add queue measurement");
+            return;
+        }
+        if (queueTime === 0) {
+            // Possible for there to be no queue time after calculation
+            this.logger.trace("PerformanceClient.addQueueMeasurement: queue time provided for " + eventName + " is " + queueTime);
+        }
+        else if (!queueTime) {
+            this.logger.trace("PerformanceClient.addQueueMeasurement: no queue time provided for " + eventName);
+            return;
+        }
+        var queueMeasurement = { eventName: eventName, queueTime: queueTime, manuallyCompleted: manuallyCompleted };
+        // Adds to existing correlation Id if present in queueMeasurements
+        var existingMeasurements = this.queueMeasurements.get(correlationId);
+        if (existingMeasurements) {
+            existingMeasurements.push(queueMeasurement);
+            this.queueMeasurements.set(correlationId, existingMeasurements);
+        }
+        else {
+            // Sets new correlation Id if not present in queueMeasurements
+            this.logger.trace("PerformanceClient.addQueueMeasurement: adding correlationId " + correlationId + " to queue measurements");
+            var measurementArray = [queueMeasurement];
+            this.queueMeasurements.set(correlationId, measurementArray);
+        }
+        // Delete processed pre-queue event.
+        this.preQueueTimeByCorrelationId.delete(correlationId);
+    };
     /**
      * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
      *
@@ -8421,17 +8736,8 @@ var PerformanceClient = /** @class */ (function () {
         }
         // Duplicate code to address spelling error will be removed at the next major version bump.
         this.logger.trace("PerformanceClient: Performance measurement started for " + measureName, eventCorrelationId);
-        var validMeasurement;
-        var performanceMeasuremeant = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
-        if (performanceMeasuremeant.startMeasurement) {
-            performanceMeasuremeant.startMeasurement();
-            validMeasurement = performanceMeasuremeant;
-        }
-        else {
-            var performanceMeasurement = this.startPerformanceMeasurement(measureName, eventCorrelationId);
-            performanceMeasurement.startMeasurement();
-            validMeasurement = performanceMeasurement;
-        }
+        var performanceMeasurement = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
+        performanceMeasurement.startMeasurement();
         var inProgressEvent = {
             eventId: this.generateId(),
             status: exports.PerformanceEventStatus.InProgress,
@@ -8442,27 +8748,15 @@ var PerformanceClient = /** @class */ (function () {
             name: measureName,
             startTimeMs: Date.now(),
             correlationId: eventCorrelationId,
-        };
-        // Store in progress events so they can be discarded if not ended properly
-        this.cacheEventByCorrelationId(inProgressEvent);
-        var staticFields = {
             appName: (_a = this.applicationTelemetry) === null || _a === void 0 ? void 0 : _a.appName,
             appVersion: (_b = this.applicationTelemetry) === null || _b === void 0 ? void 0 : _b.appVersion,
         };
-        this.addStaticFields(staticFields, eventCorrelationId);
-        this.cacheMeasurement(inProgressEvent, validMeasurement);
+        // Store in progress events so they can be discarded if not ended properly
+        this.cacheEventByCorrelationId(inProgressEvent);
         // Return the event and functions the caller can use to properly end/flush the measurement
         return {
             endMeasurement: function (event) {
-                var completedEvent = _this.endMeasurement(__assign(__assign({}, inProgressEvent), event));
-                if (completedEvent) {
-                    // Cache event so that submeasurements can be added downstream
-                    _this.cacheEventByCorrelationId(completedEvent);
-                }
-                return completedEvent;
-            },
-            flushMeasurement: function () {
-                return _this.flushMeasurements(inProgressEvent.name, inProgressEvent.correlationId);
+                return _this.endMeasurement(__assign(__assign({}, inProgressEvent), event), performanceMeasurement);
             },
             discardMeasurement: function () {
                 return _this.discardMeasurements(inProgressEvent.correlationId);
@@ -8473,40 +8767,66 @@ var PerformanceClient = /** @class */ (function () {
             increment: function (counters) {
                 return _this.increment(counters, inProgressEvent.correlationId);
             },
-            measurement: validMeasurement,
+            measurement: performanceMeasurement,
             event: inProgressEvent
         };
     };
     /**
      * Stops measuring the performance for an operation. Should only be called directly by PerformanceClient classes,
      * as consumers should instead use the function returned by startMeasurement.
+     * Adds a new field named as "[event name]DurationMs" for sub-measurements, completes and emits an event
+     * otherwise.
      *
      * @param {PerformanceEvent} event
+     * @param {IPerformanceMeasurement} measurement
      * @returns {(PerformanceEvent | null)}
      */
-    PerformanceClient.prototype.endMeasurement = function (event) {
-        var performanceMeasurement = this.measurementsById.get(event.eventId);
-        if (performanceMeasurement) {
-            // Immediately delete so that the same event isnt ended twice
-            this.measurementsById.delete(event.eventId);
-            performanceMeasurement.endMeasurement();
-            var durationMs = performanceMeasurement.flushMeasurement();
-            // null indicates no measurement was taken (e.g. needed performance APIs not present)
-            if (durationMs !== null) {
-                this.logger.trace("PerformanceClient: Performance measurement ended for " + event.name + ": " + durationMs + " ms", event.correlationId);
-                var completedEvent = __assign(__assign({ 
-                    // Allow duration to be overwritten when event ends (e.g. testing), but not status
-                    durationMs: Math.round(durationMs) }, event), { status: exports.PerformanceEventStatus.Completed });
-                return completedEvent;
-            }
-            else {
-                this.logger.trace("PerformanceClient: Performance measurement not taken", event.correlationId);
-            }
+    PerformanceClient.prototype.endMeasurement = function (event, measurement) {
+        var _this = this;
+        var _a, _b;
+        var rootEvent = this.eventsByCorrelationId.get(event.correlationId);
+        if (!rootEvent) {
+            this.logger.trace("PerformanceClient: Measurement not found for " + event.eventId, event.correlationId);
+            return null;
+        }
+        var isRoot = event.eventId === rootEvent.eventId;
+        var queueInfo = {
+            totalQueueTime: 0,
+            totalQueueCount: 0,
+            manuallyCompletedCount: 0
+        };
+        if (isRoot) {
+            queueInfo = this.getQueueInfo(event.correlationId);
+            this.discardCache(rootEvent.correlationId);
         }
         else {
-            this.logger.trace("PerformanceClient: Measurement not found for " + event.eventId, event.correlationId);
+            (_a = rootEvent.incompleteSubMeasurements) === null || _a === void 0 ? void 0 : _a.delete(event.eventId);
         }
-        return null;
+        measurement === null || measurement === void 0 ? void 0 : measurement.endMeasurement();
+        var durationMs = measurement === null || measurement === void 0 ? void 0 : measurement.flushMeasurement();
+        // null indicates no measurement was taken (e.g. needed performance APIs not present)
+        if (!durationMs) {
+            this.logger.trace("PerformanceClient: Performance measurement not taken", rootEvent.correlationId);
+            return null;
+        }
+        this.logger.trace("PerformanceClient: Performance measurement ended for " + event.name + ": " + durationMs + " ms", event.correlationId);
+        // Add sub-measurement attribute to root event.
+        if (!isRoot) {
+            rootEvent[event.name + "DurationMs"] = Math.floor(durationMs);
+            return __assign({}, rootEvent);
+        }
+        var finalEvent = __assign(__assign({}, rootEvent), event);
+        var incompleteSubsCount = 0;
+        // Incomplete sub-measurements are discarded. They are likely an instrumentation bug that should be fixed.
+        (_b = finalEvent.incompleteSubMeasurements) === null || _b === void 0 ? void 0 : _b.forEach(function (subMeasurement) {
+            _this.logger.trace("PerformanceClient: Incomplete submeasurement " + subMeasurement.name + " found for " + event.name, finalEvent.correlationId);
+            incompleteSubsCount++;
+        });
+        finalEvent.incompleteSubMeasurements = undefined;
+        finalEvent = __assign(__assign({}, finalEvent), { durationMs: Math.round(durationMs), queuedTimeMs: queueInfo.totalQueueTime, queuedCount: queueInfo.totalQueueCount, queuedManuallyCompletedCount: queueInfo.manuallyCompletedCount, status: exports.PerformanceEventStatus.Completed, incompleteSubsCount: incompleteSubsCount });
+        this.truncateIntegralFields(finalEvent, this.getIntFields());
+        this.emitEvents([finalEvent], event.correlationId);
+        return finalEvent;
     };
     /**
      * Saves extra information to be emitted when the measurements are flushed
@@ -8514,14 +8834,13 @@ var PerformanceClient = /** @class */ (function () {
      * @param correlationId
      */
     PerformanceClient.prototype.addStaticFields = function (fields, correlationId) {
-        var existingStaticFields = this.staticFieldsByCorrelationId.get(correlationId);
-        if (existingStaticFields) {
-            this.logger.trace("PerformanceClient: Updating static fields");
-            this.staticFieldsByCorrelationId.set(correlationId, __assign(__assign({}, existingStaticFields), fields));
+        this.logger.trace("PerformanceClient: Updating static fields");
+        var event = this.eventsByCorrelationId.get(correlationId);
+        if (event) {
+            this.eventsByCorrelationId.set(correlationId, __assign(__assign({}, event), fields));
         }
         else {
-            this.logger.trace("PerformanceClient: Adding static fields");
-            this.staticFieldsByCorrelationId.set(correlationId, fields);
+            this.logger.trace("PerformanceClient: Event not found for", correlationId);
         }
     };
     /**
@@ -8530,18 +8849,18 @@ var PerformanceClient = /** @class */ (function () {
      * @param correlationId {string} correlation identifier
      */
     PerformanceClient.prototype.increment = function (counters, correlationId) {
-        var existing = this.countersByCorrelationId.get(correlationId);
-        if (!existing) {
-            this.logger.trace("PerformanceClient: Setting counters");
-            this.countersByCorrelationId.set(correlationId, __assign({}, counters));
-            return;
-        }
         this.logger.trace("PerformanceClient: Updating counters");
-        for (var counter in counters) {
-            if (!existing.hasOwnProperty(counter)) {
-                existing[counter] = 0;
+        var event = this.eventsByCorrelationId.get(correlationId);
+        if (event) {
+            for (var counter in counters) {
+                if (!event.hasOwnProperty(counter)) {
+                    event[counter] = 0;
+                }
+                event[counter] += counters[counter];
             }
-            existing[counter] += counters[counter];
+        }
+        else {
+            this.logger.trace("PerformanceClient: Event not found for", correlationId);
         }
     };
     /**
@@ -8554,100 +8873,35 @@ var PerformanceClient = /** @class */ (function () {
      * @param {PerformanceEvent} event
      */
     PerformanceClient.prototype.cacheEventByCorrelationId = function (event) {
-        var existingEvents = this.eventsByCorrelationId.get(event.correlationId);
-        if (existingEvents) {
+        var rootEvent = this.eventsByCorrelationId.get(event.correlationId);
+        if (rootEvent) {
             this.logger.trace("PerformanceClient: Performance measurement for " + event.name + " added/updated", event.correlationId);
-            existingEvents.set(event.eventId, event);
+            rootEvent.incompleteSubMeasurements = rootEvent.incompleteSubMeasurements || new Map();
+            rootEvent.incompleteSubMeasurements.set(event.eventId, { name: event.name, startTimeMs: event.startTimeMs });
         }
         else {
             this.logger.trace("PerformanceClient: Performance measurement for " + event.name + " started", event.correlationId);
-            this.eventsByCorrelationId.set(event.correlationId, new Map().set(event.eventId, event));
+            this.eventsByCorrelationId.set(event.correlationId, __assign({}, event));
         }
     };
-    /**
-     * Cache measurements by their id.
-     *
-     * @private
-     * @param {PerformanceEvent} event
-     * @param {IPerformanceMeasurement} measurement
-     */
-    PerformanceClient.prototype.cacheMeasurement = function (event, measurement) {
-        this.measurementsById.set(event.eventId, measurement);
-    };
-    /**
-     * Gathers and emits performance events for measurements taked for the given top-level API and correlation ID.
-     *
-     * @param {PerformanceEvents} measureName
-     * @param {string} correlationId
-     */
-    PerformanceClient.prototype.flushMeasurements = function (measureName, correlationId) {
-        var _this = this;
-        this.logger.trace("PerformanceClient: Performance measurements flushed for " + measureName, correlationId);
-        var eventsForCorrelationId = this.eventsByCorrelationId.get(correlationId);
-        var staticFields = this.staticFieldsByCorrelationId.get(correlationId);
-        var counters = this.countersByCorrelationId.get(correlationId);
-        if (eventsForCorrelationId) {
-            this.discardCache(correlationId);
-            /*
-             * Manually end incomplete submeasurements to ensure there arent orphaned/never ending events.
-             * Incomplete submeasurements are likely an instrumentation bug that should be fixed.
-             * IE only supports Map.forEach.
-             */
-            var completedEvents_1 = [];
-            eventsForCorrelationId.forEach(function (event) {
-                if (event.name !== measureName && event.status !== exports.PerformanceEventStatus.Completed) {
-                    _this.logger.trace("PerformanceClient: Incomplete submeasurement " + event.name + " found for " + measureName, correlationId);
-                    var completedEvent = _this.endMeasurement(event);
-                    if (completedEvent) {
-                        completedEvents_1.push(completedEvent);
-                    }
-                }
-                completedEvents_1.push(event);
-            });
-            // Sort events by start time (earliest first)
-            var sortedCompletedEvents = completedEvents_1.sort(function (eventA, eventB) { return eventA.startTimeMs - eventB.startTimeMs; });
-            // Take completed top level event and add completed submeasurements durations as properties
-            var topLevelEvents = sortedCompletedEvents.filter(function (event) { return event.name === measureName && event.status === exports.PerformanceEventStatus.Completed; });
-            if (topLevelEvents.length > 0) {
-                /*
-                 * Only take the first top-level event if there are multiple events with the same correlation id.
-                 * This greatly simplifies logic for submeasurements.
-                 */
-                if (topLevelEvents.length > 1) {
-                    this.logger.verbose("PerformanceClient: Multiple distinct top-level performance events found, using the first", correlationId);
-                }
-                var topLevelEvent = topLevelEvents[0];
-                this.logger.verbose("PerformanceClient: Measurement found for " + measureName, correlationId);
-                // Build event object with top level and sub measurements
-                var eventToEmit = sortedCompletedEvents.reduce(function (previous, current) {
-                    if (current.name !== measureName) {
-                        _this.logger.trace("PerformanceClient: Complete submeasurement found for " + current.name, correlationId);
-                        // TODO: Emit additional properties for each subMeasurement
-                        var subMeasurementName = current.name + "DurationMs";
-                        /*
-                         * Some code paths, such as resolving an authority, can occur multiple times.
-                         * Only take the first measurement, since the second could be read from the cache,
-                         * or due to the same correlation id being used for two distinct requests.
-                         */
-                        if (!previous[subMeasurementName]) {
-                            previous[subMeasurementName] = current.durationMs;
-                        }
-                        else {
-                            _this.logger.verbose("PerformanceClient: Submeasurement for " + measureName + " already exists for " + current.name + ", ignoring", correlationId);
-                        }
-                    }
-                    return previous;
-                }, topLevelEvent);
-                var finalEvent = __assign(__assign(__assign({}, eventToEmit), staticFields), counters);
-                this.emitEvents([finalEvent], eventToEmit.correlationId);
-            }
-            else {
-                this.logger.verbose("PerformanceClient: No completed top-level measurements found for " + measureName, correlationId);
-            }
-        }
-        else {
-            this.logger.verbose("PerformanceClient: No measurements found", correlationId);
+    PerformanceClient.prototype.getQueueInfo = function (correlationId) {
+        var queueMeasurementForCorrelationId = this.queueMeasurements.get(correlationId);
+        if (!queueMeasurementForCorrelationId) {
+            this.logger.trace("PerformanceClient: no queue measurements found for for correlationId: " + correlationId);
         }
+        var totalQueueTime = 0;
+        var totalQueueCount = 0;
+        var manuallyCompletedCount = 0;
+        queueMeasurementForCorrelationId === null || queueMeasurementForCorrelationId === void 0 ? void 0 : queueMeasurementForCorrelationId.forEach(function (measurement) {
+            totalQueueTime += measurement.queueTime;
+            totalQueueCount++;
+            manuallyCompletedCount += measurement.manuallyCompleted ? 1 : 0;
+        });
+        return {
+            totalQueueTime: totalQueueTime,
+            totalQueueCount: totalQueueCount,
+            manuallyCompletedCount: manuallyCompletedCount
+        };
     };
     /**
      * Removes measurements for a given correlation id.
@@ -8661,14 +8915,14 @@ var PerformanceClient = /** @class */ (function () {
     /**
      * Removes cache for a given correlation id.
      *
-     * @param {string} correlation identifier
+     * @param {string} correlationId correlation identifier
      */
     PerformanceClient.prototype.discardCache = function (correlationId) {
         this.discardMeasurements(correlationId);
-        this.logger.trace("PerformanceClient: Static fields discarded", correlationId);
-        this.staticFieldsByCorrelationId.delete(correlationId);
-        this.logger.trace("PerformanceClient: Counters discarded", correlationId);
-        this.countersByCorrelationId.delete(correlationId);
+        this.logger.trace("PerformanceClient: QueueMeasurements discarded", correlationId);
+        this.queueMeasurements.delete(correlationId);
+        this.logger.trace("PerformanceClient: Pre-queue times discarded", correlationId);
+        this.preQueueTimeByCorrelationId.delete(correlationId);
     };
     /**
      * Registers a callback function to receive performance events.
@@ -8712,6 +8966,18 @@ var PerformanceClient = /** @class */ (function () {
             callback.apply(null, [events]);
         });
     };
+    /**
+     * Enforce truncation of integral fields in performance event.
+     * @param {PerformanceEvent} event performance event to update.
+     * @param {Set<string>} intFields integral fields.
+     */
+    PerformanceClient.prototype.truncateIntegralFields = function (event, intFields) {
+        intFields.forEach(function (key) {
+            if (key in event && typeof event[key] === "number") {
+                event[key] = Math.floor(event[key]);
+            }
+        });
+    };
     return PerformanceClient;
 }());
 
@@ -8745,6 +9011,18 @@ var StubPerformanceClient = /** @class */ (function (_super) {
     StubPerformanceClient.prototype.startPerformanceMeasurement = function () {
         return new StubPerformanceMeasurement();
     };
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+    StubPerformanceClient.prototype.calculateQueuedTime = function (preQueueTime, currentTime) {
+        return 0;
+    };
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+    StubPerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime) {
+        return;
+    };
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+    StubPerformanceClient.prototype.setPreQueueTime = function (eventName, correlationId) {
+        return;
+    };
     return StubPerformanceClient;
 }(PerformanceClient));
 
@@ -8776,6 +9054,7 @@ exports.DeviceCodeClient = DeviceCodeClient;
 exports.Errors = Errors;
 exports.IdToken = AuthToken;
 exports.IdTokenEntity = IdTokenEntity;
+exports.IntFields = IntFields;
 exports.InteractionRequiredAuthError = InteractionRequiredAuthError;
 exports.InteractionRequiredAuthErrorMessage = InteractionRequiredAuthErrorMessage;
 exports.JoseHeader = JoseHeader;