@fluidframework/container-runtime 2.1.0-276985 → 2.1.0

package/src/gc/garbageCollection.ts

@@ -403,20 +403,21 @@ export class GarbageCollector implements IGarbageCollector {
 			this.mc.logger,
 			{
 				eventName: "InitializeOrUpdateGCState",
-				details: { initialized, unrefNodeCount: this.unreferencedNodesState.size },
 			},
-			async () => {
+			async (event) => {
 				// If the GC state hasn't been initialized yet, initialize it and return.
 				if (!initialized) {
 					await this.initializeGCStateFromBaseSnapshotP;
-					return;
-				}
-
-				// If the GC state has been initialized, update the tracking of unreferenced nodes as per the current
-				// reference timestamp.
-				for (const [, nodeStateTracker] of this.unreferencedNodesState) {
-					nodeStateTracker.updateTracking(currentReferenceTimestampMs);
+				} else {
+					// If the GC state has been initialized, update the tracking of unreferenced nodes as per the current
+					// reference timestamp.
+					for (const [, nodeStateTracker] of this.unreferencedNodesState) {
+						nodeStateTracker.updateTracking(currentReferenceTimestampMs);
+					}
 				}
+				event.end({
+					details: { initialized, unrefNodeCount: this.unreferencedNodesState.size },
+				});
 			},
 		);
 	}
@@ -819,7 +820,9 @@ export class GarbageCollector implements IGarbageCollector {
 				if (gcDataSuperSet.gcNodes[sourceNodeId] === undefined) {
 					gcDataSuperSet.gcNodes[sourceNodeId] = outboundRoutes;
 				} else {
-					gcDataSuperSet.gcNodes[sourceNodeId].push(...outboundRoutes);
+					// Non null asserting here because we are checking if it is undefined above.
+					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+					gcDataSuperSet.gcNodes[sourceNodeId]!.push(...outboundRoutes);
 				}
 				newOutboundRoutesSinceLastRun.push(...outboundRoutes);
 			},
@@ -1001,6 +1004,7 @@ export class GarbageCollector implements IGarbageCollector {
 		packagePath,
 		request,
 		headerData,
+		additionalProps,
 	}: IGCNodeUpdatedProps) {
 		// If there is no reference timestamp to work with, no ops have been processed after creation. If so, skip
 		// logging as nothing interesting would have happened worth logging.
@@ -1027,6 +1031,7 @@ export class GarbageCollector implements IGarbageCollector {
 			headers: headerData,
 			requestUrl: request?.url,
 			requestHeaders: JSON.stringify(request?.headers),
+			additionalProps,
 		});
 
 		// Any time we log a Tombstone Loaded error (via Telemetry Tracker),

package/src/gc/gcDefinitions.ts

@@ -13,7 +13,10 @@ import {
 	ISummarizeResult,
 } from "@fluidframework/runtime-definitions/internal";
 import { ReadAndParseBlob } from "@fluidframework/runtime-utils/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import {
+	ITelemetryLoggerExt,
+	type ITelemetryPropertiesExt,
+} from "@fluidframework/telemetry-utils/internal";
 
 import { RuntimeHeaderData } from "../containerRuntime.js";
 import { ContainerRuntimeGCMessage } from "../messageTypes.js";
@@ -397,7 +400,7 @@ export interface IGCNodeUpdatedProps {
 	/** Type and path of the updated node */
 	node: { type: (typeof GCNodeType)["DataStore" | "Blob"]; path: string };
 	/** Whether the node (or a subpath) was loaded or changed. */
-	reason: "Loaded" | "Changed";
+	reason: "Loaded" | "Changed" | "Realized";
 	/**
 	 * The op-based timestamp when the node changed. If the update is from receiving an op, this should
 	 * be the timestamp of the op. If not, this should be the timestamp of the last op processed.
@@ -409,6 +412,8 @@ export interface IGCNodeUpdatedProps {
 	request?: IRequest;
 	/** If the node was loaded via request path, the header data. May be modified from the original request */
 	headerData?: RuntimeHeaderData;
+	/** Any other properties to be logged. */
+	additionalProps?: ITelemetryPropertiesExt;
 }
 
 /** Parameters necessary for creating a GarbageCollector. */

