@fluidframework/container-runtime 0.59.2001 → 0.59.3000-66610

package/dist/containerRuntime.js

@@ -115,11 +115,11 @@ function unpackRuntimeMessage(message) {
         else {
             // new format
             const innerContents = message.contents;
-            common_utils_1.assert(innerContents.type !== undefined, 0x121 /* "Undefined inner contents type!" */);
+            (0, common_utils_1.assert)(innerContents.type !== undefined, 0x121 /* "Undefined inner contents type!" */);
             message.type = innerContents.type;
             message.contents = innerContents.contents;
         }
-        common_utils_1.assert(isRuntimeMessage(message), 0x122 /* "Message to unpack is not proper runtime message" */);
+        (0, common_utils_1.assert)(isRuntimeMessage(message), 0x122 /* "Message to unpack is not proper runtime message" */);
     }
     else {
         // Legacy format, but it's already "unpacked",
@@ -164,7 +164,7 @@ class ScheduleManagerCore {
             this.trackPending(message);
         });
         // Start with baseline - empty inbound queue.
-        common_utils_1.assert(!this.localPaused, 0x293 /* "initial state" */);
+        (0, common_utils_1.assert)(!this.localPaused, 0x293 /* "initial state" */);
         const allPending = this.deltaManager.inbound.toArray();
         for (const pending of allPending) {
             this.trackPending(pending);
@@ -179,10 +179,10 @@ class ScheduleManagerCore {
      * to make decision if op processing should be paused or not afer that.
      */
     afterOpProcessing(sequenceNumber) {
-        common_utils_1.assert(!this.localPaused, 0x294 /* "can't have op processing paused if we are processing an op" */);
+        (0, common_utils_1.assert)(!this.localPaused, 0x294 /* "can't have op processing paused if we are processing an op" */);
         // If the inbound queue is ever empty, nothing to do!
         if (this.deltaManager.inbound.length === 0) {
-            common_utils_1.assert(this.pauseSequenceNumber === undefined, 0x295 /* "there should be no pending batch if we have no ops" */);
+            (0, common_utils_1.assert)(this.pauseSequenceNumber === undefined, 0x295 /* "there should be no pending batch if we have no ops" */);
             return;
         }
         // The queue is
@@ -192,7 +192,7 @@ class ScheduleManagerCore {
         // 2. resumed when batch end comes in (in trackPending())
         // do we have incomplete batch to worry about?
         if (this.pauseSequenceNumber !== undefined) {
-            common_utils_1.assert(sequenceNumber < this.pauseSequenceNumber, 0x296 /* "we should never start processing incomplete batch!" */);
+            (0, common_utils_1.assert)(sequenceNumber < this.pauseSequenceNumber, 0x296 /* "we should never start processing incomplete batch!" */);
             // If the next op is the start of incomplete batch, then we can't process it until it's fully in - pause!
             if (sequenceNumber + 1 === this.pauseSequenceNumber) {
                 this.pauseQueue();
@@ -200,7 +200,7 @@ class ScheduleManagerCore {
         }
     }
     pauseQueue() {
-        common_utils_1.assert(!this.localPaused, 0x297 /* "always called from resumed state" */);
+        (0, common_utils_1.assert)(!this.localPaused, 0x297 /* "always called from resumed state" */);
         this.localPaused = true;
         this.timePaused = common_utils_1.performance.now();
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -241,20 +241,20 @@ class ScheduleManagerCore {
      * Called for each incoming op (i.e. inbound "push" notification)
      */
     trackPending(message) {
-        common_utils_1.assert(this.deltaManager.inbound.length !== 0, 0x298 /* "we have something in the queue that generates this event" */);
-        common_utils_1.assert((this.currentBatchClientId === undefined) === (this.pauseSequenceNumber === undefined), 0x299 /* "non-synchronized state" */);
+        (0, common_utils_1.assert)(this.deltaManager.inbound.length !== 0, 0x298 /* "we have something in the queue that generates this event" */);
+        (0, common_utils_1.assert)((this.currentBatchClientId === undefined) === (this.pauseSequenceNumber === undefined), 0x299 /* "non-synchronized state" */);
         const metadata = message.metadata;
         const batchMetadata = metadata === null || metadata === void 0 ? void 0 : metadata.batch;
         // Protocol messages are never part of a runtime batch of messages
         if (!isRuntimeMessage(message)) {
             // Protocol messages should never show up in the middle of the batch!
-            common_utils_1.assert(this.currentBatchClientId === undefined, 0x29a /* "System message in the middle of batch!" */);
-            common_utils_1.assert(batchMetadata === undefined, 0x29b /* "system op in a batch?" */);
-            common_utils_1.assert(!this.localPaused, 0x29c /* "we should be processing ops when there is no active batch" */);
+            (0, common_utils_1.assert)(this.currentBatchClientId === undefined, 0x29a /* "System message in the middle of batch!" */);
+            (0, common_utils_1.assert)(batchMetadata === undefined, 0x29b /* "system op in a batch?" */);
+            (0, common_utils_1.assert)(!this.localPaused, 0x29c /* "we should be processing ops when there is no active batch" */);
             return;
         }
         if (this.currentBatchClientId === undefined && batchMetadata === undefined) {
-            common_utils_1.assert(!this.localPaused, 0x29d /* "we should be processing ops when there is no active batch" */);
+            (0, common_utils_1.assert)(!this.localPaused, 0x29d /* "we should be processing ops when there is no active batch" */);
             return;
         }
         // If the client ID changes then we can move the pause point. If it stayed the same then we need to check.
@@ -263,7 +263,7 @@ class ScheduleManagerCore {
         if (this.currentBatchClientId !== undefined || batchMetadata === false) {
             if (this.currentBatchClientId !== message.clientId) {
                 // "Batch not closed, yet message from another client!"
-                throw new container_utils_1.DataCorruptionError("OpBatchIncomplete", Object.assign({ batchClientId: this.currentBatchClientId }, container_utils_1.extractSafePropertiesFromMessage(message)));
+                throw new container_utils_1.DataCorruptionError("OpBatchIncomplete", Object.assign({ batchClientId: this.currentBatchClientId }, (0, container_utils_1.extractSafePropertiesFromMessage)(message)));
             }
         }
         // The queue is
@@ -272,8 +272,8 @@ class ScheduleManagerCore {
         //    - here (batchMetadata == false below), when queue was empty and start of batch showed up.
         // 2. resumed when batch end comes in (batchMetadata === true case below)
         if (batchMetadata) {
-            common_utils_1.assert(this.currentBatchClientId === undefined, 0x29e /* "there can't be active batch" */);
-            common_utils_1.assert(!this.localPaused, 0x29f /* "we should be processing ops when there is no active batch" */);
+            (0, common_utils_1.assert)(this.currentBatchClientId === undefined, 0x29e /* "there can't be active batch" */);
+            (0, common_utils_1.assert)(!this.localPaused, 0x29f /* "we should be processing ops when there is no active batch" */);
             this.pauseSequenceNumber = message.sequenceNumber;
             this.currentBatchClientId = message.clientId;
             // Start of the batch
@@ -284,7 +284,7 @@ class ScheduleManagerCore {
             }
         }
         else if (batchMetadata === false) {
-            common_utils_1.assert(this.pauseSequenceNumber !== undefined, 0x2a0 /* "batch presence was validated above" */);
+            (0, common_utils_1.assert)(this.pauseSequenceNumber !== undefined, 0x2a0 /* "batch presence was validated above" */);
             // Batch is complete, we can process it!
             this.resumeQueue(this.pauseSequenceNumber, message);
             this.pauseSequenceNumber = undefined;
@@ -292,7 +292,7 @@ class ScheduleManagerCore {
         }
         else {
             // Continuation of current batch. Do nothing
-            common_utils_1.assert(this.currentBatchClientId !== undefined, 0x2a1 /* "logic error" */);
+            (0, common_utils_1.assert)(this.currentBatchClientId !== undefined, 0x2a1 /* "logic error" */);
         }
     }
 }
@@ -315,7 +315,7 @@ class ScheduleManager {
     beforeOpProcessing(message) {
         var _a;
         if (this.batchClientId !== message.clientId) {
-            common_utils_1.assert(this.batchClientId === undefined, 0x2a2 /* "Batch is interrupted by other client op. Should be caught by trackPending()" */);
+            (0, common_utils_1.assert)(this.batchClientId === undefined, 0x2a2 /* "Batch is interrupted by other client op. Should be caught by trackPending()" */);
             // This could be the beginning of a new batch or an individual message.
             this.emitter.emit("batchBegin", message);
             this.deltaScheduler.batchBegin(message);
@@ -331,7 +331,7 @@ class ScheduleManager {
     afterOpProcessing(error, message) {
         var _a;
         // If this is no longer true, we need to revisit what we do where we set this.hitError.
-        common_utils_1.assert(!this.hitError, 0x2a3 /* "container should be closed on any error" */);
+        (0, common_utils_1.assert)(!this.hitError, 0x2a3 /* "container should be closed on any error" */);
         if (error) {
             // We assume here that loader will close container and stop processing all future ops.
             // This is implicit dependency. If this flow changes, this code might no longer be correct.
@@ -379,8 +379,8 @@ exports.getDeviceSpec = getDeviceSpec;
  * It will define the store level mappings.
  */
 class ContainerRuntime extends common_utils_1.TypedEventEmitter {
-    constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, requestHandler, _storage) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, requestHandler) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         super();
         this.context = context;
         this.registry = registry;
@@ -388,7 +388,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.containerScope = containerScope;
         this.logger = logger;
         this.requestHandler = requestHandler;
-        this._storage = _storage;
         this.defaultMaxConsecutiveReconnects = 15;
         this._orderSequentiallyCalls = 0;
         this.needsFlush = false;
@@ -406,7 +405,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
          * so we listen directly from DeltaManager instead.
          */
         this.onOp = (op) => {
-            common_utils_1.assert(!this.paused, 0x128 /* "Container should not already be paused before applying stashed ops" */);
+            (0, common_utils_1.assert)(!this.paused, 0x128 /* "Container should not already be paused before applying stashed ops" */);
             this.paused = true;
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.context.deltaManager.inbound.pause();
@@ -415,7 +414,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 this.paused = false;
                 this.context.deltaManager.inbound.resume();
             }, (error) => {
-                this.closeFn(telemetry_utils_1.normalizeError(error));
+                this.closeFn((0, telemetry_utils_1.normalizeError)(error));
             });
         };
         this.summarizeOnDemand = (...args) => {
@@ -447,36 +446,22 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
         };
         this.messageAtLastSummary = metadata === null || metadata === void 0 ? void 0 : metadata.message;
-        // If this is an existing container, we get values from metadata.
-        // otherwise, we initialize them.
-        if (existing) {
-            this.createContainerMetadata = {
-                createContainerRuntimeVersion: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerRuntimeVersion,
-                createContainerTimestamp: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerTimestamp,
-            };
-            this.summaryCount = metadata === null || metadata === void 0 ? void 0 : metadata.summaryCount;
-        }
-        else {
-            this.createContainerMetadata = {
-                createContainerRuntimeVersion: packageVersion_1.pkgVersion,
-                createContainerTimestamp: Date.now(),
-            };
-        }
         // Default to false (enabled).
         this.disableIsolatedChannels = (_a = this.runtimeOptions.summaryOptions.disableIsolatedChannels) !== null && _a !== void 0 ? _a : false;
         this._connected = this.context.connected;
         this.chunkMap = new Map(chunks);
         this.handleContext = new containerHandleContext_1.ContainerFluidHandleContext("", this);
-        this.mc = telemetry_utils_1.loggerToMonitoringContext(telemetry_utils_1.ChildLogger.create(this.logger, "ContainerRuntime"));
+        this.mc = (0, telemetry_utils_1.loggerToMonitoringContext)(telemetry_utils_1.ChildLogger.create(this.logger, "ContainerRuntime"));
         this._aliasingEnabled =
             ((_b = this.mc.config.getBoolean(useDataStoreAliasingKey)) !== null && _b !== void 0 ? _b : false) ||
                 ((_c = runtimeOptions.useDataStoreAliasing) !== null && _c !== void 0 ? _c : false);
         this._maxOpSizeInBytes = ((_d = this.mc.config.getNumber(maxOpSizeInBytesKey)) !== null && _d !== void 0 ? _d : defaultMaxOpSizeInBytes);
-        this.maxConsecutiveReconnects = (_e = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _e !== void 0 ? _e : this.defaultMaxConsecutiveReconnects;
+        this.maxConsecutiveReconnects =
+            (_e = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _e !== void 0 ? _e : this.defaultMaxConsecutiveReconnects;
         this._flushMode = runtimeOptions.flushMode;
-        this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (nodePath) => this.getGCNodePackagePath(nodePath), () => { var _a; return (_a = this.messageAtLastSummary) === null || _a === void 0 ? void 0 : _a.timestamp; }, context.baseSnapshot, async (id) => driver_utils_1.readAndParse(this.storage, id), this.mc.logger, existing, metadata);
+        this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (nodePath) => this.getGCNodePackagePath(nodePath), () => { var _a; return (_a = this.messageAtLastSummary) === null || _a === void 0 ? void 0 : _a.timestamp; }, context.baseSnapshot, async (id) => (0, driver_utils_1.readAndParse)(this.storage, id), this.mc.logger, existing, metadata);
         const loadedFromSequenceNumber = this.deltaManager.initialSequenceNumber;
-        this.summarizerNode = runtime_utils_1.createRootSummarizerNodeWithGC(telemetry_utils_1.ChildLogger.create(this.logger, "SummarizerNode"), 
+        this.summarizerNode = (0, runtime_utils_1.createRootSummarizerNodeWithGC)(telemetry_utils_1.ChildLogger.create(this.logger, "SummarizerNode"), 
         // Summarize function to call when summarize is called. Summarizer node always tracks summary state.
         async (fullTree, trackState) => this.summarizeInternal(fullTree, trackState), 
         // Latest change sequence number, no changes since summary applied yet
@@ -495,7 +480,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (this.context.baseSnapshot) {
             this.summarizerNode.loadBaseSummaryWithoutDifferential(this.context.baseSnapshot);
         }
-        this.dataStores = new dataStores_1.DataStores(dataStores_1.getSummaryForDatastores(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getBaseGCDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getBaseGCDetailsFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, async () => this.garbageCollector.getBaseGCDetails(), (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), new Map(dataStoreAliasMap), this.garbageCollector.writeDataAtRoot);
+        this.dataStores = new dataStores_1.DataStores((0, dataStores_1.getSummaryForDatastores)(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getBaseGCDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getBaseGCDetailsFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, async () => this.garbageCollector.getBaseGCDetails(), (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), new Map(dataStoreAliasMap), this.garbageCollector.writeDataAtRoot);
         this.blobManager = new blobManager_1.BlobManager(this.handleContext, blobManagerSnapshot, () => this.storage, (blobId) => this.submit(ContainerMessageType.BlobAttach, undefined, undefined, { blobId }), this, this.logger);
         this.scheduleManager = new ScheduleManager(context.deltaManager, this, telemetry_utils_1.ChildLogger.create(this.logger, "ScheduleManager"));
         this.deltaSender = this.deltaManager;
@@ -549,7 +534,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 this.summaryCollection, this.logger, this.formRequestSummarizerFn(this.context.loader), new throttler_1.Throttler(60 * 1000, // 60 sec delay window
                 30 * 1000, // 30 sec max delay
                 // throttling function increases exponentially (0ms, 40ms, 80ms, 160ms, etc)
-                throttler_1.formExponentialFn({ coefficient: 20, initialDelay: 0 })), {
+                (0, throttler_1.formExponentialFn)({ coefficient: 20, initialDelay: 0 })), {
                     initialDelayMs: this.runtimeOptions.summaryOptions.initialSummarizerDelayMs,
                 }, this.runtimeOptions.summaryOptions.summarizerOptions);
                 this.summaryManager.start();
@@ -558,7 +543,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.deltaManager.on("readonly", (readonly) => {
             // we accumulate ops while being in read-only state.
             // once user gets write permissions and we have active connection, flush all pending ops.
-            common_utils_1.assert(readonly === this.deltaManager.readOnlyInfo.readonly, 0x124 /* "inconsistent readonly property/event state" */);
+            (0, common_utils_1.assert)(readonly === this.deltaManager.readOnlyInfo.readonly, 0x124 /* "inconsistent readonly property/event state" */);
             // We need to be very careful with when we (re)send pending ops, to ensure that we only send ops
             // when we either never send an op, or attempted to send it but we know for sure it was not
             // sequenced by server and will never be sequenced (i.e. was lost)
@@ -571,7 +556,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // can rely on same safety mechanism and resend ops only when we establish new connection.
             // This is applicable for read-only permissions (event is raised before connection is properly registered),
             // but it's an extra requirement for Container.forceReadonly() API
-            common_utils_1.assert(!readonly || !this.connected, 0x125 /* "Unsafe to transition to read-only state!" */);
+            (0, common_utils_1.assert)(!readonly || !this.connected, 0x125 /* "Unsafe to transition to read-only state!" */);
             this.replayPendingStates();
         });
         if (context.pendingLocalState !== undefined) {
@@ -579,10 +564,29 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
         // logging hardware telemetry
         logger.sendTelemetryEvent(Object.assign({ eventName: "DeviceSpec" }, getDeviceSpec()));
-        // logging container load stats
-        this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryCount: this.summaryCount, summaryFormatVersion: metadata === null || metadata === void 0 ? void 0 : metadata.summaryFormatVersion, disableIsolatedChannels: metadata === null || metadata === void 0 ? void 0 : metadata.disableIsolatedChannels, gcVersion: metadata === null || metadata === void 0 ? void 0 : metadata.gcFeature }));
-        connectionTelemetry_1.ReportOpPerfTelemetry(this.context.clientId, this.deltaManager, this.logger);
-        batchTracker_1.BindBatchTracker(this, this.logger);
+        let loadSummaryNumber;
+        // Get the container creation metadata. For new container, we initialize these. For existing containers,
+        // get the values from the metadata blob.
+        if (existing) {
+            this.createContainerMetadata = {
+                createContainerRuntimeVersion: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerRuntimeVersion,
+                createContainerTimestamp: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerTimestamp,
+            };
+            // back-compat 0.59.3000 - Older document may either write summaryCount or not write it at all. If it does
+            // not write it, initialize summaryNumber to 0.
+            loadSummaryNumber = (_l = (_k = metadata === null || metadata === void 0 ? void 0 : metadata.summaryNumber) !== null && _k !== void 0 ? _k : metadata === null || metadata === void 0 ? void 0 : metadata.summaryCount) !== null && _l !== void 0 ? _l : 0;
+        }
+        else {
+            this.createContainerMetadata = {
+                createContainerRuntimeVersion: packageVersion_1.pkgVersion,
+                createContainerTimestamp: Date.now(),
+            };
+            loadSummaryNumber = 0;
+        }
+        this.nextSummaryNumber = loadSummaryNumber + 1;
+        this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryNumber: loadSummaryNumber, summaryFormatVersion: metadata === null || metadata === void 0 ? void 0 : metadata.summaryFormatVersion, disableIsolatedChannels: metadata === null || metadata === void 0 ? void 0 : metadata.disableIsolatedChannels, gcVersion: metadata === null || metadata === void 0 ? void 0 : metadata.gcFeature }));
+        (0, connectionTelemetry_1.ReportOpPerfTelemetry)(this.context.clientId, this.deltaManager, this.logger);
+        (0, batchTracker_1.BindBatchTracker)(this, this.logger);
         this.opTracker = new opTelemetry_1.OpTracker(this.deltaManager, this.mc.config.getBoolean(disableOpTrackingKey) === true);
     }
     get IContainerRuntime() { return this; }
@@ -607,28 +611,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             },
         });
         const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", useDataStoreAliasing = false, flushMode = defaultFlushMode, } = runtimeOptions;
-        // We pack at data store level only. If isolated channels are disabled,
-        // then there are no .channel layers, we pack at level 1, otherwise we pack at level 2
-        const packingLevel = summaryOptions.disableIsolatedChannels ? 1 : 2;
-        let storage = context.storage;
-        if (context.baseSnapshot) {
-            // This will patch snapshot in place!
-            // If storage is provided, it will wrap storage with BlobAggregationStorage that can
-            // pack & unpack aggregated blobs.
-            // Note that if storage is provided later by loader layer, we will wrap storage in this.storage getter.
-            // BlobAggregationStorage is smart enough for double-wrapping to be no-op
-            if (context.attachState === container_definitions_1.AttachState.Attached) {
-                // IContainerContext storage api return type still has undefined in 0.39 package version.
-                // So once we release 0.40 container-defn package we can remove this check.
-                common_utils_1.assert(context.storage !== undefined, 0x1f4 /* "Attached state should have storage" */);
-                const aggrStorage = driver_utils_1.BlobAggregationStorage.wrap(context.storage, logger, undefined /* allowPacking */, packingLevel);
-                await aggrStorage.unpackSnapshot(context.baseSnapshot);
-                storage = aggrStorage;
-            }
-            else {
-                await driver_utils_1.BlobAggregationStorage.unpackSnapshot(context.baseSnapshot);
-            }
-        }
+        const storage = context.storage;
         const registry = new dataStoreRegistry_1.FluidDataStoreRegistry(registryEntries);
         const tryFetchBlob = async (blobName) => {
             var _a;
@@ -636,8 +619,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             if (context.baseSnapshot && blobId) {
                 // IContainerContext storage api return type still has undefined in 0.39 package version.
                 // So once we release 0.40 container-defn package we can remove this check.
-                common_utils_1.assert(storage !== undefined, 0x1f5 /* "Attached state should have storage" */);
-                return driver_utils_1.readAndParse(storage, blobId);
+                (0, common_utils_1.assert)(storage !== undefined, 0x1f5 /* "Attached state should have storage" */);
+                return (0, driver_utils_1.readAndParse)(storage, blobId);
             }
         };
         const [chunks, metadata, electedSummarizerData, aliases] = await Promise.all([
@@ -651,8 +634,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         const blobManagerSnapshot = await blobManager_1.BlobManager.load((_b = context.baseSnapshot) === null || _b === void 0 ? void 0 : _b.trees[summaryFormat_1.blobsTreeName], async (id) => {
             // IContainerContext storage api return type still has undefined in 0.39 package version.
             // So once we release 0.40 container-defn package we can remove this check.
-            common_utils_1.assert(storage !== undefined, 0x256 /* "storage undefined in attached container" */);
-            return driver_utils_1.readAndParse(storage, id);
+            (0, common_utils_1.assert)(storage !== undefined, 0x256 /* "storage undefined in attached container" */);
+            return (0, driver_utils_1.readAndParse)(storage, id);
         });
         // Verify summary runtime sequence number matches protocol sequence number.
         const runtimeSequenceNumber = (_c = metadata === null || metadata === void 0 ? void 0 : metadata.message) === null || _c === void 0 ? void 0 : _c.sequenceNumber;
@@ -678,7 +661,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             loadSequenceNumberVerification,
             useDataStoreAliasing,
             flushMode,
-        }, containerScope, logger, loadExisting, blobManagerSnapshot, requestHandler, storage);
+        }, containerScope, logger, loadExisting, blobManagerSnapshot, requestHandler);
         return runtime;
     }
     get options() {
@@ -694,20 +677,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return this.context.deltaManager;
     }
     get storage() {
-        // This code is plain wrong. It lies that it never returns undefined!!!
-        // All callers should be fixed, as this API is called in detached state of container when we have
-        // no storage and it's passed down the stack without right typing.
-        // back-compat 0.40 NoStorageInDetachedMode. Also, IContainerContext storage api return type still
-        // has undefined in 0.39 package version.
-        // So once we release 0.40 container-defn package we can remove this check.
-        if (!this._storage && this.context.storage) {
-            // Note: BlobAggregationStorage is smart enough for double-wrapping to be no-op
-            // If isolated channels are disabled, then there are no .channel layers, we pack at level 1,
-            // otherwise we pack at level 2
-            this._storage = driver_utils_1.BlobAggregationStorage.wrap(this.context.storage, this.logger, undefined /* allowPacking */, this.disableIsolatedChannels ? 1 : 2);
-        }
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return this._storage;
+        return this.context.storage;
     }
     get reSubmitFn() {
         // eslint-disable-next-line @typescript-eslint/unbound-method
@@ -745,7 +715,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     get disposed() { return this._disposed; }
     get summarizer() {
-        common_utils_1.assert(this._summarizer !== undefined, 0x257 /* "This is not summarizing container" */);
+        (0, common_utils_1.assert)(this._summarizer !== undefined, 0x257 /* "This is not summarizing container" */);
         return this._summarizer;
     }
     get summariesDisabled() {
@@ -800,15 +770,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                         value: this.summarizer,
                     };
                 }
-                return runtime_utils_1.create404Response(request);
+                return (0, runtime_utils_1.create404Response)(request);
             }
             if (this.requestHandler !== undefined) {
                 return this.requestHandler(parser, this);
             }
-            return runtime_utils_1.create404Response(request);
+            return (0, runtime_utils_1.create404Response)(request);
         }
         catch (error) {
-            return runtime_utils_1.exceptionToResponse(error);
+            return (0, runtime_utils_1.exceptionToResponse)(error);
         }
     }
     /**
@@ -832,7 +802,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     };
                 }
                 else {
-                    return runtime_utils_1.create404Response(request);
+                    return (0, runtime_utils_1.create404Response)(request);
                 }
             }
             else if (requestParser.pathParts.length > 0) {
@@ -840,19 +810,20 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 const subRequest = requestParser.createSubRequest(1);
                 // We always expect createSubRequest to include a leading slash, but asserting here to protect against
                 // unintentionally modifying the url if that changes.
-                common_utils_1.assert(subRequest.url.startsWith("/"), 0x126 /* "Expected createSubRequest url to include a leading slash" */);
+                (0, common_utils_1.assert)(subRequest.url.startsWith("/"), 0x126 /* "Expected createSubRequest url to include a leading slash" */);
                 return dataStore.IFluidRouter.request(subRequest);
             }
