@fluidframework/container-runtime 2.0.0-dev-rc.3.0.0.250606 → 2.0.0-dev-rc.3.0.0.253463

package/src/summary/summarizerTypes.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { ContainerWarning, IDeltaManager } from "@fluidframework/container-definitions";
+import { IDeltaManager } from "@fluidframework/container-definitions";
+import { ContainerWarning } from "@fluidframework/container-definitions/internal";
 import { IEvent, IEventProvider, ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
 import {
 	IDocumentMessage,
@@ -11,8 +12,11 @@ import {
 	ISummaryTree,
 } from "@fluidframework/protocol-definitions";
 import { ISummaryStats } from "@fluidframework/runtime-definitions";
-import { ITelemetryLoggerExt, ITelemetryLoggerPropertyBag } from "@fluidframework/telemetry-utils";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { ITelemetryLoggerPropertyBag } from "@fluidframework/telemetry-utils/internal";
+
 import { ISummaryConfigurationHeuristics } from "../containerRuntime.js";
+
 import { ISummaryAckMessage, ISummaryNackMessage, ISummaryOpMessage } from "./summaryCollection.js";
 import { SummarizeReason } from "./summaryGenerator.js";
 

package/src/summary/summaryCollection.ts

@@ -6,7 +6,7 @@
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { IDisposable, IEvent } from "@fluidframework/core-interfaces";
-import { assert, Deferred } from "@fluidframework/core-utils";
+import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import {
 	IDocumentMessage,
 	ISequencedDocumentMessage,

package/src/summary/summaryFormat.ts

@@ -3,23 +3,22 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
 import {
 	blobHeadersBlobName as blobNameForBlobHeaders,
 	readAndParse,
-} from "@fluidframework/driver-utils";
+} from "@fluidframework/driver-utils/internal";
 import {
 	ISequencedDocumentMessage,
 	ISnapshotTree,
 	SummaryType,
 } from "@fluidframework/protocol-definitions";
-import {
-	ISummaryTreeWithStats,
-	channelsTreeName,
-	gcTreeKey,
-} from "@fluidframework/runtime-definitions";
+import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
+import { channelsTreeName, gcTreeKey } from "@fluidframework/runtime-definitions/internal";
+
 import { IGCMetadata } from "../gc/index.js";
+
 import { IDocumentSchema } from "./documentSchema.js";
 
 type OmitAttributesVersions<T> = Omit<T, "snapshotFormatVersion" | "summaryFormatVersion">;

package/src/summary/summaryGenerator.ts

@@ -4,22 +4,19 @@
  */
 
 import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import {
-	ITelemetryLoggerExt,
-	LoggingError,
-	PerformanceEvent,
-} from "@fluidframework/telemetry-utils";
-
 import {
 	assert,
 	Deferred,
 	IPromiseTimer,
 	IPromiseTimerResult,
 	Timer,
-} from "@fluidframework/core-utils";
+} from "@fluidframework/core-utils/internal";
 import { DriverErrorTypes } from "@fluidframework/driver-definitions";
-import { getRetryDelaySecondsFromError } from "@fluidframework/driver-utils";
+import { getRetryDelaySecondsFromError } from "@fluidframework/driver-utils/internal";
 import { MessageType } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { LoggingError, PerformanceEvent } from "@fluidframework/telemetry-utils/internal";
+
 import {
 	IAckSummaryResult,
 	IBroadcastSummaryResult,

package/src/summary/summaryManager.ts

@@ -10,14 +10,13 @@ import {
 	IEventProvider,
 	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { DriverErrorTypes } from "@fluidframework/driver-definitions";
-import {
-	ITelemetryLoggerExt,
-	PerformanceEvent,
-	createChildLogger,
-} from "@fluidframework/telemetry-utils";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { PerformanceEvent, createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
 import { IThrottler } from "../throttler.js";
+
 import { Summarizer } from "./summarizer.js";
 import { ISummarizerClientElection } from "./summarizerClientElection.js";
 import {
@@ -168,6 +167,10 @@ export class SummaryManager extends TypedEventEmitter<ISummarizerEvents> impleme
 		state === SummaryManagerState.Starting || state === SummaryManagerState.Running;
 
 	private getShouldSummarizeState(): ShouldSummarizeState {
+		if (this.disposed) {
+			return { shouldSummarize: false, stopReason: "parentNotConnected" };
+		}
+
 		// Note that if we're in the Running state, the electedClient may be a summarizer client, so we can't
 		// enforce connectedState.clientId === clientElection.electedClientId. But once we're Running, we should
 		// only transition to Stopping when the electedParentId changes. Stopping the summarizer without
@@ -190,11 +193,7 @@ export class SummaryManager extends TypedEventEmitter<ISummarizerEvents> impleme
 			return { shouldSummarize: false, stopReason: "parentNotConnected" };
 		}
 
-		if (this.disposed) {
-			assert(false, 0x260 /* "Disposed should mean disconnected!" */);
-		} else {
-			return { shouldSummarize: true };
-		}
+		return { shouldSummarize: true };
 	}
 
 	private readonly refreshSummarizer = () => {
@@ -238,6 +237,10 @@ export class SummaryManager extends TypedEventEmitter<ISummarizerEvents> impleme
 
 		this.delayBeforeCreatingSummarizer()
 			.then(async (startWithInitialDelay: boolean) => {
+				if (this.disposed) {
+					return "early exit (disposed)";
+				}
+
 				// Re-validate that it need to be running. Due to asynchrony, it may be not the case anymore
 				// but only if creation was delayed. If it was not, then we want to ensure we always create
 				// a summarizer to kick off lastSummary. Without that, we would not be able to summarize and get

package/lib/test/batchTracker.spec.js

@@ -1,88 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { EventEmitter } from "@fluid-internal/client-utils";
-import { MockLogger } from "@fluidframework/telemetry-utils";
-import { BatchTracker } from "../batchTracker.js";
-describe("Runtime", () => {
-    const emitter = new EventEmitter();
-    let mockLogger;
-    beforeEach(() => {
-        mockLogger = new MockLogger();
-    });
-    it("Track only batches with op count over a threshold", () => {
-        let ticks = 0;
-        new BatchTracker(emitter, mockLogger, 5, 100, () => ticks);
-        emitter.emit("batchBegin", batchMessage(2));
-        emitter.emit("batchEnd", /* error */ undefined, batchMessage(5));
-        emitter.emit("batchBegin", batchMessage(1));
-        ticks += 10;
-        emitter.emit("batchEnd", /* error */ undefined, batchMessage(5));
-        emitter.emit("batchBegin", batchMessage(1));
-        ticks += 20;
-        emitter.emit("batchEnd", new Error(), batchMessage(8));
-        mockLogger.assertMatch([
-            {
-                eventName: "Batching:LengthTooBig",
-                length: 5,
-                threshold: 5,
-                batchEndSequenceNumber: 5,
-                duration: 10,
-                batchError: false,
-                category: "performance",
-            },
-            {
-                eventName: "Batching:LengthTooBig",
-                length: 8,
-                threshold: 5,
-                batchEndSequenceNumber: 8,
-                duration: 20,
-                batchError: true,
-                category: "performance",
-            },
-        ]);
-    });
-    it("Track batch sizes based on rate", async () => {
-        let ticks = 0;
-        new BatchTracker(emitter, mockLogger, 100, 3, () => ticks);
-        for (let i = 1; i <= 10; i++) {
-            emitter.emit("batchBegin", batchMessage(1));
-            ticks += i;
-            emitter.emit("batchEnd", /* error */ undefined, batchMessage(i));
-        }
-        mockLogger.assertMatch([
-            {
-                eventName: "Batching:Length",
-                length: 3,
-                samplingRate: 3,
-                batchEndSequenceNumber: 3,
-                duration: 3,
-                category: "performance",
-            },
-            {
-                eventName: "Batching:Length",
-                length: 6,
-                samplingRate: 3,
-                batchEndSequenceNumber: 6,
-                duration: 6,
-                category: "performance",
-            },
-            {
-                eventName: "Batching:Length",
-                length: 9,
-                samplingRate: 3,
-                batchEndSequenceNumber: 9,
-                duration: 9,
-                category: "performance",
-            },
-        ]);
-    });
-    const batchMessage = (sequenceNumber) => 
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    ({
-        sequenceNumber,
-        referenceSequenceNumber: sequenceNumber,
-    });
-});
-//# sourceMappingURL=batchTracker.spec.js.map

package/lib/test/batchTracker.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"batchTracker.spec.js","sourceRoot":"","sources":["../../src/test/batchTracker.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { EventEmitter } from \"@fluid-internal/client-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { MockLogger } from \"@fluidframework/telemetry-utils\";\nimport { BatchTracker } from \"../batchTracker.js\";\n\ndescribe(\"Runtime\", () => {\n\tconst emitter = new EventEmitter();\n\tlet mockLogger: MockLogger;\n\n\tbeforeEach(() => {\n\t\tmockLogger = new MockLogger();\n\t});\n\n\tit(\"Track only batches with op count over a threshold\", () => {\n\t\tlet ticks = 0;\n\t\tnew BatchTracker(emitter, mockLogger, 5, 100, () => ticks);\n\n\t\temitter.emit(\"batchBegin\", batchMessage(2));\n\t\temitter.emit(\"batchEnd\", /* error */ undefined, batchMessage(5));\n\n\t\temitter.emit(\"batchBegin\", batchMessage(1));\n\t\tticks += 10;\n\t\temitter.emit(\"batchEnd\", /* error */ undefined, batchMessage(5));\n\n\t\temitter.emit(\"batchBegin\", batchMessage(1));\n\t\tticks += 20;\n\t\temitter.emit(\"batchEnd\", new Error(), batchMessage(8));\n\n\t\tmockLogger.assertMatch([\n\t\t\t{\n\t\t\t\teventName: \"Batching:LengthTooBig\",\n\t\t\t\tlength: 5,\n\t\t\t\tthreshold: 5,\n\t\t\t\tbatchEndSequenceNumber: 5,\n\t\t\t\tduration: 10,\n\t\t\t\tbatchError: false,\n\t\t\t\tcategory: \"performance\",\n\t\t\t},\n\t\t\t{\n\t\t\t\teventName: \"Batching:LengthTooBig\",\n\t\t\t\tlength: 8,\n\t\t\t\tthreshold: 5,\n\t\t\t\tbatchEndSequenceNumber: 8,\n\t\t\t\tduration: 20,\n\t\t\t\tbatchError: true,\n\t\t\t\tcategory: \"performance\",\n\t\t\t},\n\t\t]);\n\t});\n\n\tit(\"Track batch sizes based on rate\", async () => {\n\t\tlet ticks = 0;\n\t\tnew BatchTracker(emitter, mockLogger, 100, 3, () => ticks);\n\n\t\tfor (let i = 1; i <= 10; i++) {\n\t\t\temitter.emit(\"batchBegin\", batchMessage(1));\n\t\t\tticks += i;\n\t\t\temitter.emit(\"batchEnd\", /* error */ undefined, batchMessage(i));\n\t\t}\n\n\t\tmockLogger.assertMatch([\n\t\t\t{\n\t\t\t\teventName: \"Batching:Length\",\n\t\t\t\tlength: 3,\n\t\t\t\tsamplingRate: 3,\n\t\t\t\tbatchEndSequenceNumber: 3,\n\t\t\t\tduration: 3,\n\t\t\t\tcategory: \"performance\",\n\t\t\t},\n\t\t\t{\n\t\t\t\teventName: \"Batching:Length\",\n\t\t\t\tlength: 6,\n\t\t\t\tsamplingRate: 3,\n\t\t\t\tbatchEndSequenceNumber: 6,\n\t\t\t\tduration: 6,\n\t\t\t\tcategory: \"performance\",\n\t\t\t},\n\t\t\t{\n\t\t\t\teventName: \"Batching:Length\",\n\t\t\t\tlength: 9,\n\t\t\t\tsamplingRate: 3,\n\t\t\t\tbatchEndSequenceNumber: 9,\n\t\t\t\tduration: 9,\n\t\t\t\tcategory: \"performance\",\n\t\t\t},\n\t\t]);\n\t});\n\n\tconst batchMessage = (sequenceNumber: number): ISequencedDocumentMessage =>\n\t\t// eslint-disable-next-line @typescript-eslint/consistent-type-assertions\n\t\t({\n\t\t\tsequenceNumber,\n\t\t\treferenceSequenceNumber: sequenceNumber,\n\t\t}) as ISequencedDocumentMessage;\n});\n"]}