Update telemetry for getDeltas from db

server/routerlicious/packages/lambdas/src/scribe/checkpointManager.ts

@@ -59,6 +59,7 @@ export class CheckpointManager implements ICheckpointManager {
 					this.documentId,
 					expectedSequenceNumber - 1,
 					expectedSequenceNumber + 1,
+					"scribe",
 				);
 
 				// If we don't get the expected delta, retry after a delay
@@ -82,6 +83,7 @@ export class CheckpointManager implements ICheckpointManager {
 						this.documentId,
 						expectedSequenceNumber - 1,
 						expectedSequenceNumber + 1,
+						"scribe",
 					);
 
 					if (

server/routerlicious/packages/lambdas/src/scribe/lambdaFactory.ts

@@ -318,6 +318,8 @@ export class ScribeLambdaFactory
 				tenantId,
 				documentId,
 				lastCheckpoint.protocolState.sequenceNumber,
+				undefined,
+				"scribe",
 			);
 		}
 		return opMessages;

server/routerlicious/packages/lambdas/src/scribe/pendingMessageReader.ts

@@ -26,6 +26,7 @@ export class PendingMessageReader implements IPendingMessageReader {
 			this.documentId,
 			from - 1,
 			to + 1,
+			"scribe",
 		);
 		return deltasP;
 	}

server/routerlicious/packages/lambdas/src/scribe/summaryWriter.ts

@@ -713,7 +713,14 @@ export class SummaryWriter implements ISummaryWriter {
 		let logTail: ISequencedDocumentMessage[] = [];
 
 		if (this.getDeltasViaAlfred) {
-			logTail = await this.deltaService.getDeltas("", this.tenantId, this.documentId, gt, lt);
+			logTail = await this.deltaService.getDeltas(
+				"",
+				this.tenantId,
+				this.documentId,
+				gt,
+				lt,
+				"scribe",
+			);
 		} else {
 			const query = {
 				"documentId": this.documentId,

server/routerlicious/packages/routerlicious-base/src/alfred/routes/api/deltas.ts

@@ -147,6 +147,7 @@ export function create(
 			const from = stringToSequenceNumber(request.query.from);
 			const to = stringToSequenceNumber(request.query.to);
 			const tenantId = getParam(request.params, "tenantId") || appTenants[0].id;
+			const caller = request.query.caller?.toString();
 
 			// Query for the deltas and return a filtered version of just the operations field
 			const deltasP = deltaService.getDeltas(
@@ -155,6 +156,7 @@ export function create(
 				getParam(request.params, "id"),
 				from,
 				to,
+				caller,
 			);
 
 			handleResponse(deltasP, response, undefined, 500);

server/routerlicious/packages/routerlicious-base/src/alfred/services/deltaService.ts

@@ -11,6 +11,11 @@ import {
 	ITenantManager,
 	MongoManager,
 } from "@fluidframework/server-services-core";
+import {
+	BaseTelemetryProperties,
+	LumberEventName,
+	Lumberjack,
+} from "@fluidframework/server-services-telemetry";
 
 export class DeltaService implements IDeltaService {
 	constructor(
@@ -24,23 +29,42 @@ export class DeltaService implements IDeltaService {
 		documentId: string,
 		from?: number,
 		to?: number,
+		caller?: string,
 	): Promise<ISequencedDocumentMessage[]> {
-		// Create an optional filter to restrict the delta range
-		const query: any = { documentId, tenantId };
-		if (from !== undefined || to !== undefined) {
-			query["operation.sequenceNumber"] = {};
+		const metricProperties = {
+			[BaseTelemetryProperties.tenantId]: tenantId,
+			[BaseTelemetryProperties.documentId]: documentId,
+			from,
+			to,
+			caller,
+		};
+		const metric = Lumberjack.newLumberMetric(
+			LumberEventName.GetDeltasFromDb,
+			metricProperties,
+		);
+		try {
+			// Create an optional filter to restrict the delta range
+			const query: any = { documentId, tenantId };
+			if (from !== undefined || to !== undefined) {
+				query["operation.sequenceNumber"] = {};
 
-			if (from !== undefined) {
-				query["operation.sequenceNumber"].$gt = from;
-			}
+				if (from !== undefined) {
+					query["operation.sequenceNumber"].$gt = from;
+				}
 
-			if (to !== undefined) {
-				query["operation.sequenceNumber"].$lt = to;
+				if (to !== undefined) {
+					query["operation.sequenceNumber"].$lt = to;
+				}
 			}
-		}
 
-		const sort = { "operation.sequenceNumber": 1 };
-		return this.queryDeltas(collectionName, query, sort);
+			const sort = { "operation.sequenceNumber": 1 };
+			const deltas = this.queryDeltas(collectionName, query, sort);
+			metric.success("getDeltasFromDb succeeded");
+			return deltas;
+		} catch (err) {
+			metric.error("getDeltasFromDb failed", err);
+			throw err;
+		}
 	}
 
 	public async getDeltasFromStorage(

server/routerlicious/packages/services-core/src/delta.ts

@@ -12,6 +12,7 @@ export interface IDeltaService {
 		documentId: string,
 		from?: number,
 		to?: number,
+		caller?: string,
 	): Promise<ISequencedDocumentMessage[]>;
 
 	getDeltasFromStorage(

server/routerlicious/packages/services-telemetry/src/lumberEventNames.ts

@@ -50,4 +50,5 @@ export enum LumberEventName {
 	ConnectionCountPerNode = "ConnectionCountPerNode",
 	RestoreFromCheckpoint = "RestoreFromCheckpoint",
 	ReprocessOps = "ReprocessOps",
+	GetDeltasFromDb = "GetDeltasFromDb",
 }

server/routerlicious/packages/services/src/deltaManager.ts

@@ -22,12 +22,13 @@ export class DeltaManager implements IDeltaService {
 		documentId: string,
 		from: number,
 		to: number,
+		caller?: string,
 	): Promise<ISequencedDocumentMessage[]> {
 		const baseUrl = `${this.internalAlfredUrl}`;
 		const restWrapper = await this.getBasicRestWrapper(tenantId, documentId, baseUrl);
 		const resultP = restWrapper.get<ISequencedDocumentMessage[]>(
 			`/deltas/${tenantId}/${documentId}`,
-			{ from, to },
+			{ from, to, caller },
 		);
 		return resultP;
 	}