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

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @effect-app/infra
 
+## 4.0.0-beta.212
+
+### Patch Changes
+
+- Updated dependencies [8792221]
+  - effect-app@4.0.0-beta.212
+
+## 4.0.0-beta.211
+
+### Patch Changes
+
+- ebbb799: Repository owns OTel span topology; store adapters annotate db._ semconv attrs on the current span instead of opening their own child spans. Eliminates 1-1 nested span chains (e.g. `Repository.query` → `Cosmos.filter`). Adds `annotateDb` helper alongside `withDbSpan` in `otel.ts`. Repo public ops (`find`, `all`, `query`, `queryRaw`, `mapped._`) get explicit `Repository.<op>` spans; internal codec steps (`encodeMany`, `parseMany`, `parseMany2`) keep bare names. `validateSample`opens per-iteration sub-spans to prevent attribute clobber. Adds WeakMap decoder cache for`parseMany2` schemas.
+- e33f1eb: Drop OTel spans from ServiceBus client/sender/receiver/subscription lifecycle wrappers; keep `withLogSpan` + info logs only. Removes high-cardinality `sessionId` from log span names; promotes it to `messaging.session.id` log attribute via `Effect.annotateLogs`.
+  - effect-app@4.0.0-beta.211
+
 ## 4.0.0-beta.210
 
 ### Minor Changes

package/dist/Model/Repository/internal/internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}

package/dist/Model/Repository/internal/internal.js

@@ -44,7 +44,10 @@ export function makeRepoInternal() {
                     .pipe(Effect.flatMap((cm) => Effect.map(store.all, (_) => _.map((_) => mapReverse(_, cm.set)))));
                 const all = Effect
                     .flatMap(allE, (_) => decodeMany(_).pipe(Effect.orDie))
-                    .pipe(Effect.map((_) => _));
+                    .pipe(Effect.map((_) => _), Effect.withSpan("Repository.all", {
+                    kind: "client",
+                    attributes: { "app.entity": name }
+                }, { captureStackTrace: false }));
                 const fieldsSchema = schema;
                 // assumes the id field never needs a service...
                 const i = ("fields" in fieldsSchema ? S.Struct(fieldsSchema["fields"]) : schema)
@@ -86,7 +89,10 @@ export function makeRepoInternal() {
                     yield* Effect.annotateCurrentSpan({ "app.entity.id": id });
                     return yield* pipe(encodeId({ [idKey]: id }), Effect.orDie, Effect.map((_) => _[idKey]), Effect.flatMap(findEId));
                 });