-            return runtime_utils_1.create404Response(request);
+            return (0, runtime_utils_1.create404Response)(request);
         }
         catch (error) {
-            return runtime_utils_1.exceptionToResponse(error);
+            return (0, runtime_utils_1.exceptionToResponse)(error);
         }
     }
     async getDataStoreFromRequest(id, request) {
         var _a, _b, _c;
         const wait = typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a[RuntimeHeaders.wait]) === "boolean"
-            ? (_b = request.headers) === null || _b === void 0 ? void 0 : _b[RuntimeHeaders.wait] : true;
+            ? (_b = request.headers) === null || _b === void 0 ? void 0 : _b[RuntimeHeaders.wait]
+            : true;
         const dataStoreContext = await this.dataStores.getDataStore(id, wait);
         /**
          * If GC should run and this an external app request with "externalRequest" header, we need to return
@@ -867,45 +838,51 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // Older documents may not have used routes in the summary. They are considered referenced.
             const usedRoutes = (await dataStoreContext.getBaseGCDetails()).usedRoutes;
             if (!(usedRoutes === undefined || usedRoutes.includes("") || usedRoutes.includes("/"))) {
-                throw runtime_utils_1.responseToException(runtime_utils_1.create404Response(request), request);
+                throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.create404Response)(request), request);
             }
         }
         const dataStoreChannel = await dataStoreContext.realize();
         this.garbageCollector.nodeUpdated(`/${id}`, "Loaded", undefined /* timestampMs */, dataStoreContext.packagePath, request === null || request === void 0 ? void 0 : request.headers);
         return dataStoreChannel;
     }
