@fluidframework/azure-end-to-end-tests 2.70.0 → 2.72.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/azure-end-to-end-tests",
-  "version": "2.70.0",
+  "version": "2.72.0",
   "description": "Azure client end to end tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -33,29 +33,29 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-experimental/data-objects": "~2.70.0",
-    "@fluid-internal/client-utils": "~2.70.0",
-    "@fluid-internal/mocha-test-setup": "~2.70.0",
-    "@fluid-private/test-version-utils": "~2.70.0",
-    "@fluidframework/aqueduct": "~2.70.0",
-    "@fluidframework/azure-client": "~2.70.0",
+    "@fluid-experimental/data-objects": "~2.72.0",
+    "@fluid-internal/client-utils": "~2.72.0",
+    "@fluid-internal/mocha-test-setup": "~2.72.0",
+    "@fluid-private/test-version-utils": "~2.72.0",
+    "@fluidframework/aqueduct": "~2.72.0",
+    "@fluidframework/azure-client": "~2.72.0",
     "@fluidframework/azure-client-legacy": "npm:@fluidframework/azure-client@^1.2.0",
-    "@fluidframework/container-definitions": "~2.70.0",
-    "@fluidframework/container-loader": "~2.70.0",
-    "@fluidframework/core-interfaces": "~2.70.0",
-    "@fluidframework/counter": "~2.70.0",
-    "@fluidframework/datastore-definitions": "~2.70.0",
-    "@fluidframework/fluid-static": "~2.70.0",
-    "@fluidframework/map": "~2.70.0",
+    "@fluidframework/container-definitions": "~2.72.0",
+    "@fluidframework/container-loader": "~2.72.0",
+    "@fluidframework/core-interfaces": "~2.72.0",
+    "@fluidframework/counter": "~2.72.0",
+    "@fluidframework/datastore-definitions": "~2.72.0",
+    "@fluidframework/fluid-static": "~2.72.0",
+    "@fluidframework/map": "~2.72.0",
     "@fluidframework/map-legacy": "npm:@fluidframework/map@^1.4.0",
-    "@fluidframework/matrix": "~2.70.0",
-    "@fluidframework/presence": "~2.70.0",
-    "@fluidframework/runtime-definitions": "~2.70.0",
-    "@fluidframework/sequence": "~2.70.0",
-    "@fluidframework/telemetry-utils": "~2.70.0",
-    "@fluidframework/test-runtime-utils": "~2.70.0",
-    "@fluidframework/test-utils": "~2.70.0",
-    "@fluidframework/tree": "~2.70.0",
+    "@fluidframework/matrix": "~2.72.0",
+    "@fluidframework/presence": "~2.72.0",
+    "@fluidframework/runtime-definitions": "~2.72.0",
+    "@fluidframework/sequence": "~2.72.0",
+    "@fluidframework/telemetry-utils": "~2.72.0",
+    "@fluidframework/test-runtime-utils": "~2.72.0",
+    "@fluidframework/test-utils": "~2.72.0",
+    "@fluidframework/tree": "~2.72.0",
     "axios": "^1.8.4",
     "cross-env": "^7.0.3",
     "mocha": "^10.8.2",
