@fluidframework/routerlicious-driver 2.0.0-dev.6.4.0.192049 → 2.0.0-dev.7.2.0.204906

package/src/gitManager.ts

@@ -9,59 +9,19 @@ import {
 	IWriteSummaryResponse,
 } from "@fluidframework/server-services-client";
 import { IGitManager, IHistorian } from "./storageContracts";
-import { IR11sResponse, createR11sResponseFromContent } from "./restWrapper";
+import { IR11sResponse } from "./restWrapper";
 import { IWholeFlatSnapshot } from "./contracts";
 
 export class GitManager implements IGitManager {
-	private readonly blobCache = new Map<string, resources.IBlob>();
-	private readonly commitCache = new Map<string, resources.ICommit>();
-	private readonly treeCache = new Map<string, resources.ITree>();
-	private readonly refCache = new Map<string, string>();
-
 	constructor(private readonly historian: IHistorian) {}
 
 	/**
 	 * Reads the object with the given ID. We defer to the client implementation to do the actual read.
 	 */
 	public async getCommits(
-		shaOrRef: string,
+		sha: string,
 		count: number,
 	): Promise<IR11sResponse<resources.ICommitDetails[]>> {
-		let sha: string | undefined = shaOrRef;
-
-		// See if the sha is really a ref and convert
-		if (this.refCache.has(shaOrRef)) {
-			sha = this.refCache.get(shaOrRef);
-
-			// Delete refcache after first use
-			this.refCache.delete(shaOrRef);
-
-			// If null is stored for the ref then there are no commits - return an empty array
-			if (!sha) {
-				return createR11sResponseFromContent([]);
-			}
-		}
-
-		// See if the commit sha is hashed and return it if so
-		const commit = this.commitCache.get(sha);
-		if (commit !== undefined) {
-			return createR11sResponseFromContent([
-				{
-					commit: {
-						author: commit.author,
-						committer: commit.committer,
-						message: commit.message,
-						tree: commit.tree,
-						url: commit.url,
-					},
-					parents: commit.parents,
-					sha: commit.sha,
-					url: commit.url,
-				},
-			]);
-		}
-
-		// Otherwise fall back to the historian
 		return this.historian.getCommits(sha, count);
 	}
 
@@ -69,19 +29,10 @@ export class GitManager implements IGitManager {
 	 * Reads the object with the given ID. We defer to the client implementation to do the actual read.
 	 */
 	public async getTree(root: string, recursive = true): Promise<IR11sResponse<resources.ITree>> {
-		const tree = this.treeCache.get(root);
-		if (tree !== undefined) {
-			return createR11sResponseFromContent(tree);
-		}
-
 		return this.historian.getTree(root, recursive);
 	}
 
 	public async getBlob(sha: string): Promise<IR11sResponse<resources.IBlob>> {
-		const blob = this.blobCache.get(sha);
-		if (blob !== undefined) {
-			return createR11sResponseFromContent(blob);
-		}
 		return this.historian.getBlob(sha);
 	}
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "2.0.0-dev.6.4.0.192049";
+export const pkgVersion = "2.0.0-dev.7.2.0.204906";

package/src/policies.ts

@@ -19,14 +19,6 @@ export interface IRouterliciousDriverPolicies {
 	 * Default: 100
 	 */
 	maxConcurrentOrdererRequests: number;
-	/**
-	 * Give hosts the option to change blob aggregation behavior to suit their needs.
-	 * Larger number means fewer blob individual requests, but less blob-deduping.
-	 * Smaller number means more blob individual requests, but more blob-deduping.
-	 * Setting to `undefined` disables blob aggregration.
-	 * Default: undefined
-	 */
-	aggregateBlobsSmallerThanBytes: number | undefined;
 	/**
 	 * Enable uploading entire summary tree as a IWholeSummaryPayload to storage.
 	 * Default: false

package/src/restWrapper.ts

@@ -76,6 +76,7 @@ function headersToMap(headers: Headers) {
 }
 
 export function getPropsToLogFromResponse(headers: {
+	// eslint-disable-next-line @rushstack/no-new-null
 	get: (id: string) => string | undefined | null;
 }) {
 	interface LoggingHeader {
@@ -183,6 +184,7 @@ export class RouterliciousRestWrapper extends RestWrapper {
 			return {
 				content: result,
 				headers,
+				// eslint-disable-next-line @typescript-eslint/no-base-to-string
 				requestUrl: fetchRequestConfig[0].toString(),
 				propsToLog: {
 					...getPropsToLogFromResponse(headers),

package/src/shreddedSummaryDocumentStorageService.ts

@@ -3,7 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
+import {
+	ITelemetryLoggerExt,
+	MonitoringContext,
+	PerformanceEvent,
+	createChildMonitoringContext,
+} from "@fluidframework/telemetry-utils";
 import { stringToBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
 import {
 	IDocumentStorageService,
@@ -34,15 +39,14 @@ const isNode = typeof window === "undefined";
  * Downloads summaries piece-by-piece on-demand, or up-front when prefetch is enabled.
  */
 export class ShreddedSummaryDocumentStorageService implements IDocumentStorageService {
+	private readonly mc: MonitoringContext;
 	// The values of this cache is useless. We only need the keys. So we are always putting
 	// empty strings as values.
 	protected readonly blobsShaCache = new Map<string, string>();
 	private readonly blobCache: ICache<ArrayBufferLike> | undefined;
 	private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion> | undefined;
 
-	public get repositoryUrl(): string {
-		return "";
-	}
+	public readonly repositoryUrl = "";
 
 	private async getSummaryUploadManager(): Promise<ISummaryUploadManager> {
 		const manager = await this.getStorageManager();
@@ -69,6 +73,10 @@ export class ShreddedSummaryDocumentStorageService implements IDocumentStorageSe
 			this.blobCache = blobCache ?? new InMemoryCache();
 			this.snapshotTreeCache = snapshotTreeCache ?? new InMemoryCache();
 		}
+
+		this.mc = createChildMonitoringContext({
+			logger,
+		});
 	}
 
 	public async getVersions(versionId: string | null, count: number): Promise<IVersion[]> {
@@ -153,6 +161,9 @@ export class ShreddedSummaryDocumentStorageService implements IDocumentStorageSe
 				});
 				return response;
 			},
+			undefined, // workers
+			undefined, // recordHeapSize
+			this.mc.config.getNumber("Fluid.Driver.ReadBlobTelemetrySampling"),
 		);
 		this.blobsShaCache.set(value.sha, "");
 		const bufferContent = stringToBuffer(value.content, value.encoding);

