@azure/msal-common 10.0.0 → 11.0.0

package/dist/telemetry/performance/PerformanceClient.d.ts

@@ -3,6 +3,10 @@ import { Logger } from "../../logger/Logger";
 import { InProgressPerformanceEvent, IPerformanceClient, PerformanceCallbackFunction, QueueMeasurement } from "./IPerformanceClient";
 import { IPerformanceMeasurement } from "./IPerformanceMeasurement";
 import { Counters, PerformanceEvent, PerformanceEvents, StaticFields } from "./PerformanceEvent";
+export interface PreQueueEvent {
+    name: PerformanceEvents;
+    time: number;
+}
 export declare abstract class PerformanceClient implements IPerformanceClient {
     protected authority: string;
     protected libraryName: string;
@@ -13,34 +17,17 @@ export declare abstract class PerformanceClient implements IPerformanceClient {
     protected callbacks: Map<string, PerformanceCallbackFunction>;
     /**
      * Multiple events with the same correlation id.
-     * Double keyed by correlation id and event id.
      * @protected
-     * @type {Map<string, Map<string, PerformanceEvent>>}
-     */
-    protected eventsByCorrelationId: Map<string, Map<string, PerformanceEvent>>;
-    /**
-     * Fields to be emitted which are scoped to the top level request and whose value will not change in submeasurements
-     * For example: App name, version, etc.
+     * @type {Map<string, PerformanceEvent>}
      */
-    protected staticFieldsByCorrelationId: Map<string, StaticFields>;
-    /**
-     * Counters to be emitted which are scoped to the top level request and whose value may change in sub-measurements
-     */
-    protected countersByCorrelationId: Map<string, Counters>;
-    /**
-     * Underlying performance measurements for each operation
-     *
-     * @protected
-     * @type {Map<string, IPerformanceMeasurement>}
-     */
-    protected measurementsById: Map<string, IPerformanceMeasurement>;
+    protected eventsByCorrelationId: Map<string, PerformanceEvent>;
     /**
      * Map of pre-queue times by correlation Id
      *
      * @protected
-     * @type {Map<string, Map<string, number>>}
+     * @type {Map<string, PreQueueEvent>}
      */
-    protected preQueueTimeByCorrelationId: Map<string, Map<string, number>>;
+    protected preQueueTimeByCorrelationId: Map<string, PreQueueEvent>;
     /**
      * Map of queue measurements by correlation Id
      *
@@ -119,12 +106,13 @@ export declare abstract class PerformanceClient implements IPerformanceClient {
     /**
      * Adds queue measurement time to QueueMeasurements array for given correlation ID.
      *
-     * @param {PerformanceEvents} name
+     * @param {PerformanceEvents} eventName
      * @param {?string} correlationId
-     * @param {?number} time
+     * @param {?number} queueTime
+     * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
      * @returns
      */
-    addQueueMeasurement(eventName: PerformanceEvents, correlationId?: string, queueTime?: number): void;
+    addQueueMeasurement(eventName: PerformanceEvents, correlationId?: string, queueTime?: number, manuallyCompleted?: boolean): void;
     /**
      * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
      *
@@ -136,11 +124,14 @@ export declare abstract class PerformanceClient implements IPerformanceClient {
     /**
      * 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)}
      */
-    endMeasurement(event: PerformanceEvent): PerformanceEvent | null;
+    endMeasurement(event: PerformanceEvent, measurement?: IPerformanceMeasurement): PerformanceEvent | null;
     /**
      * Saves extra information to be emitted when the measurements are flushed
      * @param fields
@@ -163,21 +154,7 @@ export declare abstract class PerformanceClient implements IPerformanceClient {
      * @param {PerformanceEvent} event
      */
     private cacheEventByCorrelationId;
-    /**
-     * Cache measurements by their id.
-     *
-     * @private
-     * @param {PerformanceEvent} event
-     * @param {IPerformanceMeasurement} measurement
-     */
-    private cacheMeasurement;
-    /**
-     * Gathers and emits performance events for measurements taked for the given top-level API and correlation ID.
-     *
-     * @param {PerformanceEvents} measureName
-     * @param {string} correlationId
-     */
-    flushMeasurements(measureName: PerformanceEvents, correlationId: string): void;
+    private getQueueInfo;
     /**
      * Removes measurements for a given correlation id.
      *
@@ -187,7 +164,7 @@ export declare abstract class PerformanceClient implements IPerformanceClient {
     /**
      * Removes cache for a given correlation id.
      *
-     * @param {string} correlation identifier
+     * @param {string} correlationId correlation identifier
      */
     private discardCache;
     /**

package/dist/telemetry/performance/PerformanceClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PerformanceClient.d.ts","sourceRoot":"","sources":["../../../src/telemetry/performance/PerformanceClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PerformanceClient.d.ts","sourceRoot":"","sources":["../../../src/telemetry/performance/PerformanceClient.ts"],"names":[],"mappings":"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"}

package/dist/telemetry/performance/PerformanceClient.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-common v10.0.0 2023-02-06 */
+/*! @azure/msal-common v11.0.0 2023-03-07 */
 'use strict';
 import { __assign } from '../../_virtual/_tslib.js';
 import { IntFields, PerformanceEventStatus } from './PerformanceEvent.js';
@@ -28,11 +28,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.queueMeasurements = new Map();
         this.preQueueTimeByCorrelationId = new Map();
-        this.countersByCorrelationId = new Map();
     }
     /**
      * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
@@ -73,16 +70,16 @@ var PerformanceClient = /** @class */ (function () {
      * @returns {number}
      */
     PerformanceClient.prototype.getPreQueueTime = function (eventName, correlationId) {
-        var preQueueTimesByEvents = this.preQueueTimeByCorrelationId.get(correlationId);
-        if (!preQueueTimesByEvents) {
+        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 (!preQueueTimesByEvents.get(eventName)) {
+        else if (preQueueEvent.name !== eventName) {
             this.logger.trace("PerformanceClient.getPreQueueTime: no pre-queue time found for " + eventName + ", unable to add queue measurement");
             return;
         }
-        return preQueueTimesByEvents.get(eventName);
+        return preQueueEvent.time;
     };
     /**
      * Calculates the difference between current time and time when function was queued.
@@ -110,12 +107,13 @@ var PerformanceClient = /** @class */ (function () {
     /**
      * Adds queue measurement time to QueueMeasurements array for given correlation ID.
      *
-     * @param {PerformanceEvents} name
+     * @param {PerformanceEvents} eventName
      * @param {?string} correlationId
-     * @param {?number} time
+     * @param {?number} queueTime
+     * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
      * @returns
      */
-    PerformanceClient.prototype.addQueueMeasurement = function (eventName, correlationId, queueTime) {
+    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;
@@ -128,7 +126,7 @@ var PerformanceClient = /** @class */ (function () {
             this.logger.trace("PerformanceClient.addQueueMeasurement: no queue time provided for " + eventName);
             return;
         }
-        var queueMeasurement = { eventName: eventName, queueTime: queueTime };
+        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) {
@@ -141,6 +139,8 @@ var PerformanceClient = /** @class */ (function () {
             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.
@@ -159,17 +159,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: PerformanceEventStatus.InProgress,
@@ -180,27 +171,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);
@@ -211,40 +190,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: 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);
+        }
+        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);
         }
-        return null;
+        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: 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
@@ -252,14 +257,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);
         }
     };
     /**
@@ -268,18 +272,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);
         }
     };
     /**
@@ -292,117 +296,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);
-        /**
-         * Adds all queue time and count measurements for given correlation ID
-         * then deletes queue times for given correlation ID from queueMeasurements map.
-         */
+    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;
         });
-        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 = [];
-            var incompleteSubsCount_1 = 0;
-            eventsForCorrelationId.forEach(function (event) {
-                if (event.name !== measureName && event.status !== PerformanceEventStatus.Completed) {
-                    _this.logger.trace("PerformanceClient: Incomplete submeasurement " + event.name + " found for " + measureName, correlationId);
-                    incompleteSubsCount_1++;
-                    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 === 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(__assign({}, eventToEmit), staticFields), counters), { queuedTimeMs: totalQueueTime, queuedCount: totalQueueCount, incompleteSubsCount: incompleteSubsCount_1 });
-                this.truncateIntegralFields(finalEvent, this.getIntFields());
-                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);
-        }
+        return {
+            totalQueueTime: totalQueueTime,
+            totalQueueCount: totalQueueCount,
+            manuallyCompletedCount: manuallyCompletedCount
+        };
     };
     /**
      * Removes measurements for a given correlation id.
@@ -416,14 +338,10 @@ 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);