@effect-app/infra 4.0.0-beta.210 → 4.0.0-beta.211

package/src/Model/Repository/internal/internal.ts

@@ -103,7 +103,13 @@ export function makeRepoInternal<
               allE,
               (_) => decodeMany(_).pipe(Effect.orDie)
             )
-            .pipe(Effect.map((_) => _ as T[]))
+            .pipe(
+              Effect.map((_) => _ as T[]),
+              Effect.withSpan("Repository.all", {
+                kind: "client",
+                attributes: { "app.entity": name }
+              }, { captureStackTrace: false })
+            )
 
           const fieldsSchema = schema as unknown as { fields: any }
           // assumes the id field never needs a service...
@@ -163,9 +169,11 @@ export function makeRepoInternal<
             )
           })
 
-          const find = Effect.fn("find", { attributes: { "app.entity": name } })(function*(id: T[IdKey]) {
+          const find = Effect.fn("Repository.find", {
+            kind: "client",
+            attributes: { "app.entity": name }
+          })(function*(id: T[IdKey]) {
             yield* Effect.annotateCurrentSpan({ "app.entity.id": id })
-
             return yield* flatMapOption(findE(id), (_) => Effect.orDie(decode(_)))
           })
 
@@ -190,7 +198,7 @@ export function makeRepoInternal<
                 Effect.andThen(saveAllE)
               )
 
-          const saveAndPublish = Effect.fn("saveAndPublish", { attributes: { "app.entity": name } })(
+          const saveAndPublish = Effect.fn("Repository.saveAndPublish", { attributes: { "app.entity": name } })(
             function*(items: Iterable<T>, events: Iterable<Evt> = []) {
               const it = Chunk.fromIterable(items)
               const evts = [...events]
@@ -209,7 +217,7 @@ export function makeRepoInternal<
             }
           )
 
-          const removeAndPublish = Effect.fn("removeAndPublish", { attributes: { "app.entity": name } })(
+          const removeAndPublish = Effect.fn("Repository.removeAndPublish", { attributes: { "app.entity": name } })(
             function*(a: Iterable<T>, events: Iterable<Evt> = []) {
               const { set } = yield* cms
               const it = [...a]
@@ -237,7 +245,7 @@ export function makeRepoInternal<
             }
           )
 
-          const removeById = Effect.fn("removeById", { attributes: { "app.entity": name } })(
+          const removeById = Effect.fn("Repository.removeById", { attributes: { "app.entity": name } })(
             function*(idOrIds: T[IdKey] | ReadonlyArray<T[IdKey]>) {
               const ids = globalThis.Array.isArray(idOrIds)
                 ? idOrIds as readonly T[IdKey][]
@@ -262,12 +270,22 @@ export function makeRepoInternal<
               return yield* decodeMany(items.map((_) => mapReverse(_, cm.set))).pipe(Effect.orDie)
             }
           )
+          const decodeManyCache = new WeakMap<
+            S.Codec<any, any, any>,
+            (i: readonly any[]) => Effect.Effect<any, any, any>
+          >()
+          const getDecodeMany = (s: S.Codec<any, Encoded, any>) => {
+            let dec = decodeManyCache.get(s)
+            if (!dec) {
+              dec = S.decodeEffectConcurrently(S.Array(s))
+              decodeManyCache.set(s, dec)
+            }
+            return dec
+          }
           const parseMany2 = Effect.fn("parseMany2", { attributes: { "app.entity": name } })(
             function*<A, R>(items: readonly PM[], schema: S.Codec<A, Encoded, R>) {
               const cm = yield* cms
-              return yield* S.decodeEffectConcurrently(S.Array(schema))(items.map((_) => mapReverse(_, cm.set))).pipe(
-                Effect.orDie
-              )
+              return yield* getDecodeMany(schema)(items.map((_) => mapReverse(_, cm.set))).pipe(Effect.orDie)
             }
           )
           const filter = <U extends keyof Encoded = keyof Encoded>(args: FilterArgs<Encoded, U>) =>
@@ -340,18 +358,21 @@ export function makeRepoInternal<
                   .map(eff, (_) => NonNegativeInt(_.length))
                   .pipe(Effect.catchTag("SchemaError", (e) => Effect.die(e)))
                 : eff,
-              Effect.withSpan(`query ${name}`, {
+              Effect.tap((r) =>
+                Effect.annotateCurrentSpan({
+                  "app.query.ttype": a.ttype,
+                  "app.query.mode": a.mode,
+                  "db.response.returned_rows": Array.isArray(r) ? r.length : 1
+                })
+              ),
+              Effect.withSpan("Repository.query", {
                 kind: "client",
-                attributes: {
-                  "app.entity": name,
-                  "db.operation.name": "query",
-                  "db.collection.name": name
-                }
+                attributes: { "app.entity": name }
               }, { captureStackTrace: false })
             )
           }) as any
 
-          const validateSample = Effect.fn("validateSample", { attributes: { "app.entity": name } })(
+          const validateSample = Effect.fn("Repository.validateSample", { attributes: { "app.entity": name } })(
             function*(options?: {
               percentage?: number
               maxItems?: number
@@ -360,10 +381,15 @@ export function makeRepoInternal<
               const maxItems = options?.maxItems
 
               // 1. get all IDs with projection (bypasses main schema decode)
-              const allIds = yield* store.filter({
-                t: null as unknown as Encoded,
-                select: [idKey as keyof Encoded]
-              })
+              const allIds = yield* store
+                .filter({
+                  t: null as unknown as Encoded,
+                  select: [idKey as keyof Encoded]
+                })
+                .pipe(Effect.withSpan("Repository.filter", {
+                  kind: "client",
+                  attributes: { "app.entity": name }
+                }, { captureStackTrace: false }))
 
               // 2. random subset
               const shuffled = [...allIds].sort(() => Math.random() - 0.5)
@@ -378,7 +404,12 @@ export function makeRepoInternal<
 
               for (const item of sample) {
                 const id = item[idKey]
-                const rawResult = yield* store.find(id)
+                const rawResult = yield* store.find(id).pipe(
+                  Effect.withSpan("Repository.find", {
+                    kind: "client",
+                    attributes: { "app.entity": name, "app.entity.id": id }
+                  }, { captureStackTrace: false })
+                )
 
                 if (Option.isNone(rawResult)) continue
 
@@ -424,7 +455,13 @@ export function makeRepoInternal<
             validateSample,
             queryRaw<A, Out, QR>(schema: S.Codec<A, Out, QR>, q: Q.RawQuery<Encoded, Out>) {
               const dec = S.decodeEffectConcurrently(S.Array(schema))
-              return store.queryRaw(q).pipe(Effect.flatMap(dec))
+              return store.queryRaw(q).pipe(
+                Effect.flatMap(dec),
+                Effect.withSpan("Repository.queryRaw", {
+                  kind: "client",
+                  attributes: { "app.entity": name }
+                }, { captureStackTrace: false })
+              )
             },
             query(q: any) {
               // eslint-disable-next-line prefer-rest-params
@@ -437,12 +474,20 @@ export function makeRepoInternal<
               const dec = S.decodeEffectConcurrently(schema)
               const encMany = S.encodeEffect(S.Array(schema))
               const decMany = S.decodeEffectConcurrently(S.Array(schema))
+              const spanAttrs = { kind: "client" as const, attributes: { "app.entity": name } }
               return {
                 all: allE.pipe(
                   Effect.flatMap(decMany),
-                  Effect.map((_) => _ as any[])
+                  Effect.map((_) => _ as any[]),
+                  Effect.withSpan("Repository.mapped.all", spanAttrs, { captureStackTrace: false })
                 ),
-                find: (id: T[IdKey]) => flatMapOption(findE(id), dec),
+                find: (id: T[IdKey]) =>
+                  flatMapOption(findE(id), dec).pipe(
+                    Effect.withSpan("Repository.mapped.find", {
+                      ...spanAttrs,
+                      attributes: { ...spanAttrs.attributes, "app.entity.id": id }
+                    }, { captureStackTrace: false })
+                  ),
                 // query: (q: any) => {
                 //   const a = Q.toFilter(q)
 
@@ -461,7 +506,7 @@ export function makeRepoInternal<
                 // },
                 save: (...xes: any[]) =>
                   Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(
-                    Effect.withSpan("mapped.save", { attributes: { "app.entity": name } }, { captureStackTrace: false })
+                    Effect.withSpan("Repository.mapped.save", spanAttrs, { captureStackTrace: false })
                   )
               }
             }

package/src/Store/Cosmos.ts

@@ -8,7 +8,7 @@ import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"
 import type { FieldValues } from "../Model/filter/types.js"
 import { type RawQuery } from "../Model/query.js"
-import { annotateCosmosResponse, withDbSpan } from "../otel.js"
+import { annotateCosmosResponse, annotateDb } from "../otel.js"
 import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.js"
 import { storeId } from "./Memory.js"
 import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "./service.js"
@@ -140,7 +140,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
               )
             }),
             Effect.withLogSpan(`Cosmos.seedCheck ${name} in ${ns} [effect-app/infra/Store]`),
-            withDbSpan({
+            annotateDb({
               operation: "seed",
               system: "cosmosdb",
               collection: containerId,
@@ -260,7 +260,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
             return batchResult.flat() as unknown as NonEmptyReadonlyArray<Encoded>
           })
           .pipe(
-            withDbSpan({
+            annotateDb({
               operation: "bulkSet",
               system: "cosmosdb",
               collection: containerId,
@@ -334,7 +334,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                     })) as unknown as NonEmptyReadonlyArray<Encoded>
                   })))
               })
-              .pipe(withDbSpan({
+              .pipe(annotateDb({
                 operation: "batchSet",
                 system: "cosmosdb",
                 collection: containerId,
@@ -364,7 +364,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                     )
                   })
                   .pipe(
-                    withDbSpan({
+                    annotateDb({
                       operation: "queryRaw",
                       system: "cosmosdb",
                       collection: containerId,
@@ -392,7 +392,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                 )
               )
               .pipe(
-                withDbSpan({
+                annotateDb({
                   operation: "batchRemove",
                   system: "cosmosdb",
                   collection: containerId,
@@ -421,7 +421,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                   return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
                 })
                 .pipe(
-                  withDbSpan({
+                  annotateDb({
                     operation: "all",
                     system: "cosmosdb",
                     collection: containerId,
@@ -486,7 +486,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                       return response.resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f as any) }) as any)
                     })
                     .pipe(
-                      withDbSpan({
+                      annotateDb({
                         operation: "filter",
                         system: "cosmosdb",
                         collection: containerId,
@@ -512,7 +512,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                   Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
                 )
               })
-              .pipe(withDbSpan({
+              .pipe(annotateDb({
                 operation: "find",
                 system: "cosmosdb",
                 collection: containerId,
@@ -572,7 +572,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                       _etag: x.etag
                     }))
                   }),
-                withDbSpan({
+                annotateDb({
                   operation: "set",
                   system: "cosmosdb",
                   collection: containerId,

package/src/Store/Disk.ts

@@ -5,7 +5,7 @@ import fs from "fs"
 
 import { Console, Effect, flow, Semaphore } from "effect-app"
 import type { FieldValues } from "../Model/filter/types.js"
-import { withDbSpan } from "../otel.js"
+import { annotateDb } from "../otel.js"
 import { makeMemoryStoreInt, storeId } from "./Memory.js"
 import { type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "./service.js"
 
@@ -32,7 +32,7 @@ function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValu
       get: fu
         .readTextFile(file)
         .pipe(
-          withDbSpan({
+          annotateDb({
             operation: "read.readFile",
             system: "disk",
             collection: name,
@@ -42,7 +42,7 @@ function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValu
           }),
           Effect.flatMap((x) =>
             Effect.sync(() => JSON.parse(x) as PM[]).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "read.parse",
                 system: "disk",
                 collection: name,
@@ -53,7 +53,7 @@ function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValu
             )
           ),
           Effect.orDie,
-          withDbSpan({
+          annotateDb({
             operation: "read",
             system: "disk",
             collection: name,
@@ -66,7 +66,7 @@ function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValu
         Effect
           .sync(() => JSON.stringify([...v], undefined, 2))
           .pipe(
-            withDbSpan({
+            annotateDb({
               operation: "stringify",
               system: "disk",
               collection: name,
@@ -79,7 +79,7 @@ function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValu
                 (json) =>
                   fu
                     .writeTextFile(file, json)
-                    .pipe(withDbSpan({
+                    .pipe(annotateDb({
                       operation: "write.writeFile",
                       system: "disk",
                       collection: name,
@@ -88,7 +88,7 @@ function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValu
                       extra: { ...fileExtra, "disk.file.size": json.length }
                     }))
               ),
-            withDbSpan({
+            annotateDb({
               operation: "write",
               system: "disk",
               collection: name,

package/src/Store/Memory.ts

@@ -4,7 +4,7 @@ import { Array, Context, Effect, flow, type NonEmptyReadonlyArray, Option, Order
 import { NonEmptyString255 } from "effect-app/Schema"
 import { InfraLogger } from "../logger.js"
 import type { FieldValues } from "../Model/filter/types.js"
-import { withDbSpan } from "../otel.js"
+import { annotateDb } from "../otel.js"
 import { codeFilter, codeFilter3_ } from "./codeFilter.js"
 import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, StoreMaker } from "./service.js"
 import { makeUpdateETag } from "./utils.js"
@@ -163,7 +163,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
           .pipe(
             // Effect.tap(() => logQuery(query, defaultValues)),
             Effect.map(query.memory),
-            withDbSpan({
+            annotateDb({
               operation: "queryRaw",
               system: "memory",
               collection: modelName,
@@ -172,7 +172,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
             })
           ),
 
-      all: all.pipe(withDbSpan({
+      all: all.pipe(annotateDb({
         operation: "all",
         system: "memory",
         collection: modelName,
@@ -184,7 +184,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
           .get(store)
           .pipe(
             Effect.map((_) => Option.fromNullishOr(_.get(id))),
-            withDbSpan({
+            annotateDb({
               operation: "find",
               system: "memory",
               collection: modelName,
@@ -198,7 +198,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
           .pipe(
             Effect.tap(() => logQuery(f, defaultValues)),
             Effect.map(memFilter(f)),
-            withDbSpan({
+            annotateDb({
               operation: "filter",
               system: "memory",
               collection: modelName,
@@ -219,7 +219,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
                 )
               ),
             withPermit,
-            withDbSpan({
+            annotateDb({
               operation: "set",
               system: "memory",
               collection: modelName,
@@ -237,7 +237,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
               Effect.filterOrFail((_) => _.length <= 100, () => "BatchRemove: a batch may not exceed 100 items"),
               Effect.orDie,
               Effect.andThen(batchRemove),
-              withDbSpan({
+              annotateDb({
                 operation: "batchRemove",
                 system: "memory",
                 collection: modelName,
@@ -255,7 +255,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
               Effect.filterOrFail((_) => _.length <= 100, () => "BatchSet: a batch may not exceed 100 items"),
               Effect.orDie,
               Effect.andThen(batchSet),
-              withDbSpan({
+              annotateDb({
                 operation: "batchSet",
                 system: "memory",
                 collection: modelName,
@@ -267,7 +267,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
       bulkSet: flow(
         batchSet,
         (_) =>
-          _.pipe(withDbSpan({
+          _.pipe(annotateDb({
             operation: "bulkSet",
             system: "memory",
             collection: modelName,

package/src/Store/SQL/Pg.ts

@@ -6,7 +6,7 @@ import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../../errors.js"
 import { InfraLogger } from "../../logger.js"
 import type { FieldValues } from "../../Model/filter/types.js"
-import { withDbSpan } from "../../otel.js"
+import { annotateDb } from "../../otel.js"
 import { storeId } from "../Memory.js"
 import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "../service.js"
 import { makeETag } from "../utils.js"
@@ -167,7 +167,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
             return exec(sqlText, [ns])
               .pipe(
                 Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
-                withDbSpan({
+                annotateDb({
                   operation: "all",
                   system: "postgresql",
                   collection: tableName,
@@ -191,7 +191,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                       ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
                       : Option.none()
                   }),
-                  withDbSpan({
+                  annotateDb({
                     operation: "find",
                     system: "postgresql",
                     collection: tableName,
@@ -255,7 +255,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                     })
                   )
                 ),
-                withDbSpan({
+                annotateDb({
                   operation: "filter",
                   system: "postgresql",
                   collection: tableName,
@@ -269,7 +269,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
         set: (e) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             setInternal(e, ns).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "set",
                 system: "postgresql",
                 collection: tableName,
@@ -283,7 +283,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
         batchSet: (items) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             bulkSetInternal(items, ns).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "batchSet",
                 system: "postgresql",
                 collection: tableName,
@@ -296,7 +296,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
         bulkSet: (items) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             bulkSetInternal(items, ns).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "bulkSet",
                 system: "postgresql",
                 collection: tableName,
@@ -314,7 +314,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
             return exec(sqlText, [...ids, ns])
               .pipe(
                 Effect.asVoid,
-                withDbSpan({
+                annotateDb({
                   operation: "batchRemove",
                   system: "postgresql",
                   collection: tableName,
@@ -329,7 +329,7 @@ const makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
         queryRaw: (query) =>
           s.all.pipe(
             Effect.map(query.memory),
-            withDbSpan({
+            annotateDb({
               operation: "queryRaw",
               system: "postgresql",
               collection: tableName,

package/src/Store/SQL.ts

@@ -7,7 +7,7 @@ import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"
 import type { FieldValues } from "../Model/filter/types.js"
-import { type DbSystem, withDbSpan } from "../otel.js"
+import { annotateDb, type DbSystem } from "../otel.js"
 import { storeId } from "./Memory.js"
 import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "./service.js"
 import { buildWhereSQLQuery, logQuery, type SQLDialect, sqliteDialect } from "./SQL/query.js"
@@ -181,7 +181,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
               return exec(sqlText, [ns])
                 .pipe(
                   Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
-                  withDbSpan({
+                  annotateDb({
                     operation: "all",
                     system,
                     collection: tableName,
@@ -205,7 +205,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
                         ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
                         : Option.none()
                     }),
-                    withDbSpan({
+                    annotateDb({
                       operation: "find",
                       system,
                       collection: tableName,
@@ -290,7 +290,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
                           })
                         )
                       ),
-                      withDbSpan({
+                      annotateDb({
                         operation: "filter",
                         system,
                         collection: tableName,
@@ -304,7 +304,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
           set: (e) =>
             resolveNamespace.pipe(Effect.flatMap((ns) =>
               setInternal(e, ns).pipe(
-                withDbSpan({
+                annotateDb({
                   operation: "set",
                   system,
                   collection: tableName,
@@ -318,7 +318,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
           batchSet: (items) =>
             resolveNamespace.pipe(Effect.flatMap((ns) =>
               bulkSetInternal(items, ns).pipe(
-                withDbSpan({
+                annotateDb({
                   operation: "batchSet",
                   system,
                   collection: tableName,
@@ -331,7 +331,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
           bulkSet: (items) =>
             resolveNamespace.pipe(Effect.flatMap((ns) =>
               bulkSetInternal(items, ns).pipe(
-                withDbSpan({
+                annotateDb({
                   operation: "bulkSet",
                   system,
                   collection: tableName,
@@ -348,7 +348,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
               return exec(sqlText, [...ids, ns])
                 .pipe(
                   Effect.asVoid,
-                  withDbSpan({
+                  annotateDb({
                     operation: "batchRemove",
                     system,
                     collection: tableName,
@@ -363,7 +363,7 @@ function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType:
           queryRaw: (query) =>
             s.all.pipe(
               Effect.map(query.memory),
-              withDbSpan({
+              annotateDb({
                 operation: "queryRaw",
                 system,
                 collection: tableName,
@@ -526,7 +526,7 @@ function makeSQLiteStorePerNs(
           return exec(ns, sqlText)
             .pipe(
               Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
-              withDbSpan({
+              annotateDb({
                 operation: "all",
                 system: "sqlite",
                 collection: tableName,
@@ -549,7 +549,7 @@ function makeSQLiteStorePerNs(
                       ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
                       : Option.none()
                   }),
-                  withDbSpan({
+                  annotateDb({
                     operation: "find",
                     system: "sqlite",
                     collection: tableName,
@@ -613,7 +613,7 @@ function makeSQLiteStorePerNs(
                         })
                       )
                     ),
-                    withDbSpan({
+                    annotateDb({
                       operation: "filter",
                       system: "sqlite",
                       collection: tableName,
@@ -627,7 +627,7 @@ function makeSQLiteStorePerNs(
         set: (e) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             setInternal(e, ns).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "set",
                 system: "sqlite",
                 collection: tableName,
@@ -641,7 +641,7 @@ function makeSQLiteStorePerNs(
         batchSet: (items) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             bulkSetInternal(items, ns).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "batchSet",
                 system: "sqlite",
                 collection: tableName,
@@ -654,7 +654,7 @@ function makeSQLiteStorePerNs(
         bulkSet: (items) =>
           resolveNamespace.pipe(Effect.flatMap((ns) =>
             bulkSetInternal(items, ns).pipe(
-              withDbSpan({
+              annotateDb({
                 operation: "bulkSet",
                 system: "sqlite",
                 collection: tableName,
@@ -671,7 +671,7 @@ function makeSQLiteStorePerNs(
             return exec(ns, sqlText, [...ids])
               .pipe(
                 Effect.asVoid,
-                withDbSpan({
+                annotateDb({
                   operation: "batchRemove",
                   system: "sqlite",
                   collection: tableName,
@@ -686,7 +686,7 @@ function makeSQLiteStorePerNs(
         queryRaw: (query) =>
           s.all.pipe(
             Effect.map(query.memory),
-            withDbSpan({
+            annotateDb({
               operation: "queryRaw",
               system: "sqlite",
               collection: tableName,