@fluidframework/container-runtime 2.0.0-internal.3.0.4 → 2.0.0-internal.3.0.6

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,mCAAmC,CAAC;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-runtime\";\nexport const pkgVersion = \"2.0.0-internal.3.0.4\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,mCAAmC,CAAC;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-runtime\";\nexport const pkgVersion = \"2.0.0-internal.3.0.6\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-runtime",
-  "version": "2.0.0-internal.3.0.4",
+  "version": "2.0.0-internal.3.0.6",
   "description": "Fluid container runtime",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -65,19 +65,19 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/datastore": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/garbage-collector": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/datastore": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/garbage-collector": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
     "@fluidframework/protocol-base": "^0.1038.2000",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
     "double-ended-queue": "^2.1.0-0",
     "events": "^3.1.0",
     "lz4js": "^0.2.0",
@@ -89,8 +89,8 @@
     "@fluidframework/build-tools": "^0.8.0",
     "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-internal.3.0.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.0.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.0.6 <2.0.0-internal.4.0.0",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/double-ended-queue": "^2.1.0",

package/src/containerRuntime.ts

@@ -2198,7 +2198,7 @@ export class ContainerRuntime extends TypedEventEmitter<IContainerRuntimeEvents>
 
         const telemetryContext = new TelemetryContext();
         // Add the options that are used to generate this summary to the telemetry context.
