@fluidframework/container-runtime 2.0.0-dev-rc.5.0.0.263932 → 2.0.0-dev-rc.5.0.0.267932

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-runtime",
-  "version": "2.0.0-dev-rc.5.0.0.263932",
+  "version": "2.0.0-dev-rc.5.0.0.267932",
   "description": "Fluid container runtime",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -127,19 +127,18 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/datastore": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/driver-utils": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/id-compressor": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/protocol-definitions": "^3.2.0",
-    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/runtime-utils": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.5.0.0.263932",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/container-definitions": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/datastore": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/id-compressor": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.5.0.0.267932",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "double-ended-queue": "^2.1.0-0",
     "lz4js": "^0.2.0",
@@ -148,17 +147,17 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
     "@biomejs/biome": "^1.6.2",
-    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.5.0.0.263932",
-    "@fluid-private/test-pairwise-generator": "2.0.0-dev-rc.5.0.0.263932",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.5.0.0.267932",
+    "@fluid-private/test-pairwise-generator": "2.0.0-dev-rc.5.0.0.267932",
     "@fluid-tools/benchmark": "^0.48.0",
-    "@fluid-tools/build-cli": "^0.38.0",
+    "@fluid-tools/build-cli": "^0.39.0-264124",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.38.0",
-    "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-rc.3.0.0",
+    "@fluidframework/build-tools": "^0.39.0-264124",
+    "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-rc.4.0.0",
     "@fluidframework/eslint-config-fluid": "^5.1.0",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.5.0.0.263932",
-    "@microsoft/api-extractor": "^7.43.1",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.5.0.0.267932",
+    "@microsoft/api-extractor": "^7.45.1",
     "@types/double-ended-queue": "^2.1.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
@@ -175,7 +174,7 @@
     "prettier": "~3.0.3",
     "rimraf": "^4.4.0",
     "sinon": "^17.0.1",
-    "typescript": "~5.1.6"
+    "typescript": "~5.4.5"
   },
   "typeValidation": {
     "broken": {
@@ -187,8 +186,57 @@
         "backCompat": false,
         "forwardCompat": false
       },
-      "ClassDeclaration_DataStoreContexts": {
+      "ClassDeclaration_FluidDataStoreContext": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "ClassDeclaration_LocalFluidDataStoreContextBase": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "ClassDeclaration_LocalFluidDataStoreContext": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "RemovedEnumDeclaration_RuntimeMessage": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_IFluidDataStoreContextInternal": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_IFluidDataStoreContextProps": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_ILocalDetachedFluidDataStoreContextProps": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_ILocalFluidDataStoreContextProps": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_ISummarizerRuntime": {
+        "backCompat": false,
         "forwardCompat": false
+      },
+      "RemovedInterfaceDeclaration_IRetriableFailureResult": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_IGenerateSummaryTreeResult": {
+        "backCompat": false
+      },
+      "InterfaceDeclaration_ISubmitSummaryOpResult": {
+        "backCompat": false
+      },
+      "InterfaceDeclaration_IUploadSummaryResult": {
+        "backCompat": false
+      },
+      "TypeAliasDeclaration_SubmitSummaryResult": {
+        "backCompat": false
       }
     }
   },

package/src/batchTracker.ts

