@rocicorp/zero 1.2.0-canary.0 → 1.2.0-canary.10

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

@@ -21,8 +21,8 @@ import { ttlClockAsNumber, ttlClockFromNumber } from "./ttl-clock.js";
 import { EMPTY_CVR_VERSION, cmpVersions, versionFromString, versionString, versionToCookie } from "./schema/types.js";
 import { ProtocolErrorWithLevel, getLogLevel } from "../../types/error-with-level.js";
 import { ClientHandler, startPoke } from "./client-handler.js";
-import { CVRStore, ClientNotFoundError } from "./cvr-store.js";
 import { tracer } from "./tracer.js";
+import { CVRStore, ClientNotFoundError } from "./cvr-store.js";
 import { CVRConfigDrivenUpdater, CVRQueryDrivenUpdater, nextEvictionTime } from "./cvr.js";
 import { handleInspect } from "./inspect-handler.js";
 import { resolver } from "@rocicorp/resolver";
@@ -404,7 +404,7 @@ var ViewSyncerService = class {
 		this.#cvrStore.updateTTLClock(ttlClock, start).then(() => {
 			lc.debug?.("Synced ttlClock", rid, `in ${Date.now() - start} ms`);
 		}).catch((e) => {
-			lc.error?.("failed to update TTL clock", rid, `after ${Date.now() - start} ms`, e);
+			lc.warn?.("failed to update TTL clock", rid, `after ${Date.now() - start} ms`, e);
 		});
 	}
 	async #updateCVRConfig(lc, cvr, clientID, customQueryTransformMode, fn) {