-        telemetryContext.setAll("fluid_Summarize", "Options", {
+        telemetryContext.setMultiple("fluid_Summarize", "Options", {
             fullTree,
             trackState,
             runGC,

package/src/garbageCollection.ts

@@ -28,7 +28,6 @@ import {
     ISummarizeResult,
     ITelemetryContext,
     IGarbageCollectionNodeData,
-    IGarbageCollectionSummaryDetailsLegacy,
     ISummaryTreeWithStats,
     gcDeletedBlobKey,
 } from "@fluidframework/runtime-definitions";
@@ -49,7 +48,6 @@ import {
 } from "@fluidframework/telemetry-utils";
 
 import { IGCRuntimeOptions, RuntimeHeaders } from "./containerRuntime";
-import { getSummaryForDatastores } from "./dataStores";
 import {
     currentGCVersion,
     defaultInactiveTimeoutMs,
@@ -67,14 +65,11 @@ import {
     gcTombstoneGenerationOptionName
 } from "./garbageCollectionConstants";
 import { sendGCTombstoneEvent } from "./garbageCollectionTombstoneUtils";
-import { SweepReadyUsageDetectionHandler } from "./gcSweepReadyUsageDetection";
 import {
     getGCVersion,
     GCVersion,
     IContainerRuntimeMetadata,
     metadataBlobName,
-    ReadFluidDataStoreAttributes,
-    dataStoreAttributesBlobName,
     IGCMetadata,
     ICreateContainerMetadata,
     GCFeatureMatrix,
@@ -498,9 +493,6 @@ export class GarbageCollector implements IGarbageCollector {
         };
     }
 
-    /** Handler to respond to when a SweepReady object is used */
-    private readonly sweepReadyUsageHandler: SweepReadyUsageDetectionHandler;
-
     protected constructor(createParams: IGarbageCollectorCreateParams) {
         this.runtime = createParams.runtime;
         this.isSummarizerClient = createParams.isSummarizerClient;
@@ -522,11 +514,6 @@ export class GarbageCollector implements IGarbageCollector {
         this.currentGCVersion =
             this.mc.config.getBoolean(gcVersionUpgradeToV2Key) === true ? currentGCVersion : stableGCVersion;
 
-        this.sweepReadyUsageHandler = new SweepReadyUsageDetectionHandler(
-            createParams.getContainerDiagnosticId(),
-            this.mc,
-            this.runtime.closeFn,
-        );
 
         let prevSummaryGCVersion: number | undefined;
 
@@ -681,50 +668,9 @@ export class GarbageCollector implements IGarbageCollector {
                     );
                 }
 
-                // back-compat - Older documents will have the GC blobs in each data store's summary tree. Get them and
-                // consolidate into IGarbageCollectionState format.
-                // Add a node for the root node that is not present in older snapshot format.
-                const gcState: IGarbageCollectionState = { gcNodes: { "/": { outboundRoutes: [] } } };
-                const dataStoreSnapshotTree = getSummaryForDatastores(baseSnapshot, metadata);
-                assert(dataStoreSnapshotTree !== undefined,
-                    0x2a8 /* "Expected data store snapshot tree in base snapshot" */);
-                for (const [dsId, dsSnapshotTree] of Object.entries(dataStoreSnapshotTree.trees)) {
-                    const blobId = dsSnapshotTree.blobs[gcTreeKey];
-                    if (blobId === undefined) {
-                        continue;
-                    }
-
-                    const gcSummaryDetails = await readAndParseBlob<IGarbageCollectionSummaryDetailsLegacy>(blobId);
-                    // If there are no nodes for this data store, skip it.
-                    if (gcSummaryDetails.gcData?.gcNodes === undefined) {
-                        continue;
-                    }
-
-                    const dsRootId = `/${dsId}`;
-                    // Since we used to write GC data at data store level, we won't have an entry for the root ("/").
-                    // Construct that entry by adding root data store ids to its outbound routes.
-                    const initialSnapshotDetails = await readAndParseBlob<ReadFluidDataStoreAttributes>(
-                        dsSnapshotTree.blobs[dataStoreAttributesBlobName],
-                    );
-                    if (initialSnapshotDetails.isRootDataStore) {
-                        gcState.gcNodes["/"].outboundRoutes.push(dsRootId);
-                    }
-
-                    for (const [id, outboundRoutes] of Object.entries(gcSummaryDetails.gcData.gcNodes)) {
-                        // Prefix the data store id to the GC node ids to make them relative to the root from being
-                        // relative to the data store. Similar to how its done in DataStore::getGCData.
-                        const rootId = id === "/" ? dsRootId : `${dsRootId}${id}`;
-                        gcState.gcNodes[rootId] = { outboundRoutes: Array.from(outboundRoutes) };
-                    }
-                    assert(gcState.gcNodes[dsRootId] !== undefined,
-                        0x2a9 /* GC nodes for data store not in GC blob */);
-                    gcState.gcNodes[dsRootId].unreferencedTimestampMs = gcSummaryDetails.unrefTimestamp;
-                }
-                // If there is only one node (root node just added above), either GC is disabled or we are loading from
-                // the first summary generated by detached container. In both cases, GC was not run - return undefined.
-                return Object.keys(gcState.gcNodes).length === 1
-                    ? undefined
-                    : { gcState, tombstones: undefined, deletedNodes: undefined };
+                // back-compat - Older documents get their gc data reset for simplicity as there are few of them
+                // incremental gc summary will not work with older gc data as well
+                return undefined;
             } catch (error) {
                 const dpe = DataProcessingError.wrapIfUnrecognized(
                     error,
@@ -987,7 +933,7 @@ export class GarbageCollector implements IGarbageCollector {
         }
 
         // Add the options that are used to run GC to the telemetry context.
-        telemetryContext?.setAll("fluid_GC", "Options", { fullGC, runSweep: options.runSweep });
+        telemetryContext?.setMultiple("fluid_GC", "Options", { fullGC, runSweep: options.runSweep });
 
         return PerformanceEvent.timedExecAsync(logger, { eventName: "GarbageCollection" }, async (event) => {
             await this.runPreGCSteps();
@@ -1723,13 +1669,6 @@ export class GarbageCollector implements IGarbageCollector {
                     this.mc.logger.sendErrorEvent(event);
                 }
             }
-
-            // If SweepReady Usage Detection is enabled, the handler may close the interactive container.
-            // Once Sweep is fully implemented, this will be removed since the objects will be gone
-            // and errors will arise elsewhere in the runtime
-            if (state === UnreferencedState.SweepReady) {
-                this.sweepReadyUsageHandler.usageDetectedInInteractiveClient({ ...propsToLog, usageType });
-            }
         }
     }
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-internal.3.0.4";
+export const pkgVersion = "2.0.0-internal.3.0.6";