@@ -68,9 +68,9 @@
   "devDependencies": {
     "@biomejs/biome": "~1.9.3",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.58.3",
-    "@fluidframework/driver-definitions": "~2.70.0",
-    "@fluidframework/eslint-config-fluid": "^6.1.0",
+    "@fluidframework/build-tools": "^0.60.0",
+    "@fluidframework/driver-definitions": "~2.72.0",
+    "@fluidframework/eslint-config-fluid": "~2.72.0",
     "@types/mocha": "^10.0.10",
     "@types/nock": "^9.3.0",
     "@types/node": "^18.19.0",
@@ -100,8 +100,8 @@
     "check:biome": "biome check .",
     "check:format": "npm run check:biome",
     "clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-    "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
+    "eslint": "eslint --quiet --format stylish src",
+    "eslint:fix": "eslint --quiet --format stylish src --fix --fix-type problem,suggestion,layout",
     "format": "npm run format:biome",
     "format:biome": "biome check . --write",
     "lint": "fluid-build . --task lint",

package/src/test/AzureClientFactory.ts

@@ -9,7 +9,7 @@ import {
 	type AzureRemoteConnectionConfig,
 	type ITelemetryBaseLogger,
 } from "@fluidframework/azure-client";
-// eslint-disable-next-line import/no-internal-modules -- TODO consider a test exposure to avoid /internal
+// eslint-disable-next-line import-x/no-internal-modules -- TODO consider a test exposure to avoid /internal
 import type { AzureClientPropsInternal } from "@fluidframework/azure-client/internal";
 import {
 	AzureClient as AzureClientLegacy,

package/src/test/TestDataObject.ts

@@ -5,7 +5,7 @@
 
 import type { SignalListener } from "@fluid-experimental/data-objects";
 import { EventEmitter } from "@fluid-internal/client-utils";
-// eslint-disable-next-line import/no-internal-modules -- TODO consider a test exposure to avoid /internal
+// eslint-disable-next-line import-x/no-internal-modules -- TODO consider a test exposure to avoid /internal
 import { createDataObjectKind } from "@fluidframework/aqueduct/internal";
 import {
 	DataObject,

package/src/test/containerCreate.spec.ts

@@ -14,7 +14,7 @@ import {
 	MessageType,
 	type ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/legacy";
-// eslint-disable-next-line import/no-internal-modules -- TODO consider a test exposure to avoid /internal
+// eslint-disable-next-line import-x/no-internal-modules -- TODO consider a test exposure to avoid /internal
 import { isTreeContainerSchema } from "@fluidframework/fluid-static/internal";
 import {
 	type ContainerSchema,

package/src/test/multiprocess/childClient.tool.ts

@@ -40,10 +40,10 @@ import type {
 	EventEntry,
 } from "./messageTypes.js";
 
-const connectTimeoutMs = 10_000;
+const testLabel = process.argv[2];
 // Identifier given to child process
-const process_id = process.argv[2];
-const verbosity = process.argv[3] ?? "";
+const process_id = process.argv[3];
+const verbosity = process.argv[4] ?? "";
 
 const useAzure = process.env.FLUID_CLIENT === "azure";
 const tenantId = useAzure
@@ -61,6 +61,10 @@ const containerSchema = {
 	},
 } as const satisfies ContainerSchema;
 
+function log(...data: unknown[]): void {
+	console.log(`[${testLabel}] [${new Date().toISOString()}] [${process_id}]`, ...data);
+}
+
 function telemetryEventInterestLevel(eventName: string): "none" | "basic" | "details" {
 	if (eventName.includes(":Signal") || eventName.includes(":Join")) {
 		return "details";
@@ -82,7 +86,7 @@ function selectiveVerboseLog(event: ITelemetryBaseEvent, logLevel?: LogLevel): v
 	if (interest === "details") {
 		content.details = event.details;
 	}
-	console.log(`[${process_id}] [${logLevel ?? LogLevel.default}]`, content);
+	log(`[${logLevel ?? LogLevel.default}]`, content);
 }
 
 /**
@@ -95,6 +99,7 @@ const getOrCreateContainer = async (params: {
 	user: UserIdAndName;
 	scopes?: ScopeType[];
 	createScopes?: ScopeType[];
+	connectTimeoutMs: number;
 }): Promise<{
 	container: IFluidContainer<typeof containerSchema>;
 	services: AzureContainerServices;
@@ -104,7 +109,7 @@ const getOrCreateContainer = async (params: {
 }> => {
 	let container: IFluidContainer<typeof containerSchema>;
 	let { containerId } = params;
-	const { logger, onDisconnected, user, scopes, createScopes } = params;
+	const { logger, onDisconnected, user, scopes, createScopes, connectTimeoutMs } = params;
 	const connectionProps: AzureRemoteConnectionConfig | AzureLocalConnectionConfig = useAzure
 		? {
 				tenantId,
@@ -163,7 +168,7 @@ function createSendFunction(): (msg: MessageToParent) => void {
 		const sendFn = process.send.bind(process);
 		if (verbosity.includes("msgs")) {
 			return (msg: MessageToParent) => {
-				console.log(`[${process_id}] Sending`, msg);
+				log(`Sending`, msg);
 				sendFn(msg);
 			};
 		}
@@ -248,11 +253,17 @@ class MessageHandler {
 
 	private readonly logger: ITelemetryBaseLogger = {
 		send: (event: ITelemetryBaseEvent, logLevel?: LogLevel) => {
+			// Filter out non-interactive client telemetry
+			const clientType = event.clientType;
+			if (typeof clientType === "string" && clientType.startsWith("noninteractive")) {
+				return;
+			}
+
 			// Special case unexpected telemetry event
 			if (event.eventName.endsWith(":JoinResponseWhenAlone")) {
 				this.send({
 					event: "error",
-					error: `Unexpected ClientJoin response. Details: ${JSON.stringify(event.details)}`,
+					error: `Unexpected ClientJoin response. Details: ${JSON.stringify(event.details)}\nLog: ${JSON.stringify(this.log)}`,
 				});
 				// Keep going
 			}
@@ -374,7 +385,7 @@ class MessageHandler {
 				eventCategory: "messageReceived",
 				eventName: msg.command,
 			});
-			console.log(`[${process_id}] Received`, msg);
+			log(`Received`, msg);
 		}
 
 		if (msg.command === "ping") {
@@ -471,7 +482,10 @@ class MessageHandler {
 			this.presence = presence;
 
 			// wait for 'ConnectionState.Connected'
-			await connected;
+			await connected.catch((error) => {
+				(error as Error).message += `\nLog: ${JSON.stringify(this.log)}`;
+				throw error;
+			});
 
 			// Acknowledge connection before sending current attendee information
 			this.send({
@@ -512,9 +526,7 @@ class MessageHandler {
 						connectedCount++;
 					}
 				}
-				console.log(
-					`[${process_id}] Report: ${attendees.size} attendees, ${connectedCount} connected`,
-				);
+				log(`Report: ${attendees.size} attendees, ${connectedCount} connected`);
 			} else {
 				this.send({ event: "error", error: `${process_id} is not connected to presence` });
 			}
@@ -712,7 +724,7 @@ function setupMessageHandler(): void {
 	const messageHandler = new MessageHandler();
 	process.on("message", (msg: MessageFromParent) => {
 		messageHandler.onMessage(msg).catch((error: Error) => {
-			console.error(`Error in client ${process_id}`, error);
+			console.error(`[${testLabel}] Error in client ${process_id}`, error);
 			send({ event: "error", error: `${process_id}: ${error.message}` });
 		});
 	});

package/src/test/multiprocess/messageTypes.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-// eslint-disable-next-line import/no-internal-modules
+// eslint-disable-next-line import-x/no-internal-modules
 import type { JsonSerializable } from "@fluidframework/core-interfaces/internal";
 import type { ScopeType } from "@fluidframework/driver-definitions/legacy";
 import type { AttendeeId } from "@fluidframework/presence/beta";
@@ -57,6 +57,7 @@ export interface ConnectCommand {
 	 * If not provided, a new Fluid container will be created.
 	 */
 	containerId?: string;
+	connectTimeoutMs: number;
 }
 
 /**

package/src/test/multiprocess/orchestratorUtils.ts

@@ -58,6 +58,7 @@ interface ChildProcess extends AnyChildProcess {
  * @returns A collection of child processes and a promise that rejects on the first child error.
  */
 export async function forkChildProcesses(
+	testLabel: string,
 	numProcesses: number,
 	cleanUpAccumulator: (() => void)[],
 ): Promise<{
@@ -72,6 +73,7 @@ export async function forkChildProcesses(
 	const childErrorPromises: Promise<never>[] = [];
 	for (let i = 0; i < numProcesses; i++) {
 		const child = fork("./lib/test/multiprocess/childClient.tool.js", [
+			testLabel,
 			`child ${i}` /* identifier passed to child process */,
 			childLoggingVerbosity /* console logging verbosity */,
 		]);
@@ -152,6 +154,7 @@ export async function executeDebugReports(
 function composeConnectMessage(
 	id: string | number,
 	scopes: ScopeType[] = [ScopeType.DocRead],
+	connectTimeoutMs: number,
 ): ConnectCommand {
 	return {
 		command: "connect",
@@ -161,6 +164,7 @@ function composeConnectMessage(
 		},
 		scopes,
 		createScopes: [ScopeType.DocWrite, ScopeType.DocRead],
+		connectTimeoutMs,
 	};
 }
 
@@ -255,6 +259,7 @@ export async function connectChildProcesses(
 		const connectContainerCreator = composeConnectMessage(
 			0,
 			writeClients > 0 ? [ScopeType.DocWrite, ScopeType.DocRead] : [ScopeType.DocRead],
+			/* connectTimeoutMs */ readyTimeoutMs,
 		);
 		firstChild.send(connectContainerCreator);
 	}
@@ -264,7 +269,10 @@ export async function connectChildProcesses(
 			durationMs: readyTimeoutMs,
 			errorMsg: "did not receive 'connected' from child process",
 		},
-	);
+	).catch(async (error) => {
+		await executeDebugReports([firstChild]);
+		throw error;
+	});
 
 	const attendeeIdPromises: Promise<AttendeeId>[] = [];
 	for (const [index, child] of childProcesses.entries()) {
@@ -275,6 +283,7 @@ export async function connectChildProcesses(
 		const message = composeConnectMessage(
 			index,
 			index < writeClients ? [ScopeType.DocWrite, ScopeType.DocRead] : [ScopeType.DocRead],
+			/* connectTimeoutMs */ readyTimeoutMs,
 		);
 		message.containerId = containerId;
 		attendeeIdPromises.push(
@@ -348,6 +357,10 @@ export async function connectAndListenForAttendees(
 		readyTimeoutMs: childConnectTimeoutMs,
 	});
 
+	// These actions are not awaited. They are here to provide additional logging.
+	// It is up to the caller to await attendeeIdPromises if desired. This can mean
+	// An "error" message is output, but the caller does not care about attendee
+	// ids and proceeds.
 	Promise.all(connectResult.attendeeIdPromises)
 		.then(() => console.log("All attendees connected."))
 		.catch((error) => {