@fluidframework/container-runtime 2.0.0-dev.4.4.0.162574 → 2.0.0-dev.5.2.0.169897

package/src/opLifecycle/opDecompressor.ts

@@ -6,8 +6,7 @@
 import { decompress } from "lz4js";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { assert, IsoBuffer, Uint8ArrayToString } from "@fluidframework/common-utils";
-import { ChildLogger } from "@fluidframework/telemetry-utils";
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ChildLogger, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { CompressionAlgorithms } from "../containerRuntime";
 import { IMessageProcessingResult } from "./definitions";
 
@@ -25,7 +24,7 @@ export class OpDecompressor {
 	private processedCount = 0;
 	private readonly logger;
 
-	constructor(logger: ITelemetryLogger) {
+	constructor(logger: ITelemetryLoggerExt) {
 		this.logger = ChildLogger.create(logger, "OpDecompressor");
 	}
 

package/src/opLifecycle/opGroupingManager.ts

@@ -5,7 +5,7 @@
 
 import { assert } from "@fluidframework/common-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { ContainerMessageType, ContainerRuntimeMessage } from "..";
+import { ContainerMessageType } from "..";
 import { IBatch } from "./definitions";
 
 interface IGroupedMessage {
@@ -26,7 +26,7 @@ export class OpGroupingManager {
 
 		for (const message of batch.content) {
 			// Blob attaches cannot be grouped (grouped batching would hide metadata)
-			if (message.deserializedContent.type === ContainerMessageType.BlobAttach) {
+			if (message.type === ContainerMessageType.BlobAttach) {
 				return batch;
 			}
 			if (message.metadata) {
@@ -39,14 +39,14 @@ export class OpGroupingManager {
 			}
 		}
 
-		const deserializedContent = {
+		const serializedContent = JSON.stringify({
 			type: OpGroupingManager.groupedBatchOp,
 			contents: batch.content.map<IGroupedMessage>((message) => ({
 				contents: message.contents === undefined ? undefined : JSON.parse(message.contents),
 				metadata: message.metadata,
 				compression: message.compression,
 			})),
-		};
+		});
 
 		const groupedBatch: IBatch = {
 			...batch,
@@ -55,9 +55,8 @@ export class OpGroupingManager {
 					localOpMetadata: undefined,
 					metadata: undefined,
 					referenceSequenceNumber: batch.content[0].referenceSequenceNumber,
-					// Need deserializedContent for back-compat
-					deserializedContent: deserializedContent as ContainerRuntimeMessage,
-					contents: JSON.stringify(deserializedContent),
+					contents: serializedContent,
+					type: OpGroupingManager.groupedBatchOp as ContainerMessageType,
 				},
 			],
 		};

package/src/opLifecycle/opSplitter.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt, ChildLogger } from "@fluidframework/telemetry-utils";
 import { assert } from "@fluidframework/common-utils";
 import { IBatchMessage } from "@fluidframework/container-definitions";
 import {
@@ -11,7 +11,6 @@ import {
 	extractSafePropertiesFromMessage,
 } from "@fluidframework/container-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { ChildLogger } from "@fluidframework/telemetry-utils";
 import { ContainerMessageType, ContainerRuntimeMessage } from "../containerRuntime";
 import { estimateSocketSize } from "./batchManager";
 import { BatchMessage, IBatch, IChunkedOp, IMessageProcessingResult } from "./definitions";
@@ -31,7 +30,7 @@ export class OpSplitter {
 			| undefined,
 		public readonly chunkSizeInBytes: number,
 		private readonly maxBatchSizeInBytes: number,
-		logger: ITelemetryLogger,
+		logger: ITelemetryLoggerExt,
 	) {
 		this.chunkMap = new Map<string, string[]>(chunks);
 		this.logger = ChildLogger.create(logger, "OpSplitter");
@@ -214,7 +213,7 @@ const chunkToBatchMessage = (
 	};
 	return {
 		contents: JSON.stringify(payload),
-		deserializedContent: payload,
+		type: payload.type,
 		metadata,
 		localOpMetadata: undefined,
 		referenceSequenceNumber,
@@ -251,7 +250,7 @@ export const splitOp = (
 		const chunk: IChunkedOp = {
 			chunkId,
 			contents: op.contents.substr(offset, chunkSizeInBytes),
-			originalType: op.deserializedContent.type,
+			originalType: op.type,
 			totalChunks: chunkCount,
 		};
 

package/src/opLifecycle/outbox.ts

@@ -3,16 +3,16 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
-import { assert } from "@fluidframework/common-utils";
-import { IContainerContext } from "@fluidframework/container-definitions";
-import { GenericError, UsageError } from "@fluidframework/container-utils";
-import { MessageType } from "@fluidframework/protocol-definitions";
 import {
+	ITelemetryLoggerExt,
 	ChildLogger,
 	loggerToMonitoringContext,
 	MonitoringContext,
 } from "@fluidframework/telemetry-utils";
+import { assert } from "@fluidframework/common-utils";
+import { IContainerContext } from "@fluidframework/container-definitions";
+import { GenericError, UsageError } from "@fluidframework/container-utils";
+import { MessageType } from "@fluidframework/protocol-definitions";
 import { ICompressionRuntimeOptions } from "../containerRuntime";
 import { PendingStateManager } from "../pendingStateManager";
 import {
@@ -40,7 +40,7 @@ export interface IOutboxParameters {
 	readonly config: IOutboxConfig;
 	readonly compressor: OpCompressor;
 	readonly splitter: OpSplitter;
-	readonly logger: ITelemetryLogger;
+	readonly logger: ITelemetryLoggerExt;
 	readonly groupingManager: OpGroupingManager;
 	readonly getCurrentSequenceNumbers: () => BatchSequenceNumbers;
 }
@@ -279,7 +279,8 @@ export class Outbox {
 			for (const message of batch.content) {
 				this.params.containerContext.submitFn(
 					MessageType.Operation,
-					message.deserializedContent,
+					// For back-compat (submitFn only works on deserialized content)
+					message.contents === undefined ? undefined : JSON.parse(message.contents),
 					true, // batch
 					message.metadata,
 				);
@@ -308,9 +309,9 @@ export class Outbox {
 		// In future, need to shift toward keeping batch as a whole!
 		for (const message of batch) {
 			this.params.pendingStateManager.onSubmitMessage(
-				message.deserializedContent.type,
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				message.contents!,
 				message.referenceSequenceNumber,
-				message.deserializedContent.contents,
 				message.localOpMetadata,
 				message.metadata,
 			);

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-dev.4.4.0.162574";
+export const pkgVersion = "2.0.0-dev.5.2.0.169897";

package/src/pendingStateManager.ts

@@ -13,10 +13,9 @@ import { ContainerMessageType } from "./containerRuntime";
 import { pkgVersion } from "./packageVersion";
 
 /**
- * This represents a message that has been submitted and is added to the pending queue when `submit` is called on the
- * ContainerRuntime. This message has either not been ack'd by the server or has not been submitted to the server yet.
+ * ! TODO: Remove this interface in "2.0.0-internal.7.0.0" once we only read IPendingMessageNew
  */
-export interface IPendingMessage {
+export interface IPendingMessageOld {
 	type: "message";
 	messageType: ContainerMessageType;
 	clientSequenceNumber: number;
@@ -27,16 +26,22 @@ export interface IPendingMessage {
 }
 
 /**
- * This represents an explicit flush call and is added to the pending queue when flush is called on the ContainerRuntime
- * to flush pending messages.
- * ! TODO: Remove in "2.0.0-internal.5.0.0" AB#2496
+ * This represents a message that has been submitted and is added to the pending queue when `submit` is called on the
+ * ContainerRuntime. This message has either not been ack'd by the server or has not been submitted to the server yet.
  */
-export interface IPendingFlush {
-	type: "flush";
+export interface IPendingMessageNew {
+	type: "message";
+	clientSequenceNumber: number;
+	referenceSequenceNumber: number;
+	content: string;
+	localOpMetadata: unknown;
+	opMetadata: Record<string, unknown> | undefined;
 }
 
-/** ! TODO: Remove in "2.0.0-internal.5.0.0" AB#2496 */
-export type IPendingState = IPendingMessage | IPendingFlush;
+/**
+ * ! TODO: Remove this type in "2.0.0-internal.7.0.0"
+ */
+export type IPendingState = IPendingMessageOld | IPendingMessageNew;
 
 export interface IPendingLocalState {
 	/**
@@ -49,14 +54,12 @@ export interface IRuntimeStateHandler {
 	connected(): boolean;
 	clientId(): string | undefined;
 	close(error?: ICriticalContainerError): void;
-	applyStashedOp: (type: ContainerMessageType, content: unknown) => Promise<unknown>;
+	applyStashedOp(content: string): Promise<unknown>;
 	reSubmit(
-		type: ContainerMessageType,
-		content: any,
+		content: string | undefined,
 		localOpMetadata: unknown,
 		opMetadata: Record<string, unknown> | undefined,
 	): void;
-	rollback(type: ContainerMessageType, content: any, localOpMetadata: unknown): void;
 	orderSequentially(callback: () => void): void;
 }
 
@@ -70,8 +73,8 @@ export interface IRuntimeStateHandler {
  * It verifies that all the ops are acked, are received in the right order and batch information is correct.
  */
 export class PendingStateManager implements IDisposable {
-	private readonly pendingMessages = new Deque<IPendingMessage>();
-	private readonly initialMessages = new Deque<IPendingMessage>();
+	private readonly pendingMessages = new Deque<IPendingMessageNew>();
+	private readonly initialMessages = new Deque<IPendingMessageNew>();
 	private readonly disposeOnce = new Lazy<void>(() => {
 		this.initialMessages.clear();
 		this.pendingMessages.clear();
@@ -105,22 +108,23 @@ export class PendingStateManager implements IDisposable {
 		);
 		if (!this.pendingMessages.isEmpty()) {
 			return {
-				// delete localOpMetadata since it may not be serializable
-				// and will be regenerated by applyStashedOp()
-				pendingStates: this.pendingMessages.toArray().map((message) =>
+				pendingStates: this.pendingMessages.toArray().map((message) => {
+					// ! TODO: Remove conversion to IPendingMessageOld in "2.0.0-internal.6.0.0" AB#3826
+					const content = JSON.parse(message.content);
 					// IdAllocations need their localOpMetadata stashed in the contents
 					// of the op to correctly resume the session when processing stashed ops
-					message.messageType === ContainerMessageType.IdAllocation
-						? {
-								...message,
-								content: {
-									...message.content,
-									stashedState: message.localOpMetadata,
-								},
-								localOpMetadata: undefined,
-						  }
-						: { ...message, localOpMetadata: undefined },
-				),
+					if (content.type === ContainerMessageType.IdAllocation) {
+						content.contents.stashedState = message.localOpMetadata;
+					}
+					return {
+						...message,
+						messageType: content.type,
+						content: content.contents,
+						// delete localOpMetadata since it may not be serializable
+						// and will be regenerated by applyStashedOp()
+						localOpMetadata: undefined,
+					};
+				}),
 			};
 		}
 	}
@@ -130,34 +134,27 @@ export class PendingStateManager implements IDisposable {
 		initialLocalState: IPendingLocalState | undefined,
 	) {
 		/**
-		 * Convert old local state format to the new format
-		 * The old format contained "flush" messages as the indicator of batch ends
-		 * The new format instead uses batch metadata on the last message to indicate batch ends
-		 * ! TODO: Remove this conversion in "2.0.0-internal.5.0.0" as version from "2.0.0-internal.4.0.0" will be new format
-		 * AB#2496 tracks removal
+		 * Convert old local state format to the new format (IPendingMessageOld to IPendingMessageNew)
+		 * ! TODO: Remove this conversion in "2.0.0-internal.7.0.0"
 		 */
 		if (initialLocalState?.pendingStates) {
-			const pendingStates = initialLocalState?.pendingStates;
-			let currentlyBatching = false;
-			for (let i = 0; i < pendingStates.length; i++) {
-				const initialState = pendingStates[i];
-
-				// Skip over "flush" messages
-				if (initialState.type === "message") {
-					if (initialState.opMetadata?.batch) {
-						currentlyBatching = true;
-					} else if (initialState.opMetadata?.batch === false) {
-						currentlyBatching = false;
-					} else if (
-						// End of batch if we are currently batching and this is last message or next message is flush
-						currentlyBatching &&
-						(i === pendingStates.length - 1 || pendingStates[i + 1].type === "flush")
-					) {
-						currentlyBatching = false;
-						initialState.opMetadata = { ...initialState.opMetadata, batch: false };
-					}
-					this.initialMessages.push(initialState);
+			for (const initialState of initialLocalState.pendingStates) {
+				let messageContent = initialState.content;
+				if (
+					(initialState as IPendingMessageOld).messageType !== undefined &&
+					typeof initialState.content !== "string"
+				) {
+					// Convert IPendingMessageOld to IPendingMessageNew
+					messageContent = JSON.stringify({
+						type: (initialState as IPendingMessageOld).messageType,
+						contents: initialState.content,
+					});
 				}
+				// Note: this object may contain "messageType" prop, but it should not be easily accesible due to interface being used
+				this.initialMessages.push({
+					...initialState,
+					content: messageContent,
+				});
 			}
 		}
 	}
@@ -175,15 +172,13 @@ export class PendingStateManager implements IDisposable {
 	 * @param localOpMetadata - The local metadata associated with the message.
 	 */
 	public onSubmitMessage(
-		type: ContainerMessageType,
+		content: string,
 		referenceSequenceNumber: number,
-		content: any,
 		localOpMetadata: unknown,
 		opMetadata: Record<string, unknown> | undefined,
 	) {
-		const pendingMessage: IPendingMessage = {
+		const pendingMessage: IPendingMessageNew = {
 			type: "message",
-			messageType: type,
 			clientSequenceNumber: -1, // dummy value (not to be used anywhere)
 			referenceSequenceNumber,
 			content,
@@ -213,18 +208,9 @@ export class PendingStateManager implements IDisposable {
 			}
 
 			// applyStashedOp will cause the DDS to behave as if it has sent the op but not actually send it
-			const localOpMetadata = await this.stateHandler.applyStashedOp(
-				nextMessage.messageType,
-				nextMessage.content,
-			);
+			const localOpMetadata = await this.stateHandler.applyStashedOp(nextMessage.content);
 			nextMessage.localOpMetadata = localOpMetadata;
 
-			if (nextMessage.messageType === ContainerMessageType.IdAllocation) {
-				// Remove the stashed state from the op
-				// so that it doesn't go over the wire
-				delete nextMessage.content.stashedState;
-			}
-
 			// then we push onto pendingMessages which will cause PendingStateManager to resubmit when we connect
 			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			this.pendingMessages.push(this.initialMessages.shift()!);
@@ -248,32 +234,17 @@ export class PendingStateManager implements IDisposable {
 		);
 		this.pendingMessages.shift();
 
-		if (pendingMessage.messageType !== message.type) {
-			// Close the container because this could indicate data corruption.
-			this.stateHandler.close(
-				DataProcessingError.create(
-					"pending local message type mismatch",
-					"unexpectedAckReceived",
-					message,
-					{
-						expectedMessageType: pendingMessage.messageType,
-					},
-				),
-			);
-			return;
-		}
-
-		const pendingMessageContent = JSON.stringify(pendingMessage.content);
-		const messageContent = JSON.stringify(message.contents);
-
+		const messageContent = JSON.stringify({ type: message.type, contents: message.contents });
 		// Stringified content does not match
-		if (pendingMessageContent !== messageContent) {
-			// Close the container because this could indicate data corruption.
+		if (pendingMessage.content !== messageContent) {
 			this.stateHandler.close(
 				DataProcessingError.create(
 					"pending local message content mismatch",
 					"unexpectedAckReceived",
 					message,
+					{
+						expectedMessageType: JSON.parse(pendingMessage.content).type,
+					},
 				),
 			);
 			return;
@@ -412,7 +383,6 @@ export class PendingStateManager implements IDisposable {
 					while (pendingMessagesCount >= 0) {
 						// check is >= because batch end may be last pending message
 						this.stateHandler.reSubmit(
-							pendingMessage.messageType,
 							pendingMessage.content,
 							pendingMessage.localOpMetadata,
 							pendingMessage.opMetadata,
@@ -434,7 +404,6 @@ export class PendingStateManager implements IDisposable {
 				});
 			} else {
 				this.stateHandler.reSubmit(
-					pendingMessage.messageType,
 					pendingMessage.content,
 					pendingMessage.localOpMetadata,
 					pendingMessage.opMetadata,

package/src/scheduleManager.ts

@@ -5,8 +5,7 @@
 import { EventEmitter } from "events";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
-import { ChildLogger } from "@fluidframework/telemetry-utils";
+import { ITelemetryLoggerExt, ChildLogger } from "@fluidframework/telemetry-utils";
 import { assert, performance } from "@fluidframework/common-utils";
 import { isRuntimeMessage } from "@fluidframework/driver-utils";
 import {
@@ -41,7 +40,7 @@ export class ScheduleManager {
 		private readonly deltaManager: IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>,
 		private readonly emitter: EventEmitter,
 		readonly getClientId: () => string | undefined,
-		private readonly logger: ITelemetryLogger,
+		private readonly logger: ITelemetryLoggerExt,
 	) {
 		this.deltaScheduler = new DeltaScheduler(
 			this.deltaManager,
@@ -106,7 +105,7 @@ class ScheduleManagerCore {
 	constructor(
 		private readonly deltaManager: IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>,
 		private readonly getClientId: () => string | undefined,
-		private readonly logger: ITelemetryLogger,
+		private readonly logger: ITelemetryLoggerExt,
 	) {
 		// Listen for delta manager sends and add batch metadata to messages
 		this.deltaManager.on("prepareSend", (messages: IDocumentMessage[]) => {

package/src/summary/orderedClientElection.ts

@@ -3,12 +3,12 @@
  * Licensed under the MIT License.
  */
 /* eslint-disable @rushstack/no-new-null */
-import { IEvent, IEventProvider, ITelemetryLogger } from "@fluidframework/common-definitions";
+import { IEvent, IEventProvider } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt, ChildLogger } from "@fluidframework/telemetry-utils";
 import { assert, TypedEventEmitter } from "@fluidframework/common-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { UsageError } from "@fluidframework/container-utils";
 import { IClient, IQuorumClients, ISequencedClient } from "@fluidframework/protocol-definitions";
-import { ChildLogger } from "@fluidframework/telemetry-utils";
 import { summarizerClientType } from "./summarizerClientElection";
 
 // helper types for recursive readonly.
@@ -91,7 +91,7 @@ export class OrderedClientCollection
 	};
 	/** Pointer to end of linked list, for optimized client adds. */
 	private _youngestClient: LinkNode = this.rootNode;
-	private readonly logger: ITelemetryLogger;
+	private readonly logger: ITelemetryLoggerExt;
 
 	public get count() {
 		return this.clientMap.size;
@@ -101,7 +101,7 @@ export class OrderedClientCollection
 	}
 
 	constructor(
-		logger: ITelemetryLogger,
+		logger: ITelemetryLoggerExt,
 		deltaManager: Pick<IDeltaManager<unknown, unknown>, "lastSequenceNumber">,
 		quorum: Pick<IQuorumClients, "getMembers" | "on">,
 	) {
@@ -336,7 +336,7 @@ export class OrderedClientElection
 	}
 
 	constructor(
-		private readonly logger: ITelemetryLogger,
+		private readonly logger: ITelemetryLoggerExt,
 		private readonly orderedClientCollection: IOrderedClientCollection,
 		/** Serialized state from summary or current sequence number at time of load if new. */
 		initialState: ISerializedElection | number,
@@ -372,7 +372,7 @@ export class OrderedClientElection
 			// Override the initially elected client with the initial state.
 			if (initialClient?.clientId !== initialState.electedClientId) {
 				// Cannot find initially elected client, so elect undefined.
-				logger.sendErrorEvent({
+				this.logger.sendErrorEvent({
 					eventName: "InitialElectedClientNotFound",
 					electionSequenceNumber: initialState.electionSequenceNumber,
 					expectedClientId: initialState.electedClientId,
@@ -382,7 +382,7 @@ export class OrderedClientElection
 			} else if (initialClient !== undefined && !isEligibleFn(initialClient)) {
 				// Initially elected client is ineligible, so elect next eligible client.
 				initialClient = initialParent = this.findFirstEligibleParent(initialParent);
-				logger.sendErrorEvent({
+				this.logger.sendErrorEvent({
 					eventName: "InitialElectedClientIneligible",
 					electionSequenceNumber: initialState.electionSequenceNumber,
 					expectedClientId: initialState.electedClientId,
@@ -416,13 +416,6 @@ export class OrderedClientElection
 			change = true;
 		}
 		if (change) {
-			this.logger.sendTelemetryEvent({
-				eventName: "SummarizerClientElected",
-				electedClientId: this._electedClient?.clientId,
-				electedParentId: this._electedParent?.clientId,
-				electionSequenceNumber: sequenceNumber,
-				isSummarizerClient,
-			});
 			this.emit("election", client, sequenceNumber, prevClient);
 		}
 	}
@@ -430,12 +423,6 @@ export class OrderedClientElection
 	private tryElectingParent(client: ILinkedClient | undefined, sequenceNumber: number): void {
 		if (this._electedParent !== client) {
 			this._electedParent = client;
-			this.logger.sendTelemetryEvent({
-				eventName: "SummarizerParentElected",
-				electedClientId: this._electedClient?.clientId,
-				electedParentId: this._electedParent?.clientId,
-				electionSequenceNumber: sequenceNumber,
-			});
 			this.emit("election", this._electedClient, sequenceNumber, this._electedClient);
 		}
 	}

package/src/summary/runningSummarizer.ts

@@ -3,18 +3,19 @@
  * Licensed under the MIT License.
  */
 
-import { IDisposable, ITelemetryLogger } from "@fluidframework/common-definitions";
-import { assert, delay, Deferred, PromiseTimer } from "@fluidframework/common-utils";
-import { UsageError } from "@fluidframework/container-utils";
-import { DriverErrorType } from "@fluidframework/driver-definitions";
-import { isRuntimeMessage } from "@fluidframework/driver-utils";
-import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions";
+import { IDisposable } from "@fluidframework/common-definitions";
 import {
+	ITelemetryLoggerExt,
 	ChildLogger,
 	isFluidError,
 	loggerToMonitoringContext,
 	MonitoringContext,
 } from "@fluidframework/telemetry-utils";
+import { assert, delay, Deferred, PromiseTimer } from "@fluidframework/common-utils";
+import { UsageError } from "@fluidframework/container-utils";
+import { DriverErrorType } from "@fluidframework/driver-definitions";
+import { isRuntimeMessage } from "@fluidframework/driver-utils";
+import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions";
 import { ISummaryConfiguration } from "../containerRuntime";
 import { opSize } from "../opProperties";
 import { SummarizeHeuristicRunner } from "./summarizerHeuristics";
@@ -56,7 +57,7 @@ const defaultNumberSummarizationAttempts = 2; // only up to 2 attempts
  */
 export class RunningSummarizer implements IDisposable {
 	public static async start(
-		logger: ITelemetryLogger,
+		logger: ITelemetryLoggerExt,
 		summaryWatcher: IClientSummaryWatcher,
 		configuration: ISummaryConfiguration,
 		submitSummaryCallback: (options: ISubmitSummaryOptions) => Promise<SubmitSummaryResult>,
@@ -149,7 +150,7 @@ export class RunningSummarizer implements IDisposable {
 	private readonly runtimeListener;
 
 	private constructor(
-		baseLogger: ITelemetryLogger,
+		baseLogger: ITelemetryLoggerExt,
 		private readonly summaryWatcher: IClientSummaryWatcher,
 		private readonly configuration: ISummaryConfiguration,
 		private readonly submitSummaryCallback: (
@@ -252,7 +253,7 @@ export class RunningSummarizer implements IDisposable {
 		// Can remove and only listen to runtime once loader version is past 2.0.0-internal.1.2.0 (https://github.com/microsoft/FluidFramework/pull/11832)
 		// Tracked by AB#3883
 		this.runtime.deltaManager.on("op", this.deltaManagerListener);
-		this.runtime.on?.("op", this.runtimeListener);
+		this.runtime.on("op", this.runtimeListener);
 	}
 
 	private async handleSummaryAck(): Promise<number> {
@@ -347,7 +348,7 @@ export class RunningSummarizer implements IDisposable {
 
 	public dispose(): void {
 		this.runtime.deltaManager.off("op", this.deltaManagerListener);
-		this.runtime.off?.("op", this.runtimeListener);
+		this.runtime.off("op", this.runtimeListener);
 		this.summaryWatcher.dispose();
 		this.heuristicRunner?.dispose();
 		this.heuristicRunner = undefined;

package/src/summary/summarizer.ts

@@ -5,17 +5,17 @@
 
 import { EventEmitter } from "events";
 import { Deferred } from "@fluidframework/common-utils";
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
-import { ILoader, LoaderHeader } from "@fluidframework/container-definitions";
-import { UsageError } from "@fluidframework/container-utils";
-import { DriverHeader } from "@fluidframework/driver-definitions";
-import { requestFluidObject } from "@fluidframework/runtime-utils";
 import {
+	ITelemetryLoggerExt,
 	ChildLogger,
 	IFluidErrorBase,
 	LoggingError,
 	wrapErrorAndLog,
 } from "@fluidframework/telemetry-utils";
+import { ILoader, LoaderHeader } from "@fluidframework/container-definitions";
+import { UsageError } from "@fluidframework/container-utils";
+import { DriverHeader } from "@fluidframework/driver-definitions";
+import { requestFluidObject } from "@fluidframework/runtime-utils";
 import { FluidObject, IFluidHandleContext, IRequest } from "@fluidframework/core-interfaces";
 import { ISummaryConfiguration } from "../containerRuntime";
 import { ICancellableSummarizerController } from "./runWhileConnectedCoordinator";
@@ -47,7 +47,7 @@ export class SummarizingWarning
 		super(errorMessage);
 	}
 
-	static wrap(error: any, logged: boolean = false, logger: ITelemetryLogger) {
+	static wrap(error: any, logged: boolean = false, logger: ITelemetryLoggerExt) {
 		const newErrorFn = (errMsg: string) => new SummarizingWarning(errMsg, logged);
 		return wrapErrorAndLog<SummarizingWarning>(error, newErrorFn, logger);
 	}
@@ -66,7 +66,7 @@ export class Summarizer extends EventEmitter implements ISummarizer {
 		return this;
 	}
 
-	private readonly logger: ITelemetryLogger;
+	private readonly logger: ITelemetryLoggerExt;
 	private runningSummarizer?: RunningSummarizer;
 	private _disposed: boolean = false;
 	private starting: boolean = false;
@@ -152,7 +152,7 @@ export class Summarizer extends EventEmitter implements ISummarizer {
 		// This will result in "summarizerClientDisconnected" stop reason recorded in telemetry,
 		// unless stop() was called earlier
 		this.dispose();
-		(this.runtime.disposeFn ?? this.runtime.closeFn)();
+		this.runtime.disposeFn();
 	}
 
 	private async runCore(onBehalfOf: string): Promise<SummarizerStopReason> {

package/src/summary/summarizerClientElection.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { IEvent, IEventProvider, ITelemetryLogger } from "@fluidframework/common-definitions";
+import { IEvent, IEventProvider } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { TypedEventEmitter } from "@fluidframework/common-utils";
 import { IClientDetails, MessageType } from "@fluidframework/protocol-definitions";
 import {
@@ -55,7 +56,7 @@ export class SummarizerClientElection
 	}
 
 	constructor(
-		private readonly logger: ITelemetryLogger,
+		private readonly logger: ITelemetryLoggerExt,
 		private readonly summaryCollection: IEventProvider<ISummaryCollectionOpEvents>,
 		public readonly clientElection: IOrderedClientElection,
 		private readonly maxOpsSinceLastSummary: number,