@rocicorp/zero 0.26.0-canary.7 → 0.26.0

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

@@ -1,3 +1,4 @@
+import { startSpan, startAsyncSpan } from "../../../../otel/src/span.js";
 import { assert } from "../../../../shared/src/asserts.js";
 import "../../../../shared/src/bigint-json.js";
 import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
@@ -13,6 +14,7 @@ import { rowIDString } from "../../types/row-key.js";
 import { upstreamSchema } from "../../types/shards.js";
 import "./cvr-store.js";
 import { cmpVersions, maxVersion, oneAfter } from "./schema/types.js";
+import { tracer } from "./tracer.js";
 import { ttlClockAsNumber } from "./ttl-clock.js";
 const CLIENT_LMID_QUERY_ID = "lmids";
 const CLIENT_MUTATION_RESULTS_QUERY_ID = "mutationResults";
@@ -105,70 +107,71 @@ class CVRConfigDrivenUpdater extends CVRUpdater {
     this.#shard = shard;
   }
   ensureClient(id) {
-    let client = this._cvr.clients[id];
-    if (client) {
-      return client;
-    }
-    client = { id, desiredQueryIDs: [] };
-    this._cvr.clients[id] = client;
-    this._ensureNewVersion();
-    this._cvrStore.insertClient(client);
-    if (!this._cvr.queries[CLIENT_LMID_QUERY_ID]) {
-      const lmidsQuery = {
-        id: CLIENT_LMID_QUERY_ID,
-        ast: {
-          schema: "",
-          table: `${upstreamSchema(this.#shard)}.clients`,
-          where: {
-            type: "simple",
-            left: {
-              type: "column",
-              name: "clientGroupID"
+    return startSpan(tracer, "CVRConfigDrivenUpdater.ensureClient", () => {
+      let client = this._cvr.clients[id];
+      if (client) {
+        return client;
+      }
+      client = { id, desiredQueryIDs: [] };
+      this._cvr.clients[id] = client;
+      this._ensureNewVersion();
+      this._cvrStore.insertClient(client);
+      if (!this._cvr.queries[CLIENT_LMID_QUERY_ID]) {
+        const lmidsQuery = {
+          id: CLIENT_LMID_QUERY_ID,
+          ast: {
+            schema: "",
+            table: `${upstreamSchema(this.#shard)}.clients`,
+            where: {
+              type: "simple",
+              left: {
+                type: "column",
+                name: "clientGroupID"
+              },
+              op: "=",
+              right: {
+                type: "literal",
+                value: this._cvr.id
+              }
             },
-            op: "=",
-            right: {
-              type: "literal",
-              value: this._cvr.id
-            }
+            orderBy: [
+              ["clientGroupID", "asc"],
+              ["clientID", "asc"]
+            ]
           },
-          orderBy: [
-            ["clientGroupID", "asc"],
-            ["clientID", "asc"]
-          ]
-        },
-        type: "internal"
-      };
-      this._cvr.queries[CLIENT_LMID_QUERY_ID] = lmidsQuery;
-      this._cvrStore.putQuery(lmidsQuery);
-    }
-    if (!this._cvr.queries[CLIENT_MUTATION_RESULTS_QUERY_ID]) {
-      const mutationResultsQuery = getMutationResultsQuery(
-        upstreamSchema(this.#shard),
-        this._cvr.id
-      );
-      this._cvr.queries[CLIENT_MUTATION_RESULTS_QUERY_ID] = mutationResultsQuery;
-      this._cvrStore.putQuery(mutationResultsQuery);
-    }
-    return client;
+          type: "internal"
+        };
+        this._cvr.queries[CLIENT_LMID_QUERY_ID] = lmidsQuery;
+        this._cvrStore.putQuery(lmidsQuery);
+      }
+      if (!this._cvr.queries[CLIENT_MUTATION_RESULTS_QUERY_ID]) {
+        const mutationResultsQuery = getMutationResultsQuery(upstreamSchema(this.#shard), this._cvr.id);
+        this._cvr.queries[CLIENT_MUTATION_RESULTS_QUERY_ID] = mutationResultsQuery;
+        this._cvrStore.putQuery(mutationResultsQuery);
+      }
+      return client;
+    });
   }
   setClientSchema(lc, clientSchema) {
-    if (this._cvr.clientSchema === null) {
-      this._cvr.clientSchema = clientSchema;
-      this._cvrStore.putInstance(this._cvr);
-    } else if (!deepEqual(this._cvr.clientSchema, clientSchema)) {
-      lc.warn?.(
-        `New schema ${JSON.stringify(
-          clientSchema
-        )} does not match existing schema ${JSON.stringify(
-          this._cvr.clientSchema
-        )}`
-      );
-      throw new ProtocolError({
-        kind: "InvalidConnectionRequest",
-        message: `Provided schema does not match previous schema`,
-        origin: ZeroCache
-      });
-    }
+    startSpan(tracer, "CVRConfigDrivenUpdater.setClientSchema", () => {
+      if (this._cvr.clientSchema === null) {
+        this._cvr.clientSchema = clientSchema;
+        this._cvrStore.putInstance(this._cvr);
+      } else if (!deepEqual(this._cvr.clientSchema, clientSchema)) {
+        lc.warn?.(
+          `New schema ${JSON.stringify(
+            clientSchema
+          )} does not match existing schema ${JSON.stringify(
+            this._cvr.clientSchema
+          )}`
+        );
+        throw new ProtocolError({
+          kind: "InvalidConnectionRequest",
+          message: `Provided schema does not match previous schema`,
+          origin: ZeroCache
+        });
+      }
+    });
   }
   setProfileID(lc, profileID) {
     if (this._cvr.profileID !== profileID) {
@@ -182,72 +185,74 @@ class CVRConfigDrivenUpdater extends CVRUpdater {
     }
   }
   putDesiredQueries(clientID, queries) {
-    const patches = [];
-    const client = this.ensureClient(clientID);
-    const current = new Set(client.desiredQueryIDs);
-    const needed = /* @__PURE__ */ new Set();
-    const recordQueryForTelemetry = (q) => {
-      const { ast, name, args } = q;
-      if (ast) {
-        recordQuery("crud");
-      } else if (name && args) {
-        recordQuery("custom");
-      }
-    };
-    for (const q of queries) {
-      const { hash, ttl = DEFAULT_TTL_MS } = q;
-      const query = this._cvr.queries[hash];
-      if (!query) {
-        recordQueryForTelemetry(q);
-        needed.add(hash);
-        continue;
-      }
-      if (query.type === "internal") {
-        continue;
+    return startSpan(tracer, "CVRConfigDrivenUpdater.putDesiredQueries", () => {
+      const patches = [];
+      const client = this.ensureClient(clientID);
+      const current = new Set(client.desiredQueryIDs);
+      const needed = /* @__PURE__ */ new Set();
+      const recordQueryForTelemetry = (q) => {
+        const { ast, name, args } = q;
+        if (ast) {
+          recordQuery("crud");
+        } else if (name && args) {
+          recordQuery("custom");
+        }
+      };
+      for (const q of queries) {
+        const { hash, ttl = DEFAULT_TTL_MS } = q;
+        const query = this._cvr.queries[hash];
+        if (!query) {
+          recordQueryForTelemetry(q);
+          needed.add(hash);
+          continue;
+        }
+        if (query.type === "internal") {
+          continue;
+        }
+        const oldClientState = query.clientState[clientID];
+        if (!oldClientState || oldClientState.inactivatedAt !== void 0) {
+          recordQueryForTelemetry(q);
+          needed.add(hash);
+          continue;
+        }
+        if (compareTTL(ttl, oldClientState.ttl) > 0) {
+          needed.add(hash);
+        }
       }
-      const oldClientState = query.clientState[clientID];
-      if (!oldClientState || oldClientState.inactivatedAt !== void 0) {
-        recordQueryForTelemetry(q);
-        needed.add(hash);
-        continue;
+      if (needed.size === 0) {
+        return patches;
       }
-      if (compareTTL(ttl, oldClientState.ttl) > 0) {
-        needed.add(hash);
+      const newVersion = this._ensureNewVersion();
+      client.desiredQueryIDs = [...union(current, needed)].sort(stringCompare);
+      for (const id of needed) {
+        const q = must(queries.find(({ hash }) => hash === id));
+        const { ast, name, args } = q;
+        const ttl = clampTTL(q.ttl ?? DEFAULT_TTL_MS);
+        const query = this._cvr.queries[id] ?? newQueryRecord(id, ast, name, args);
+        assertNotInternal(query);
+        const inactivatedAt = void 0;
+        query.clientState[clientID] = {
+          inactivatedAt,
+          ttl,
+          version: newVersion
+        };
+        this._cvr.queries[id] = query;
+        patches.push({
+          toVersion: newVersion,
+          patch: { type: "query", op: "put", id, clientID }
+        });
+        this._cvrStore.putQuery(query);
+        this._cvrStore.putDesiredQuery(
+          newVersion,
+          query,
+          client,
+          false,
+          inactivatedAt,
+          ttl
+        );
       }
-    }
-    if (needed.size === 0) {
       return patches;
-    }
-    const newVersion = this._ensureNewVersion();
-    client.desiredQueryIDs = [...union(current, needed)].sort(stringCompare);
-    for (const id of needed) {
-      const q = must(queries.find(({ hash }) => hash === id));
-      const { ast, name, args } = q;
-      const ttl = clampTTL(q.ttl ?? DEFAULT_TTL_MS);
-      const query = this._cvr.queries[id] ?? newQueryRecord(id, ast, name, args);
-      assertNotInternal(query);
-      const inactivatedAt = void 0;
-      query.clientState[clientID] = {
-        inactivatedAt,
-        ttl,
-        version: newVersion
-      };
-      this._cvr.queries[id] = query;
-      patches.push({
-        toVersion: newVersion,
-        patch: { type: "query", op: "put", id, clientID }
-      });
-      this._cvrStore.putQuery(query);
-      this._cvrStore.putDesiredQuery(
-        newVersion,
-        query,
-        client,
-        false,
-        inactivatedAt,
-        ttl
-      );
-    }
-    return patches;
+    });
   }
   markDesiredQueriesAsInactive(clientID, queryHashes, ttlClock) {
     return this.#deleteQueries(clientID, queryHashes, ttlClock);
@@ -256,75 +261,79 @@ class CVRConfigDrivenUpdater extends CVRUpdater {
     return this.#deleteQueries(clientID, queryHashes, void 0);
   }
   #deleteQueries(clientID, queryHashes, inactivatedAt) {
-    const patches = [];
-    const client = this.ensureClient(clientID);
-    const current = new Set(client.desiredQueryIDs);
-    const unwanted = new Set(queryHashes);
-    const remove = intersection(unwanted, current);
-    if (remove.size === 0) {
-      return patches;
-    }
-    const newVersion = this._ensureNewVersion();
-    client.desiredQueryIDs = [...difference(current, remove)].sort(
-      stringCompare
-    );
-    for (const id of remove) {
-      const query = this._cvr.queries[id];
-      if (!query) {
-        continue;
+    return startSpan(tracer, "CVRConfigDrivenUpdater.#deleteQueries", () => {
+      const patches = [];
+      const client = this.ensureClient(clientID);
+      const current = new Set(client.desiredQueryIDs);
+      const unwanted = new Set(queryHashes);
+      const remove = intersection(unwanted, current);
+      if (remove.size === 0) {
+        return patches;
       }
-      assertNotInternal(query);
-      let ttl = DEFAULT_TTL_MS;
-      if (inactivatedAt === void 0) {
-        delete query.clientState[clientID];
-      } else {
-        const clientState = query.clientState[clientID];
-        if (clientState !== void 0) {
-          assert(
-            clientState.inactivatedAt === void 0,
-            `Query ${id} is already inactivated`
-          );
-          ttl = clampTTL(clientState.ttl);
-          query.clientState[clientID] = {
-            inactivatedAt,
-            ttl,
-            version: newVersion
-          };
+      const newVersion = this._ensureNewVersion();
+      client.desiredQueryIDs = [...difference(current, remove)].sort(
+        stringCompare
+      );
+      for (const id of remove) {
+        const query = this._cvr.queries[id];
+        if (!query) {
+          continue;
+        }
+        assertNotInternal(query);
+        let ttl = DEFAULT_TTL_MS;
+        if (inactivatedAt === void 0) {
+          delete query.clientState[clientID];
+        } else {
+          const clientState = query.clientState[clientID];
+          if (clientState !== void 0) {
+            assert(
+              clientState.inactivatedAt === void 0,
+              `Query ${id} is already inactivated`
+            );
+            ttl = clampTTL(clientState.ttl);
+            query.clientState[clientID] = {
+              inactivatedAt,
+              ttl,
+              version: newVersion
+            };
+          }
         }
+        this._cvrStore.putQuery(query);
+        this._cvrStore.putDesiredQuery(
+          newVersion,
+          query,
+          client,
+          true,
+          inactivatedAt,
+          ttl
+        );
+        patches.push({
+          toVersion: newVersion,
+          patch: { type: "query", op: "del", id, clientID }
+        });
       }
-      this._cvrStore.putQuery(query);
-      this._cvrStore.putDesiredQuery(
-        newVersion,
-        query,
-        client,
-        true,
-        inactivatedAt,
-        ttl
-      );
-      patches.push({
-        toVersion: newVersion,
-        patch: { type: "query", op: "del", id, clientID }
-      });
-    }
-    return patches;
+      return patches;
+    });
   }
   clearDesiredQueries(clientID) {
     const client = this.ensureClient(clientID);
     return this.#deleteQueries(clientID, client.desiredQueryIDs, void 0);
   }
   deleteClient(clientID, ttlClock) {
-    const client = this._cvr.clients[clientID];
-    if (!client) {
-      return [];
-    }
-    const patches = this.markDesiredQueriesAsInactive(
-      clientID,
-      client.desiredQueryIDs,
-      ttlClock
-    );
-    delete this._cvr.clients[clientID];
-    this._cvrStore.deleteClient(clientID);
-    return patches;
+    return startSpan(tracer, "CVRConfigDrivenUpdater.deleteClient", () => {
+      const client = this._cvr.clients[clientID];
+      if (!client) {
+        return [];
+      }
+      const patches = this.markDesiredQueriesAsInactive(
+        clientID,
+        client.desiredQueryIDs,
+        ttlClock
+      );
+      delete this._cvr.clients[clientID];
+      this._cvrStore.deleteClient(clientID);
+      return patches;
+    });
   }
 }
 class CVRQueryDrivenUpdater extends CVRUpdater {
@@ -368,48 +377,56 @@ class CVRQueryDrivenUpdater extends CVRUpdater {
    * @returns The new CVRVersion to be used when all changes are committed.
    */
   trackQueries(lc, executed, removed) {
-    assert(this.#existingRows === void 0, `trackQueries already called`);
-    const queryPatches = [
-      executed.map((q) => this.#trackExecuted(q.id, q.transformationHash)),
-      removed.map((q) => this.#trackRemoved(q.id))
-    ].flat(2);
-    this.#existingRows = this.#lookupRowsForExecutedAndRemovedQueries(lc);
-    void this.#existingRows.then(() => {
+    return startSpan(tracer, "CVRQueryDrivenUpdater.trackQueries", () => {
+      assert(this.#existingRows === void 0, `trackQueries already called`);
+      const queryPatches = [
+        executed.map((q) => this.#trackExecuted(q.id, q.transformationHash)),
+        removed.map((q) => this.#trackRemoved(q.id))
+      ].flat(2);
+      this.#existingRows = this.#lookupRowsForExecutedAndRemovedQueries(lc);
+      void this.#existingRows.then(() => {
+      });
+      return {
+        newVersion: this._cvr.version,
+        queryPatches: queryPatches.map((patch) => ({
+          patch,
+          toVersion: this._cvr.version
+        }))
+      };
     });
-    return {
-      newVersion: this._cvr.version,
-      queryPatches: queryPatches.map((patch) => ({
-        patch,
-        toVersion: this._cvr.version
-      }))
-    };
   }
-  async #lookupRowsForExecutedAndRemovedQueries(lc) {
-    const results = new CustomKeyMap(rowIDString);
-    if (this.#removedOrExecutedQueryIDs.size === 0) {
-      return [];
-    }
-    const allRowRecords = (await this._cvrStore.getRowRecords()).values();
-    let total = 0;
-    for (const existing of allRowRecords) {
-      total++;
-      assert(
-        existing.refCounts !== null,
-        "allRowRecords should not include null refCounts"
-      );
-      for (const id of Object.keys(existing.refCounts)) {
-        if (this.#removedOrExecutedQueryIDs.has(id)) {
-          results.set(existing.id, existing);
-          break;
+  #lookupRowsForExecutedAndRemovedQueries(lc) {
+    return startAsyncSpan(
+      tracer,
+      "CVRQueryDrivenUpdater.#lookupRowsForExecutedAndRemovedQueries",
+      async () => {
+        const results = new CustomKeyMap(rowIDString);
+        if (this.#removedOrExecutedQueryIDs.size === 0) {
+          return [];
+        }
+        const allRowRecords = (await this._cvrStore.getRowRecords()).values();
+        let total = 0;
+        for (const existing of allRowRecords) {
+          total++;
+          assert(
+            existing.refCounts !== null,
+            "allRowRecords should not include null refCounts"
+          );
+          for (const id of Object.keys(existing.refCounts)) {
+            if (this.#removedOrExecutedQueryIDs.has(id)) {
+              results.set(existing.id, existing);
+              break;
+            }
+          }
         }
+        lc.debug?.(
+          `found ${results.size} (of ${total}) rows for executed / removed queries ${[
+            ...this.#removedOrExecutedQueryIDs
+          ]}`
+        );
+        return results.values();
       }
-    }
-    lc.debug?.(
-      `found ${results.size} (of ${total}) rows for executed / removed queries ${[
-        ...this.#removedOrExecutedQueryIDs
-      ]}`
     );
-    return results.values();
   }
   /**
    * Tracks an executed query, ensures that it is marked as "gotten",
@@ -418,28 +435,30 @@ class CVRQueryDrivenUpdater extends CVRUpdater {
    * This must be called for all executed queries.
    */
   #trackExecuted(queryID, transformationHash) {
-    assert(
-      !this.#removedOrExecutedQueryIDs.has(queryID),
-      () => `Query ${queryID} already tracked as executed or removed`
-    );
-    this.#removedOrExecutedQueryIDs.add(queryID);
-    let gotQueryPatch;
-    const query = this._cvr.queries[queryID];
-    if (query.transformationHash !== transformationHash) {
-      const transformationVersion = this._ensureNewVersion();
-      if (query.type !== "internal" && query.patchVersion === void 0) {
-        query.patchVersion = transformationVersion;
-        gotQueryPatch = {
-          type: "query",
-          op: "put",
-          id: query.id
-        };
+    return startSpan(tracer, "CVRQueryDrivenUpdater.#trackExecuted", () => {
+      assert(
+        !this.#removedOrExecutedQueryIDs.has(queryID),
+        () => `Query ${queryID} already tracked as executed or removed`
+      );
+      this.#removedOrExecutedQueryIDs.add(queryID);
+      let gotQueryPatch;
+      const query = this._cvr.queries[queryID];
+      if (query.transformationHash !== transformationHash) {
+        const transformationVersion = this._ensureNewVersion();
+        if (query.type !== "internal" && query.patchVersion === void 0) {
+          query.patchVersion = transformationVersion;
+          gotQueryPatch = {
+            type: "query",
+            op: "put",
+            id: query.id
+          };
+        }
+        query.transformationHash = transformationHash;
+        query.transformationVersion = transformationVersion;
+        this._cvrStore.updateQuery(query);
       }
-      query.transformationHash = transformationHash;
-      query.transformationVersion = transformationVersion;
-      this._cvrStore.updateQuery(query);
-    }
-    return gotQueryPatch ? [gotQueryPatch] : [];
+      return gotQueryPatch ? [gotQueryPatch] : [];
+    });
   }
   /**
    * Tracks a query removed from the "gotten" set. In addition to producing the
@@ -452,18 +471,20 @@ class CVRQueryDrivenUpdater extends CVRUpdater {
    * This must only be called on queries that are not "desired" by any client.
    */
   #trackRemoved(queryID) {
-    const query = this._cvr.queries[queryID];
-    assertNotInternal(query);
-    assert(
-      !this.#removedOrExecutedQueryIDs.has(queryID),
-      () => `Query ${queryID} already tracked as executed or removed`
-    );
-    this.#removedOrExecutedQueryIDs.add(queryID);
-    delete this._cvr.queries[queryID];
-    const newVersion = this._ensureNewVersion();
-    const queryPatch = { type: "query", op: "del", id: queryID };
-    this._cvrStore.markQueryAsDeleted(newVersion, queryPatch);
-    return [queryPatch];
+    return startSpan(tracer, "CVRQueryDrivenUpdater.#trackRemoved", () => {
+      const query = this._cvr.queries[queryID];
+      assertNotInternal(query);
+      assert(
+        !this.#removedOrExecutedQueryIDs.has(queryID),
+        () => `Query ${queryID} already tracked as executed or removed`
+      );
+      this.#removedOrExecutedQueryIDs.add(queryID);
+      delete this._cvr.queries[queryID];
+      const newVersion = this._ensureNewVersion();
+      const queryPatch = { type: "query", op: "del", id: queryID };
+      this._cvrStore.markQueryAsDeleted(newVersion, queryPatch);
+      return [queryPatch];
+    });
   }
   /**
    * Asserts that a new version has already been set.
@@ -486,65 +507,74 @@ class CVRQueryDrivenUpdater extends CVRUpdater {
    * returns (put) patches to be returned to update their state, versioned by
    * patchVersion so that only the patches new to the clients are sent.
    */
-  async received(_lc, rows) {
-    const patches = [];
-    const existingRows = await this._cvrStore.getRowRecords();
-    for (const [id, update] of rows.entries()) {
-      const { contents, version, refCounts } = update;
-      let existing = existingRows.get(id);
-      const previouslyReceived = this.#receivedRows.get(id);
-      const merged = previouslyReceived !== void 0 ? mergeRefCounts(previouslyReceived, refCounts) : mergeRefCounts(
-        existing?.refCounts,
-        refCounts,
-        this.#removedOrExecutedQueryIDs
-      );
-      this.#receivedRows.set(id, merged);
-      const newRowVersion = merged === null ? void 0 : version;
-      const patchVersion = existing && existing.rowVersion === newRowVersion ? existing.patchVersion : this.#assertNewVersion();
-      const rowVersion = version ?? existing?.rowVersion;
-      if (rowVersion) {
-        this._cvrStore.putRowRecord({
-          id,
-          rowVersion,
-          patchVersion,
-          refCounts: merged
-        });
-      } else {
-        this._cvrStore.delRowRecord(id);
-      }
-      const lastPatch = this.#lastPatches.get(id);
-      const toVersion = maxVersion(patchVersion, lastPatch?.toVersion);
-      if (merged === null) {
-        if (existing || previouslyReceived) {
-          if (lastPatch?.rowVersion !== null) {
-            patches.push({
-              patch: {
-                type: "row",
-                op: "del",
-                id
-              },
-              toVersion
+  received(_lc, rows) {
+    return startAsyncSpan(
+      tracer,
+      "CVRQueryDrivenUpdater.received",
+      async () => {
+        const patches = [];
+        const existingRows = await this._cvrStore.getRowRecords();
+        for (const [id, update] of rows.entries()) {
+          const { contents, version, refCounts } = update;
+          let existing = existingRows.get(id);
+          const previouslyReceived = this.#receivedRows.get(id);
+          const merged = previouslyReceived !== void 0 ? mergeRefCounts(previouslyReceived, refCounts) : mergeRefCounts(
+            existing?.refCounts,
+            refCounts,
+            this.#removedOrExecutedQueryIDs
+          );
+          this.#receivedRows.set(id, merged);
+          const newRowVersion = merged === null ? void 0 : version;
+          const patchVersion = existing && existing.rowVersion === newRowVersion ? existing.patchVersion : this.#assertNewVersion();
+          const rowVersion = version ?? existing?.rowVersion;
+          if (rowVersion) {
+            this._cvrStore.putRowRecord({
+              id,
+              rowVersion,
+              patchVersion,
+              refCounts: merged
             });
-            this.#lastPatches.set(id, { rowVersion: null, toVersion });
+          } else {
+            this._cvrStore.delRowRecord(id);
+          }
+          const lastPatch = this.#lastPatches.get(id);
+          const toVersion = maxVersion(patchVersion, lastPatch?.toVersion);
+          if (merged === null) {
+            if (existing || previouslyReceived) {
+              if (lastPatch?.rowVersion !== null) {
+                patches.push({
+                  patch: {
+                    type: "row",
+                    op: "del",
+                    id
+                  },
+                  toVersion
+                });
+                this.#lastPatches.set(id, { rowVersion: null, toVersion });
+              }
+            }
+          } else if (contents) {
+            assert(
+              rowVersion,
+              "rowVersion is required when contents is present"
+            );
+            if (!lastPatch?.rowVersion || lastPatch.rowVersion < rowVersion) {
+              patches.push({
+                patch: {
+                  type: "row",
+                  op: "put",
+                  id,
+                  contents
+                },
+                toVersion
+              });
+              this.#lastPatches.set(id, { rowVersion, toVersion });
+            }
           }
         }
-      } else if (contents) {
-        assert(rowVersion, "rowVersion is required when contents is present");
-        if (!lastPatch?.rowVersion || lastPatch.rowVersion < rowVersion) {
-          patches.push({
-            patch: {
-              type: "row",
-              op: "put",
-              id,
-              contents
-            },
-            toVersion
-          });
-          this.#lastPatches.set(id, { rowVersion, toVersion });
-        }
+        return patches;
       }
-    }
-    return patches;
+    );
   }
   /**
    * Computes and updates the row records based on:
@@ -558,49 +588,61 @@ class CVRQueryDrivenUpdater extends CVRUpdater {
    * This is Step [5] of the
    * [CVR Sync Algorithm](https://www.notion.so/replicache/Sync-and-Client-View-Records-CVR-a18e02ec3ec543449ea22070855ff33d?pvs=4#7874f9b80a514be2b8cd5cf538b88d37).
    */
-  async deleteUnreferencedRows(lc) {
-    if (this.#removedOrExecutedQueryIDs.size === 0) {
-      assert(
-        this.#receivedRows.size === 0,
-        () => `Expected no received rows for query-less update, got ${this.#receivedRows.size}`
-      );
-      return [];
-    }
-    const patches = [];
-    const start = Date.now();
-    assert(this.#existingRows, `trackQueries() was not called`);
-    for (const existing of await this.#existingRows) {
-      const deletedID = this.#deleteUnreferencedRow(existing);
-      if (deletedID === null) {
-        continue;
+  deleteUnreferencedRows(lc) {
+    return startAsyncSpan(
+      tracer,
+      "CVRQueryDrivenUpdater.deleteUnreferencedRows",
+      async () => {
+        if (this.#removedOrExecutedQueryIDs.size === 0) {
+          assert(
+            this.#receivedRows.size === 0,
+            () => `Expected no received rows for query-less update, got ${this.#receivedRows.size}`
+          );
+          return [];
+        }
+        const patches = [];
+        const start = Date.now();
+        assert(this.#existingRows, `trackQueries() was not called`);
+        for (const existing of await this.#existingRows) {
+          const deletedID = this.#deleteUnreferencedRow(existing);
+          if (deletedID === null) {
+            continue;
+          }
+          patches.push({
+            toVersion: this._cvr.version,
+            patch: { type: "row", op: "del", id: deletedID }
+          });
+        }
+        lc?.debug?.(
+          `computed ${patches.length} delete patches (${Date.now() - start} ms)`
+        );
+        return patches;
       }
-      patches.push({
-        toVersion: this._cvr.version,
-        patch: { type: "row", op: "del", id: deletedID }
-      });
-    }
-    lc?.debug?.(
-      `computed ${patches.length} delete patches (${Date.now() - start} ms)`
     );
-    return patches;
   }
   #deleteUnreferencedRow(existing) {
-    if (this.#receivedRows.get(existing.id)) {
-      return null;
-    }
-    const newRefCounts = mergeRefCounts(
-      existing.refCounts,
-      void 0,
-      this.#removedOrExecutedQueryIDs
+    return startSpan(
+      tracer,
+      "CVRQueryDrivenUpdater.#deleteUnreferencedRow",
+      () => {
+        if (this.#receivedRows.get(existing.id)) {
+          return null;
+        }
+        const newRefCounts = mergeRefCounts(
+          existing.refCounts,
+          void 0,
+          this.#removedOrExecutedQueryIDs
+        );
+        const patchVersion = newRefCounts ? existing.patchVersion : this.#assertNewVersion();
+        const rowRecord = {
+          ...existing,
+          patchVersion,
+          refCounts: newRefCounts
+        };
+        this._cvrStore.putRowRecord(rowRecord);
+        return newRefCounts ? null : existing.id;
+      }
     );
-    const patchVersion = newRefCounts ? existing.patchVersion : this.#assertNewVersion();
-    const rowRecord = {
-      ...existing,
-      patchVersion,
-      refCounts: newRefCounts
-    };
-    this._cvrStore.putRowRecord(rowRecord);
-    return newRefCounts ? null : existing.id;
   }
 }
 function mergeRefCounts(existing, received, removeHashes) {