@rocicorp/zero 1.4.0-canary.2 → 1.4.0-canary.3

package/out/zero-cache/src/services/view-syncer/view-syncer.js

@@ -8,7 +8,7 @@ import { stringify } from "../../../../shared/src/bigint-json.js";
 import { manualSpan, startAsyncSpan, startSpan } from "../../../../otel/src/span.js";
 import { ZERO_VERSION_COLUMN_NAME } from "../replicator/schema/constants.js";
 import { transformAndHashQuery } from "../../auth/read-authorizer.js";
-import { getOrCreateCounter, getOrCreateHistogram, getOrCreateUpDownCounter } from "../../observability/metrics.js";
+import { getOrCreateCounter, getOrCreateLatencyHistogram, getOrCreateUpDownCounter } from "../../observability/metrics.js";
 import { rowIDString } from "../../types/row-key.js";
 import "../replicator/schema/replication-state.js";
 import { ResetPipelinesSignal } from "./snapshotter.js";
@@ -86,25 +86,13 @@ var ViewSyncerService = class {
 	#queryReplacements = /* @__PURE__ */ new Map();
 	#activeClients = getOrCreateUpDownCounter("sync", "active-clients", "Number of active sync clients");
 	#hydrations = getOrCreateCounter("sync", "hydration", "Number of query hydrations");
-	#hydrationTime = getOrCreateHistogram("sync", "hydration-time", {
-		description: "Time to hydrate a query.",
-		unit: "s"
-	});
-	#transactionAdvanceTime = getOrCreateHistogram("sync", "advance-time", {
-		description: "Time to advance all queries for a given client group after applying a new transaction to the replica.",
-		unit: "s"
-	});
+	#hydrationTime = getOrCreateLatencyHistogram("sync", "hydration-time", "Time to hydrate a query.");
+	#transactionAdvanceTime = getOrCreateLatencyHistogram("sync", "advance-time", "Time to advance all queries for a given client group after applying a new transaction to the replica.");
 	#queryTransformations = getOrCreateCounter("sync", "query.transformations", "Number of query transformations performed");
-	#queryTransformationTime = getOrCreateHistogram("sync", "query.transformation-time", {
-		description: "Time to transform custom queries via API server",
-		unit: "s"
-	});
+	#queryTransformationTime = getOrCreateLatencyHistogram("sync", "query.transformation-time", "Time to transform custom queries via API server.");
 	#queryTransformationHashChanges = getOrCreateCounter("sync", "query.transformation-hash-changes", "Number of times query transformation hash changed");
 	#queryTransformationNoOps = getOrCreateCounter("sync", "query.transformation-no-ops", "Number of times query transformation resulted in no-op (hash unchanged)");
-	#lockWaitTime = getOrCreateHistogram("sync", "lock-wait-time", {
-		description: "Time spent waiting to acquire the ViewSyncer lock.",
-		unit: "s"
-	});
+	#lockWaitTime = getOrCreateLatencyHistogram("sync", "lock-wait-time", "Time spent waiting to acquire the ViewSyncer lock.");
 	#pipelineResets = getOrCreateCounter("sync", "pipeline-resets", "Number of pipeline resets");
 	#inspectorDelegate;
 	#config;
@@ -132,7 +120,7 @@ var ViewSyncerService = class {
 		this.#lc.debug?.("about to acquire lock for cvr ", rid);
 		const lockWaitStart = performance.now();
 		return this.#lock.withLock(async () => {
-			this.#lockWaitTime.record((performance.now() - lockWaitStart) / 1e3);
+			this.#lockWaitTime.recordMs(performance.now() - lockWaitStart);
 			this.#lc.debug?.("acquired lock in #runInLockWithCVR ", rid);
 			const lc = this.#lc.withContext("lock", rid);
 			if (!this.#stateChanges.active) {
@@ -625,7 +613,7 @@ var ViewSyncerService = class {
 			});
 			const elapsed = timer.totalElapsed();
 			this.#hydrations.add(1);
-			this.#hydrationTime.record(elapsed / 1e3);
+			this.#hydrationTime.recordMs(elapsed);
 			this.#addQueryMaterializationServerMetric(transformationHash, elapsed);
 			lc.debug?.(`hydrated ${count} rows for ${queryID} (${elapsed} ms)`);
 		}
@@ -727,8 +715,8 @@ var ViewSyncerService = class {
 					this.#queryTransformations.add(1, { result: "error" });
 					throw e;
 				} finally {
-					const transformDuration = (performance.now() - transformStart) / 1e3;
-					this.#queryTransformationTime.record(transformDuration);
+					const transformDuration = performance.now() - transformStart;
+					this.#queryTransformationTime.recordMs(transformDuration);
 				}
 				const successfullyTransformedCustomQueries = /* @__PURE__ */ new Map();
 				erroredQueryIDs = this.#processTransformedCustomQueries(lc, transformedCustomQueries.result, (q) => {
@@ -756,10 +744,11 @@ var ViewSyncerService = class {
 				}
 			}
 			const removeQueriesQueryIds = new Set([...Object.values(cvr.queries).filter((q) => expired(ttlClock, q)).map((q) => q.id), ...erroredQueryIDs || []]);
-			const addQueries = transformedQueries.map(({ id, transformed }) => ({
+			const addQueries = transformedQueries.map(({ id, origQuery, transformed }) => ({
 				id,
 				ast: transformed.transformedAst,
-				transformationHash: transformed.transformationHash
+				transformationHash: transformed.transformationHash,
+				name: origQuery.type === "custom" ? origQuery.name : void 0
 			})).filter((q) => !removeQueriesQueryIds.has(q.id) && this.#pipelines.queries().get(q.id)?.transformationHash !== q.transformationHash);
 			lc.info?.(`syncQueryPipelineSet: ${cvrQueryEntires.length} CVR queries, ${customQueriesToTransform.length} custom re-transformed, ${erroredQueryIDs?.length ?? 0} errored, ${removeQueriesQueryIds.size} to remove, ${addQueries.length} to add`);
 			for (const q of addQueries) {
@@ -832,11 +821,12 @@ var ViewSyncerService = class {
 					if (elapsed > slowHydrateThreshold) lc.warn?.("Slow query materialization", elapsed, q.ast);
 					manualSpan(tracer, "vs.addAndConsumeQuery", elapsed, {
 						hash: q.id,
-						transformationHash: q.transformationHash
+						transformationHash: q.transformationHash,
+						...q.name !== void 0 && { name: q.name }
 					});
 				}
 				hydrations.add(1);
-				hydrationTime.record(totalProcessTime / 1e3);
+				hydrationTime.recordMs(totalProcessTime);
 			}
 			await this.#processChanges(lc, timer, generateRowChanges(this.#slowHydrateThreshold), updater, pokers);
 			await startAsyncSpan(tracer, "vs.#syncQueryPipelineSet.deleteUnreferencedRows", async () => {
@@ -1009,7 +999,7 @@ var ViewSyncerService = class {
 			const wallTime = performance.now() - start;
 			const totalProcessTime = timer.totalElapsed();
 			lc.info?.(`finished processing advancement of ${numChanges} changes ((process: ${totalProcessTime} ms, wall: ${wallTime} ms))`);
-			this.#transactionAdvanceTime.record(totalProcessTime / 1e3);
+			this.#transactionAdvanceTime.recordMs(totalProcessTime);
 			return "success";
 		});
 	}