@@ -432,7 +432,9 @@ var ViewSyncerService = class {
 		const { clientID, wsID } = ctx;
 		const [cmd, body] = msg;
 		if (newClient || !this.#clients.has(clientID)) this.#lastConnectTime = Date.now();
-		return startAsyncSpan(tracer, `vs.#runInLockForClient(${cmd})`, async () => {
+		return startAsyncSpan(tracer, `vs.#runInLockForClient(${cmd})`, async (span) => {
+			span.setAttribute("clientGroupID", this.id);
+			span.setAttribute("clientID", clientID);
 			let client;
 			let result;
 			try {
@@ -554,25 +556,34 @@ var ViewSyncerService = class {
 		const gotQueries = Object.entries(cvr.queries).filter(([_, state]) => state.transformationHash !== void 0);
 		const customQueries = /* @__PURE__ */ new Map();
 		const otherQueries = [];
+		let inactivatedCount = 0;
 		for (const [, query] of gotQueries) {
-			if (query.type !== "internal" && Object.values(query.clientState).every(({ inactivatedAt }) => inactivatedAt !== void 0)) continue;
+			if (query.type !== "internal" && Object.values(query.clientState).every(({ inactivatedAt }) => inactivatedAt !== void 0)) {
+				inactivatedCount++;
+				continue;
+			}
 			if (query.type === "custom") customQueries.set(query.id, query);
 			else otherQueries.push(query);
 		}
 		const transformedQueries = [];
+		let customErrorCount = 0;
+		let customHashMismatchCount = 0;
+		let otherHashMismatchCount = 0;
 		if (customQueries.size > 0 && !this.#customQueryTransformer) lc.warn?.("Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache.");
 		const customQueryTransformer = this.#customQueryTransformer;
 		if (customQueryTransformer && customQueries.size > 0) {
 			const transformedCustomQueries = await this.#runPriorityOp(lc, "#hydrateUnchangedQueries transforming custom queries", () => customQueryTransformer.transform(this.#getHeaderOptions(this.#queryConfig.forwardCookies), customQueries.values(), this.userQueryURL));
-			if (Array.isArray(transformedCustomQueries)) {
-				for (const q of transformedCustomQueries) if (!("error" in q) && q.transformationHash === customQueries.get(q.id)?.transformationHash) transformedQueries.push(q);
-			}
+			if (Array.isArray(transformedCustomQueries)) for (const q of transformedCustomQueries) if ("error" in q) customErrorCount++;
+			else if (q.transformationHash !== customQueries.get(q.id)?.transformationHash) customHashMismatchCount++;
+			else transformedQueries.push(q);
 		}
 		for (const q of otherQueries) {
 			const auth = this.#authSession.auth;
 			const transformed = transformAndHashQuery(lc, q.id, q.ast, must(this.#pipelines.currentPermissions()).permissions ?? { tables: {} }, auth?.type === "jwt" ? auth : void 0, q.type === "internal");
 			if (transformed.transformationHash === q.transformationHash) transformedQueries.push(transformed);
+			else otherHashMismatchCount++;
 		}
+		lc.info?.(`hydrateUnchangedQueries: ${gotQueries.length} got queries, ${inactivatedCount} inactivated, ${customErrorCount} custom transform errors, ${customHashMismatchCount} custom hash mismatches, ${otherHashMismatchCount} other hash mismatches, ${transformedQueries.length} hydrated`);
 		for (const { id: queryID, transformationHash, transformedAst } of transformedQueries) {
 			const timer = new TimeSliceTimer(lc);
 			let count = 0;
@@ -642,7 +653,8 @@ var ViewSyncerService = class {
 	* This must be called from within the #lock.
 	*/
 	#syncQueryPipelineSet(lc, cvr, customQueryTransformMode) {
-		return startAsyncSpan(tracer, "vs.#syncQueryPipelineSet", async () => {
+		return startAsyncSpan(tracer, "vs.#syncQueryPipelineSet", async (span) => {
+			span.setAttribute("clientGroupID", this.id);
 			assert(this.#pipelines.initialized(), "pipelines must be initialized (syncQueryPipelineSet)");
 			if (this.#ttlClock === void 0) this.#ttlClock = cvr.ttlClock;
 			const now = Date.now();
@@ -717,6 +729,7 @@ var ViewSyncerService = class {
 				ast: transformed.transformedAst,
 				transformationHash: transformed.transformationHash
 			})).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) {
 				const orig = cvr.queries[q.id];
 				lc.debug?.("ViewSyncer adding query", q.ast, "transformed from", orig.type === "custom" ? orig.name : orig.ast);
@@ -794,11 +807,13 @@ var ViewSyncerService = class {
 				hydrationTime.record(totalProcessTime / 1e3);
 			}
 			await this.#processChanges(lc, timer, generateRowChanges(this.#slowHydrateThreshold), updater, pokers);
-			for (const patch of await updater.deleteUnreferencedRows(lc)) await pokers.addPatch(patch);
+			await startAsyncSpan(tracer, "vs.#syncQueryPipelineSet.deleteUnreferencedRows", async () => {
+				for (const patch of await updater.deleteUnreferencedRows(lc)) await pokers.addPatch(patch);
+			});
 			this.#cvr = await this.#flushUpdater(lc, updater);
 			const finalVersion = this.#cvr.version;
 			await this.#catchupClients(lc, cvr, finalVersion, addQueries.map((q) => q.id), pokers);
-			await pokers.end(finalVersion);
+			await startAsyncSpan(tracer, "vs.#syncQueryPipelineSet.pokeEnd", () => pokers.end(finalVersion));
 			const wallTime = performance.now() - start;
 			lc.info?.(`finished processing queries (process: ${totalProcessTime} ms, wall: ${wallTime} ms)`);
 		});
@@ -879,7 +894,10 @@ var ViewSyncerService = class {
 				total += rows.size;
 				lc.debug?.(`processing ${rows.size} (of ${total}) rows (${wallElapsed} ms)`);
 				const patches = await updater.received(lc, rows);
-				for (const patch of patches) await pokers.addPatch(patch);
+				await startAsyncSpan(tracer, "processBatch.flushToClient", async (span) => {
+					span.setAttribute("patches", patches.length);
+					for (const patch of patches) await pokers.addPatch(patch);
+				});
 				rows.clear();
 			});
 			await startAsyncSpan(tracer, "loopingChanges", async (span) => {
@@ -934,7 +952,8 @@ var ViewSyncerService = class {
 	* Returns false if the advancement failed due to a schema change.
 	*/
 	#advancePipelines(lc, cvr) {
-		return startAsyncSpan(tracer, "vs.#advancePipelines", async () => {
+		return startAsyncSpan(tracer, "vs.#advancePipelines", async (span) => {
+			span.setAttribute("clientGroupID", this.id);
 			assert(this.#pipelines.initialized(), "pipelines must be initialized (advancePipelines");
 			const start = performance.now();
 			const timer = new TimeSliceTimer(lc);
@@ -954,7 +973,7 @@ var ViewSyncerService = class {
 			}
 			this.#cvr = await this.#flushUpdater(lc, updater);
 			const finalVersion = this.#cvr.version;
-			await pokers.end(finalVersion);
+			await startAsyncSpan(tracer, "vs.#advancePipelines.pokeEnd", () => pokers.end(finalVersion));
 			const wallTime = performance.now() - start;
 			const totalProcessTime = timer.totalElapsed();
 			lc.info?.(`finished processing advancement of ${numChanges} changes ((process: ${totalProcessTime} ms, wall: ${wallTime} ms))`);