@@ -7,7 +7,7 @@ import type { EventEmitter } from "@fluid-internal/client-utils";
 import { performance } from "@fluid-internal/client-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions";
 import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils/internal";
 
 export class BatchTracker {

package/src/blobManager.ts

@@ -14,18 +14,18 @@ import {
 	type IFluidHandleInternal,
 } from "@fluidframework/core-interfaces/internal";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
-import { canRetryOnError, runWithRetry } from "@fluidframework/driver-utils/internal";
+import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions";
 import {
+	IDocumentStorageService,
 	ICreateBlobResponse,
-	ISequencedDocumentMessage,
 	ISnapshotTree,
-} from "@fluidframework/protocol-definitions";
+} from "@fluidframework/driver-definitions/internal";
+import { canRetryOnError, runWithRetry } from "@fluidframework/driver-utils/internal";
 import {
 	IGarbageCollectionData,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
-} from "@fluidframework/runtime-definitions";
+} from "@fluidframework/runtime-definitions/internal";
 import {
 	FluidHandleBase,
 	SummaryTreeBuilder,
@@ -96,7 +96,7 @@ export interface IBlobManagerLoadInfo {
 // the contract explicit and reduces the amount of mocking required for tests.
 export type IBlobManagerRuntime = Pick<
 	IContainerRuntime,
-	"attachState" | "connected" | "logger" | "clientDetails"
+	"attachState" | "connected" | "baseLogger" | "clientDetails"
 > &
 	TypedEventEmitter<IContainerRuntimeEvents>;
 
@@ -233,7 +233,7 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		this.closeContainer = closeContainer;
 
 		this.mc = createChildMonitoringContext({
-			logger: this.runtime.logger,
+			logger: this.runtime.baseLogger,
 			namespace: "BlobManager",
 		});
 

package/src/channelCollection.ts

@@ -14,20 +14,18 @@ import {
 import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
 import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils/internal";
 import { FluidObjectHandle } from "@fluidframework/datastore/internal";
+import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions";
+import type { ISnapshot } from "@fluidframework/driver-definitions/internal";
+import { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 import {
 	buildSnapshotTree,
 	getSnapshotTree,
 	isInstanceOfISnapshot,
 } from "@fluidframework/driver-utils/internal";
-import type { ISnapshot } from "@fluidframework/driver-definitions/internal";
-import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import {
-	IGarbageCollectionData,
-	IInboundSignalMessage,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
-} from "@fluidframework/runtime-definitions";
-import {
+	IGarbageCollectionData,
 	AliasResult,
 	CreateSummarizerNodeSource,
 	IAttachMessage,
@@ -42,6 +40,7 @@ import {
 	InboundAttachMessage,
 	NamedFluidDataStoreRegistryEntries,
 	channelsTreeName,
+	IInboundSignalMessage,
 } from "@fluidframework/runtime-definitions/internal";
 import {
 	GCDataBuilder,
@@ -149,7 +148,7 @@ export function wrapContext(context: IFluidParentContext): IFluidParentContext {
 		},
 		deltaManager: context.deltaManager,
 		storage: context.storage,
-		logger: context.logger,
+		baseLogger: context.baseLogger,
 		get clientDetails() {
 			return context.clientDetails;
 		},
@@ -679,7 +678,7 @@ export class ChannelCollection implements IFluidDataStoreChannel, IDisposable {
 					channel,
 					id,
 					this,
-					createChildLogger({ logger: this.parentContext.logger }),
+					createChildLogger({ logger: this.parentContext.baseLogger }),
 				),
 		});
 
@@ -1561,7 +1560,7 @@ export class ChannelCollectionFactory<T extends ChannelCollection = ChannelColle
 		const runtime = this.ctor(
 			context.baseSnapshot,
 			context, // parentContext
-			context.logger,
+			context.baseLogger,
 			() => {}, // gcNodeUpdated
 			(_nodePath: string) => false, // isDataStoreDeleted
 			new Map(), // aliasMap

package/src/connectionTelemetry.ts

@@ -8,12 +8,9 @@ import { IDeltaManager } from "@fluidframework/container-definitions/internal";
 import { IContainerRuntimeEvents } from "@fluidframework/container-runtime-definitions/internal";
 import { IEventProvider } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
+import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions";
+import { IDocumentMessage, MessageType } from "@fluidframework/driver-definitions/internal";
 import { isRuntimeMessage } from "@fluidframework/driver-utils/internal";
-import {
-	IDocumentMessage,
-	ISequencedDocumentMessage,
-	MessageType,
-} from "@fluidframework/protocol-definitions";
 import {
 	IEventSampler,
 	ITelemetryLoggerExt,
@@ -95,6 +92,13 @@ class OpPerfTelemetry {
 	private readonly deltaLatencyLogger: ISampledTelemetryLogger;
 
 	private static readonly PROCESSED_OPS_SAMPLE_RATE = 500;
+
+	/**
+	 * A sampled logger to log Ops that have been processed by the current client, the NoOp sent and the
+	 * size of the ops processed within one sampling window of this log event.
+	 * The data from this logger will be used to monitor the efficiency of NoOp-heuristics or to get approximate collab window size.
+	 * Note: no log events are sent when sampling is disabled, because logging at every op will be too noisy.
+	 */
 	private readonly opsLogger: ISampledTelemetryLogger;
 
 	/**
@@ -167,7 +171,11 @@ class OpPerfTelemetry {
 				},
 			};
 		})();
-		this.opsLogger = createSampledLogger(logger, opsEventSampler);
+		this.opsLogger = createSampledLogger(
+			logger,
+			opsEventSampler,
+			true /* skipLoggingWhenSamplingIsDisabled */,
+		);
 
 		this.deltaManager.on("pong", (latency) => this.recordPingTime(latency));
 		this.deltaManager.on("submitOp", (message) => this.beforeOpSubmit(message));

package/src/containerHandleContext.ts

@@ -4,7 +4,8 @@
  */
 
 import { AttachState } from "@fluidframework/container-definitions";
-import { IFluidHandleContext, IRequest, IResponse } from "@fluidframework/core-interfaces";
+import { IRequest, IResponse } from "@fluidframework/core-interfaces";
+import { IFluidHandleContext } from "@fluidframework/core-interfaces/internal";
 import { generateHandleContextPath } from "@fluidframework/runtime-utils/internal";
 
 import { ContainerRuntime } from "./containerRuntime.js";