@fluidframework/container-loader 2.92.0 → 2.100.0

package/src/container.ts

@@ -84,7 +84,7 @@ import {
 } from "@fluidframework/driver-utils/internal";
 import {
 	type TelemetryEventCategory,
-	type ITelemetryLoggerExt,
+	type TelemetryLoggerExt,
 	EventEmitterWithErrorHandling,
 	GenericError,
 	type IFluidErrorBase,
@@ -94,6 +94,7 @@ import {
 	connectedEventName,
 	createChildLogger,
 	createChildMonitoringContext,
+	extractTelemetryLoggerExt,
 	formatTick,
 	normalizeError,
 	raiseConnectedEvent,
@@ -101,7 +102,6 @@ import {
 	loggerToMonitoringContext,
 	type ITelemetryErrorEventExt,
 } from "@fluidframework/telemetry-utils/internal";
-import structuredClone from "@ungap/structured-clone";
 import { v4 as uuid } from "uuid";
 
 import {
@@ -430,7 +430,7 @@ export class Container
 	private readonly codeLoader: ICodeDetailsLoader;
 	private readonly options: ILoaderOptions;
 	private readonly scope: FluidObject;
-	private readonly subLogger: ITelemetryLoggerExt;
+	private readonly subLogger: TelemetryLoggerExt;
 	private readonly detachedBlobStorage: MemoryDetachedBlobStorage | undefined;
 	private readonly protocolHandlerBuilder: InternalProtocolHandlerBuilder;
 	private readonly signalAudience = new Audience();
@@ -859,7 +859,7 @@ export class Container
 				logger: this.mc.logger,
 				// WARNING: logger on this context should not including getters like containerConnectionState above (on this.subLogger),
 				// as that will result in attempt to dereference this.connectionStateHandler from this call while it's still undefined.
-				mc: loggerToMonitoringContext(subLogger),
+				mc: loggerToMonitoringContext(extractTelemetryLoggerExt(subLogger)),
 				connectionStateChanged: (value, oldState, reason) => {
 					this.logConnectionStateChangeTelemetry(value, oldState, reason);
 					if (this.loaded) {
@@ -1048,13 +1048,13 @@ export class Container
 			try {
 				// Raise event first, to ensure we capture _lifecycleState before transition.
 				// This gives us a chance to know what errors happened on open vs. on fully loaded container.
-				// Log generic events instead of error events if container is in loading state, as most errors are not really FF errors
-				// which can pollute telemetry for real bugs
+				// Log as error whenever an error is present. Some unrelated errors might get caught during load
+				// time (such as permission errors) and it's up to the client to decide what to do with the error.
+				// so keep this in mind when interpreting this info in telemetry
 				this.mc.logger.sendTelemetryEvent(
 					{
 						eventName: "ContainerClose",
-						category:
-							this._lifecycleState !== "loading" && error !== undefined ? "error" : "generic",
+						category: error === undefined ? "generic" : "error",
 					},
 					error,
 				);
@@ -1610,7 +1610,11 @@ export class Container
 			this.connectToDeltaStream(connectionArgs);
 		}
 
-		this.storageAdapter.connectToService(this.service);
+		// When DisableLoadConnectionRetries is enabled, use no internal retries.
+		// The consumer will own the retry policy.
+		const disableLoadRetries =
+			this.mc.config.getBoolean("Fluid.Container.DisableLoadConnectionRetries") === true;
+		this.storageAdapter.connectToService(this.service, disableLoadRetries ? 0 : undefined);
 
 		this.attachmentData = {
 			state: AttachState.Attached,
@@ -1995,6 +1999,8 @@ export class Container
 
 	private createDeltaManager(): DeltaManager<ConnectionManager> {
 		const serviceProvider = (): IDocumentService | undefined => this.service;
+		const disableLoadConnectionRetries =
+			this.mc.config.getBoolean("Fluid.Container.DisableLoadConnectionRetries") === true;
 		const deltaManager = new DeltaManager<ConnectionManager>(
 			serviceProvider,
 			createChildLogger({ logger: this.subLogger, namespace: "DeltaManager" }),
@@ -2007,6 +2013,7 @@ export class Container
 					this._canReconnect,
 					createChildLogger({ logger: this.subLogger, namespace: "ConnectionManager" }),
 					props,
+					disableLoadConnectionRetries ? 1 : undefined /* maxInitialConnectionAttempts */,
 				),
 		);
 

package/src/containerStorageAdapter.ts

@@ -104,7 +104,7 @@ export class ContainerStorageAdapter
 		this.disposed = true;
 	}
 
-	public connectToService(service: IDocumentService): void {
+	public connectToService(service: IDocumentService, maxRetries?: number): void {
 		if (!(this._storageService instanceof BlobOnlyStorage)) {
 			return;
 		}
@@ -113,6 +113,7 @@ export class ContainerStorageAdapter
 		const retriableStorage = (this._storageService = new RetriableDocumentStorageService(
 			storageServiceP,
 			this.logger,
+			maxRetries,
 		));
 
 		// A storage service wrapper which intercept calls to uploadSummaryWithContext and ensure they include

package/src/loader.ts

@@ -26,13 +26,15 @@ import type {
 	IUrlResolver,
 } from "@fluidframework/driver-definitions/internal";
 import {
-	type ITelemetryLoggerExt,
 	type MonitoringContext,
 	PerformanceEvent,
 	createChildMonitoringContext,
 	mixinMonitoringContext,
 	sessionStorageConfigProvider,
+	toITelemetryLoggerExt,
 } from "@fluidframework/telemetry-utils/internal";
+// eslint-disable-next-line import-x/no-internal-modules -- Needed to avoid specialized /internal ITelemetryLoggerExt
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/legacy";
 import { v4 as uuid } from "uuid";
 
 import { Container } from "./container.js";
@@ -268,7 +270,7 @@ export class Loader implements IHostLoader {
 			scope:
 				options?.provideScopeLoader === false ? { ...scope } : { ...scope, ILoader: this },
 			protocolHandlerBuilder,
-			subLogger: subMc.logger,
+			subLogger: toITelemetryLoggerExt(subMc.logger),
 		};
 		this.mc = createChildMonitoringContext({
 			logger: this.services.subLogger,

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.92.0";
+export const pkgVersion = "2.100.0";

package/src/retriableDocumentStorageService.ts

@@ -30,6 +30,7 @@ export class RetriableDocumentStorageService implements IDocumentStorageService,
 	constructor(
 		private readonly internalStorageServiceP: Promise<IDocumentStorageService>,
 		private readonly logger: ITelemetryLoggerExt,
+		private readonly maxRetries?: number,
 	) {
 		this.internalStorageServiceP
 			.then((s) => (this.internalStorageService = s))
@@ -167,9 +168,15 @@ export class RetriableDocumentStorageService implements IDocumentStorageService,
 	}
 
 	private async runWithRetry<T>(api: () => Promise<T>, callName: string): Promise<T> {
-		return runWithRetry(api, callName, this.logger, {
-			onRetry: (_delayInMs: number, error: unknown) =>
-				this.checkStorageDisposed(callName, error),
-		});
+		return runWithRetry(
+			api,
+			callName,
+			this.logger,
+			{
+				onRetry: (_delayInMs: number, error: unknown) =>
+					this.checkStorageDisposed(callName, error),
+			},
+			this.maxRetries,
+		);
 	}
 }