-    formMetadata() {
+    /** Adds the container's metadata to the given summary tree. */
+    addMetadataToSummary(summaryTree) {
         var _a;
-        return Object.assign(Object.assign({}, this.createContainerMetadata), { summaryCount: this.summaryCount, summaryFormatVersion: 1, disableIsolatedChannels: this.disableIsolatedChannels || undefined, gcFeature: this.garbageCollector.gcSummaryFeatureVersion, 
+        const metadata = Object.assign(Object.assign(Object.assign(Object.assign({}, this.createContainerMetadata), { 
+            // back-compat 0.59.3000: This is renamed to summaryNumber. Can be removed when 0.59.3000 saturates.
+            summaryCount: this.nextSummaryNumber, 
+            // Increment the summary number for the next summary that will be generated.
+            summaryNumber: this.nextSummaryNumber++, summaryFormatVersion: 1, disableIsolatedChannels: this.disableIsolatedChannels || undefined }), this.garbageCollector.getMetadata()), { 
             // The last message processed at the time of summary. If there are no new messages, use the message from the
             // last summary.
-            message: (_a = summaryFormat_1.extractSummaryMetadataMessage(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.messageAtLastSummary, sessionExpiryTimeoutMs: this.garbageCollector.sessionExpiryTimeoutMs });
+            message: (_a = (0, summaryFormat_1.extractSummaryMetadataMessage)(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.messageAtLastSummary });
+        (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.metadataBlobName, JSON.stringify(metadata));
     }
     addContainerStateToSummary(summaryTree) {
         var _a;
-        runtime_utils_1.addBlobToSummary(summaryTree, summaryFormat_1.metadataBlobName, JSON.stringify(this.formMetadata()));
+        this.addMetadataToSummary(summaryTree);
         if (this.chunkMap.size > 0) {
             const content = JSON.stringify([...this.chunkMap]);
-            runtime_utils_1.addBlobToSummary(summaryTree, summaryFormat_1.chunksBlobName, content);
+            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.chunksBlobName, content);
         }
         const dataStoreAliases = this.dataStores.aliases();
         if (dataStoreAliases.size > 0) {
-            runtime_utils_1.addBlobToSummary(summaryTree, summaryFormat_1.aliasBlobName, JSON.stringify([...dataStoreAliases]));
+            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.aliasBlobName, JSON.stringify([...dataStoreAliases]));
         }
         if (this.summarizerClientElection) {
             const electedSummarizerContent = JSON.stringify((_a = this.summarizerClientElection) === null || _a === void 0 ? void 0 : _a.serialize());
-            runtime_utils_1.addBlobToSummary(summaryTree, summaryFormat_1.electedSummarizerBlobName, electedSummarizerContent);
+            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.electedSummarizerBlobName, electedSummarizerContent);
         }
-        const summary = this.blobManager.summarize();
+        const blobManagerSummary = this.blobManager.summarize();
         // Some storage (like git) doesn't allow empty tree, so we can omit it.
         // and the blob manager can handle the tree not existing when loading
-        if (Object.keys(summary.summary.tree).length > 0) {
-            runtime_utils_1.addTreeToSummary(summaryTree, summaryFormat_1.blobsTreeName, summary);
+        if (Object.keys(blobManagerSummary.summary.tree).length > 0) {
+            (0, runtime_utils_1.addTreeToSummary)(summaryTree, summaryFormat_1.blobsTreeName, blobManagerSummary);
         }
         if (this.garbageCollector.writeDataAtRoot) {
             const gcSummary = this.garbageCollector.summarize();
             if (gcSummary !== undefined) {
-                runtime_utils_1.addTreeToSummary(summaryTree, garbageCollection_1.gcTreeKey, gcSummary);
+                (0, runtime_utils_1.addTreeToSummary)(summaryTree, garbageCollection_1.gcTreeKey, gcSummary);
             }
         }
     }
@@ -951,7 +928,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // Save the old state, reset to false, disable event emit
         const oldState = this.dirtyContainer;
         this.dirtyContainer = false;
-        common_utils_1.assert(this.emitDirtyDocumentEvent, 0x127 /* "dirty document event not set on replay" */);
+        (0, common_utils_1.assert)(this.emitDirtyDocumentEvent, 0x127 /* "dirty document event not set on replay" */);
         this.emitDirtyDocumentEvent = false;
         let newState;
         try {
@@ -981,7 +958,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             case ContainerMessageType.Rejoin:
                 throw new Error("rejoin not expected here");
             default:
-                common_utils_1.unreachableCase(type, `Unknown ContainerMessageType: ${type}`);
+                (0, common_utils_1.unreachableCase)(type, `Unknown ContainerMessageType: ${type}`);
         }
     }
     setConnectionState(connected, clientId) {
@@ -1002,7 +979,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.replayPendingStates();
         }
         this.dataStores.setConnectionState(connected, clientId);
-        telemetry_utils_1.raiseConnectedEvent(this.mc.logger, this, connected, clientId);
+        (0, telemetry_utils_1.raiseConnectedEvent)(this.mc.logger, this, connected, clientId);
     }
     process(messageArg, local) {
         var _a;
@@ -1044,7 +1021,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     this.dataStores.processFluidDataStoreOp(message, local || localAck, localOpMetadata);
                     break;
                 case ContainerMessageType.BlobAttach:
-                    common_utils_1.assert((_a = message === null || message === void 0 ? void 0 : message.metadata) === null || _a === void 0 ? void 0 : _a.blobId, 0x12a /* "Missing blob id on metadata" */);
+                    (0, common_utils_1.assert)((_a = message === null || message === void 0 ? void 0 : message.metadata) === null || _a === void 0 ? void 0 : _a.blobId, 0x12a /* "Missing blob id on metadata" */);
                     this.blobManager.processBlobAttachOp(message.metadata.blobId, local);
                     break;
                 default:
@@ -1082,7 +1059,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     async getRootDataStore(id, wait = true) {
         const context = await this.dataStores.getDataStore(id, wait);
-        common_utils_1.assert(await context.isRoot(), 0x12b /* "did not get root data store" */);
+        (0, common_utils_1.assert)(await context.isRoot(), 0x12b /* "did not get root data store" */);
         return context.realize();
     }
     setFlushMode(mode) {
@@ -1103,7 +1080,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.pendingStateManager.onFlushModeUpdated(mode);
     }
     flush() {
-        common_utils_1.assert(this._orderSequentiallyCalls === 0, 0x24c /* "Cannot call `flush()` from `orderSequentially`'s callback" */);
+        (0, common_utils_1.assert)(this._orderSequentiallyCalls === 0, 0x24c /* "Cannot call `flush()` from `orderSequentially`'s callback" */);
         if (!this.deltaSender) {
             return;
         }
@@ -1155,8 +1132,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
     }
     async createDataStore(pkg) {
-        const internalId = uuid_1.v4();
-        return dataStore_1.channelToDataStore(await this._createDataStore(pkg, false /* isRoot */, internalId), internalId, this, this.dataStores, this.mc.logger);
+        const internalId = (0, uuid_1.v4)();
+        return (0, dataStore_1.channelToDataStore)(await this._createDataStore(pkg, false /* isRoot */, internalId), internalId, this, this.dataStores, this.mc.logger);
     }
     /**
      * Creates a root datastore directly with a user generated id and attaches it to storage.
@@ -1193,9 +1170,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @returns - An aliased data store which can can be found / loaded by alias.
      */
     async createAndAliasDataStore(pkg, alias, props) {
-        const internalId = uuid_1.v4();
+        const internalId = (0, uuid_1.v4)();
         const dataStore = await this._createDataStore(pkg, false /* isRoot */, internalId, props);
-        const aliasedDataStore = dataStore_1.channelToDataStore(dataStore, internalId, this, this.dataStores, this.mc.logger);
+        const aliasedDataStore = (0, dataStore_1.channelToDataStore)(dataStore, internalId, this, this.dataStores, this.mc.logger);
         const result = await aliasedDataStore.trySetAlias(alias);
         if (result !== "Success") {
             throw new container_utils_1.GenericError("dataStoreAliasFailure", undefined /* error */, {
@@ -1224,7 +1201,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      *
      * This method will be removed. See #6465.
      */
-    async _createDataStoreWithPropsLegacy(pkg, props, id = uuid_1.v4(), isRoot = false) {
+    async _createDataStoreWithPropsLegacy(pkg, props, id = (0, uuid_1.v4)(), isRoot = false) {
         const fluidDataStore = await this.dataStores._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, isRoot, props).realize();
         if (isRoot) {
             // back-compat 0.59.1000 - makeVisibleAndAttachGraph was added in this version to IFluidDataStoreChannel.
@@ -1240,14 +1217,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 hasProps: props !== undefined,
             });
         }
-        return dataStore_1.channelToDataStore(fluidDataStore, id, this, this.dataStores, this.mc.logger);
+        return (0, dataStore_1.channelToDataStore)(fluidDataStore, id, this, this.dataStores, this.mc.logger);
     }
-    async _createDataStoreWithProps(pkg, props, id = uuid_1.v4(), isRoot = false) {
+    async _createDataStoreWithProps(pkg, props, id = (0, uuid_1.v4)(), isRoot = false) {
         return this._aliasingEnabled === true && isRoot ?
             this.createAndAliasDataStore(pkg, id, props) :
             this._createDataStoreWithPropsLegacy(pkg, props, id, isRoot);
     }
-    async _createDataStore(pkg, isRoot, id = uuid_1.v4(), props) {
+    async _createDataStore(pkg, isRoot, id = (0, uuid_1.v4)(), props) {
         return this.dataStores
             ._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, isRoot, props)
             .realize();
@@ -1302,10 +1279,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     setAttachState(attachState) {
         if (attachState === container_definitions_1.AttachState.Attaching) {
-            common_utils_1.assert(this.attachState === container_definitions_1.AttachState.Attaching, 0x12d /* "Container Context should already be in attaching state" */);
+            (0, common_utils_1.assert)(this.attachState === container_definitions_1.AttachState.Attaching, 0x12d /* "Container Context should already be in attaching state" */);
         }
         else {
-            common_utils_1.assert(this.attachState === container_definitions_1.AttachState.Attached, 0x12e /* "Container Context should already be in attached state" */);
+            (0, common_utils_1.assert)(this.attachState === container_definitions_1.AttachState.Attached, 0x12e /* "Container Context should already be in attached state" */);
             this.emit("attached");
         }
         if (attachState === container_definitions_1.AttachState.Attached && !this.pendingStateManager.hasPendingMessages()) {
@@ -1327,7 +1304,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         const summarizeResult = this.dataStores.createSummary();
         if (!this.disableIsolatedChannels) {
             // Wrap data store summaries in .channels subtree.
-            summaryFormat_1.wrapSummaryInChannelsTree(summarizeResult);
+            (0, summaryFormat_1.wrapSummaryInChannelsTree)(summarizeResult);
         }
         this.addContainerStateToSummary(summarizeResult);
         return summarizeResult.summary;
@@ -1346,7 +1323,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         let pathPartsForChildren;
         if (!this.disableIsolatedChannels) {
             // Wrap data store summaries in .channels subtree.
-            summaryFormat_1.wrapSummaryInChannelsTree(summarizeResult);
+            (0, summaryFormat_1.wrapSummaryInChannelsTree)(summarizeResult);
             pathPartsForChildren = [runtime_definitions_1.channelsTreeName];
         }
         this.addContainerStateToSummary(summarizeResult);
@@ -1363,7 +1340,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             gcStats = await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC });
         }
         const { stats, summary } = await this.summarizerNode.summarize(fullTree, trackState);
-        common_utils_1.assert(summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
+        (0, common_utils_1.assert)(summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
         return { stats, summary, gcStats };
     }
     /**
@@ -1437,31 +1414,30 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return (_b = (_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.timestamp) !== null && _b !== void 0 ? _b : (_c = this.messageAtLastSummary) === null || _c === void 0 ? void 0 : _c.timestamp;
     }
     /**
-     * Returns the type of the GC node. Currently, there are nodes that belong to data store and nodes that belong
-     * to the blob manager.
+     * Returns the type of the GC node. Currently, there are nodes that belong to the root ("/"), data stores or
+     * blob manager.
      */
     getNodeType(nodePath) {
+        var _a;
         if (this.isBlobPath(nodePath)) {
             return garbageCollection_1.GCNodeType.Blob;
         }
-        if (this.dataStores.isDataStoreNode(nodePath)) {
-            return garbageCollection_1.GCNodeType.DataStore;
-        }
-        // Root node ("/") and DDS nodes belong to "Other" node types.
-        return garbageCollection_1.GCNodeType.Other;
+        return (_a = this.dataStores.getGCNodeType(nodePath)) !== null && _a !== void 0 ? _a : garbageCollection_1.GCNodeType.Other;
     }
     /**
      * Called by GC to retrieve the package path of the node with the given path. The node should belong to a
      * data store or an attachment blob.
      */
     getGCNodePackagePath(nodePath) {
-        // If the node is a blob, return "_blobs" as the package path.
-        if (this.isBlobPath(nodePath)) {
-            return ["_blobs"];
+        switch (this.getNodeType(nodePath)) {
+            case garbageCollection_1.GCNodeType.Blob:
+                return ["_blobs"];
+            case garbageCollection_1.GCNodeType.DataStore:
+            case garbageCollection_1.GCNodeType.SubDataStore:
+                return this.dataStores.getDataStorePackagePath(nodePath);
+            default:
+                (0, common_utils_1.assert)(false, 0x2de /* "Package path requested for unsupported node type." */);
         }
-        const dataStorePkgPath = this.dataStores.getDataStorePackagePath(nodePath);
-        common_utils_1.assert(dataStorePkgPath !== undefined, 0x2d6 /* "Package path requested for unknown node type." */);
-        return dataStorePkgPath;
     }
     /**
      * Returns whether a given path is for attachment blobs that are in the format - "/BlobManager.basePath/...".
@@ -1500,11 +1476,17 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     async submitSummary(options) {
         var _a, _b, _c;
         const { fullTree, refreshLatestAck, summaryLogger } = options;
+        // The summary number for this summary. This will be updated during the summary process, so get it now and
+        // use it for all events logged during this summary.
+        const summaryNumber = this.nextSummaryNumber;
+        const summaryNumberLogger = telemetry_utils_1.ChildLogger.create(summaryLogger, undefined, {
+            all: { summaryNumber },
+        });
         if (refreshLatestAck) {
-            const latestSummaryRefSeq = await this.refreshLatestSummaryAckFromServer(telemetry_utils_1.ChildLogger.create(summaryLogger, undefined, { all: { safeSummary: true } }));
+            const latestSummaryRefSeq = await this.refreshLatestSummaryAckFromServer(telemetry_utils_1.ChildLogger.create(summaryNumberLogger, undefined, { all: { safeSummary: true } }));
             if (latestSummaryRefSeq > this.deltaManager.lastSequenceNumber) {
                 // We need to catch up to the latest summary's reference sequence number before pausing.
-                await telemetry_utils_1.PerformanceEvent.timedExecAsync(summaryLogger, {
+                await telemetry_utils_1.PerformanceEvent.timedExecAsync(summaryNumberLogger, {
                     eventName: "WaitingForSeq",
                     lastSequenceNumber: this.deltaManager.lastSequenceNumber,
                     targetSequenceNumber: latestSummaryRefSeq,
@@ -1520,12 +1502,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // We should be here is we haven't processed be here. If we are of if the last message's sequence number
             // doesn't match the last processed sequence number, log an error.
             if (summaryRefSeqNum !== ((_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.sequenceNumber)) {
-                summaryLogger.sendErrorEvent({
+                summaryNumberLogger.sendErrorEvent({
                     eventName: "LastSequenceMismatch",
                     error: message,
                 });
             }
-            this.summarizerNode.startSummary(summaryRefSeqNum, summaryLogger);
+            this.summarizerNode.startSummary(summaryRefSeqNum, summaryNumberLogger);
             // Helper function to check whether we should still continue between each async step.
             const checkContinue = () => {
                 // Do not check for loss of connectivity directly! Instead leave it up to
@@ -1540,7 +1522,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 // That said, we rely on submitSystemMessage() that today only works in connected state.
                 // So if we fail here, it either means that RunWhileConnectedCoordinator does not work correctly,
                 // OR that design changed and we need to remove this check and fix submitSystemMessage.
-                common_utils_1.assert(this.connected, 0x258 /* "connected" */);
+                (0, common_utils_1.assert)(this.connected, 0x258 /* "connected" */);
                 // Ensure that lastSequenceNumber has not changed after pausing.
                 // We need the summary op's reference sequence number to match our summary sequence number,
                 // otherwise we'll get the wrong sequence number stamped on the summary's .protocol attributes.
@@ -1562,13 +1544,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     error: continueResult.error,
                 };
             }
-            // increment summary count
-            if (this.summaryCount !== undefined) {
-                this.summaryCount++;
-            }
-            else {
-                this.summaryCount = 1;
-            }
             const trace = common_utils_1.Trace.start();
             let summarizeResult;
             // If the GC state needs to be reset, we need to force a full tree summary and update the unreferenced
@@ -1578,7 +1553,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 summarizeResult = await this.summarize({
                     fullTree: fullTree || forcedFullTree,
                     trackState: true,
-                    summaryLogger,
+                    summaryLogger: summaryNumberLogger,
                     runGC: this.garbageCollector.shouldRunGC,
                 });
             }
@@ -1597,12 +1572,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // Because handles are unchanged dataStores in the current logic,
             // summarized dataStore count is total dataStore count minus handle count
             const dataStoreTree = this.disableIsolatedChannels ? summaryTree : summaryTree.tree[runtime_definitions_1.channelsTreeName];
-            common_utils_1.assert(dataStoreTree.type === protocol_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
+            (0, common_utils_1.assert)(dataStoreTree.type === protocol_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
             const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === protocol_definitions_1.SummaryType.Handle).length;
             const gcSummaryTreeStats = summaryTree.tree[garbageCollection_1.gcTreeKey]
-                ? runtime_utils_1.calculateStats(summaryTree.tree[garbageCollection_1.gcTreeKey])
+                ? (0, runtime_utils_1.calculateStats)(summaryTree.tree[garbageCollection_1.gcTreeKey])
                 : undefined;
-            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: (_b = summarizeResult.gcStats) === null || _b === void 0 ? void 0 : _b.updatedDataStoreCount, gcBlobNodeCount: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.blobNodeCount, gcTotalBlobsSize: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.totalBlobSize, opsSizesSinceLastSummary: this.opTracker.opsSizeAccumulator, nonSystemOpsSinceLastSummary: this.opTracker.nonSystemOpCount }, partialStats);
+            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: (_b = summarizeResult.gcStats) === null || _b === void 0 ? void 0 : _b.updatedDataStoreCount, gcBlobNodeCount: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.blobNodeCount, gcTotalBlobsSize: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.totalBlobSize, opsSizesSinceLastSummary: this.opTracker.opsSizeAccumulator, nonSystemOpsSinceLastSummary: this.opTracker.nonSystemOpCount, summaryNumber }, partialStats);
             const generateSummaryData = {
                 referenceSequenceNumber: summaryRefSeqNum,
                 minimumSequenceNumber,
@@ -1690,7 +1665,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             map = [];
             this.chunkMap.set(clientId, map);
         }
