@fluidframework/odsp-driver 2.20.0 → 2.22.0

package/src/fetchSnapshot.ts

@@ -46,6 +46,7 @@ import {
 import { EpochTracker } from "./epochTracker.js";
 import { getQueryString } from "./getQueryString.js";
 import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
+import { mockify } from "./mockify.js";
 import { convertOdspSnapshotToSnapshotTreeAndBlobs } from "./odspSnapshotParser.js";
 import { checkForKnownServerFarmType } from "./odspUrlHelper.js";
 import {
@@ -693,87 +694,92 @@ function getTreeStatsCore(snapshotTree: ISnapshotTree, stats: ITreeStats): void
  * @param epochTracker - epoch tracker used to add/validate epoch in the network call.
  * @returns fetched snapshot.
  */
-export async function downloadSnapshot(
-	odspResolvedUrl: IOdspResolvedUrl,
-	getAuthHeader: InstrumentedStorageTokenFetcher,
-	tokenFetchOptions: TokenFetchOptionsEx,
-	loadingGroupIds: string[] | undefined,
-	snapshotOptions: ISnapshotOptions | undefined,
-	snapshotFormatFetchType?: SnapshotFormatSupportType,
-	controller?: AbortController,
-	epochTracker?: EpochTracker,
-	scenarioName?: string,
-): Promise<ISnapshotRequestAndResponseOptions> {
-	// back-compat: This block to be removed with #8784 when we only consume/consider odsp resolvers that are >= 0.51
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-	const sharingLinkToRedeem = (odspResolvedUrl as any).sharingLinkToRedeem;
-	if (sharingLinkToRedeem) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		odspResolvedUrl.shareLinkInfo = { ...odspResolvedUrl.shareLinkInfo, sharingLinkToRedeem };
-	}
+export const downloadSnapshot = mockify(
+	async (
+		odspResolvedUrl: IOdspResolvedUrl,
+		getAuthHeader: InstrumentedStorageTokenFetcher,
+		tokenFetchOptions: TokenFetchOptionsEx,
+		loadingGroupIds: string[] | undefined,
+		snapshotOptions: ISnapshotOptions | undefined,
+		snapshotFormatFetchType?: SnapshotFormatSupportType,
+		controller?: AbortController,
+		epochTracker?: EpochTracker,
+		scenarioName?: string,
+	): Promise<ISnapshotRequestAndResponseOptions> => {
+		// back-compat: This block to be removed with #8784 when we only consume/consider odsp resolvers that are >= 0.51
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+		const sharingLinkToRedeem = (odspResolvedUrl as any).sharingLinkToRedeem;
+		if (sharingLinkToRedeem) {
+			odspResolvedUrl.shareLinkInfo = {
+				...odspResolvedUrl.shareLinkInfo,
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				sharingLinkToRedeem,
+			};
+		}
 
-	const snapshotUrl = odspResolvedUrl.endpoints.snapshotStorageUrl;
+		const snapshotUrl = odspResolvedUrl.endpoints.snapshotStorageUrl;
 
-	const queryParams: Record<string, unknown> = { ump: 1 };
-	if (snapshotOptions !== undefined) {
-		for (const [key, value] of Object.entries(snapshotOptions)) {
-			// Exclude "timeout" from query string
-			if (value !== undefined && key !== "timeout") {
-				queryParams[key] = value;
+		const queryParams: Record<string, unknown> = { ump: 1 };
+		if (snapshotOptions !== undefined) {
+			for (const [key, value] of Object.entries(snapshotOptions)) {
+				// Exclude "timeout" from query string
+				if (value !== undefined && key !== "timeout") {
+					queryParams[key] = value;
+				}
 			}
 		}
-	}
 
-	if (loadingGroupIds !== undefined) {
-		queryParams.groupId = loadingGroupIds.join(",");
-	}
-
-	const queryString = getQueryString(queryParams);
-	const url = `${snapshotUrl}/trees/latest${queryString}`;
-	const method = "POST";
-	// The location of file can move on Spo in which case server returns 308(Permanent Redirect) error.
-	// Adding below header will make VROOM API return 404 instead of 308 and browser can intercept it.
-	// This error thrown by server will contain the new redirect location. Look at the 404 error parsing
-	// for further reference here: \packages\utils\odsp-doclib-utils\src\odspErrorUtils.ts
-	const header = { prefer: "manualredirect" };
-	const authHeader = await getAuthHeader(
-		{ ...tokenFetchOptions, request: { url, method } },
-		"downloadSnapshot",
-	);
-	assert(authHeader !== null, 0x1e5 /* "Storage token should not be null" */);
-	const { body, headers } = getFormBodyAndHeaders(odspResolvedUrl, authHeader, header);
-	const fetchOptions = {
-		body,
-		headers,
-		signal: controller?.signal,
-		method,
-	};
-	// Decide what snapshot format to fetch as per the feature gate.
-	switch (snapshotFormatFetchType) {
-		case SnapshotFormatSupportType.Binary: {
-			headers.accept = `application/ms-fluid; v=${currentReadVersion}`;
-			break;
+		if (loadingGroupIds !== undefined) {
+			queryParams.groupId = loadingGroupIds.join(",");
 		}
-		default: {
-			// By default ask both versions and let the server decide the format.
-			headers.accept = `application/json, application/ms-fluid; v=${currentReadVersion}`;
+
+		const queryString = getQueryString(queryParams);
+		const url = `${snapshotUrl}/trees/latest${queryString}`;
+		const method = "POST";
+		// The location of file can move on Spo in which case server returns 308(Permanent Redirect) error.
+		// Adding below header will make VROOM API return 404 instead of 308 and browser can intercept it.
+		// This error thrown by server will contain the new redirect location. Look at the 404 error parsing
+		// for further reference here: \packages\utils\odsp-doclib-utils\src\odspErrorUtils.ts
+		const header = { prefer: "manualredirect" };
+		const authHeader = await getAuthHeader(
+			{ ...tokenFetchOptions, request: { url, method } },
+			"downloadSnapshot",
+		);
+		assert(authHeader !== null, 0x1e5 /* "Storage token should not be null" */);
+		const { body, headers } = getFormBodyAndHeaders(odspResolvedUrl, authHeader, header);
+		const fetchOptions = {
+			body,
+			headers,
+			signal: controller?.signal,
+			method,
+		};
+		// Decide what snapshot format to fetch as per the feature gate.
+		switch (snapshotFormatFetchType) {
+			case SnapshotFormatSupportType.Binary: {
+				headers.accept = `application/ms-fluid; v=${currentReadVersion}`;
+				break;
+			}
+			default: {
+				// By default ask both versions and let the server decide the format.
+				headers.accept = `application/json, application/ms-fluid; v=${currentReadVersion}`;
+			}
 		}
-	}
 
-	const odspResponse = await (epochTracker?.fetch(
-		url,
-		fetchOptions,
-		"treesLatest",
-		true,
-		scenarioName,
-	) ?? fetchHelper(url, fetchOptions));
-
-	return {
-		odspResponse,
-		requestHeaders: headers,
-		requestUrl: url,
-	};
-}
+		const odspResponse = await (epochTracker?.fetch(
+			url,
+			fetchOptions,
+			"treesLatest",
+			true,
+			scenarioName,
+		) ?? fetchHelper(url, fetchOptions));
+
+		return {
+			odspResponse,
+			requestHeaders: headers,
+			requestUrl: url,
+		};
+	},
+);
 
 function isRedeemSharingLinkError(
 	odspResolvedUrl: IOdspResolvedUrl,

package/src/getFileLink.ts

@@ -20,6 +20,7 @@ import {
 } from "@fluidframework/telemetry-utils/internal";
 
 import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
+import { mockify } from "./mockify.js";
 import {
 	fetchHelper,
 	getWithRetryForTokenRefresh,
@@ -42,64 +43,66 @@ const fileLinkCache = new Map<string, Promise<string>>();
  * @param logger - used to log results of operation, including any error
  * @returns Promise which resolves to file link url when successful; otherwise, undefined.
  */
-export async function getFileLink(
-	getToken: TokenFetcher<OdspResourceTokenFetchOptions>,
-	resolvedUrl: IOdspResolvedUrl,
-	logger: ITelemetryLoggerExt,
-): Promise<string> {
-	const cacheKey = `${resolvedUrl.siteUrl}_${resolvedUrl.driveId}_${resolvedUrl.itemId}`;
-	const maybeFileLinkCacheEntry = fileLinkCache.get(cacheKey);
-	if (maybeFileLinkCacheEntry !== undefined) {
-		return maybeFileLinkCacheEntry;
-	}
+export const getFileLink = mockify(
+	async (
+		getToken: TokenFetcher<OdspResourceTokenFetchOptions>,
+		resolvedUrl: IOdspResolvedUrl,
+		logger: ITelemetryLoggerExt,
+	): Promise<string> => {
+		const cacheKey = `${resolvedUrl.siteUrl}_${resolvedUrl.driveId}_${resolvedUrl.itemId}`;
+		const maybeFileLinkCacheEntry = fileLinkCache.get(cacheKey);
+		if (maybeFileLinkCacheEntry !== undefined) {
+			return maybeFileLinkCacheEntry;
+		}
 
-	const fileLinkGenerator = async function (): Promise<string> {
-		let fileLinkCore: string;
-		try {
-			let retryCount = 0;
-			fileLinkCore = await runWithRetry(
-				async () =>
-					runWithRetryForCoherencyAndServiceReadOnlyErrors(
-						async () =>
-							getFileLinkWithLocationRedirectionHandling(getToken, resolvedUrl, logger),
-						"getFileLinkCore",
-						logger,
-					),
-				"getShareLink",
-				logger,
-				{
-					// TODO: use a stronger type
-					// eslint-disable-next-line @typescript-eslint/no-explicit-any
-					onRetry(delayInMs: number, error: any) {
-						retryCount++;
-						if (retryCount === 5) {
-							if (error !== undefined && typeof error === "object") {
-								// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-								error.canRetry = false;
+		const fileLinkGenerator = async function (): Promise<string> {
+			let fileLinkCore: string;
+			try {
+				let retryCount = 0;
+				fileLinkCore = await runWithRetry(
+					async () =>
+						runWithRetryForCoherencyAndServiceReadOnlyErrors(
+							async () =>
+								getFileLinkWithLocationRedirectionHandling(getToken, resolvedUrl, logger),
+							"getFileLinkCore",
+							logger,
+						),
+					"getShareLink",
+					logger,
+					{
+						// TODO: use a stronger type
+						// eslint-disable-next-line @typescript-eslint/no-explicit-any
+						onRetry(delayInMs: number, error: any) {
+							retryCount++;
+							if (retryCount === 5) {
+								if (error !== undefined && typeof error === "object") {
+									// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+									error.canRetry = false;
+									throw error;
+								}
 								throw error;
 							}
-							throw error;
-						}
+						},
 					},
-				},
-			);
-		} catch (error) {
-			// Delete from the cache to permit retrying later.
-			fileLinkCache.delete(cacheKey);
-			throw error;
-		}
+				);
+			} catch (error) {
+				// Delete from the cache to permit retrying later.
+				fileLinkCache.delete(cacheKey);
+				throw error;
+			}
 
-		// We are guaranteed to run the getFileLinkCore at least once with successful result (which must be a string)
-		assert(
-			fileLinkCore !== undefined,
-			0x292 /* "Unexpected undefined result from getFileLinkCore" */,
-		);
-		return fileLinkCore;
-	};
-	const fileLink = fileLinkGenerator();
-	fileLinkCache.set(cacheKey, fileLink);
-	return fileLink;
-}
+			// We are guaranteed to run the getFileLinkCore at least once with successful result (which must be a string)
+			assert(
+				fileLinkCore !== undefined,
+				0x292 /* "Unexpected undefined result from getFileLinkCore" */,
+			);
+			return fileLinkCore;
+		};
+		const fileLink = fileLinkGenerator();
+		fileLinkCache.set(cacheKey, fileLink);
+		return fileLink;
+	},
+);
 
 /**
  * Handles location redirection while fulfilling the getFileLink call. We don't want browser to handle

package/src/index.ts

@@ -29,7 +29,6 @@ export {
 	OdspDocumentServiceFactory,
 } from "./odspDocumentServiceFactory.js";
 export { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
-export { OdspDocumentServiceFactoryWithCodeSplit } from "./odspDocumentServiceFactoryWithCodeSplit.js";
 
 // File creation
 export { createOdspCreateContainerRequest } from "./createOdspCreateContainerRequest.js";

package/src/mockify.ts

@@ -0,0 +1,67 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * A special key used to store the original function in a {@link Mockable | mockable} function.
+ * @remarks Use {@link mockify | `mockify.key`} as a convenient way to access this key.
+ */
+export const mockifyMockKey = Symbol("`mockify` mock function key");
+
+/**
+ * A function that can be mocked after being decorated by {@link mockify | mockify()}.
+ */
+export interface Mockable<T extends (...args: any[]) => unknown> {
+	(...args: Parameters<T>): ReturnType<T>;
+	[mockifyMockKey]: T;
+}
+
+/**
+ * Decorates a function to allow it to be mocked.
+ * @param fn - The function that will become mockable.
+ * @returns A function with a {@link mockifyMockKey | special property } that can be overwritten to mock the original function.
+ * By default, this property is set to the original function.
+ * If overwritten with a new function, the new function will be called instead of the original.
+ * @example
+ * ```typescript
+ * const original = () => console.log("original");
+ * const mockable = mockify(original);
+ * mockable(); // logs "original"
+ * mockable[mockify.key] = () => console.log("mocked");
+ * mockable(); // logs "mocked"
+ * mockable[mockify.key] = original;
+ * mockable(); // logs "original"
+ * ```
+ *
+ * This pattern is useful for mocking top-level exported functions in a module.
+ * For example,
+ * ```typescript
+ * export function fn() { /* ... * / }
+ * ```
+ * becomes
+ * ```typescript
+ * import { mockify } from "./mockify.js";
+ * export const fn = mockify(() => { /* ... * / });
+ * ```
+ * and can now be mocked by another module that imports it.
+ * ```typescript
+ * import * as sinon from "sinon";
+ * import { mockify } from "./mockify.js";
+ * import { fn } from "./module.js";
+ * sinon.stub(fn, mockify.key).callsFake(() => {
+ *   // ... mock function implementation ...
+ * });
+ * // ...
+ * sinon.restore();
+ * ```
+ */
+export function mockify<T extends (...args: any[]) => unknown>(fn: T): Mockable<T> {
+	const mockable = (...args: Parameters<T>): ReturnType<T> => {
+		return mockable[mockifyMockKey](...args) as ReturnType<T>;
+	};
+	mockable[mockifyMockKey] = fn;
+	return mockable;
+}
+
+mockify.key = mockifyMockKey;

package/src/odspDelayLoadedDeltaStream.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { ISignalEnvelope } from "@fluidframework/core-interfaces/internal";
 import { assert } from "@fluidframework/core-utils/internal";
 import { IClient } from "@fluidframework/driver-definitions";
@@ -519,7 +519,7 @@ export class OdspDelayLoadedDeltaStream {
 		client: IClient,
 		webSocketUrl: string,
 	): Promise<OdspDocumentDeltaConnection> {
-		const startTime = performance.now();
+		const startTime = performanceNow();
 		const connection = await OdspDocumentDeltaConnection.create(
 			tenantId,
 			documentId,
@@ -531,7 +531,7 @@ export class OdspDelayLoadedDeltaStream {
 			this.epochTracker,
 			this.socketReferenceKeyPrefix,
 		);
-		const duration = performance.now() - startTime;
+		const duration = performanceNow() - startTime;
 		// This event happens rather often, so it adds up to cost of telemetry.
 		// Given that most reconnects result in reusing socket and happen very quickly,
 		// report event only if it took longer than threshold.

package/src/odspDocumentDeltaConnection.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { TypedEventEmitter, performance } from "@fluid-internal/client-utils";
+import { TypedEventEmitter, performanceNow } from "@fluid-internal/client-utils";
 import { IEvent } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import { DocumentDeltaConnection } from "@fluidframework/driver-base/internal";
@@ -450,7 +450,7 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 
 		this.pushCallCounter++;
 		const nonce = `${this.requestOpsNoncePrefix}${this.pushCallCounter}`;
-		const start = performance.now();
+		const start = performanceNow();
 
 		// We may keep keep accumulating memory for nothing, if we are not getting responses.
 		// Note that we should not have overlapping requests, as DeltaManager allows only one
@@ -475,7 +475,7 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 				from: payloadToDelete.from,
 				to: payloadToDelete.to,
 				length: payloadToDelete.to - payloadToDelete.from,
-				duration: performance.now() - payloadToDelete.start,
+				duration: performanceNow() - payloadToDelete.start,
 			});
 			this.getOpsMap.delete(key!);
 		}
@@ -591,7 +591,7 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 					code: result.code,
 					from: data?.from,
 					to: data?.to,
-					duration: data === undefined ? undefined : performance.now() - data.start,
+					duration: data === undefined ? undefined : performanceNow() - data.start,
 				};
 				if (messages !== undefined && messages.length > 0) {
 					this.logger.sendPerformanceEvent({

package/src/odspDocumentStorageManager.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { LogLevel } from "@fluidframework/core-interfaces";
 import { assert, delay } from "@fluidframework/core-utils/internal";
 import { promiseRaceWithWinner } from "@fluidframework/driver-base/internal";
@@ -271,7 +271,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 				let retrievedSnapshot: ISnapshot | IPrefetchSnapshotContents | undefined;
 
 				let method: string;
-				let prefetchWaitStartTime: number = performance.now();
+				let prefetchWaitStartTime: number = performanceNow();
 				if (snapshotFetchOptions.fetchSource === FetchSource.noCache) {
 					retrievedSnapshot = await this.fetchSnapshotFromNetwork(
 						hostSnapshotOptions,
@@ -394,13 +394,13 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 					} else {
 						// Note: There's a race condition here - another caller may come past the undefined check
 						// while the first caller is awaiting later async code in this block.
-						const startTime = performance.now();
+						const startTime = performanceNow();
 						retrievedSnapshot = await cachedSnapshotP;
-						cacheLookupTimeInSerialFetch = performance.now() - startTime;
+						cacheLookupTimeInSerialFetch = performanceNow() - startTime;
 						method = retrievedSnapshot === undefined ? "network" : "cache";
 
 						if (retrievedSnapshot === undefined) {
-							prefetchWaitStartTime = performance.now();
+							prefetchWaitStartTime = performanceNow();
 							retrievedSnapshot = await this.fetchSnapshotFromNetwork(
 								hostSnapshotOptions,
 								snapshotFetchOptions.loadingGroupIds,
@@ -437,7 +437,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 			},
 		);
 
-		const stTime = performance.now();
+		const stTime = performanceNow();
 		// Don't override ops which were fetched during initial load, since we could still need them.
 		const id = this.initializeFromSnapshot(
 			odspSnapshotCacheValue,
@@ -447,7 +447,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		this.logger.sendTelemetryEvent(
 			{
 				eventName: "SnapshotInitializeTime",
-				duration: performance.now() - stTime,
+				duration: performanceNow() - stTime,
 			},
 			undefined,
 			LogLevel.verbose,

package/src/odspUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import {
 	ITelemetryBaseLogger,
 	ITelemetryBaseProperties,
@@ -54,7 +54,6 @@ import {
 	wrapError,
 } from "@fluidframework/telemetry-utils/internal";
 
-import { fetch } from "./fetch.js";
 import { storeLocatorInOdspUrl } from "./odspFluidFileLink.js";
 // eslint-disable-next-line import/no-deprecated
 import { ISnapshotContents } from "./odspPublicUtils.js";
@@ -135,12 +134,11 @@ export async function fetchHelper(
 	requestInfo: RequestInfo,
 	requestInit: RequestInit | undefined,
 ): Promise<IOdspResponse<Response>> {
-	const start = performance.now();
+	const start = performanceNow();
 
-	// Node-fetch and dom have conflicting typing, force them to work by casting for now
 	return fetch(requestInfo, requestInit).then(
 		async (fetchResponse) => {
-			const response = fetchResponse as unknown as Response;
+			const response = fetchResponse;
 			// Let's assume we can retry.
 			if (!response) {
 				throw new NonRetryableError(
@@ -165,7 +163,7 @@ export async function fetchHelper(
 				content: response,
 				headers,
 				propsToLog: getSPOAndGraphRequestIdsFromResponse(headers),
-				duration: performance.now() - start,
+				duration: performanceNow() - start,
 			};
 		},
 		(error) => {
@@ -221,6 +219,8 @@ export async function fetchHelper(
 		},
 	);
 }
+// This allows `fetch` to be mocked (e.g. with sinon `stub()`)
+fetchHelper.fetch = fetch;
 
 /**
  * A utility function to fetch and parse as JSON with support for retries
@@ -508,16 +508,16 @@ export function buildOdspShareLinkReqParams(
 }
 
 export function measure<T>(callback: () => T): [T, number] {
-	const start = performance.now();
+	const start = performanceNow();
 	const result = callback();
-	const time = performance.now() - start;
+	const time = performanceNow() - start;
 	return [result, time];
 }
 
 export async function measureP<T>(callback: () => Promise<T>): Promise<[T, number]> {
-	const start = performance.now();
+	const start = performanceNow();
 	const result = await callback();
-	const time = performance.now() - start;
+	const time = performanceNow() - start;
 	return [result, time];
 }
 

package/src/opsCaching.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 // ISequencedDocumentMessage
@@ -183,11 +183,11 @@ export class OpsCache {
 	 * @returns ops retrieved
 	 */
 	public async get(from: number, to?: number): Promise<IMessage[]> {
-		const start = performance.now();
+		const start = performanceNow();
 
 		const messages = await this.getCore(from, to);
 
-		const duration = performance.now() - start;
+		const duration = performanceNow() - start;
 		if (messages.length > 0 || duration > 1000) {
 			this.logger.sendPerformanceEvent({
 				eventName: "CacheOpsUsed",

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/odsp-driver";
-export const pkgVersion = "2.20.0";
+export const pkgVersion = "2.22.0";

package/src/prefetchLatestSnapshot.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import { IResolvedUrl } from "@fluidframework/driver-definitions/internal";
@@ -127,7 +127,7 @@ export async function prefetchLatestSnapshot(
 		odspLogger,
 		{ eventName: "PrefetchLatestSnapshot" },
 		async () => {
-			const prefetchStartTime = performance.now();
+			const prefetchStartTime = performanceNow();
 			// Add the deferred promise to the cache, so that it can be leveraged while loading the container.
 			const snapshotContentsWithEpochP = new Deferred<IPrefetchSnapshotContents>();
 			const nonPersistentCacheKey = getKeyForCacheEntry(snapshotKey);

package/src/retryUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { delay } from "@fluidframework/core-utils/internal";
 import {
 	canRetryOnError,
@@ -24,7 +24,7 @@ export async function runWithRetry<T>(
 	checkDisposed?: () => void,
 ): Promise<T> {
 	let retryAfter = 1000;
-	const start = performance.now();
+	const start = performanceNow();
 	let lastError: unknown;
 	for (let attempts = 1; ; attempts++) {
 		if (checkDisposed !== undefined) {
@@ -38,7 +38,7 @@ export async function runWithRetry<T>(
 						eventName: "MultipleRetries",
 						callName,
 						attempts,
-						duration: performance.now() - start,
+						duration: performanceNow() - start,
 					},
 					lastError,
 				);
@@ -62,7 +62,7 @@ export async function runWithRetry<T>(
 						eventName: `${callName}_firstFailed`,
 						callName,
 						attempts,
-						duration: performance.now() - start, // record total wait time.
+						duration: performanceNow() - start, // record total wait time.
 					},
 					error,
 				);
@@ -86,7 +86,7 @@ export async function runWithRetry<T>(
 							: "ServiceReadonlyErrorTooManyRetries",
 						callName,
 						attempts,
-						duration: performance.now() - start, // record total wait time.
+						duration: performanceNow() - start, // record total wait time.
 					},
 					error,
 				);