@fluidframework/container-runtime 2.0.0-dev.7.4.0.215366 → 2.0.0-dev.7.4.0.215930

package/api-report/container-runtime.api.md

@@ -446,16 +446,7 @@ export interface IGCRuntimeOptions {
 }
 
 // @public
-export interface IGCStats {
-    attachmentBlobCount: number;
-    dataStoreCount: number;
-    nodeCount: number;
-    unrefAttachmentBlobCount: number;
-    unrefDataStoreCount: number;
-    unrefNodeCount: number;
-    updatedAttachmentBlobCount: number;
-    updatedDataStoreCount: number;
-    updatedNodeCount: number;
+export interface IGCStats extends IMarkPhaseStats, ISweepPhaseStats {
 }
 
 // @public
@@ -478,6 +469,19 @@ export interface IGenerateSummaryTreeResult extends Omit<IBaseSummarizeResult, "
     readonly summaryTree: ISummaryTree;
 }
 
+// @public
+export interface IMarkPhaseStats {
+    attachmentBlobCount: number;
+    dataStoreCount: number;
+    nodeCount: number;
+    unrefAttachmentBlobCount: number;
+    unrefDataStoreCount: number;
+    unrefNodeCount: number;
+    updatedAttachmentBlobCount: number;
+    updatedDataStoreCount: number;
+    updatedNodeCount: number;
+}
+
 // @public (undocumented)
 export interface INackSummaryResult extends IRetriableFailureResult {
     // (undocumented)
@@ -703,6 +707,16 @@ export interface ISummaryRuntimeOptions {
     summaryConfigOverrides?: ISummaryConfiguration;
 }
 
+// @public
+export interface ISweepPhaseStats {
+    deletedAttachmentBlobCount: number;
+    deletedDataStoreCount: number;
+    deletedNodeCount: number;
+    lifetimeAttachmentBlobCount: number;
+    lifetimeDataStoreCount: number;
+    lifetimeNodeCount: number;
+}
+
 // @public
 export interface IUploadSummaryResult extends Omit<IGenerateSummaryTreeResult, "stage"> {
     readonly handle: string;

package/dist/container-runtime-alpha.d.ts

@@ -1008,25 +1008,7 @@ export declare interface IGCRuntimeOptions {
  * The statistics of the system state after a garbage collection run.
  * @public
  */
-export declare interface IGCStats {
-    /** The number of nodes in the container. */
-    nodeCount: number;
-    /** The number of data stores in the container. */
-    dataStoreCount: number;
-    /** The number of attachment blobs in the container. */
-    attachmentBlobCount: number;
-    /** The number of unreferenced nodes in the container. */
-    unrefNodeCount: number;
-    /** The number of unreferenced data stores in the container. */
-    unrefDataStoreCount: number;
-    /** The number of unreferenced attachment blobs in the container. */
-    unrefAttachmentBlobCount: number;
-    /** The number of nodes whose reference state updated since last GC run. */
-    updatedNodeCount: number;
-    /** The number of data stores whose reference state updated since last GC run. */
-    updatedDataStoreCount: number;
-    /** The number of attachment blobs whose reference state updated since last GC run. */
-    updatedAttachmentBlobCount: number;
+export declare interface IGCStats extends IMarkPhaseStats, ISweepPhaseStats {
 }
 
 /**
@@ -1065,6 +1047,31 @@ export declare interface IGenerateSummaryTreeResult extends Omit<IBaseSummarizeR
     readonly forcedFullTree: boolean;
 }
 
+/**
+ * The statistics of the system state after a garbage collection mark phase run.
+ * @public
+ */
+export declare interface IMarkPhaseStats {
+    /** The number of nodes in the container. */
+    nodeCount: number;
+    /** The number of data stores in the container. */
+    dataStoreCount: number;
+    /** The number of attachment blobs in the container. */
+    attachmentBlobCount: number;
+    /** The number of unreferenced nodes in the container. */
+    unrefNodeCount: number;
+    /** The number of unreferenced data stores in the container. */
+    unrefDataStoreCount: number;
+    /** The number of unreferenced attachment blobs in the container. */
+    unrefAttachmentBlobCount: number;
+    /** The number of nodes whose reference state updated since last GC run. */
+    updatedNodeCount: number;
+    /** The number of data stores whose reference state updated since last GC run. */
+    updatedDataStoreCount: number;
+    /** The number of attachment blobs whose reference state updated since last GC run. */
+    updatedAttachmentBlobCount: number;
+}
+
 /**
  * @public
  */
@@ -1455,6 +1462,25 @@ export declare interface ISummaryRuntimeOptions {
     initialSummarizerDelayMs?: number;
 }
 
+/**
+ * The statistics of the system state after a garbage collection sweep phase run.
+ * @public
+ */
+export declare interface ISweepPhaseStats {
+    /** The number of nodes in the lifetime of the container. */
+    lifetimeNodeCount: number;
+    /** The number of data stores in the lifetime of the container. */
+    lifetimeDataStoreCount: number;
+    /** The number of attachment blobs in the lifetime of the container. */
+    lifetimeAttachmentBlobCount: number;
+    /** The number of deleted nodes in the container. */
+    deletedNodeCount: number;
+    /** The number of deleted data stores in the container. */
+    deletedDataStoreCount: number;
+    /** The number of deleted attachment blobs in the container. */
+    deletedAttachmentBlobCount: number;
+}
+
 /**
  * Results of submitSummary after uploading the tree to storage.
  * @public

package/dist/container-runtime-beta.d.ts

@@ -1007,25 +1007,7 @@ export declare interface IGCRuntimeOptions {
  * The statistics of the system state after a garbage collection run.
  * @public
  */
-export declare interface IGCStats {
-    /** The number of nodes in the container. */
-    nodeCount: number;
-    /** The number of data stores in the container. */
-    dataStoreCount: number;
-    /** The number of attachment blobs in the container. */
-    attachmentBlobCount: number;
-    /** The number of unreferenced nodes in the container. */
-    unrefNodeCount: number;
-    /** The number of unreferenced data stores in the container. */
-    unrefDataStoreCount: number;
-    /** The number of unreferenced attachment blobs in the container. */
-    unrefAttachmentBlobCount: number;
-    /** The number of nodes whose reference state updated since last GC run. */
-    updatedNodeCount: number;
-    /** The number of data stores whose reference state updated since last GC run. */
-    updatedDataStoreCount: number;
-    /** The number of attachment blobs whose reference state updated since last GC run. */
-    updatedAttachmentBlobCount: number;
+export declare interface IGCStats extends IMarkPhaseStats, ISweepPhaseStats {
 }
 
 /**
@@ -1066,6 +1048,31 @@ export declare interface IGenerateSummaryTreeResult extends Omit<IBaseSummarizeR
 
 /* Excluded from this release type: IGetPendingLocalStateProps */
 
+/**
+ * The statistics of the system state after a garbage collection mark phase run.
+ * @public
+ */
+export declare interface IMarkPhaseStats {
+    /** The number of nodes in the container. */
+    nodeCount: number;
+    /** The number of data stores in the container. */
+    dataStoreCount: number;
+    /** The number of attachment blobs in the container. */
+    attachmentBlobCount: number;
+    /** The number of unreferenced nodes in the container. */
+    unrefNodeCount: number;
+    /** The number of unreferenced data stores in the container. */
+    unrefDataStoreCount: number;
+    /** The number of unreferenced attachment blobs in the container. */
+    unrefAttachmentBlobCount: number;
+    /** The number of nodes whose reference state updated since last GC run. */
+    updatedNodeCount: number;
+    /** The number of data stores whose reference state updated since last GC run. */
+    updatedDataStoreCount: number;
+    /** The number of attachment blobs whose reference state updated since last GC run. */
+    updatedAttachmentBlobCount: number;
+}
+
 /**
  * @public
  */
@@ -1456,6 +1463,25 @@ export declare interface ISummaryRuntimeOptions {
     initialSummarizerDelayMs?: number;
 }
 
+/**
+ * The statistics of the system state after a garbage collection sweep phase run.
+ * @public
+ */
+export declare interface ISweepPhaseStats {
+    /** The number of nodes in the lifetime of the container. */
+    lifetimeNodeCount: number;
+    /** The number of data stores in the lifetime of the container. */
+    lifetimeDataStoreCount: number;
+    /** The number of attachment blobs in the lifetime of the container. */
+    lifetimeAttachmentBlobCount: number;
+    /** The number of deleted nodes in the container. */
+    deletedNodeCount: number;
+    /** The number of deleted data stores in the container. */
+    deletedDataStoreCount: number;
+    /** The number of deleted attachment blobs in the container. */
+    deletedAttachmentBlobCount: number;
+}
+
 /**
  * Results of submitSummary after uploading the tree to storage.
  * @public

package/dist/container-runtime-public.d.ts

@@ -1007,25 +1007,7 @@ export declare interface IGCRuntimeOptions {
  * The statistics of the system state after a garbage collection run.
  * @public
  */
-export declare interface IGCStats {
-    /** The number of nodes in the container. */
-    nodeCount: number;
-    /** The number of data stores in the container. */
-    dataStoreCount: number;
-    /** The number of attachment blobs in the container. */
-    attachmentBlobCount: number;
-    /** The number of unreferenced nodes in the container. */
-    unrefNodeCount: number;
-    /** The number of unreferenced data stores in the container. */
-    unrefDataStoreCount: number;
-    /** The number of unreferenced attachment blobs in the container. */
-    unrefAttachmentBlobCount: number;
-    /** The number of nodes whose reference state updated since last GC run. */
-    updatedNodeCount: number;
-    /** The number of data stores whose reference state updated since last GC run. */
-    updatedDataStoreCount: number;
-    /** The number of attachment blobs whose reference state updated since last GC run. */
-    updatedAttachmentBlobCount: number;
+export declare interface IGCStats extends IMarkPhaseStats, ISweepPhaseStats {
 }
 
 /**
@@ -1066,6 +1048,31 @@ export declare interface IGenerateSummaryTreeResult extends Omit<IBaseSummarizeR
 
 /* Excluded from this release type: IGetPendingLocalStateProps */
 
+/**
+ * The statistics of the system state after a garbage collection mark phase run.
+ * @public
+ */
+export declare interface IMarkPhaseStats {
+    /** The number of nodes in the container. */
+    nodeCount: number;
+    /** The number of data stores in the container. */
+    dataStoreCount: number;
+    /** The number of attachment blobs in the container. */
+    attachmentBlobCount: number;
+    /** The number of unreferenced nodes in the container. */
+    unrefNodeCount: number;
+    /** The number of unreferenced data stores in the container. */
+    unrefDataStoreCount: number;
+    /** The number of unreferenced attachment blobs in the container. */
+    unrefAttachmentBlobCount: number;
+    /** The number of nodes whose reference state updated since last GC run. */
+    updatedNodeCount: number;
+    /** The number of data stores whose reference state updated since last GC run. */
+    updatedDataStoreCount: number;
+    /** The number of attachment blobs whose reference state updated since last GC run. */
+    updatedAttachmentBlobCount: number;
+}
+
 /**
  * @public
  */
@@ -1456,6 +1463,25 @@ export declare interface ISummaryRuntimeOptions {
     initialSummarizerDelayMs?: number;
 }
 
+/**
+ * The statistics of the system state after a garbage collection sweep phase run.
+ * @public
+ */
+export declare interface ISweepPhaseStats {
+    /** The number of nodes in the lifetime of the container. */
+    lifetimeNodeCount: number;
+    /** The number of data stores in the lifetime of the container. */
+    lifetimeDataStoreCount: number;
+    /** The number of attachment blobs in the lifetime of the container. */
+    lifetimeAttachmentBlobCount: number;
+    /** The number of deleted nodes in the container. */
+    deletedNodeCount: number;
+    /** The number of deleted data stores in the container. */
+    deletedDataStoreCount: number;
+    /** The number of deleted attachment blobs in the container. */
+    deletedAttachmentBlobCount: number;
+}
+
 /**
  * Results of submitSummary after uploading the tree to storage.
  * @public

package/dist/container-runtime-untrimmed.d.ts

@@ -1051,25 +1051,7 @@ export declare interface IGCRuntimeOptions {
  * The statistics of the system state after a garbage collection run.
  * @public
  */
-export declare interface IGCStats {
-    /** The number of nodes in the container. */
-    nodeCount: number;
-    /** The number of data stores in the container. */
-    dataStoreCount: number;
-    /** The number of attachment blobs in the container. */
-    attachmentBlobCount: number;
-    /** The number of unreferenced nodes in the container. */
-    unrefNodeCount: number;
-    /** The number of unreferenced data stores in the container. */
-    unrefDataStoreCount: number;
-    /** The number of unreferenced attachment blobs in the container. */
-    unrefAttachmentBlobCount: number;
-    /** The number of nodes whose reference state updated since last GC run. */
-    updatedNodeCount: number;
-    /** The number of data stores whose reference state updated since last GC run. */
-    updatedDataStoreCount: number;
-    /** The number of attachment blobs whose reference state updated since last GC run. */
-    updatedAttachmentBlobCount: number;
+export declare interface IGCStats extends IMarkPhaseStats, ISweepPhaseStats {
 }
 
 /**
@@ -1108,6 +1090,31 @@ export declare interface IGenerateSummaryTreeResult extends Omit<IBaseSummarizeR
     readonly forcedFullTree: boolean;
 }
 
+/**
+ * The statistics of the system state after a garbage collection mark phase run.
+ * @public
+ */
+export declare interface IMarkPhaseStats {
+    /** The number of nodes in the container. */
+    nodeCount: number;
+    /** The number of data stores in the container. */
+    dataStoreCount: number;
+    /** The number of attachment blobs in the container. */
+    attachmentBlobCount: number;
+    /** The number of unreferenced nodes in the container. */
+    unrefNodeCount: number;
+    /** The number of unreferenced data stores in the container. */
+    unrefDataStoreCount: number;
+    /** The number of unreferenced attachment blobs in the container. */
+    unrefAttachmentBlobCount: number;
+    /** The number of nodes whose reference state updated since last GC run. */
+    updatedNodeCount: number;
+    /** The number of data stores whose reference state updated since last GC run. */
+    updatedDataStoreCount: number;
+    /** The number of attachment blobs whose reference state updated since last GC run. */
+    updatedAttachmentBlobCount: number;
+}
+
 /**
  * @public
  */
@@ -1498,6 +1505,25 @@ export declare interface ISummaryRuntimeOptions {
     initialSummarizerDelayMs?: number;
 }
 
+/**
+ * The statistics of the system state after a garbage collection sweep phase run.
+ * @public
+ */
+export declare interface ISweepPhaseStats {
+    /** The number of nodes in the lifetime of the container. */
+    lifetimeNodeCount: number;
+    /** The number of data stores in the lifetime of the container. */
+    lifetimeDataStoreCount: number;
+    /** The number of attachment blobs in the lifetime of the container. */
+    lifetimeAttachmentBlobCount: number;
+    /** The number of deleted nodes in the container. */
+    deletedNodeCount: number;
+    /** The number of deleted data stores in the container. */
+    deletedDataStoreCount: number;
+    /** The number of deleted attachment blobs in the container. */
+    deletedAttachmentBlobCount: number;
+}
+
 /**
  * Results of submitSummary after uploading the tree to storage.
  * @public

package/dist/gc/garbageCollection.d.ts

@@ -106,9 +106,10 @@ export declare class GarbageCollector implements IGarbageCollector {
     /**
      * Runs garbage collection. It does the following:
      * 1. It generates / analyzes the runtime's reference graph.
-     * 2. Generates stats for the GC run based on previous / current GC state.
+     * 2. Generates mark phase stats.
      * 3. Runs Mark phase.
      * 4. Runs Sweep phase.
+     * 5. Generates sweep phase stats.
      */
     private runGC;
     /**
@@ -191,10 +192,18 @@ export declare class GarbageCollector implements IGarbageCollector {
     isNodeDeleted(nodePath: string): boolean;
     dispose(): void;
     /**
-     * Generates the stats of a garbage collection run from the given results of the run.
-     * @param gcResult - The result of a GC run.
-     * @returns the GC stats of the GC run.
+     * Generates the stats of a garbage collection mark phase run.
+     * @param gcResult - The result of the current GC run.
+     * @returns the stats of the mark phase run.
      */
-    private generateStats;
+    private getMarkPhaseStats;
+    /**
+     * Generates the stats of a garbage collection sweep phase run.
+     * @param allDeletedNodes - All the nodes that have been deleted across all GC runs.
+     * @param currentDeletedNodes - The nodes that have been deleted in this GC run.
+     * @param markPhaseStats - The stats of the mark phase run.
+     * @returns the stats of the sweep phase run.
+     */
+    private getSweepPhaseStats;
 }
 //# sourceMappingURL=garbageCollection.d.ts.map

package/dist/gc/garbageCollection.d.ts.map

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

package/dist/gc/garbageCollection.js

@@ -200,6 +200,7 @@ class GarbageCollector {
             eventName: "GarbageCollectorLoaded",
             gcConfigs: JSON.stringify(this.configs),
             gcOptions: JSON.stringify(createParams.gcOptions),
+            ...createParams.createContainerMetadata,
         });
     }
     /**
@@ -375,7 +376,11 @@ class GarbageCollector {
             await this.runtime.updateStateBeforeGC();
             /** GC step */
             const gcStats = await this.runGC(fullGC, currentReferenceTimestampMs, logger);
-            event.end({ ...gcStats, timestamp: currentReferenceTimestampMs });
+            event.end({
+                ...gcStats,
+                timestamp: currentReferenceTimestampMs,
+                sweep: this.configs.shouldRunSweep,
+            });
             /** Post-GC steps */
             // Log pending unreferenced events such as a node being used after inactive. This is done after GC runs and
             // updates its state so that we don't send false positives based on intermediate state. For example, we may get
@@ -391,9 +396,10 @@ class GarbageCollector {
     /**
      * Runs garbage collection. It does the following:
      * 1. It generates / analyzes the runtime's reference graph.
-     * 2. Generates stats for the GC run based on previous / current GC state.
+     * 2. Generates mark phase stats.
      * 3. Runs Mark phase.
      * 4. Runs Sweep phase.
+     * 5. Generates sweep phase stats.
      */
     async runGC(fullGC, currentReferenceTimestampMs, logger) {
         // 1. Generate / analyze the runtime's reference graph.
@@ -403,17 +409,19 @@ class GarbageCollector {
         // Get all referenced nodes - References in this run + references between the previous and current runs.
         const allReferencedNodeIds = this.findAllNodesReferencedBetweenGCs(gcData, this.gcDataFromLastRun, logger) ??
             gcResult.referencedNodeIds;
-        // 2. Generate stats based on the previous / current GC state.
-        // Must happen before running Mark / Sweep phase because previous GC state will be updated in these stages.
-        const gcStats = this.generateStats(gcResult);
+        // 2. Get the mark phase stats based on the previous / current GC state.
+        // This is done before running mark phase because we need the previous GC state before it is updated.
+        const markPhaseStats = this.getMarkPhaseStats(gcResult);
         // 3. Run the Mark phase.
         // It will mark nodes as referenced / unreferenced and return a list of node ids that are ready to be swept.
         const sweepReadyNodeIds = this.runMarkPhase(gcResult, allReferencedNodeIds, currentReferenceTimestampMs);
         // 4. Run the Sweep phase.
         // It will delete sweep ready nodes and return a list of deleted node ids.
-        const deletedNodeIds = this.runSweepPhase(gcResult, sweepReadyNodeIds, currentReferenceTimestampMs, logger);
+        const deletedNodeIds = this.runSweepPhase(gcResult, sweepReadyNodeIds);
         this.gcDataFromLastRun = (0, gcHelpers_1.cloneGCData)(gcData, (id) => deletedNodeIds.includes(id) /* filter out deleted nodes */);
-        return gcStats;
+        // 5. Get the sweep phase stats.
+        const sweepPhaseStats = this.getSweepPhaseStats(this.configs.shouldRunSweep ? this.deletedNodes : sweepReadyNodeIds, new Set(deletedNodeIds), markPhaseStats);
+        return { ...markPhaseStats, ...sweepPhaseStats };
     }
     /**
      * Runs the GC Mark phase. It does the following:
@@ -441,7 +449,7 @@ class GarbageCollector {
             }
         }
         // 2. Mark unreferenced nodes in this run by starting unreferenced tracking for them.
-        const sweepReadyNodeIds = [];
+        const sweepReadyNodeIds = new Set();
         for (const nodeId of gcResult.deletedNodeIds) {
             const nodeStateTracker = this.unreferencedNodesState.get(nodeId);
             if (nodeStateTracker === undefined) {
@@ -453,7 +461,7 @@ class GarbageCollector {
                 nodeStateTracker.updateTracking(currentReferenceTimestampMs);
                 // If a node is sweep ready, store it so it can be returned.
                 if (nodeStateTracker.state === gcDefinitions_1.UnreferencedState.SweepReady) {
-                    sweepReadyNodeIds.push(nodeId);
+                    sweepReadyNodeIds.add(nodeId);
                 }
             }
         }
@@ -472,10 +480,7 @@ class GarbageCollector {
      * @param logger - The logger to be used to log any telemetry.
      * @returns A list of nodes that have been deleted.
      */
-    runSweepPhase(gcResult, sweepReadyNodes, currentReferenceTimestampMs, logger) {
-        // Log events for objects that are ready to be deleted by sweep. This will give us data on sweep when
-        // its not enabled.
-        this.telemetryTracker.logSweepEvents(logger, currentReferenceTimestampMs, this.unreferencedNodesState, this.completedRuns, this.getLastSummaryTimestampMs());
+    runSweepPhase(gcResult, sweepReadyNodes) {
         /**
          * Currently, there are 3 modes for sweep:
          * Test mode - Unreferenced nodes are immediately deleted without waiting for them to be sweep ready.
@@ -491,7 +496,7 @@ class GarbageCollector {
             return [];
         }
         if (this.configs.tombstoneMode) {
-            this.tombstones = sweepReadyNodes;
+            this.tombstones = Array.from(sweepReadyNodes);
             // If we are running in GC tombstone mode, update tombstoned routes. This enables testing scenarios
             // involving access to "deleted" data without actually deleting the data from summaries.
             this.runtime.updateTombstonedRoutes(this.tombstones);
@@ -503,7 +508,7 @@ class GarbageCollector {
         // 1. Call the runtime to delete sweep ready nodes. The runtime returns a list of nodes it deleted.
         // TODO: GC:Validation - validate that removed routes are not double delete and that the child routes of
         // removed routes are deleted as well.
-        const deletedNodeIds = this.runtime.deleteSweepReadyNodes(sweepReadyNodes);
+        const deletedNodeIds = this.runtime.deleteSweepReadyNodes(Array.from(sweepReadyNodes));
         // 2. Clear unreferenced state tracking for deleted nodes.
         for (const nodeId of deletedNodeIds) {
             const nodeStateTracker = this.unreferencedNodesState.get(nodeId);
@@ -715,12 +720,12 @@ class GarbageCollector {
         this.sessionExpiryTimer = undefined;
     }
     /**
-     * Generates the stats of a garbage collection run from the given results of the run.
-     * @param gcResult - The result of a GC run.
-     * @returns the GC stats of the GC run.
+     * Generates the stats of a garbage collection mark phase run.
+     * @param gcResult - The result of the current GC run.
+     * @returns the stats of the mark phase run.
      */
-    generateStats(gcResult) {
-        const gcStats = {
+    getMarkPhaseStats(gcResult) {
+        const markPhaseStats = {
             nodeCount: 0,
             dataStoreCount: 0,
             attachmentBlobCount: 0,
@@ -732,33 +737,33 @@ class GarbageCollector {
             updatedAttachmentBlobCount: 0,
         };
         const updateNodeStats = (nodeId, referenced) => {
-            gcStats.nodeCount++;
+            markPhaseStats.nodeCount++;
             // If there is no previous GC data, every node's state is generated and is considered as updated.
             // Otherwise, find out if any node went from referenced to unreferenced or vice-versa.
             const stateUpdated = this.gcDataFromLastRun === undefined ||
                 this.unreferencedNodesState.has(nodeId) === referenced;
             if (stateUpdated) {
-                gcStats.updatedNodeCount++;
+                markPhaseStats.updatedNodeCount++;
             }
             if (!referenced) {
-                gcStats.unrefNodeCount++;
+                markPhaseStats.unrefNodeCount++;
             }
             if (this.runtime.getNodeType(nodeId) === gcDefinitions_1.GCNodeType.DataStore) {
-                gcStats.dataStoreCount++;
+                markPhaseStats.dataStoreCount++;
                 if (stateUpdated) {
-                    gcStats.updatedDataStoreCount++;
+                    markPhaseStats.updatedDataStoreCount++;
                 }
                 if (!referenced) {
-                    gcStats.unrefDataStoreCount++;
+                    markPhaseStats.unrefDataStoreCount++;
                 }
             }
             if (this.runtime.getNodeType(nodeId) === gcDefinitions_1.GCNodeType.Blob) {
-                gcStats.attachmentBlobCount++;
+                markPhaseStats.attachmentBlobCount++;
                 if (stateUpdated) {
-                    gcStats.updatedAttachmentBlobCount++;
+                    markPhaseStats.updatedAttachmentBlobCount++;
                 }
                 if (!referenced) {
-                    gcStats.unrefAttachmentBlobCount++;
+                    markPhaseStats.unrefAttachmentBlobCount++;
                 }
             }
         };
@@ -768,7 +773,57 @@ class GarbageCollector {
         for (const nodeId of gcResult.deletedNodeIds) {
             updateNodeStats(nodeId, false /* referenced */);
         }
-        return gcStats;
+        return markPhaseStats;
+    }
+    /**
+     * Generates the stats of a garbage collection sweep phase run.
+     * @param allDeletedNodes - All the nodes that have been deleted across all GC runs.
+     * @param currentDeletedNodes - The nodes that have been deleted in this GC run.
+     * @param markPhaseStats - The stats of the mark phase run.
+     * @returns the stats of the sweep phase run.
+     */
+    getSweepPhaseStats(allDeletedNodes, currentDeletedNodes, markPhaseStats) {
+        // Initialize the life time node counts to the mark phase node counts. If sweep is not enabled,
+        // these will be the life time node count for this container.
+        const sweepPhaseStats = {
+            lifetimeNodeCount: markPhaseStats.nodeCount,
+            lifetimeDataStoreCount: markPhaseStats.dataStoreCount,
+            lifetimeAttachmentBlobCount: markPhaseStats.attachmentBlobCount,
+            deletedNodeCount: 0,
+            deletedDataStoreCount: 0,
+            deletedAttachmentBlobCount: 0,
+        };
+        for (const nodeId of allDeletedNodes) {
+            sweepPhaseStats.deletedNodeCount++;
+            const nodeType = this.runtime.getNodeType(nodeId);
+            if (nodeType === gcDefinitions_1.GCNodeType.DataStore) {
+                sweepPhaseStats.deletedDataStoreCount++;
+            }
+            else if (nodeType === gcDefinitions_1.GCNodeType.Blob) {
+                sweepPhaseStats.deletedAttachmentBlobCount++;
+            }
+        }
+        if (!this.configs.shouldRunSweep) {
+            return sweepPhaseStats;
+        }
+        // If sweep is enabled, the counts from the mark phase stats do not include nodes that have been
+        // deleted in previous runs. Add the deleted node counts to life time stats.
+        sweepPhaseStats.lifetimeNodeCount += sweepPhaseStats.deletedNodeCount;
+        sweepPhaseStats.lifetimeDataStoreCount += sweepPhaseStats.deletedDataStoreCount;
+        sweepPhaseStats.lifetimeAttachmentBlobCount += sweepPhaseStats.deletedAttachmentBlobCount;
+        // The node deleted in current run are counted twice - once in allDeletedNodes and again in
+        // markPhaseStats. So, remove them from the life time stats.
+        for (const nodeId of currentDeletedNodes) {
+            sweepPhaseStats.lifetimeNodeCount--;
+            const nodeType = this.runtime.getNodeType(nodeId);
+            if (nodeType === gcDefinitions_1.GCNodeType.DataStore) {
+                sweepPhaseStats.lifetimeDataStoreCount--;
+            }
+            else if (nodeType === gcDefinitions_1.GCNodeType.Blob) {
+                sweepPhaseStats.lifetimeAttachmentBlobCount--;
+            }
+        }
+        return sweepPhaseStats;
     }
 }
 exports.GarbageCollector = GarbageCollector;