@effect-app/infra 0.94.8 → 0.94.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 0.94.9
+
+### Patch Changes
+
+- 3b33ecee: enable span update on rc update
+
 ## 0.94.8
 
 ### Patch Changes

package/_cjs/services/RequestContextContainer.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.live = exports.RequestContextContainerImpl = exports.RequestContextContainer = exports.RCTag = void 0;
+exports.spanAttributes = exports.live = exports.RequestContextContainerImpl = exports.RequestContextContainer = exports.RCTag = void 0;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/service"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Option"));
 var tsplus_module_3 = _interopRequireWildcard(require("effect/Effect"));
@@ -46,7 +46,7 @@ class RequestContextContainerImpl extends RequestContextContainer {
   constructor() {
     super();
     _RequestContextContainerImpl_ref.set(this, void 0);
-    this.update = f => tsplus_module_7.getAndUpdate(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), f);
+    this.update = f => tsplus_module_3.tap(tsplus_module_7.getAndUpdate(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), f), rc => tsplus_module_3.annotateCurrentSpan(spanAttributes_1(rc)));
     this.start = a => tsplus_module_3.zipRight(tsplus_module_8.restoreFromRequestContext(a))(tsplus_module_7.set(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), a));
     __classPrivateFieldSet(this, _RequestContextContainerImpl_ref, tsplus_module_7.unsafeMake(new _RequestContext.RequestContext({
       name: tsplus_module_6.ReasonableString("_root_"),
@@ -66,4 +66,18 @@ _RequestContextContainerImpl_ref = new WeakMap();
 const live = exports.live = tsplus_module_9.effect(RequestContextContainer)(tsplus_module_3.sync(() => new RequestContextContainerImpl()));
 /** @tsplus static RequestContext.Ops Tag */
 const RCTag = exports.RCTag = tsplus_module_5.Tag();
+/**
+ * @tsplus getter RequestContext spanAttributes
+ */
+const spanAttributes_1 = ctx => ({
+  "request.id": ctx.id,
+  "request.name": ctx.name,
+  "request.locale": ctx.locale,
+  "request.namespace": ctx.namespace,
+  ...(ctx.userProfile?.sub ? {
+    "request.user.sub": ctx.userProfile.sub,
+    "request.user.roles": "roles" in ctx.userProfile ? ctx.userProfile.roles : undefined
+  } : {})
+});
+const spanAttributes = exports.spanAttributes = spanAttributes_1;
 //# sourceMappingURL=RequestContextContainer.cjs.map

package/_cjs/services/RequestContextContainer.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.cjs","names":["_ids","require","_RequestContext","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestContextContainer","tsplus_module_1","TagClass","flatMap","_","requestContext","getOption","tsplus_module_3","contextWith","tsplus_module_5","tsplus_module_2","isSome","map","value","some","sync","tsplus_module_4","none","exports","RequestContextContainerImpl","constructor","_RequestContextContainerImpl_ref","update","f","tsplus_module_7","getAndUpdate","__classPrivateFieldGet","start","zipRight","tsplus_module_8","restoreFromRequestContext","__classPrivateFieldSet","unsafeMake","RequestContext","name","tsplus_module_6","ReasonableString","rootId","RequestId","locale","live","tsplus_module_9","effect","RCTag","Tag"],"sources":["../../_src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"RequestContextContainer.cjs","names":["_ids","require","_RequestContext","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestContextContainer","tsplus_module_1","TagClass","flatMap","_","requestContext","getOption","tsplus_module_3","contextWith","tsplus_module_5","tsplus_module_2","isSome","map","value","some","sync","tsplus_module_4","none","exports","RequestContextContainerImpl","constructor","_RequestContextContainerImpl_ref","update","f","tap","tsplus_module_7","getAndUpdate","__classPrivateFieldGet","rc","annotateCurrentSpan","spanAttributes_1","start","zipRight","tsplus_module_8","restoreFromRequestContext","__classPrivateFieldSet","unsafeMake","RequestContext","name","tsplus_module_6","ReasonableString","rootId","RequestId","locale","live","tsplus_module_9","effect","RCTag","Tag","ctx","id","namespace","userProfile","sub","roles","undefined","spanAttributes"],"sources":["../../_src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/services/RequestContextContainer.ts

@@ -36,7 +36,8 @@ export class RequestContextContainerImpl extends RequestContextContainer {
     return this.#ref.get
   }
 
-  override update = (f: (a: RequestContext) => RequestContext) => this.#ref.getAndUpdate(f)
+  override update = (f: (a: RequestContext) => RequestContext) =>
+    this.#ref.getAndUpdate(f).tap((rc) => Effect.annotateCurrentSpan(rc.spanAttributes))
   override start = (a: RequestContext) => this.#ref.set(a) > a.restoreStoreId
 }
 
@@ -47,3 +48,24 @@ export const live = Effect.sync(() => new RequestContextContainerImpl()).toLayer
 
 /** @tsplus static RequestContext.Ops Tag */
 export const RCTag = Tag<RequestContext>()
+
+/**
+ * @tsplus getter RequestContext spanAttributes
+ */
+export const spanAttributes = (ctx: RequestContext) => ({
+  "request.id": ctx.id,
+  "request.name": ctx.name,
+  "request.locale": ctx.locale,
+  "request.namespace": ctx.namespace,
+  ...ctx.userProfile?.sub
+    ? {
+      "request.user.sub": ctx
+        .userProfile
+        .sub,
+      "request.user.roles": "roles" in ctx
+          .userProfile
+        ? ctx.userProfile.roles
+        : undefined
+    }
+    : {}
+})

package/dist/services/Repository.d.ts

@@ -181,7 +181,7 @@ export declare function queryAndSavePureEffect<T extends {
     skip?: number;
 }>): <R2, A, E2, S2 extends T>(pure: Effect<FixEnv<R2, Evt, S[], S2[]>, E2, A>) => import("effect/Effect").Effect<R | Exclude<R2, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E | E2, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E | E2, A>;
 /**
  * @tsplus fluent Repository queryAndSavePure
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -197,7 +197,7 @@ export declare function queryAndSavePure<T extends {
     skip?: number;
 }): <R2, A, E2, S2 extends T>(pure: import("effect/Effect").Effect<FixEnv<R2, Evt, S[], S2[]>, E2, A>) => import("effect/Effect").Effect<Exclude<R2, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E2, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E2, A>;
 /**
  * @tsplus getter Repository saveManyWithPure
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -208,7 +208,7 @@ export declare function saveManyWithPure<T extends {
     id: string;
 }, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<FixEnv<R, Evt, S1[], S2[]>, E, A>) => (items: Iterable<S1>) => import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S1[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E, A>;
 /**
  * @tsplus fluent Repository byIdAndSaveWithPure
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -219,7 +219,7 @@ export declare function byIdAndSaveWithPure<T extends {
     id: string;
 }, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>, id: T["id"]): <R, A, E, S2 extends T>(pure: Effect<FixEnv<R, Evt, T, S2>, E, A>) => import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, T, S2>;
-}>, OptimisticConcurrencyException | InvalidStateError | E | NotFoundError<ItemType>, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E | NotFoundError<ItemType>, A>;
 /**
  * NOTE: it's not as composable, only useful when the request is simple, and only this part needs request args.
  * @tsplus getter Repository handleByIdAndSaveWithPure
@@ -233,7 +233,7 @@ export declare function handleByIdAndSaveWithPure<T extends {
     id: T["id"];
 }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<FixEnv<R, Evt, T, S2>, E, A>) => (req: Req, ctx: Context) => import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, T, S2>;
-}>, OptimisticConcurrencyException | InvalidStateError | E | NotFoundError<ItemType>, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E | NotFoundError<ItemType>, A>;
 /**
  * @tsplus fluent Repository saveManyWithPure_
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -244,7 +244,7 @@ export declare function saveManyWithPure_<Id extends string, R, T extends {
     id: string;
 }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>, items: Iterable<S1>, pure: Effect<FixEnv<R, Evt, S1[], S2[]>, E, A>): import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S1[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E, A>;
 /**
  * @tsplus fluent Repository saveWithPure_
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -255,12 +255,12 @@ export declare function saveWithPure_<Id extends string, R, T extends {
     id: string;
 }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>, item: S1, pure: Effect<FixEnv<R, Evt, S1, S2>, E, A>): import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S1, S2>;
-}>, OptimisticConcurrencyException | InvalidStateError | E, A>;
+}>, InvalidStateError | OptimisticConcurrencyException | E, A>;
 export declare function saveAllWithEffectInt<T extends {
     id: string;
 }, PM extends {
     id: string;
-}, P extends T, Evt, ItemType extends string, R, E, A>(self: Repository<T, PM, Evt, ItemType>, gen: Effect<R, E, readonly [Iterable<P>, Iterable<Evt>, A]>): import("effect/Effect").Effect<R, OptimisticConcurrencyException | InvalidStateError | E, A>;
+}, P extends T, Evt, ItemType extends string, R, E, A>(self: Repository<T, PM, Evt, ItemType>, gen: Effect<R, E, readonly [Iterable<P>, Iterable<Evt>, A]>): import("effect/Effect").Effect<R, InvalidStateError | OptimisticConcurrencyException | E, A>;
 /**
  * @tsplus fluent Repository queryAndSavePureEffectBatched
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -276,7 +276,7 @@ export declare function queryAndSavePureEffectBatched<T extends {
     skip?: number;
 }>, batchSize?: number): <R2, A, E2, S2 extends T>(pure: Effect<FixEnv<R2, Evt, S[], S2[]>, E2, A>) => import("effect/Effect").Effect<R | Exclude<R2, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E | E2, A[]>;
+}>, InvalidStateError | OptimisticConcurrencyException | E | E2, A[]>;
 /**
  * @tsplus fluent Repository queryAndSavePureBatched
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -292,7 +292,7 @@ export declare function queryAndSavePureBatched<T extends {
     skip?: number;
 }, batchSize?: number): <R2, A, E2, S2 extends T>(pure: import("effect/Effect").Effect<FixEnv<R2, Evt, S[], S2[]>, E2, A>) => import("effect/Effect").Effect<Exclude<R2, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E2, A[]>;
+}>, InvalidStateError | OptimisticConcurrencyException | E2, A[]>;
 /**
  * @tsplus fluent Repository saveManyWithPureBatched
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -303,7 +303,7 @@ export declare function saveManyWithPureBatched<T extends {
     id: string;
 }, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<FixEnv<R, Evt, S1[], S2[]>, E, A>) => (items: Iterable<S1>) => import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S1[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E, A[]>;
+}>, InvalidStateError | OptimisticConcurrencyException | E, A[]>;
 /**
  * @tsplus fluent Repository saveManyWithPureBatched_
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -314,7 +314,7 @@ export declare function saveManyWithPureBatched_<Id extends string, R, T extends
     id: string;
 }, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>, items: Iterable<S1>, pure: Effect<FixEnv<R, Evt, S1[], S2[]>, E, A>, batchSize?: number): import("effect/Effect").Effect<Exclude<R, {
     env: import("@effect-app/prelude/Pure").PureEnv<Evt, S1[], S2[]>;
-}>, OptimisticConcurrencyException | InvalidStateError | E, A[]>;
+}>, InvalidStateError | OptimisticConcurrencyException | E, A[]>;
 export type AllDSL<T, Evt> = (<R, A, E, S1 extends T, S2 extends T>(pure: (dsl: PureDSL<S1[], S2[], Evt>) => Effect<R, E, A>) => Effect<FixEnv<R, Evt, S1[], S2[]>, E, A>) & AllDSLExt<T, Evt>;
 /**
  * @tsplus type DSLExt
@@ -363,7 +363,7 @@ export declare function save<T extends {
     id: string;
 }, PM extends {
     id: string;
-}, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>): (items_0: T, ...items_1: T[]) => import("effect/Effect").Effect<never, OptimisticConcurrencyException | InvalidStateError, void>;
+}, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>): (items_0: T, ...items_1: T[]) => import("effect/Effect").Effect<never, InvalidStateError | OptimisticConcurrencyException, void>;
 /**
  * @tsplus getter Repository saveWithEvents
  * @tsplus location "@effect-app/infra/services/Repository"
@@ -372,5 +372,5 @@ export declare function saveWithEvents<T extends {
     id: string;
 }, PM extends {
     id: string;
-}, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>): (events: Iterable<Evt>) => (items_0: T, ...items_1: T[]) => import("effect/Effect").Effect<never, OptimisticConcurrencyException | InvalidStateError, void>;
+}, Evt, ItemType extends string>(self: Repository<T, PM, Evt, ItemType>): (events: Iterable<Evt>) => (items_0: T, ...items_1: T[]) => import("effect/Effect").Effect<never, InvalidStateError | OptimisticConcurrencyException, void>;
 //# sourceMappingURL=Repository.d.ts.map

package/dist/services/RequestContextContainer.d.ts

@@ -38,5 +38,17 @@ export declare const live: import("effect/Layer").Layer<never, never, RequestCon
  * @tsplus location "@effect-app/infra/services/RequestContextContainer"
  */
 export declare const RCTag: import("effect/Context").Tag<RequestContext, RequestContext>;
+/**
+ * @tsplus getter RequestContext spanAttributes
+ * @tsplus location "@effect-app/infra/services/RequestContextContainer"
+ */
+export declare const spanAttributes: (ctx: RequestContext) => {
+    "request.user.sub"?: import("@effect-app/prelude/ids").UserProfileId | undefined;
+    "request.user.roles"?: unknown;
+    "request.id": import("@effect-app/schema").ReasonableString;
+    "request.name": import("@effect-app/schema").ReasonableString;
+    "request.locale": "en" | "de";
+    "request.namespace": import("@effect-app/schema").ReasonableString | undefined;
+};
 export {};
 //# sourceMappingURL=RequestContextContainer.d.ts.map

package/dist/services/RequestContextContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;;AAErD;;;GAGG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IAC7G,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,iGAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;;IAStE,IAAa,cAAc,iEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,kEAA8B;IAChF,KAAK,MAAO,cAAc,wDAAwC;CAC5E;;;;;AAKD,eAAO,MAAM,IAAI,qEAAwF,CAAA;;;;;AAGzG,eAAO,MAAM,KAAK,8DAAwB,CAAA"}
+{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;;AAErD;;;GAGG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IAC7G,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,iGAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;;IAStE,IAAa,cAAc,iEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,kEAC2B;IAC7E,KAAK,MAAO,cAAc,wDAAwC;CAC5E;;;;;AAKD,eAAO,MAAM,IAAI,qEAAwF,CAAA;;;;;AAGzG,eAAO,MAAM,KAAK,8DAAwB,CAAA;;;;;AAK1C,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;CAgBhD,CAAA"}

package/dist/services/RequestContextContainer.js

@@ -39,7 +39,7 @@ export class RequestContextContainerImpl extends RequestContextContainer {
     constructor() {
         super();
         _RequestContextContainerImpl_ref.set(this, void 0);
-        this.update = (f) => tsplus_module_7.getAndUpdate(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), f);
+        this.update = (f) => tsplus_module_3.tap(tsplus_module_7.getAndUpdate(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), f), (rc) => tsplus_module_3.annotateCurrentSpan(spanAttributes_1(rc)));
         this.start = (a) => tsplus_module_3.zipRight(tsplus_module_8.restoreFromRequestContext(a))(tsplus_module_7.set(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), a));
         __classPrivateFieldSet(this, _RequestContextContainerImpl_ref, tsplus_module_7.unsafeMake(new RequestContext({ name: tsplus_module_6.ReasonableString("_root_"), rootId: RequestId("_root_"), locale: "en" })), "f");
     }
@@ -54,4 +54,25 @@ _RequestContextContainerImpl_ref = new WeakMap();
 export const live = tsplus_module_9.effect(RequestContextContainer)(tsplus_module_3.sync(() => new RequestContextContainerImpl()));
 /** @tsplus static RequestContext.Ops Tag */
 export const RCTag = tsplus_module_5.Tag();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQix1QkFBd0IsU0FBUSxnQkFBQSxRQUFRLEVBQTJCO0lBSXZGLE1BQU0sS0FBSyxHQUFHO1FBQ1osT0FBTyx1QkFBdUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUN6RSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQzFCLHVCQUFBLGNBQWMsQ0FBUztZQUNyQixDQUFDLENBQUMsb0JBQUEsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLHVCQUFpQjtZQUN0RCxDQUFDLENBQUMsZ0RBQW1CLENBQ3hCLENBQUE7SUFDTCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sMkJBQTRCLFNBQVEsdUJBQXVCO0lBRXRFO1FBQ0UsS0FBSyxFQUFFLENBQUE7UUFGVCxtREFBOEI7UUFZckIsV0FBTSxHQUFHLENBQUMsQ0FBd0MsRUFBRSxFQUFFLENBQUMsNkJBQUEsdUJBQUEsSUFBSSx3Q0FBSyxFQUFjLENBQUMsQ0FBQyxDQUFBO1FBQ2hGLFVBQUssR0FBRyxDQUFDLENBQWlCLEVBQUUsRUFBRSxvRUFBb0IsQ0FBQyxHQUFwQixvQkFBQSx1QkFBQSxJQUFJLHdDQUFLLEVBQUssQ0FBQyxDQUFDLENBQW1CLENBQUE7UUFWekUsdUJBQUEsSUFBSSxvQ0FBUSwyQkFDVixJQUFJLGNBQWMsQ0FBQyxFQUFFLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUNwRyxNQUFBLENBQUE7SUFDSCxDQUFDO0lBRUQsSUFBYSxjQUFjO1FBQ3pCLDJCQUFPLHVCQUFBLElBQUksd0NBQUssRUFBSTtJQUN0QixDQUFDO0NBSUY7O0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsdUJBQTZELHVCQUF1QixFQUFwRixxQkFBWSxHQUFHLEVBQUUsQ0FBQyxJQUFJLDJCQUEyQixFQUFFLENBQUMsQ0FBaUMsQ0FBQTtBQUV6Ryw0Q0FBNEM7QUFDNUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLGdCQUFBLEdBQUcsRUFBa0IsQ0FBQSJ9
+/**
+ * @tsplus getter RequestContext spanAttributes
+ */
+const spanAttributes_1 = (ctx) => ({
+    "request.id": ctx.id,
+    "request.name": ctx.name,
+    "request.locale": ctx.locale,
+    "request.namespace": ctx.namespace,
+    ...ctx.userProfile?.sub
+        ? {
+            "request.user.sub": ctx
+                .userProfile
+                .sub,
+            "request.user.roles": "roles" in ctx
+                .userProfile
+                ? ctx.userProfile.roles
+                : undefined
+        }
+        : {}
+});
+export const spanAttributes = spanAttributes_1;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQix1QkFBd0IsU0FBUSxnQkFBQSxRQUFRLEVBQTJCO0lBSXZGLE1BQU0sS0FBSyxHQUFHO1FBQ1osT0FBTyx1QkFBdUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUN6RSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQzFCLHVCQUFBLGNBQWMsQ0FBUztZQUNyQixDQUFDLENBQUMsb0JBQUEsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLHVCQUFpQjtZQUN0RCxDQUFDLENBQUMsZ0RBQW1CLENBQ3hCLENBQUE7SUFDTCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sMkJBQTRCLFNBQVEsdUJBQXVCO0lBRXRFO1FBQ0UsS0FBSyxFQUFFLENBQUE7UUFGVCxtREFBOEI7UUFZckIsV0FBTSxHQUFHLENBQUMsQ0FBd0MsRUFBRSxFQUFFLENBQzdELG9CQUFBLDZCQUFBLHVCQUFBLElBQUksd0NBQUssRUFBYyxDQUFDLENBQUMsRUFBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMscURBQTJCLEVBQUUsRUFBZ0IsQ0FBQyxDQUFBO1FBQzdFLFVBQUssR0FBRyxDQUFDLENBQWlCLEVBQUUsRUFBRSxvRUFBb0IsQ0FBQyxHQUFwQixvQkFBQSx1QkFBQSxJQUFJLHdDQUFLLEVBQUssQ0FBQyxDQUFDLENBQW1CLENBQUE7UUFYekUsdUJBQUEsSUFBSSxvQ0FBUSwyQkFDVixJQUFJLGNBQWMsQ0FBQyxFQUFFLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUNwRyxNQUFBLENBQUE7SUFDSCxDQUFDO0lBRUQsSUFBYSxjQUFjO1FBQ3pCLDJCQUFPLHVCQUFBLElBQUksd0NBQUssRUFBSTtJQUN0QixDQUFDO0NBS0Y7O0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsdUJBQTZELHVCQUF1QixFQUFwRixxQkFBWSxHQUFHLEVBQUUsQ0FBQyxJQUFJLDJCQUEyQixFQUFFLENBQUMsQ0FBaUMsQ0FBQTtBQUV6Ryw0Q0FBNEM7QUFDNUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLGdCQUFBLEdBQUcsRUFBa0IsQ0FBQTtBQUUxQzs7R0FFRztBQUNJLE1BQU0sbUJBQWlCLENBQUMsR0FBbUIsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN0RCxZQUFZLEVBQUUsR0FBRyxDQUFDLEVBQUU7SUFDcEIsY0FBYyxFQUFFLEdBQUcsQ0FBQyxJQUFJO0lBQ3hCLGdCQUFnQixFQUFFLEdBQUcsQ0FBQyxNQUFNO0lBQzVCLG1CQUFtQixFQUFFLEdBQUcsQ0FBQyxTQUFTO0lBQ2xDLEdBQUcsR0FBRyxDQUFDLFdBQVcsRUFBRSxHQUFHO1FBQ3JCLENBQUMsQ0FBQztZQUNBLGtCQUFrQixFQUFFLEdBQUc7aUJBQ3BCLFdBQVc7aUJBQ1gsR0FBRztZQUNOLG9CQUFvQixFQUFFLE9BQU8sSUFBSSxHQUFHO2lCQUMvQixXQUFXO2dCQUNkLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUs7Z0JBQ3ZCLENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxDQUFDLENBQUMsRUFBRTtDQUNQLENBQUMsQ0FBQTthQWhCVyxjQUFjIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.94.8",
+  "version": "0.94.9",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,8 +19,8 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.70.1",
-    "@effect-app/prelude": "0.72.5",
     "@effect-app/infra-adapters": "0.60.7",
+    "@effect-app/prelude": "0.72.5",
     "@effect-app/schema": "0.63.1"
   },
   "devDependencies": {