-                const find = Effect.fn("find", { attributes: { "app.entity": name } })(function* (id) {
+                const find = Effect.fn("Repository.find", {
+                    kind: "client",
+                    attributes: { "app.entity": name }
+                })(function* (id) {
                     yield* Effect.annotateCurrentSpan({ "app.entity.id": id });
                     return yield* flatMapOption(findE(id), (_) => Effect.orDie(decode(_)));
                 });
@@ -100,7 +106,7 @@ export function makeRepoInternal() {
                     .pipe(Effect.asVoid);
                 const saveAll = (a) => encodeMany(Array.fromIterable(a))
                     .pipe(Effect.orDie, Effect.andThen(saveAllE));
-                const saveAndPublish = Effect.fn("saveAndPublish", { attributes: { "app.entity": name } })(function* (items, events = []) {
+                const saveAndPublish = Effect.fn("Repository.saveAndPublish", { attributes: { "app.entity": name } })(function* (items, events = []) {
                     const it = Chunk.fromIterable(items);
                     const evts = [...events];
                     yield* Effect.annotateCurrentSpan({
@@ -112,7 +118,7 @@ export function makeRepoInternal() {
                     // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
                     (_) => flatMapOption(_, pub), Effect.andThen(PubSub.publish(changeFeed, [Chunk.toArray(it), "save"])), Effect.asVoid);
                 });
-                const removeAndPublish = Effect.fn("removeAndPublish", { attributes: { "app.entity": name } })(function* (a, events = []) {
+                const removeAndPublish = Effect.fn("Repository.removeAndPublish", { attributes: { "app.entity": name } })(function* (a, events = []) {
                     const { set } = yield* cms;
                     const it = [...a];
                     const evts = [...events];
@@ -133,7 +139,7 @@ export function makeRepoInternal() {
                         yield* PubSub.publish(changeFeed, [it, "remove"]);
                     }
                 });
-                const removeById = Effect.fn("removeById", { attributes: { "app.entity": name } })(function* (idOrIds) {
+                const removeById = Effect.fn("Repository.removeById", { attributes: { "app.entity": name } })(function* (idOrIds) {
                     const ids = globalThis.Array.isArray(idOrIds)
                         ? idOrIds
                         : [idOrIds];
@@ -153,9 +159,18 @@ export function makeRepoInternal() {
                     const cm = yield* cms;
                     return yield* decodeMany(items.map((_) => mapReverse(_, cm.set))).pipe(Effect.orDie);
                 });
+                const decodeManyCache = new WeakMap();
+                const getDecodeMany = (s) => {
+                    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* (items, schema) {
                     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 = (args) => store
                     .filter(
@@ -191,23 +206,28 @@ export function makeRepoInternal() {
                             ? Effect
                                 .map(eff, (_) => NonNegativeInt(_.length))
                                 .pipe(Effect.catchTag("SchemaError", (e) => Effect.die(e)))
-                            : eff, Effect.withSpan(`query ${name}`, {
+                            : eff, 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 }));
                 });
-                const validateSample = Effect.fn("validateSample", { attributes: { "app.entity": name } })(function* (options) {
+                const validateSample = Effect.fn("Repository.validateSample", { attributes: { "app.entity": name } })(function* (options) {
                     const percentage = options?.percentage ?? 0.1; // default 10%
                     const maxItems = options?.maxItems;
                     // 1. get all IDs with projection (bypasses main schema decode)
-                    const allIds = yield* store.filter({
+                    const allIds = yield* store
+                        .filter({
                         t: null,
                         select: [idKey]
-                    });
+                    })
+                        .pipe(Effect.withSpan("Repository.filter", {
+                        kind: "client",
+                        attributes: { "app.entity": name }
+                    }, { captureStackTrace: false }));
                     // 2. random subset
                     const shuffled = [...allIds].sort(() => Math.random() - 0.5);
                     const sampleSize = Math.min(maxItems ?? Infinity, Math.ceil(allIds.length * percentage));
@@ -216,7 +236,10 @@ export function makeRepoInternal() {
                     const errors = [];
                     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;
                         const rawData = rawResult.value;
@@ -251,7 +274,10 @@ export function makeRepoInternal() {
                     validateSample,
                     queryRaw(schema, q) {
                         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) {
                         // eslint-disable-next-line prefer-rest-params
@@ -264,9 +290,13 @@ 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", attributes: { "app.entity": name } };
                         return {
-                            all: allE.pipe(Effect.flatMap(decMany), Effect.map((_) => _)),
-                            find: (id) => flatMapOption(findE(id), dec),
+                            all: allE.pipe(Effect.flatMap(decMany), Effect.map((_) => _), Effect.withSpan("Repository.mapped.all", spanAttrs, { captureStackTrace: false })),
+                            find: (id) => 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)
                             //   return filter(a)
@@ -282,7 +312,7 @@ export function makeRepoInternal() {
                             //       })
                             //     )
                             // },
-                            save: (...xes) => Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(Effect.withSpan("mapped.save", { attributes: { "app.entity": name } }, { captureStackTrace: false }))
+                            save: (...xes) => Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(Effect.withSpan("Repository.mapped.save", spanAttrs, { captureStackTrace: false }))
                         };
                     }
                 };
@@ -331,4 +361,4 @@ export function makeStore() {
         return makeStore;
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}

package/dist/Store/Cosmos.js

@@ -5,7 +5,7 @@ import { dropUndefinedT, mutable } from "effect-app/utils";
 import { CosmosClient, CosmosClientLayer } from "../adapters/cosmos-client.js";
 import { OptimisticConcurrencyException } from "../errors.js";
 import { InfraLogger } from "../logger.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 { StoreMaker } from "./service.js";
@@ -89,7 +89,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                         id: markerId,
                         ttl: -1
                     }))), Effect.provide(ctx), Effect.orDie);
-                }), Effect.withLogSpan(`Cosmos.seedCheck ${name} in ${ns} [effect-app/infra/Store]`), withDbSpan({
+                }), Effect.withLogSpan(`Cosmos.seedCheck ${name} in ${ns} [effect-app/infra/Store]`), annotateDb({
                     operation: "seed",
                     system: "cosmosdb",
                     collection: containerId,
@@ -171,7 +171,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                 }))));
                 return batchResult.flat();
             })
-                .pipe(withDbSpan({
+                .pipe(annotateDb({
                 operation: "bulkSet",
                 system: "cosmosdb",
                 collection: containerId,
@@ -229,7 +229,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                         }));
                     })));
                 })
-                    .pipe(withDbSpan({
+                    .pipe(annotateDb({
                     operation: "batchSet",
                     system: "cosmosdb",
                     collection: containerId,
@@ -247,7 +247,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     yield* annotateFeed(response);
                     return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }));
                 })
-                    .pipe(withDbSpan({
+                    .pipe(annotateDb({
                     operation: "queryRaw",
                     system: "cosmosdb",
                     collection: containerId,
@@ -262,7 +262,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     // don't use this or we get an error that the request and some item partition key dont match - makese no sense
                     // partitionKey: config?.partitionValue({ [idKey]: id } as Encoded)
                 }))), partitionKey ?? nsBasePartitionKey(ns)))
-                    .pipe(withDbSpan({
+                    .pipe(annotateDb({
                     operation: "batchRemove",
                     system: "cosmosdb",
                     collection: containerId,
@@ -283,7 +283,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     yield* annotateFeed(response);
                     return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }));
                 })
-                    .pipe(withDbSpan({
+                    .pipe(annotateDb({
                     operation: "all",
                     system: "cosmosdb",
                     collection: containerId,
@@ -318,7 +318,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                         yield* annotateFeed(response);
                         return response.resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }));
                     })
-                        .pipe(withDbSpan({
+                        .pipe(annotateDb({
                         operation: "filter",
                         system: "cosmosdb",
                         collection: containerId,
@@ -335,7 +335,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                     yield* annotateItem(response);
                     return Option.fromNullishOr(response.resource).pipe(Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) })));
                 })
-                    .pipe(withDbSpan({
+                    .pipe(annotateDb({
                     operation: "find",
                     system: "cosmosdb",
                     collection: containerId,
@@ -372,7 +372,7 @@ const makeCosmosStore = Effect.fnUntraced(function* ({ prefix }) {
                         ...e,
                         _etag: x.etag
                     }));
-                }), withDbSpan({
+                }), annotateDb({
                     operation: "set",
                     system: "cosmosdb",
                     collection: containerId,

package/dist/Store/Disk.d.ts

@@ -9,4 +9,4 @@ export declare function makeDiskStore({ prefix }: StorageConfig, dir: string): E
     make: <IdKey extends keyof Encoded, Encoded extends FieldValues, R, E>(name: string, idKey: IdKey, seed?: Effect.Effect<Iterable<Encoded>, E, R> | undefined, config?: StoreConfig<Encoded> | undefined) => Effect.Effect<Store<IdKey, Encoded, PersistenceModelType<Encoded>>, E, R>;
 }, never, never>;
 export declare function DiskStoreLayer(config: StorageConfig, dir: string): import("effect/Layer").Layer<StoreMaker, never, never>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JlL0Rpc2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxFQUFXLE1BQU0sRUFBbUIsTUFBTSxZQUFZLENBQUE7QUFDN0QsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFFM0QsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQUUsS0FBSyxhQUFhLEVBQUUsS0FBSyxLQUFLLEVBQUUsS0FBSyxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBb0h0SDs7O0dBR0c7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsYUFBYSxFQUFFLEdBQUcsRUFBRSxNQUFNO1dBTTVCLEtBQUssU0FBUyxNQUFNLE9BQU8sRUFBRSxPQUFPLFNBQVMsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDO2lCQTZEckc7QUFFRCx3QkFBZ0IsY0FBYyxDQUFDLE1BQU0sRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLE1BQU0sMERBRWhFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JlL0Rpc2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxFQUFXLE1BQU0sRUFBbUIsTUFBTSxZQUFZLENBQUE7QUFDN0QsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFHM0QsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQUUsS0FBSyxhQUFhLEVBQUUsS0FBSyxLQUFLLEVBQUUsS0FBSyxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBcUp0SDs7O0dBR0c7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsYUFBYSxFQUFFLEdBQUcsRUFBRSxNQUFNO1dBTTVCLEtBQUssU0FBUyxNQUFNLE9BQU8sRUFBRSxPQUFPLFNBQVMsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDO2lCQTZEckc7QUFFRCx3QkFBZ0IsY0FBYyxDQUFDLE1BQU0sRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLE1BQU0sMERBRWhFIn0=

package/dist/Store/Disk.js

@@ -2,7 +2,7 @@
 import * as fu from "../fileUtil.js";
 import fs from "fs";
 import { Console, Effect, flow, Semaphore } from "effect-app";
-import { withDbSpan } from "../otel.js";
+import { annotateDb } from "../otel.js";
 import { makeMemoryStoreInt, storeId } from "./Memory.js";
 import { StoreMaker } from "./service.js";
 function makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, defaultValues) {
@@ -18,21 +18,21 @@ function makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, defaultValu
         const fsStore = {
             get: fu
                 .readTextFile(file)
-                .pipe(withDbSpan({
+                .pipe(annotateDb({
                 operation: "read.readFile",
                 system: "disk",
                 collection: name,
                 namespace,
                 entity: name,
                 extra: fileExtra
-            }), Effect.flatMap((x) => Effect.sync(() => JSON.parse(x)).pipe(withDbSpan({
+            }), Effect.flatMap((x) => Effect.sync(() => JSON.parse(x)).pipe(annotateDb({
                 operation: "read.parse",
                 system: "disk",
                 collection: name,
                 namespace,
                 entity: name,
                 extra: fileExtra
-            }))), Effect.orDie, withDbSpan({
+            }))), Effect.orDie, annotateDb({
                 operation: "read",
                 system: "disk",
                 collection: name,
@@ -42,7 +42,7 @@ function makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, defaultValu
             })),
             setRaw: (v) => Effect
                 .sync(() => JSON.stringify([...v], undefined, 2))
-                .pipe(withDbSpan({
+                .pipe(annotateDb({
                 operation: "stringify",
                 system: "disk",
                 collection: name,
@@ -52,14 +52,14 @@ function makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, defaultValu
             }), Effect
                 .flatMap((json) => fu
                 .writeTextFile(file, json)
-                .pipe(withDbSpan({
+                .pipe(annotateDb({
                 operation: "write.writeFile",
                 system: "disk",
                 collection: name,
                 namespace,
                 entity: name,
                 extra: { ...fileExtra, "disk.file.size": json.length }
-            }))), withDbSpan({
+            }))), annotateDb({
                 operation: "write",
                 system: "disk",
                 collection: name,

package/dist/Store/Memory.js

@@ -2,7 +2,7 @@
 import { Array, Context, Effect, flow, Option, Order, pipe, Ref, Result, Semaphore, Struct } from "effect-app";
 import { NonEmptyString255 } from "effect-app/Schema";
 import { InfraLogger } from "../logger.js";
-import { withDbSpan } from "../otel.js";
+import { annotateDb } from "../otel.js";
 import { codeFilter, codeFilter3_ } from "./codeFilter.js";
 import { StoreMaker } from "./service.js";
 import { makeUpdateETag } from "./utils.js";
@@ -107,14 +107,14 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
             queryRaw: (query) => all
                 .pipe(
             // Effect.tap(() => logQuery(query, defaultValues)),
-            Effect.map(query.memory), withDbSpan({
+            Effect.map(query.memory), annotateDb({
                 operation: "queryRaw",
                 system: "memory",
                 collection: modelName,
                 namespace,
                 entity: modelName
             })),
-            all: all.pipe(withDbSpan({
+            all: all.pipe(annotateDb({
                 operation: "all",
                 system: "memory",
                 collection: modelName,
@@ -123,7 +123,7 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
             })),
             find: (id) => Ref
                 .get(store)
-                .pipe(Effect.map((_) => Option.fromNullishOr(_.get(id))), withDbSpan({
+                .pipe(Effect.map((_) => Option.fromNullishOr(_.get(id))), annotateDb({
                 operation: "find",
                 system: "memory",
                 collection: modelName,
@@ -132,7 +132,7 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
                 extra: { "app.entity.id": id }
             })),
             filter: (f) => all
-                .pipe(Effect.tap(() => logQuery(f, defaultValues)), Effect.map(memFilter(f)), withDbSpan({
+                .pipe(Effect.tap(() => logQuery(f, defaultValues)), Effect.map(memFilter(f)), annotateDb({
                 operation: "filter",
                 system: "memory",
                 collection: modelName,
@@ -142,7 +142,7 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
             set: (e) => s
                 .find(e[idKey])
                 .pipe(Effect.flatMap((current) => updateETag(e, idKey, current)), Effect
-                .tap((e) => Ref.get(store).pipe(Effect.map((_) => new Map([..._, [e[idKey], e]])), Effect.flatMap((_) => Ref.set(store, _)))), withPermit, withDbSpan({
+                .tap((e) => Ref.get(store).pipe(Effect.map((_) => new Map([..._, [e[idKey], e]])), Effect.flatMap((_) => Ref.set(store, _)))), withPermit, annotateDb({
                 operation: "set",
                 system: "memory",
                 collection: modelName,
@@ -153,7 +153,7 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
             batchRemove: (items) => pipe(Effect
                 .sync(() => items)
                 // align with CosmosDB
-                .pipe(Effect.filterOrFail((_) => _.length <= 100, () => "BatchRemove: a batch may not exceed 100 items"), Effect.orDie, Effect.andThen(batchRemove), withDbSpan({
+                .pipe(Effect.filterOrFail((_) => _.length <= 100, () => "BatchRemove: a batch may not exceed 100 items"), Effect.orDie, Effect.andThen(batchRemove), annotateDb({
                 operation: "batchRemove",
                 system: "memory",
                 collection: modelName,
@@ -163,14 +163,14 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
             batchSet: (items) => pipe(Effect
                 .sync(() => items)
                 // align with CosmosDB
-                .pipe(Effect.filterOrFail((_) => _.length <= 100, () => "BatchSet: a batch may not exceed 100 items"), Effect.orDie, Effect.andThen(batchSet), withDbSpan({
+                .pipe(Effect.filterOrFail((_) => _.length <= 100, () => "BatchSet: a batch may not exceed 100 items"), Effect.orDie, Effect.andThen(batchSet), annotateDb({
                 operation: "batchSet",
                 system: "memory",
                 collection: modelName,
                 namespace,
                 entity: modelName
             }))),
-            bulkSet: flow(batchSet, (_) => _.pipe(withDbSpan({
+            bulkSet: flow(batchSet, (_) => _.pipe(annotateDb({
                 operation: "bulkSet",
                 system: "memory",
                 collection: modelName,

package/dist/Store/SQL/Pg.js

@@ -4,7 +4,7 @@ import { toNonEmptyArray } from "effect-app/Array";
 import { SqlClient } from "effect/unstable/sql";
 import { OptimisticConcurrencyException } from "../../errors.js";
 import { InfraLogger } from "../../logger.js";
-import { withDbSpan } from "../../otel.js";
+import { annotateDb } from "../../otel.js";
 import { storeId } from "../Memory.js";
 import { StoreMaker } from "../service.js";
 import { makeETag } from "../utils.js";
@@ -113,7 +113,7 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                 all: resolveNamespace.pipe(Effect.flatMap((ns) => {
                     const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`;
                     return exec(sqlText, [ns])
-                        .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), withDbSpan({
+                        .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), annotateDb({
                         operation: "all",
                         system: "postgresql",
                         collection: tableName,
@@ -131,7 +131,7 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                         return row
                             ? Option.some(parseRow(row, idKey, defaultValues))
                             : Option.none();
-                    }), withDbSpan({
+                    }), annotateDb({
                         operation: "find",
                         system: "postgresql",
                         collection: tableName,
@@ -165,7 +165,7 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                             });
                         }
                         return rows.map((r) => parseRow(r, idKey, defaultValues));
-                    }))), withDbSpan({
+                    }))), annotateDb({
                         operation: "filter",
                         system: "postgresql",
                         collection: tableName,
@@ -173,7 +173,7 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                         entity: name
                     }))));
                 },
-                set: (e) => resolveNamespace.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(withDbSpan({
+                set: (e) => resolveNamespace.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(annotateDb({
                     operation: "set",
                     system: "postgresql",
                     collection: tableName,
@@ -181,14 +181,14 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                     entity: name,
                     extra: { "app.entity.id": e[idKey] }
                 })))),
-                batchSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(withDbSpan({
+                batchSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
                     operation: "batchSet",
                     system: "postgresql",
                     collection: tableName,
                     namespace: ns,
                     entity: name
                 })))),
-                bulkSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(withDbSpan({
+                bulkSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
                     operation: "bulkSet",
                     system: "postgresql",
                     collection: tableName,
@@ -201,7 +201,7 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                     return resolveNamespace.pipe(Effect.flatMap((ns) => {
                         const sqlText = `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ${nsPlaceholder}`;
                         return exec(sqlText, [...ids, ns])
-                            .pipe(Effect.asVoid, withDbSpan({
+                            .pipe(Effect.asVoid, annotateDb({
                             operation: "batchRemove",
                             system: "postgresql",
                             collection: tableName,
@@ -211,7 +211,7 @@ const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
                         }));
                     }));
                 },
-                queryRaw: (query) => s.all.pipe(Effect.map(query.memory), withDbSpan({
+                queryRaw: (query) => s.all.pipe(Effect.map(query.memory), annotateDb({
                     operation: "queryRaw",
                     system: "postgresql",
                     collection: tableName,