-        common_utils_1.assert(chunkedContent.chunkId === map.length + 1, 0x131 /* "Mismatch between new chunkId and expected chunkMap" */); // 1-based indexing
+        (0, common_utils_1.assert)(chunkedContent.chunkId === map.length + 1, 0x131 /* "Mismatch between new chunkId and expected chunkMap" */); // 1-based indexing
         map.push(chunkedContent.contents);
     }
     clearPartialChunks(clientId) {
@@ -1717,7 +1692,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     submitDataStoreAliasOp(contents, localOpMetadata) {
         const aliasMessage = contents;
-        if (!dataStore_1.isDataStoreAliasMessage(aliasMessage)) {
+        if (!(0, dataStore_1.isDataStoreAliasMessage)(aliasMessage)) {
             throw new container_utils_1.UsageError("malformedDataStoreAliasMessage");
         }
         this.submit(ContainerMessageType.Alias, contents, localOpMetadata);
@@ -1732,7 +1707,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.closeFn(new container_utils_1.GenericError("containerRuntimeSubmitWithPendingLocalState"));
         }
         // There should be no ops in detached container state!
-        common_utils_1.assert(this.attachState !== container_definitions_1.AttachState.Detached, 0x132 /* "sending ops in detached container" */);
+        (0, common_utils_1.assert)(this.attachState !== container_definitions_1.AttachState.Detached, 0x132 /* "sending ops in detached container" */);
         let clientSequenceNumber = -1;
         let opMetadataInternal = opMetadata;
         if (this.canSendOps()) {
@@ -1807,7 +1782,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     submitSystemMessage(type, contents) {
         this.verifyNotClosed();
-        common_utils_1.assert(this.connected, 0x133 /* "Container disconnected when trying to submit system message" */);
+        (0, common_utils_1.assert)(this.connected, 0x133 /* "Container disconnected when trying to submit system message" */);
         // System message should not be sent in the middle of the batch.
         // That said, we can preserve existing behavior by not flushing existing buffer.
         // That might be not what caller hopes to get, but we can look deeper if telemetry tells us it's a problem.
@@ -1819,7 +1794,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     submitRuntimeMessage(type, contents, batch, appData) {
         this.verifyNotClosed();
-        common_utils_1.assert(this.connected, 0x259 /* "Container disconnected when trying to submit system message" */);
+        (0, common_utils_1.assert)(this.connected, 0x259 /* "Container disconnected when trying to submit system message" */);
         const payload = { type, contents };
         return this.context.submitFn(protocol_definitions_1.MessageType.Operation, payload, batch, appData);
     }
@@ -1858,12 +1833,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 this.submit(type, content);
                 break;
             default:
-                common_utils_1.unreachableCase(type, `Unknown ContainerMessageType: ${type}`);
+                (0, common_utils_1.unreachableCase)(type, `Unknown ContainerMessageType: ${type}`);
         }
     }
     /** Implementation of ISummarizerInternalsProvider.refreshLatestSummaryAck */
     async refreshLatestSummaryAck(proposalHandle, ackHandle, summaryRefSeq, summaryLogger) {
-        const readAndParseBlob = async (id) => driver_utils_1.readAndParse(this.storage, id);
+        const readAndParseBlob = async (id) => (0, driver_utils_1.readAndParse)(this.storage, id);
         const result = await this.summarizerNode.refreshLatestSummary(proposalHandle, summaryRefSeq, async () => this.fetchSnapshotFromStorage(ackHandle, summaryLogger, {
             eventName: "RefreshLatestSummaryGetSnapshot",
             ackHandle,
@@ -1884,8 +1859,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             eventName: "RefreshLatestSummaryGetSnapshot",
             fetchLatest: true,
         });
-        const readAndParseBlob = async (id) => driver_utils_1.readAndParse(this.storage, id);
-        const snapshotRefSeq = await runtime_utils_1.seqFromTree(snapshot, readAndParseBlob);
+        const readAndParseBlob = async (id) => (0, driver_utils_1.readAndParse)(this.storage, id);
+        const snapshotRefSeq = await (0, runtime_utils_1.seqFromTree)(snapshot, readAndParseBlob);
         const result = await this.summarizerNode.refreshLatestSummary(undefined, snapshotRefSeq, async () => snapshot, readAndParseBlob, summaryLogger);
         // Notify the garbage collector so it can update its latest summary state.
         await this.garbageCollector.latestSummaryStateRefreshed(result, readAndParseBlob);
@@ -1896,10 +1871,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const stats = {};
             const trace = common_utils_1.Trace.start();
             const versions = await this.storage.getVersions(versionId, 1);
-            common_utils_1.assert(!!versions && !!versions[0], 0x137 /* "Failed to get version from storage" */);
+            (0, common_utils_1.assert)(!!versions && !!versions[0], 0x137 /* "Failed to get version from storage" */);
             stats.getVersionDuration = trace.trace().duration;
             const maybeSnapshot = await this.storage.getSnapshotTree(versions[0]);
-            common_utils_1.assert(!!maybeSnapshot, 0x138 /* "Failed to get snapshot from storage" */);
+            (0, common_utils_1.assert)(!!maybeSnapshot, 0x138 /* "Failed to get snapshot from storage" */);
             stats.getSnapshotDuration = trace.trace().duration;
             perfEvent.end(stats);
             return maybeSnapshot;
@@ -1926,7 +1901,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 },
                 url: "/_summarizer",
             };
-            const fluidObject = await runtime_utils_1.requestFluidObject(loaderRouter, request);
+            const fluidObject = await (0, runtime_utils_1.requestFluidObject)(loaderRouter, request);
             const summarizer = fluidObject.ISummarizer;
             if (!summarizer) {
                 throw new container_utils_1.UsageError("Fluid object does not implement ISummarizer");