package/src/gc/gcHelpers.ts

@@ -166,7 +166,9 @@ export function concatGarbageCollectionData(
 		if (combinedGCData.gcNodes[id] === undefined) {
 			combinedGCData.gcNodes[id] = Array.from(routes);
 		} else {
-			const combinedRoutes = [...routes, ...combinedGCData.gcNodes[id]];
+			// Non null asserting here since we are checking if combinedGCData.gcNodes[id] is not undefined above.
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const combinedRoutes = [...routes, ...combinedGCData.gcNodes[id]!];
 			combinedGCData.gcNodes[id] = [...new Set(combinedRoutes)];
 		}
 	}
@@ -187,13 +189,17 @@ export async function getGCDataFromSnapshot(
 	for (const key of Object.keys(gcSnapshotTree.blobs)) {
 		// Update deleted nodes blob.
 		if (key === gcDeletedBlobKey) {
-			deletedNodes = await readAndParseBlob<string[]>(gcSnapshotTree.blobs[key]);
+			// Non null asserting here, we can change this to Object.entries later
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			deletedNodes = await readAndParseBlob<string[]>(gcSnapshotTree.blobs[key]!);
 			continue;
 		}
 
 		// Update tombstone blob.
 		if (key === gcTombstoneBlobKey) {
-			tombstones = await readAndParseBlob<string[]>(gcSnapshotTree.blobs[key]);
+			// Non null asserting here, we can change this to Object.entries later
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			tombstones = await readAndParseBlob<string[]>(gcSnapshotTree.blobs[key]!);
 			continue;
 		}
 
@@ -235,7 +241,9 @@ export function unpackChildNodesGCDetails(gcDetails: IGarbageCollectionDetailsBa
 		}
 
 		assert(id.startsWith("/"), 0x5d9 /* node id should always be an absolute route */);
-		const childId = id.split("/")[1];
+		// TODO Why are we non null asserting here
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		const childId = id.split("/")[1]!;
 		let childGCNodeId = id.slice(childId.length + 1);
 		// GC node id always begins with "/". Handle the special case where a child's id in the parent's GC nodes is
 		// of format `/root`. In this case, the childId is root and childGCNodeId is "". Make childGCNodeId = "/".
@@ -264,7 +272,9 @@ export function unpackChildNodesGCDetails(gcDetails: IGarbageCollectionDetailsBa
 	const usedRoutes = gcDetails.usedRoutes.filter((route) => route !== "" && route !== "/");
 	for (const route of usedRoutes) {
 		assert(route.startsWith("/"), 0x5db /* Used route should always be an absolute route */);
-		const childId = route.split("/")[1];
+		// TODO Why are we non null asserting here
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		const childId = route.split("/")[1]!;
 		const childUsedRoute = route.slice(childId.length + 1);
 
 		const childGCDetails = childGCDetailsMap.get(childId);
@@ -290,7 +300,9 @@ function trimLeadingAndTrailingSlashes(str: string) {
 
 /** Reformats a request URL to match expected format for a GC node path */
 export function urlToGCNodePath(url: string): string {
-	return `/${trimLeadingAndTrailingSlashes(url.split("?")[0])}`;
+	// TODO Why are we non null asserting here
+	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+	return `/${trimLeadingAndTrailingSlashes(url.split("?")[0]!)}`;
 }
 
 /**

package/src/gc/gcTelemetry.ts

@@ -11,6 +11,7 @@ import {
 	generateStack,
 	tagCodeArtifacts,
 	type ITelemetryGenericEventExt,
+	type ITelemetryPropertiesExt,
 } from "@fluidframework/telemetry-utils/internal";
 
 import { RuntimeHeaderData } from "../containerRuntime.js";
@@ -28,7 +29,7 @@ import {
 import { getGCVersionInEffect } from "./gcHelpers.js";
 import { UnreferencedStateTracker } from "./gcUnreferencedStateTracker.js";
 
-type NodeUsageType = "Changed" | "Loaded" | "Revived";
+type NodeUsageType = "Changed" | "Loaded" | "Revived" | "Realized";
 
 /** Properties that are common to IUnreferencedEventProps and INodeUsageProps */
 interface ICommonProps {
@@ -37,6 +38,7 @@ interface ICommonProps {
 	isTombstoned: boolean;
 	lastSummaryTime?: number;
 	headers?: RuntimeHeaderData;
+	additionalProps?: ITelemetryPropertiesExt;
 }
 
 /** The event that is logged when unreferenced node is used after a certain time. */
@@ -240,7 +242,8 @@ export class GCTelemetryTracker {
 			// Events generated:
 			// InactiveObject_Loaded, SweepReadyObject_Loaded
 			if (usageType === "Loaded") {
-				const { id, fromId, headers, gcConfigs, ...detailedProps } = unrefEventProps;
+				const { id, fromId, headers, gcConfigs, additionalProps, ...detailedProps } =
+					unrefEventProps;
 				const event = {
 					eventName: `${state}Object_${usageType}`,
 					...tagCodeArtifacts({ pkg: packagePath?.join("/") }),
@@ -248,7 +251,7 @@ export class GCTelemetryTracker {
 					id,
 					fromId,
 					headers: { ...headers },
-					details: detailedProps,
+					details: { ...detailedProps, ...additionalProps },
 					gcConfigs,
 				};
 
@@ -272,7 +275,8 @@ export class GCTelemetryTracker {
 		// GC_Tombstone_DataStore_Requested, GC_Tombstone_DataStore_Changed, GC_Tombstone_DataStore_Revived
 		// GC_Tombstone_SubDataStore_Requested, GC_Tombstone_SubDataStore_Changed, GC_Tombstone_SubDataStore_Revived
 		// GC_Tombstone_Blob_Requested, GC_Tombstone_Blob_Changed, GC_Tombstone_Blob_Revived
-		const { id, fromId, headers, gcConfigs, ...detailedProps } = unrefEventProps;
+		const { id, fromId, headers, gcConfigs, additionalProps, ...detailedProps } =
+			unrefEventProps;
 		const eventUsageName = usageType === "Loaded" ? "Requested" : usageType;
 		const event = {
 			eventName: `GC_Tombstone_${nodeType}_${eventUsageName}`,
@@ -281,7 +285,7 @@ export class GCTelemetryTracker {
 			id,
 			fromId,
 			headers: { ...headers },
-			details: detailedProps, // Also includes some properties from INodeUsageProps type
+			details: { ...detailedProps, ...additionalProps }, // Also includes some properties from INodeUsageProps type
 			gcConfigs,
 			tombstoneFlags: {
 				DisableTombstone: this.mc.config.getBoolean(disableTombstoneKey),
@@ -370,8 +374,16 @@ export class GCTelemetryTracker {
 		// InactiveObject_Loaded, InactiveObject_Changed, InactiveObject_Revived
 		// SweepReadyObject_Loaded, SweepReadyObject_Changed, SweepReadyObject_Revived
 		for (const eventProps of this.pendingEventsQueue) {
-			const { usageType, state, id, fromId, headers, gcConfigs, ...detailedProps } =
-				eventProps;
+			const {
+				usageType,
+				state,
+				id,
+				fromId,
+				headers,
+				gcConfigs,
+				additionalProps,
+				...detailedProps
+			} = eventProps;
 			/**
 			 * Revived event is logged only if the node is active. If the node is not active, the reference to it was
 			 * from another unreferenced node and this scenario is not interesting to log.
@@ -391,7 +403,7 @@ export class GCTelemetryTracker {
 					id,
 					fromId,
 					headers: { ...headers },
-					details: detailedProps,
+					details: { ...detailedProps, ...additionalProps },
 					gcConfigs,
 					...tagCodeArtifacts({
 						pkg: pkg?.join("/"),

package/src/metadata.ts

@@ -3,11 +3,21 @@
  * Licensed under the MIT License.
  */
 
+import type { BatchId } from "./opLifecycle/index.js";
+
+/** Syntactic sugar for casting */
+export function asBatchMetadata(metadata: unknown): IBatchMetadata | undefined {
+	return metadata as IBatchMetadata | undefined;
+}
+
 /**
- * Batching makes assumptions about what might be on the metadata. This interface codifies those assumptions, but does not validate them.
+ * Properties put on the op metadata object for batch tracking
  */
 export interface IBatchMetadata {
+	/** Set on first/last messages of a multi-message batch, to true/false respectively */
 	batch?: boolean;
+	/** Maybe set on first message of a batch, to the batchId generated when resubmitting (set/fixed on first resubmit) */
+	batchId?: BatchId;
 }
 
 /**

package/src/opLifecycle/README.md

@@ -10,7 +10,6 @@
     -   [Grouped batching](#grouped-batching)
         -   [Changes in op semantics](#changes-in-op-semantics)
     -   [Chunking for compression](#chunking-for-compression)
-    -   [Disabling in case of emergency](#disabling-in-case-of-emergency)
     -   [Configuration](#configuration)
     -   [Note about performance and latency](#note-about-performance-and-latency)
     -   [How it works](#how-it-works)
@@ -103,13 +102,6 @@ This config would govern chunking compressed batches only. We will not be enabli
 
 Chunking is relevant for both `FlushMode.TurnBased` and `FlushMode.Immediate` as it only targets the contents of the ops and not the number of ops in a batch. Chunking is opaque to the server and implementations of the Fluid protocol do not need to alter their behavior to support this client feature.
 
-## Disabling in case of emergency
-
-Compression and Chunking configuration can be overridden via feature gates to force-disable them:
-
--   `Fluid.ContainerRuntime.CompressionDisabled` - if set to true, will disable compression (this has a side effect of also disabling chunking, as chunking is invoked only for compressed payloads).
--   `Fluid.ContainerRuntime.CompressionChunkingDisabled` - if set to true, will disable chunking for compression.
-
 ## Configuration
 
 These features are configured via `IContainerRuntimeOptions`, passed to the `ContainerRuntime.loadRuntime` function.

package/src/opLifecycle/batchManager.ts

@@ -3,7 +3,10 @@
  * Licensed under the MIT License.
  */
 
+import { assert } from "@fluidframework/core-utils/internal";
+
 import { ICompressionRuntimeOptions } from "../containerRuntime.js";
+import { type IBatchMetadata } from "../metadata.js";
 
 import { BatchMessage, IBatch, IBatchCheckpoint } from "./definitions.js";
 
@@ -22,6 +25,14 @@ export interface BatchSequenceNumbers {
 	clientSequenceNumber?: number;
 }
 
+/** Type alias for the batchId stored in batch metadata */
+export type BatchId = string;
+
+/** Compose original client ID and client sequence number into BatchId to stamp on the message during reconnect */
+export function generateBatchId(originalClientId: string, batchStartCsn: number): BatchId {
+	return `${originalClientId}_[${batchStartCsn}]`;
+}
+
 /**
  * Estimated size of the stringification overhead for an op accumulated
  * from runtime to loader to the service.
@@ -53,7 +64,9 @@ export class BatchManager {
 	private get referenceSequenceNumber(): number | undefined {
 		return this.pendingBatch.length === 0
 			? undefined
-			: this.pendingBatch[this.pendingBatch.length - 1].referenceSequenceNumber;
+			: // Non null asserting here since we are checking the length above
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				this.pendingBatch[this.pendingBatch.length - 1]!.referenceSequenceNumber;
 	}
 
 	/**
@@ -97,9 +110,12 @@ export class BatchManager {
 		return this.pendingBatch.length === 0;
 	}
 
-	public popBatch(): IBatch {
+	/**
+	 * Gets the pending batch and clears state for the next batch.
+	 */
+	public popBatch(batchId?: BatchId): IBatch {
 		const batch: IBatch = {
-			content: this.pendingBatch,
+			messages: this.pendingBatch,
 			contentSizeInBytes: this.batchContentSize,
 			referenceSequenceNumber: this.referenceSequenceNumber,
 			hasReentrantOps: this.hasReentrantOps,
@@ -110,7 +126,7 @@ export class BatchManager {
 		this.clientSequenceNumber = undefined;
 		this.hasReentrantOps = false;
 
-		return addBatchMetadata(batch);
+		return addBatchMetadata(batch, batchId);
 	}
 
 	/**
@@ -122,7 +138,9 @@ export class BatchManager {
 			rollback: (process: (message: BatchMessage) => void) => {
 				for (let i = this.pendingBatch.length; i > startPoint; ) {
 					i--;
-					const message = this.pendingBatch[i];
+					// Non null asserting here since we are iterating though pendingBatch
+					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+					const message = this.pendingBatch[i]!;
 					this.batchContentSize -= message.contents?.length ?? 0;
 					process(message);
 				}
@@ -133,16 +151,31 @@ export class BatchManager {
 	}
 }
 
-const addBatchMetadata = (batch: IBatch): IBatch => {
-	if (batch.content.length > 1) {
-		batch.content[0].metadata = {
-			...batch.content[0].metadata,
-			batch: true,
-		};
-		batch.content[batch.content.length - 1].metadata = {
-			...batch.content[batch.content.length - 1].metadata,
-			batch: false,
-		};
+const addBatchMetadata = (batch: IBatch, batchId?: BatchId): IBatch => {
+	const batchEnd = batch.messages.length - 1;
+
+	const firstMsg = batch.messages[0];
+	const lastMsg = batch.messages[batchEnd];
+	assert(
+		firstMsg !== undefined && lastMsg !== undefined,
+		0x9d1 /* expected non-empty batch */,
+	);
+
+	const firstMetadata: Partial<IBatchMetadata> = firstMsg.metadata ?? {};
+	const lastMetadata: Partial<IBatchMetadata> = lastMsg.metadata ?? {};
+
+	// Multi-message batches: mark the first and last messages with the "batch" flag indicating batch start/end
+	if (batch.messages.length > 1) {
+		firstMetadata.batch = true;
+		lastMetadata.batch = false;
+		firstMsg.metadata = firstMetadata;
+		lastMsg.metadata = lastMetadata;
+	}
+
+	// If batchId is provided (e.g. in case of resubmit): stamp it on the first message
+	if (batchId !== undefined) {
+		firstMetadata.batchId = batchId;
+		firstMsg.metadata = firstMetadata;
 	}
 
 	return batch;
@@ -157,7 +190,7 @@ const addBatchMetadata = (batch: IBatch): IBatch => {
  * @returns An estimate of the payload size in bytes which will be produced when the batch is sent over the wire
  */
 export const estimateSocketSize = (batch: IBatch): number => {
-	return batch.contentSizeInBytes + opOverhead * batch.content.length;
+	return batch.contentSizeInBytes + opOverhead * batch.messages.length;
 };
 
 export const sequenceNumbersMatch = (

package/src/opLifecycle/definitions.ts

@@ -28,7 +28,7 @@ export interface IBatch<TMessages extends BatchMessage[] = BatchMessage[]> {
 	/**
 	 * All the messages in the batch
 	 */
-	readonly content: TMessages;
+	readonly messages: TMessages;
 	/**
 	 * The reference sequence number for the batch
 	 */

package/src/opLifecycle/index.ts

@@ -3,13 +3,24 @@
  * Licensed under the MIT License.
  */
 
-export { BatchManager, estimateSocketSize, BatchSequenceNumbers } from "./batchManager.js";
+export {
+	BatchId,
+	BatchManager,
+	BatchSequenceNumbers,
+	estimateSocketSize,
+	generateBatchId,
+	IBatchManagerOptions,
+} from "./batchManager.js";
 export { BatchMessage, IBatch, IBatchCheckpoint, IChunkedOp } from "./definitions.js";
 export { Outbox, getLongStack } from "./outbox.js";
 export { OpCompressor } from "./opCompressor.js";
 export { OpDecompressor } from "./opDecompressor.js";
 export { OpSplitter, splitOp, isChunkedMessage } from "./opSplitter.js";
-export { RemoteMessageProcessor, unpackRuntimeMessage } from "./remoteMessageProcessor.js";
+export {
+	ensureContentsDeserialized,
+	RemoteMessageProcessor,
+	unpackRuntimeMessage,
+} from "./remoteMessageProcessor.js";
 export {
 	OpGroupingManager,
 	OpGroupingManagerConfig,

package/src/opLifecycle/opCompressor.ts

@@ -35,7 +35,7 @@ export class OpCompressor {
 	 */
 	public compressBatch(batch: IBatch): IBatch {
 		assert(
-			batch.contentSizeInBytes > 0 && batch.content.length > 0,
+			batch.contentSizeInBytes > 0 && batch.messages.length > 0,
 			0x5a4 /* Batch should not be empty */,
 		);
 
@@ -47,14 +47,18 @@ export class OpCompressor {
 
 		const messages: BatchMessage[] = [];
 		messages.push({
-			...batch.content[0],
+			// Non null asserting here because of the length assert above
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			...batch.messages[0]!,
 			contents: JSON.stringify({ packedContents: compressedContent }),
-			metadata: batch.content[0].metadata,
+			// Non null asserting here because of the length assert above
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			metadata: batch.messages[0]!.metadata,
 			compression: CompressionAlgorithms.lz4,
 		});
 
 		// Add empty placeholder messages to reserve the sequence numbers
-		for (const message of batch.content.slice(1)) {
+		for (const message of batch.messages.slice(1)) {
 			messages.push({
 				localOpMetadata: message.localOpMetadata,
 				metadata: message.metadata,
@@ -64,7 +68,7 @@ export class OpCompressor {
 
 		const compressedBatch: IBatch = {
 			contentSizeInBytes: compressedContent.length,
-			content: messages,
+			messages,
 			referenceSequenceNumber: batch.referenceSequenceNumber,
 		};
 
@@ -74,7 +78,7 @@ export class OpCompressor {
 				duration,
 				sizeBeforeCompression: batch.contentSizeInBytes,
 				sizeAfterCompression: compressedBatch.contentSizeInBytes,
-				opCount: compressedBatch.content.length,
+				opCount: compressedBatch.messages.length,
 				socketSize: estimateSocketSize(compressedBatch),
 			});
 		}
@@ -88,7 +92,7 @@ export class OpCompressor {
 	private serializeBatchContents(batch: IBatch): string {
 		try {
 			// Yields a valid JSON array, since each message.contents is already serialized to JSON
-			return `[${batch.content.map((message) => message.contents).join(",")}]`;
+			return `[${batch.messages.map(({ contents }) => contents).join(",")}]`;
 		} catch (e: any) {
 			if (e.message === "Invalid string length") {
 				// This is how JSON.stringify signals that
@@ -98,7 +102,7 @@ export class OpCompressor {
 					{
 						eventName: "BatchTooLarge",
 						size: batch.contentSizeInBytes,
-						length: batch.content.length,
+						length: batch.messages.length,
 					},
 					error,
 				);

package/src/opLifecycle/opGroupingManager.ts

@@ -59,27 +59,28 @@ export class OpGroupingManager {
 	public groupBatch(batch: IBatch): IBatch<[BatchMessage]> {
 		assert(this.shouldGroup(batch), 0x946 /* cannot group the provided batch */);
 
-		if (batch.content.length >= 1000) {
+		if (batch.messages.length >= 1000) {
 			this.logger.sendTelemetryEvent({
 				eventName: "GroupLargeBatch",
-				length: batch.content.length,
+				length: batch.messages.length,
 				threshold: this.config.opCountThreshold,
 				reentrant: batch.hasReentrantOps,
-				referenceSequenceNumber: batch.content[0].referenceSequenceNumber,
+				// Non null asserting here because of the length check above
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				referenceSequenceNumber: batch.messages[0]!.referenceSequenceNumber,
 			});
 		}
 
-		for (const message of batch.content) {
+		for (const message of batch.messages) {
 			if (message.metadata) {
-				const keys = Object.keys(message.metadata);
-				assert(keys.length < 2, 0x5dd /* cannot group ops with metadata */);
-				assert(keys.length === 0 || keys[0] === "batch", 0x5de /* unexpected op metadata */);
+				const { batch: _batch, batchId, ...rest } = message.metadata;
+				assert(Object.keys(rest).length === 0, 0x5dd /* cannot group ops with metadata */);
 			}
 		}
 
 		const serializedContent = JSON.stringify({
 			type: OpGroupingManager.groupedBatchOp,
-			contents: batch.content.map<IGroupedMessage>((message) => ({
+			contents: batch.messages.map<IGroupedMessage>((message) => ({
 				contents: message.contents === undefined ? undefined : JSON.parse(message.contents),
 				metadata: message.metadata,
 				compression: message.compression,
@@ -88,10 +89,12 @@ export class OpGroupingManager {
 
 		const groupedBatch: IBatch<[BatchMessage]> = {
 			...batch,
-			content: [
+			messages: [
 				{
 					metadata: undefined,
-					referenceSequenceNumber: batch.content[0].referenceSequenceNumber,
+					// TODO why are we non null asserting here?
+					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+					referenceSequenceNumber: batch.messages[0]!.referenceSequenceNumber,
 					contents: serializedContent,
 				},
 			],
@@ -118,7 +121,7 @@ export class OpGroupingManager {
 			// Grouped batching must be enabled
 			this.config.groupedBatchingEnabled &&
 			// The number of ops in the batch must surpass the configured threshold
-			batch.content.length >= this.config.opCountThreshold &&
+			batch.messages.length >= this.config.opCountThreshold &&
 			// Support for reentrant batches must be explicitly enabled
 			(this.config.reentrantBatchGroupingEnabled || batch.hasReentrantOps !== true)
 		);

package/src/opLifecycle/opSplitter.ts

@@ -121,7 +121,7 @@ export class OpSplitter {
 	public splitFirstBatchMessage(batch: IBatch): IBatch {
 		assert(this.isBatchChunkingEnabled, 0x513 /* Chunking needs to be enabled */);
 		assert(
-			batch.contentSizeInBytes > 0 && batch.content.length > 0,
+			batch.contentSizeInBytes > 0 && batch.messages.length > 0,
 			0x514 /* Batch needs to be non-empty */,
 		);
 		assert(
@@ -134,13 +134,15 @@ export class OpSplitter {
 			0x516 /* Chunk size needs to be smaller than the max batch size */,
 		);
 
-		const firstMessage = batch.content[0]; // we expect this to be the large compressed op, which needs to be split
+		// Non null asserting here because of the length check above
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		const firstMessage = batch.messages[0]!; // we expect this to be the large compressed op, which needs to be split
 		assert(
 			(firstMessage.contents?.length ?? 0) >= this.chunkSizeInBytes,
 			0x518 /* First message in the batch needs to be chunkable */,
 		);
 
-		const restOfMessages = batch.content.slice(1); // we expect these to be empty ops, created to reserve sequence numbers
+		const restOfMessages = batch.messages.slice(1); // we expect these to be empty ops, created to reserve sequence numbers
 		const socketSize = estimateSocketSize(batch);
 		const chunks = splitOp(
 			firstMessage,
@@ -163,7 +165,9 @@ export class OpSplitter {
 		// The last chunk will be part of the new batch and needs to
 		// preserve the batch metadata of the original batch
 		const lastChunk = chunkToBatchMessage(
-			chunks[chunks.length - 1],
+			// Non null asserting here because of the length assert above
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			chunks[chunks.length - 1]!,
 			batch.referenceSequenceNumber,
 			{ batch: firstMessage.metadata?.batch },
 		);
@@ -171,7 +175,7 @@ export class OpSplitter {
 		this.logger.sendPerformanceEvent({
 			// Used to be "Chunked compressed batch"
 			eventName: "CompressedChunkedBatch",
-			length: batch.content.length,
+			length: batch.messages.length,
 			sizeInBytes: batch.contentSizeInBytes,
 			chunks: chunks.length,
 			chunkSizeInBytes: this.chunkSizeInBytes,
@@ -179,7 +183,7 @@ export class OpSplitter {
 		});
 
 		return {
-			content: [lastChunk, ...restOfMessages],
+			messages: [lastChunk, ...restOfMessages],
 			contentSizeInBytes: lastChunk.contents?.length ?? 0,
 			referenceSequenceNumber: batch.referenceSequenceNumber,
 		};