package/src/wholeSummaryDocumentStorageService.ts

@@ -3,7 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
+import {
+	ITelemetryLoggerExt,
+	MonitoringContext,
+	PerformanceEvent,
+	createChildMonitoringContext,
+} from "@fluidframework/telemetry-utils";
 import { performance, stringToBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils";
 import { getW3CData, promiseRaceWithWinner } from "@fluidframework/driver-base";
@@ -36,11 +41,10 @@ import { convertWholeFlatSnapshotToSnapshotTreeAndBlobs } from "./r11sSnapshotPa
 const latestSnapshotId: string = "latest";
 
 export class WholeSummaryDocumentStorageService implements IDocumentStorageService {
+	private readonly mc: MonitoringContext;
 	private firstVersionsCall: boolean = true;
 
-	public get repositoryUrl(): string {
-		return "";
-	}
+	public readonly repositoryUrl = "";
 
 	private async getSummaryUploadManager(): Promise<ISummaryUploadManager> {
 		const manager = await this.getStorageManager();
@@ -62,8 +66,13 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 			disableCache && this.noCacheGitManager !== undefined
 				? this.noCacheGitManager
 				: this.manager,
-	) {}
+	) {
+		this.mc = createChildMonitoringContext({
+			logger,
+		});
+	}
 
+	// eslint-disable-next-line @rushstack/no-new-null
 	public async getVersions(versionId: string | null, count: number): Promise<IVersion[]> {
 		if (versionId !== this.id && versionId !== null) {
 			// Blobs/Trees in this scenario will never have multiple versions, so return versionId as is
@@ -153,6 +162,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 		}));
 	}
 
+	// eslint-disable-next-line @rushstack/no-new-null
 	public async getSnapshotTree(version?: IVersion): Promise<ISnapshotTree | null> {
 		let requestVersion = version;
 		if (!requestVersion) {
@@ -205,6 +215,9 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 				});
 				return response;
 			},
+			undefined, // workers
+			undefined, // recordHeapSize
+			this.mc.config.getNumber("Fluid.Driver.ReadBlobTelemetrySampling"),
 		);
 		const bufferValue = stringToBuffer(blob.content, blob.encoding);
 
@@ -296,9 +309,8 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 			},
 			async (event) => {
 				const manager = await this.getStorageManager(disableCache);
-				const response: IR11sResponse<IWholeFlatSnapshot> = await manager.getSnapshot(
-					versionId,
-				);
+				const response: IR11sResponse<IWholeFlatSnapshot> =
+					await manager.getSnapshot(versionId);
 				const start = performance.now();
 				const snapshot: INormalizedWholeSnapshot =
 					convertWholeFlatSnapshotToSnapshotTreeAndBlobs(response.content);