@effect-app/infra 1.45.1 → 1.46.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @effect-app/infra
 
+## 1.46.0
+
+### Minor Changes
+
+- b49cd25: refactor: remove RequestContextContainer
+
+### Patch Changes
+
+- Updated dependencies [b49cd25]
+  - @effect-app/infra-adapters@1.21.0
+
 ## 1.45.1
 
 ### Patch Changes

package/_cjs/RequestContext.cjs

@@ -3,64 +3,42 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.spanAttributes = exports.RequestContextParent = exports.RequestContext = exports.Locale = void 0;
+exports.spanAttributes = exports.RequestContext = exports.LocaleRef = exports.Locale = void 0;
 var _schema = require("@effect-app/schema");
 var _effectApp = require("effect-app");
 var _ids = require("effect-app/ids");
 const Locale = exports.Locale = _effectApp.S.Literal("en", "de");
-// TPDP: kind of obsolete now that we use actual spans
-class RequestContextParent extends (0, _schema.ExtendedTaggedClass)()("RequestContext", {
-  id: _ids.RequestId,
-  name: _schema.NonEmptyString255,
-  userProfile: _effectApp.S.optional(_effectApp.S.Struct({
-    sub: _ids.UserProfileId
-  })),
-  locale: Locale,
-  createdAt: _effectApp.S.Date.withDefault
-}) {}
+const LocaleRef = exports.LocaleRef = _effectApp.FiberRef.unsafeMake("en");
 /**
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops
  */
-exports.RequestContextParent = RequestContextParent;
 class RequestContext extends (0, _schema.ExtendedTaggedClass)()("RequestContext", {
-  ...RequestContextParent.omit("_tag", "id"),
-  id: _ids.RequestId.withDefault,
-  rootId: _ids.RequestId,
+  span: _effectApp.S.Struct({
+    traceId: _effectApp.S.String,
+    spanId: _effectApp.S.String,
+    sampled: _effectApp.S.Boolean
+  }),
+  name: _schema.NonEmptyString255,
+  locale: Locale,
   sourceId: _effectApp.S.optional(_schema.NonEmptyString255),
-  parent: _effectApp.S.optional(RequestContextParent),
-  namespace: _effectApp.S.optional(_schema.NonEmptyString255)
-  // ...RequestContextParent.omit("id").extend({
-  //   id: RequestId.withDefault,
-  //   rootId: RequestId,
-  //   parent: RequestContextParent.optional(),
-  //   namespace: NonEmptyString255.optional()
-  // })
+  // TODO?
+  namespace: _schema.NonEmptyString255,
+  /** @deprecated */
+  userProfile: _effectApp.S.optional(_effectApp.S.Struct({
+    sub: _ids.UserProfileId
+  })) //
 }) {
   // static Tag = Context.Tag<RequestContext>()
-  static inherit(parent, newSelf) {
-    return new RequestContext({
-      namespace: parent?.namespace,
-      ...newSelf,
-      rootId: parent.rootId,
-      parent
-    });
-  }
   static toMonitoring(self) {
     return {
       operationName: self.name,
-      locale: self.locale,
-      ...(self.parent ? {
-        parentOperationName: self.parent.name,
-        parentLocale: self.parent.locale
-      } : {})
+      locale: self.locale
     };
   }
 }
 exports.RequestContext = RequestContext;
 const spanAttributes = ctx => ({
-  "request.id": ctx.id,
-  "request.root.id": ctx.rootId,
   "request.name": ctx.name,
   "request.locale": ctx.locale,
   "request.namespace": ctx.namespace,

package/_cjs/RequestContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.cjs","names":["_schema","require","_effectApp","_ids","Locale","exports","S","Literal","RequestContextParent","ExtendedTaggedClass","id","RequestId","name","NonEmptyString255","userProfile","optional","Struct","sub","UserProfileId","locale","createdAt","Date","withDefault","RequestContext","omit","rootId","sourceId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","spanAttributes","ctx","roles","undefined"],"sources":["../src/RequestContext.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AAEO,MAAMG,MAAM,GAAAC,OAAA,CAAAD,MAAA,GAAGE,YAAC,CAACC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC;AAG3C;AACM,MAAOC,oBAAqB,SAAQ,IAAAC,2BAAmB,GAG1D,CAAC,gBAAgB,EAAE;EACpBC,EAAE,EAAEC,cAAS;EACbC,IAAI,EAAEC,yBAAiB;EACvBC,WAAW,EAAER,YAAC,CAACS,QAAQ,CAACT,YAAC,CAACU,MAAM,CAAC;IAAEC,GAAG,EAAEC;EAAa,CAAE,CAAC,CAAC;EACzDC,MAAM,EAAEf,MAAM;EACdgB,SAAS,EAAEd,YAAC,CAACe,IAAI,CAACC;CACnB,CAAC;AAEF;;;;AAAAjB,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAIM,MAAOe,cAAe,SAAQ,IAAAd,2BAAmB,GAGpD,CAAC,gBAAgB,EAAE;EACpB,GAAGD,oBAAoB,CAACgB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;EAC1Cd,EAAE,EAAEC,cAAS,CAACW,WAAW;EACzBG,MAAM,EAAEd,cAAS;EACjBe,QAAQ,EAAEpB,YAAC,CAACS,QAAQ,CAACF,yBAAiB,CAAC;EACvCc,MAAM,EAAErB,YAAC,CAACS,QAAQ,CAACP,oBAAoB,CAAC;EACxCoB,SAAS,EAAEtB,YAAC,CAACS,QAAQ,CAACF,yBAAiB;EACvC;EACA;EACA;EACA;EACA;EACA;CACD,CAAC;EACA;EACA,OAAOgB,OAAOA,CAEZF,MAAsB,EACtBG,OAA8D;IAE9D,OAAO,IAAIP,cAAc,CAAC;MACxBK,SAAS,EAAED,MAAM,EAAEC,SAAS;MAC5B,GAAGE,OAAO;MACVL,MAAM,EAAEE,MAAM,CAACF,MAAM;MACrBE;KACD,CAAC;EACJ;EAEA,OAAOI,YAAYA,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAACpB,IAAI;MACxBO,MAAM,EAAEa,IAAI,CAACb,MAAM;MACnB,IAAIa,IAAI,CAACL,MAAM,GACX;QAAEO,mBAAmB,EAAEF,IAAI,CAACL,MAAM,CAACf,IAAI;QAAEuB,YAAY,EAAEH,IAAI,CAACL,MAAM,CAACR;MAAM,CAAE,GAC3E,EAAE;KACP;EACH;;AACDd,OAAA,CAAAkB,cAAA,GAAAA,cAAA;AAEM,MAAMa,cAAc,GAAIC,GAAmB,KAAM;EACtD,YAAY,EAAEA,GAAG,CAAC3B,EAAE;EACpB,iBAAiB,EAAE2B,GAAG,CAACZ,MAAM;EAC7B,cAAc,EAAEY,GAAG,CAACzB,IAAI;EACxB,gBAAgB,EAAEyB,GAAG,CAAClB,MAAM;EAC5B,mBAAmB,EAAEkB,GAAG,CAACT,SAAS;EAClC,IAAGS,GAAG,CAACX,QAAQ,GAAG;IAAE,mBAAmB,EAAEW,GAAG,CAACX;EAAQ,CAAE,GAAG,EAAE;EAC5D,IAAIW,GAAG,CAACvB,WAAW,EAAEG,GAAG,GACpB;IACA,kBAAkB,EAAEoB,GAAG,CACpBvB,WAAW,CACXG,GAAG;IACN,oBAAoB,EAAE,OAAO,IAAIoB,GAAG,CAC/BvB,WAAW,GACZuB,GAAG,CAACvB,WAAW,CAACwB,KAAK,GACrBC;GACL,GACC,EAAE;CACP,CAAC;AAWF;AACA;AACA;AACA;AAAAlC,OAAA,CAAA+B,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"file":"RequestContext.cjs","names":["_schema","require","_effectApp","_ids","Locale","exports","S","Literal","LocaleRef","FiberRef","unsafeMake","RequestContext","ExtendedTaggedClass","span","Struct","traceId","String","spanId","sampled","Boolean","name","NonEmptyString255","locale","sourceId","optional","namespace","userProfile","sub","UserProfileId","toMonitoring","self","operationName","spanAttributes","ctx","roles","undefined"],"sources":["../src/RequestContext.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AAEO,MAAMG,MAAM,GAAAC,OAAA,CAAAD,MAAA,GAAGE,YAAC,CAACC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC;AAGpC,MAAMC,SAAS,GAAAH,OAAA,CAAAG,SAAA,GAAGC,mBAAQ,CAACC,UAAU,CAAS,IAAI,CAAC;AAE1D;;;;AAIM,MAAOC,cAAe,SAAQ,IAAAC,2BAAmB,GAGpD,CAAC,gBAAgB,EAAE;EACpBC,IAAI,EAAEP,YAAC,CAACQ,MAAM,CAAC;IACbC,OAAO,EAAET,YAAC,CAACU,MAAM;IACjBC,MAAM,EAAEX,YAAC,CAACU,MAAM;IAChBE,OAAO,EAAEZ,YAAC,CAACa;GACZ,CAAC;EACFC,IAAI,EAAEC,yBAAiB;EACvBC,MAAM,EAAElB,MAAM;EACdmB,QAAQ,EAAEjB,YAAC,CAACkB,QAAQ,CAACH,yBAAiB,CAAC;EAAE;EACzCI,SAAS,EAAEJ,yBAAiB;EAC5B;EACAK,WAAW,EAAEpB,YAAC,CAACkB,QAAQ,CAAClB,YAAC,CAACQ,MAAM,CAAC;IAAEa,GAAG,EAAEC;EAAa,CAAE,CAAC,CAAC,CAAC;CAC3D,CAAC;EACA;EAEA,OAAOC,YAAYA,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAACV,IAAI;MACxBE,MAAM,EAAEQ,IAAI,CAACR;KACd;EACH;;AACDjB,OAAA,CAAAM,cAAA,GAAAA,cAAA;AAEM,MAAMqB,cAAc,GAAIC,GAAmB,KAAM;EACtD,cAAc,EAAEA,GAAG,CAACb,IAAI;EACxB,gBAAgB,EAAEa,GAAG,CAACX,MAAM;EAC5B,mBAAmB,EAAEW,GAAG,CAACR,SAAS;EAClC,IAAGQ,GAAG,CAACV,QAAQ,GAAG;IAAE,mBAAmB,EAAEU,GAAG,CAACV;EAAQ,CAAE,GAAG,EAAE;EAC5D,IAAIU,GAAG,CAACP,WAAW,EAAEC,GAAG,GACpB;IACA,kBAAkB,EAAEM,GAAG,CACpBP,WAAW,CACXC,GAAG;IACN,oBAAoB,EAAE,OAAO,IAAIM,GAAG,CAC/BP,WAAW,GACZO,GAAG,CAACP,WAAW,CAACQ,KAAK,GACrBC;GACL,GACC,EAAE;CACP,CAAC;AAQF;AACA;AACA;AACA;AAAA9B,OAAA,CAAA2B,cAAA,GAAAA,cAAA","ignoreList":[]}

package/_cjs/api/internal/RequestContextMiddleware.cjs

@@ -9,47 +9,32 @@ var _http = require("effect-app/http");
 var _ids = require("effect-app/ids");
 var _schema = require("effect-app/schema");
 var _RequestContext = require("../../RequestContext.cjs");
-var _RequestContextContainer = require("../../services/RequestContextContainer.cjs");
 var _setupRequest = require("../setupRequest.cjs");
 const RequestContextMiddleware = (defaultLocale = "en") => _http.HttpMiddleware.make(app => _effectApp.Effect.gen(function* () {
   const req = yield* _http.HttpServerRequest.HttpServerRequest;
-  const currentSpan = yield* _effectApp.Effect.currentSpan;
-  const parent = currentSpan?.parent ? currentSpan.parent.value : undefined;
-  const start = new Date();
+  const currentSpan = yield* _effectApp.Effect.currentSpan.pipe(_effectApp.Effect.orDie);
   const supported = _RequestContext.Locale.literals;
   const desiredLocale = req.headers["x-locale"];
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
   const locale = desiredLocale && supported.includes(desiredLocale) ? desiredLocale : defaultLocale;
-  const requestId = req.headers["request-id"];
-  const rootId = parent?.spanId ? (0, _ids.RequestId)(parent.spanId) : requestId ? (0, _ids.RequestId)(requestId) : _ids.RequestId.make();
-  const storeId = req.headers["x-store-id"];
-  const namespace = (0, _schema.NonEmptyString255)(storeId && (Array.isArray(storeId) ? storeId[0] : storeId) || "primary");
+  const ns = req.headers["x-store-id"];
+  const namespace = (0, _schema.NonEmptyString255)(ns && (Array.isArray(ns) ? ns[0] : ns) || "primary");
   const deviceId = req.headers["x-fe-device-id"];
   const requestContext = new _RequestContext.RequestContext({
-    id: currentSpan?.spanId ? (0, _ids.RequestId)(currentSpan.spanId) : _ids.RequestId.make(),
-    rootId,
+    span: {
+      traceId: (0, _ids.RequestId)(currentSpan.traceId),
+      spanId: (0, _ids.RequestId)(currentSpan.spanId),
+      sampled: currentSpan.sampled
+    },
     name: (0, _schema.NonEmptyString255)(req.originalUrl),
     // set more detailed elsewhere
     locale,
-    createdAt: start,
     namespace,
     sourceId: deviceId ? (0, _schema.NonEmptyString255)(deviceId) : undefined
-    // ...(context.operation.parentId
-    //   ? {
-    //     parent: new RequestContextParent({
-    //       id: RequestId(context.operation.parentId),
-    //       locale,
-    //       name: NonEmptyString255("API Request")
-    //     })
-    //   }
-    //   : {})
   });
-  const rcc = yield* _RequestContextContainer.RequestContextContainer;
-  yield* rcc.update(_ => requestContext);
-  const res = yield* (0, _setupRequest.setupExistingRequestContext)(app, requestContext);
+  const res = yield* (0, _setupRequest.setupRequestContext)(app, requestContext);
   // TODO: how to set also on errors?
   return _http.HttpServerResponse.setHeaders(res, {
-    "request-id": requestContext.rootId,
     "Content-Language": requestContext.locale
   });
 }));

package/_cjs/api/internal/RequestContextMiddleware.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextMiddleware.cjs","names":["_effectApp","require","_http","_ids","_schema","_RequestContext","_RequestContextContainer","_setupRequest","RequestContextMiddleware","defaultLocale","HttpMiddleware","make","app","Effect","gen","req","HttpServerRequest","currentSpan","parent","value","undefined","start","Date","supported","Locale","literals","desiredLocale","headers","locale","includes","requestId","rootId","spanId","RequestId","storeId","namespace","NonEmptyString255","Array","isArray","deviceId","requestContext","RequestContext","id","name","originalUrl","createdAt","sourceId","rcc","RequestContextContainer","update","_","res","setupExistingRequestContext","HttpServerResponse","setHeaders","exports"],"sources":["../../../src/api/internal/RequestContextMiddleware.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,wBAAA,GAAAL,OAAA;AACA,IAAAM,aAAA,GAAAN,OAAA;AAEO,MAAMO,wBAAwB,GAAGA,CAACC,aAAA,GAAwB,IAAI,KACnEC,oBAAc,CAACC,IAAI,CAAEC,GAAG,IACtBC,iBAAM,CAACC,GAAG,CAAC,aAAS;EAClB,MAAMC,GAAG,GAAG,OAAOC,uBAAiB,CAACA,iBAAiB;EAEtD,MAAMC,WAAW,GAAG,OAAOJ,iBAAM,CAACI,WAAW;EAC7C,MAAMC,MAAM,GAAGD,WAAW,EAAEC,MAAM,GAAGD,WAAW,CAACC,MAAM,CAACC,KAAK,GAAGC,SAAS;EACzE,MAAMC,KAAK,GAAG,IAAIC,IAAI,EAAE;EACxB,MAAMC,SAAS,GAAGC,sBAAM,CAACC,QAAQ;EACjC,MAAMC,aAAa,GAAGX,GAAG,CAACY,OAAO,CAAC,UAAU,CAAC;EAC7C;EACA,MAAMC,MAAM,GAAGF,aAAa,IAAIH,SAAS,CAACM,QAAQ,CAACH,aAAoB,CAAC,GACnEA,aAA0C,GAC3CjB,aAAa;EAEjB,MAAMqB,SAAS,GAAGf,GAAG,CAACY,OAAO,CAAC,YAAY,CAAC;EAC3C,MAAMI,MAAM,GAAGb,MAAM,EAAEc,MAAM,GACzB,IAAAC,cAAS,EAACf,MAAM,CAACc,MAAM,CAAC,GACxBF,SAAS,GACT,IAAAG,cAAS,EAACH,SAAS,CAAC,GACpBG,cAAS,CAACtB,IAAI,EAAE;EAEpB,MAAMuB,OAAO,GAAGnB,GAAG,CAACY,OAAO,CAAC,YAAY,CAAC;EACzC,MAAMQ,SAAS,GAAG,IAAAC,yBAAiB,EAAEF,OAAO,KAAKG,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,GAAGA,OAAO,CAAC,CAAC,CAAC,GAAGA,OAAO,CAAC,IAAK,SAAS,CAAC;EAE9G,MAAMK,QAAQ,GAAGxB,GAAG,CAACY,OAAO,CAAC,gBAAgB,CAAC;EAE9C,MAAMa,cAAc,GAAG,IAAIC,8BAAc,CAAC;IACxCC,EAAE,EAAEzB,WAAW,EAAEe,MAAM,GAAG,IAAAC,cAAS,EAAChB,WAAW,CAACe,MAAM,CAAC,GAAGC,cAAS,CAACtB,IAAI,EAAE;IAC1EoB,MAAM;IACNY,IAAI,EAAE,IAAAP,yBAAiB,EAACrB,GAAG,CAAC6B,WAAW,CAAC;IAAE;IAC1ChB,MAAM;IACNiB,SAAS,EAAExB,KAAK;IAChBc,SAAS;IACTW,QAAQ,EAAEP,QAAQ,GAAG,IAAAH,yBAAiB,EAACG,QAAQ,CAAC,GAAGnB;IACnD;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;GACD,CAAC;EACF,MAAM2B,GAAG,GAAG,OAAOC,gDAAuB;EAC1C,OAAOD,GAAG,CAACE,MAAM,CAAEC,CAAC,IAAKV,cAAc,CAAC;EACxC,MAAMW,GAAG,GAAG,OAAO,IAAAC,yCAA2B,EAACxC,GAAG,EAAE4B,cAAc,CAAC;EAEnE;EACA,OAAOa,wBAAkB,CAACC,UAAU,CAACH,GAAG,EAAE;IACxC,YAAY,EAAEX,cAAc,CAACT,MAAM;IACnC,kBAAkB,EAAES,cAAc,CAACZ;GACpC,CAAC;AACJ,CAAC,CAAC,CACH;AAAA2B,OAAA,CAAA/C,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"file":"RequestContextMiddleware.cjs","names":["_effectApp","require","_http","_ids","_schema","_RequestContext","_setupRequest","RequestContextMiddleware","defaultLocale","HttpMiddleware","make","app","Effect","gen","req","HttpServerRequest","currentSpan","pipe","orDie","supported","Locale","literals","desiredLocale","headers","locale","includes","ns","namespace","NonEmptyString255","Array","isArray","deviceId","requestContext","RequestContext","span","traceId","RequestId","spanId","sampled","name","originalUrl","sourceId","undefined","res","setupRequestContext","HttpServerResponse","setHeaders","exports"],"sources":["../../../src/api/internal/RequestContextMiddleware.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AAEO,MAAMM,wBAAwB,GAAGA,CAACC,aAAA,GAAwB,IAAI,KACnEC,oBAAc,CAACC,IAAI,CAAEC,GAAG,IACtBC,iBAAM,CAACC,GAAG,CAAC,aAAS;EAClB,MAAMC,GAAG,GAAG,OAAOC,uBAAiB,CAACA,iBAAiB;EAEtD,MAAMC,WAAW,GAAG,OAAOJ,iBAAM,CAACI,WAAW,CAACC,IAAI,CAACL,iBAAM,CAACM,KAAK,CAAC;EAChE,MAAMC,SAAS,GAAGC,sBAAM,CAACC,QAAQ;EACjC,MAAMC,aAAa,GAAGR,GAAG,CAACS,OAAO,CAAC,UAAU,CAAC;EAC7C;EACA,MAAMC,MAAM,GAAGF,aAAa,IAAIH,SAAS,CAACM,QAAQ,CAACH,aAAoB,CAAC,GACnEA,aAA0C,GAC3Cd,aAAa;EAEjB,MAAMkB,EAAE,GAAGZ,GAAG,CAACS,OAAO,CAAC,YAAY,CAAC;EACpC,MAAMI,SAAS,GAAG,IAAAC,yBAAiB,EAAEF,EAAE,KAAKG,KAAK,CAACC,OAAO,CAACJ,EAAE,CAAC,GAAGA,EAAE,CAAC,CAAC,CAAC,GAAGA,EAAE,CAAC,IAAK,SAAS,CAAC;EAC1F,MAAMK,QAAQ,GAAGjB,GAAG,CAACS,OAAO,CAAC,gBAAgB,CAAC;EAE9C,MAAMS,cAAc,GAAG,IAAIC,8BAAc,CAAC;IACxCC,IAAI,EAAE;MACJC,OAAO,EAAE,IAAAC,cAAS,EAACpB,WAAW,CAACmB,OAAO,CAAC;MACvCE,MAAM,EAAE,IAAAD,cAAS,EAACpB,WAAW,CAACqB,MAAM,CAAC;MACrCC,OAAO,EAAEtB,WAAW,CAACsB;KACtB;IACDC,IAAI,EAAE,IAAAX,yBAAiB,EAACd,GAAG,CAAC0B,WAAW,CAAC;IAAE;IAC1ChB,MAAM;IACNG,SAAS;IACTc,QAAQ,EAAEV,QAAQ,GAAG,IAAAH,yBAAiB,EAACG,QAAQ,CAAC,GAAGW;GACpD,CAAC;EACF,MAAMC,GAAG,GAAG,OAAO,IAAAC,iCAAmB,EAACjC,GAAG,EAAEqB,cAAc,CAAC;EAE3D;EACA,OAAOa,wBAAkB,CAACC,UAAU,CAACH,GAAG,EAAE;IACxC,kBAAkB,EAAEX,cAAc,CAACR;GACpC,CAAC;AACJ,CAAC,CAAC,CACH;AAAAuB,OAAA,CAAAxC,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/_cjs/api/internal/events.cjs

@@ -29,6 +29,6 @@ const makeSSE = (events, schema) => _effectApp.Effect.gen(function* () {
     })
   });
   return res;
-}).pipe(_effectApp.Effect.tapErrorCause((0, _errorReporter.reportError)("Request")), _ => (0, _setupRequest.setupRequestContext)(_, "events"));
+}).pipe(_effectApp.Effect.tapErrorCause((0, _errorReporter.reportError)("Request")), (0, _setupRequest.setupRequestContextFromCurrent)("events"));
 exports.makeSSE = makeSSE;
 //# sourceMappingURL=events.cjs.map

package/_cjs/api/internal/events.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"events.cjs","names":["_setupRequest","require","_errorReporter","_effectApp","_http","_logger","setRetry","Stream","succeed","keepAlive","schedule","Effect","Schedule","fixed","Duration","seconds","makeSSE","events","schema","gen","InfraLogger","logInfo","enc","TextEncoder","encode","S","eventStream","flatMap","_","evt","pipe","andThen","id","JSON","stringify","stream","merge","map","ctx","context","res","HttpServerResponse","tapErrorCause","reportError","provideContext","contentType","headers","HttpHeaders","fromInput","setupRequestContext","exports"],"sources":["../../../src/api/internal/events.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEA;AACA,MAAMK,QAAQ,GAAGC,iBAAM,CAACC,OAAO,CAAC,cAAc,CAAC;AAC/C,MAAMC,SAAS,GAAGF,iBAAM,CAACG,QAAQ,CAACC,iBAAM,CAACH,OAAO,CAAC,aAAa,CAAC,EAAEI,mBAAQ,CAACC,KAAK,CAACC,mBAAQ,CAACC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/F,MAAMC,OAAO,GAAGA,CACrBC,MAA0D,EAC1DC,MAA2B,KAE3BP,iBAAM,CACHQ,GAAG,CAAC,aAAS;EACZ,OAAOC,mBAAW,CAACC,OAAO,CAAC,6BAA6B,CAAC;EAEzD,MAAMC,GAAG,GAAG,IAAIC,WAAW,EAAE;EAE7B,MAAMC,MAAM,GAAGC,YAAC,CAACD,MAAM,CAACN,MAAM,CAAC;EAE/B,MAAMQ,WAAW,GAAGnB,iBAAM,CAACoB,OAAO,CAChCV,MAAM,EACLW,CAAC,IACAJ,MAAM,CAACI,CAAC,CAACC,GAAG,CAAC,CACVC,IAAI,CAACnB,iBAAM,CAACoB,OAAO,CAAEF,GAAG,IAAK,OAAOD,CAAC,CAACC,GAAG,CAACG,EAAE,WAAWC,IAAI,CAACC,SAAS,CAACL,GAAG,CAAC,EAAE,CAAC,CAAC,CACpF;EAED,MAAMM,MAAM,GAAG,IAAAL,eAAI,EACjBxB,QAAQ,EACRC,iBAAM,CAAC6B,KAAK,CAAC3B,SAAS,CAAC,EACvBF,iBAAM,CAAC6B,KAAK,CAACV,WAAW,CAAC,EACzBnB,iBAAM,CAAC8B,GAAG,CAAET,CAAC,IAAKN,GAAG,CAACE,MAAM,CAACI,CAAC,GAAG,MAAM,CAAC,CAAC,CAC1C;EAED,MAAMU,GAAG,GAAG,OAAO3B,iBAAM,CAAC4B,OAAO,EAAU;EAC3C,MAAMC,GAAG,GAAGC,wBAAkB,CAACN,MAAM,CACnCA,MAAM,CACHL,IAAI,CACHvB,iBAAM,CAACmC,aAAa,CAAC,IAAAC,0BAAW,EAAC,SAAS,CAAC,CAAC,EAC5CpC,iBAAM,CAACqC,cAAc,CAACN,GAAG,CAAC,CAC3B,EACH;IACEO,WAAW,EAAE,mBAAmB;IAChCC,OAAO,EAAEC,iBAAW,CAACC,SAAS,CAAC;MAC7B,cAAc,EAAE,mBAAmB;MACnC,eAAe,EAAE,UAAU;MAC3B,mBAAmB,EAAE,IAAI;MACzB,YAAY,EAAE,YAAY,CAAC;KAC5B;GACF,CACF;EACD,OAAOR,GAAG;AACZ,CAAC,CAAC,CACDV,IAAI,CAACnB,iBAAM,CAAC+B,aAAa,CAAC,IAAAC,0BAAW,EAAC,SAAS,CAAC,CAAC,EAAGf,CAAC,IAAK,IAAAqB,iCAAmB,EAACrB,CAAC,EAAE,QAAQ,CAAC,CAAC;AAAAsB,OAAA,CAAAlC,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"version":3,"file":"events.cjs","names":["_setupRequest","require","_errorReporter","_effectApp","_http","_logger","setRetry","Stream","succeed","keepAlive","schedule","Effect","Schedule","fixed","Duration","seconds","makeSSE","events","schema","gen","InfraLogger","logInfo","enc","TextEncoder","encode","S","eventStream","flatMap","_","evt","pipe","andThen","id","JSON","stringify","stream","merge","map","ctx","context","res","HttpServerResponse","tapErrorCause","reportError","provideContext","contentType","headers","HttpHeaders","fromInput","setupRequestContextFromCurrent","exports"],"sources":["../../../src/api/internal/events.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEA;AACA,MAAMK,QAAQ,GAAGC,iBAAM,CAACC,OAAO,CAAC,cAAc,CAAC;AAC/C,MAAMC,SAAS,GAAGF,iBAAM,CAACG,QAAQ,CAACC,iBAAM,CAACH,OAAO,CAAC,aAAa,CAAC,EAAEI,mBAAQ,CAACC,KAAK,CAACC,mBAAQ,CAACC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/F,MAAMC,OAAO,GAAGA,CACrBC,MAA0D,EAC1DC,MAA2B,KAE3BP,iBAAM,CACHQ,GAAG,CAAC,aAAS;EACZ,OAAOC,mBAAW,CAACC,OAAO,CAAC,6BAA6B,CAAC;EAEzD,MAAMC,GAAG,GAAG,IAAIC,WAAW,EAAE;EAE7B,MAAMC,MAAM,GAAGC,YAAC,CAACD,MAAM,CAACN,MAAM,CAAC;EAE/B,MAAMQ,WAAW,GAAGnB,iBAAM,CAACoB,OAAO,CAChCV,MAAM,EACLW,CAAC,IACAJ,MAAM,CAACI,CAAC,CAACC,GAAG,CAAC,CACVC,IAAI,CAACnB,iBAAM,CAACoB,OAAO,CAAEF,GAAG,IAAK,OAAOD,CAAC,CAACC,GAAG,CAACG,EAAE,WAAWC,IAAI,CAACC,SAAS,CAACL,GAAG,CAAC,EAAE,CAAC,CAAC,CACpF;EAED,MAAMM,MAAM,GAAG,IAAAL,eAAI,EACjBxB,QAAQ,EACRC,iBAAM,CAAC6B,KAAK,CAAC3B,SAAS,CAAC,EACvBF,iBAAM,CAAC6B,KAAK,CAACV,WAAW,CAAC,EACzBnB,iBAAM,CAAC8B,GAAG,CAAET,CAAC,IAAKN,GAAG,CAACE,MAAM,CAACI,CAAC,GAAG,MAAM,CAAC,CAAC,CAC1C;EAED,MAAMU,GAAG,GAAG,OAAO3B,iBAAM,CAAC4B,OAAO,EAAU;EAC3C,MAAMC,GAAG,GAAGC,wBAAkB,CAACN,MAAM,CACnCA,MAAM,CACHL,IAAI,CACHvB,iBAAM,CAACmC,aAAa,CAAC,IAAAC,0BAAW,EAAC,SAAS,CAAC,CAAC,EAC5CpC,iBAAM,CAACqC,cAAc,CAACN,GAAG,CAAC,CAC3B,EACH;IACEO,WAAW,EAAE,mBAAmB;IAChCC,OAAO,EAAEC,iBAAW,CAACC,SAAS,CAAC;MAC7B,cAAc,EAAE,mBAAmB;MACnC,eAAe,EAAE,UAAU;MAC3B,mBAAmB,EAAE,IAAI;MACzB,YAAY,EAAE,YAAY,CAAC;KAC5B;GACF,CACF;EACD,OAAOR,GAAG;AACZ,CAAC,CAAC,CACDV,IAAI,CAACnB,iBAAM,CAAC+B,aAAa,CAAC,IAAAC,0BAAW,EAAC,SAAS,CAAC,CAAC,EAAE,IAAAM,4CAA8B,EAAC,QAAQ,CAAC,CAAC;AAAAC,OAAA,CAAAlC,OAAA,GAAAA,OAAA","ignoreList":[]}

package/_cjs/api/setupRequest.cjs

@@ -3,55 +3,44 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setupExistingRequestContext = setupExistingRequestContext;
+exports.getRequestContext = void 0;
 exports.setupRequestContext = setupRequestContext;
-exports.updateRequestContext = updateRequestContext;
+exports.setupRequestContextFromCurrent = void 0;
 var _schema = require("@effect-app/schema");
 var _effectApp = require("effect-app");
-var _ids = require("effect-app/ids");
 var _RequestContext = require("../RequestContext.cjs");
-var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
 var _ContextMapContainer = require("../services/Store/ContextMapContainer.cjs");
-function makeInternalRequestContext(name) {
-  return _effectApp.Effect.sync(() => {
-    const id = _ids.RequestId.make();
-    return new _RequestContext.RequestContext({
-      id,
-      rootId: id,
-      locale: "en",
-      name: (0, _schema.NonEmptyString255)(name)
-    });
-  });
-}
-const withRequestSpan = f => _effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer.get, ctx => f.pipe(_effectApp.Effect.withSpan("request " + ctx.name, {
+var _Memory = require("../services/Store/Memory.cjs");
+const getRequestContext = exports.getRequestContext = _effectApp.Effect.all({
+  span: _effectApp.Effect.currentSpan.pipe(_effectApp.Effect.orDie),
+  locale: _effectApp.FiberRef.get(_RequestContext.LocaleRef),
+  namespace: _effectApp.FiberRef.get(_Memory.storeId)
+}).pipe(_effectApp.Effect.map(({
+  locale,
+  namespace,
+  span
+}) => new _RequestContext.RequestContext({
+  span,
+  locale,
+  namespace,
+  // TODO: get through span context, or don't care at all.
+  name: (0, _schema.NonEmptyString255)("_root_")
+})));
+const withRequestSpan = (name = "request") => f => _effectApp.Effect.andThen(getRequestContext, ctx => f.pipe(_effectApp.Effect.withSpan(name, {
   attributes: (0, _RequestContext.spanAttributes)(ctx),
   captureStackTrace: false
 }),
+// TODO: false
 // request context info is picked up directly in the logger for annotations.
-_effectApp.Effect.withLogSpan("request")));
-const withExistingRequestSpan = f => _effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer.get, ctx => _effectApp.Effect.annotateCurrentSpan((0, _RequestContext.spanAttributes)(ctx)).pipe(_effectApp.Effect.andThen(f),
-// request context info is picked up directly in the logger for annotations.
-_effectApp.Effect.withLogSpan("request")));
+_effectApp.Effect.withLogSpan(name)));
 const setupContextMap = _effectApp.Effect.andThen(_ContextMapContainer.ContextMapContainer, _ => _.start).pipe(_effectApp.Layer.effectDiscard);
-// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
-//   RequestContext.Tag.makeLayer(requestContext)
-// memoization problem
-// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
-const RequestContextStartLiveFromRequestContext = requestContext => _effectApp.Layer.provideMerge(setupContextMap,
-// .provideMerge(RequestContextLiveFromRequestContext(requestContext))
-_effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer, _ => _.start(requestContext)).pipe(_effectApp.Layer.effectDiscard));
-const RequestContextStartLive = requestContext => typeof requestContext === "string" ? (0, _effectApp.pipe)(makeInternalRequestContext(requestContext), _effectApp.Effect.andThen(RequestContextStartLiveFromRequestContext), _effectApp.Layer.unwrapEffect) : RequestContextStartLiveFromRequestContext(requestContext);
+const setupRequestContextFromCurrent = (name = "request") => self => self.pipe(withRequestSpan(name), _effectApp.Effect.provide(setupContextMap));
+exports.setupRequestContextFromCurrent = setupRequestContextFromCurrent;
 function setupRequestContext(self, requestContext) {
-  return self.pipe(withRequestSpan, _effectApp.Effect.provide(RequestContextStartLive(requestContext)));
-}
-function setupExistingRequestContext(self, requestContext) {
-  return self.pipe(withExistingRequestSpan, _effectApp.Effect.provide(RequestContextStartLive(requestContext)));
-}
-const UpdateRequestContextLive = f => _effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer, rcc => rcc.update(f)).pipe(_effectApp.Layer.effectDiscard);
-/**
- * @tsplus fluent effect/io/Effect updateRequestContext
- */
-function updateRequestContext(self, f) {
-  return _effectApp.Effect.provide(self, UpdateRequestContextLive(f));
+  return _effectApp.Effect.gen(function* () {
+    yield* _effectApp.FiberRef.set(_RequestContext.LocaleRef, requestContext.locale);
+    yield* _effectApp.FiberRef.set(_Memory.storeId, requestContext.namespace);
+    return yield* self.pipe(withRequestSpan(requestContext.name), _effectApp.Effect.provide(setupContextMap));
+  });
 }
 //# sourceMappingURL=setupRequest.cjs.map

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_RequestContextContainer","_ContextMapContainer","makeInternalRequestContext","name","Effect","sync","id","RequestId","make","RequestContext","rootId","locale","NonEmptyString255","withRequestSpan","f","andThen","RequestContextContainer","get","ctx","pipe","withSpan","attributes","spanAttributes","captureStackTrace","withLogSpan","withExistingRequestSpan","annotateCurrentSpan","setupContextMap","ContextMapContainer","_","start","Layer","effectDiscard","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","setupExistingRequestContext","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"setupRequest.cjs","names":["_schema","require","_effectApp","_RequestContext","_ContextMapContainer","_Memory","getRequestContext","exports","Effect","all","span","currentSpan","pipe","orDie","locale","FiberRef","get","LocaleRef","namespace","storeId","map","RequestContext","name","NonEmptyString255","withRequestSpan","f","andThen","ctx","withSpan","attributes","spanAttributes","captureStackTrace","withLogSpan","setupContextMap","ContextMapContainer","_","start","Layer","effectDiscard","setupRequestContextFromCurrent","self","provide","setupRequestContext","requestContext","gen","set"],"sources":["../../src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEO,MAAMK,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,GAAGE,iBAAM,CACpCC,GAAG,CAAC;EACHC,IAAI,EAAEF,iBAAM,CAACG,WAAW,CAACC,IAAI,CAACJ,iBAAM,CAACK,KAAK,CAAC;EAC3CC,MAAM,EAAEC,mBAAQ,CAACC,GAAG,CAACC,yBAAS,CAAC;EAC/BC,SAAS,EAAEH,mBAAQ,CAACC,GAAG,CAACG,eAAO;CAChC,CAAC,CACDP,IAAI,CACHJ,iBAAM,CAACY,GAAG,CAAC,CAAC;EAAEN,MAAM;EAAEI,SAAS;EAAER;AAAI,CAAE,KACrC,IAAIW,8BAAc,CAAC;EACjBX,IAAI;EACJI,MAAM;EACNI,SAAS;EACT;EACAI,IAAI,EAAE,IAAAC,yBAAiB,EAAC,QAAQ;CACjC,CAAC,CACH,CACF;AAEH,MAAMC,eAAe,GAAGA,CAACF,IAAI,GAAG,SAAS,KAAeG,CAAkB,IACxEjB,iBAAM,CAACkB,OAAO,CACZpB,iBAAiB,EAChBqB,GAAG,IACFF,CAAC,CAACb,IAAI,CACJJ,iBAAM,CAACoB,QAAQ,CAACN,IAAI,EAAE;EAAEO,UAAU,EAAE,IAAAC,8BAAc,EAACH,GAAG,CAAC;EAAEI,iBAAiB,EAAE;AAAK,CAAE,CAAC;AACpF;AACA;AACAvB,iBAAM,CAACwB,WAAW,CAACV,IAAI,CAAC,CACzB,CACJ;AAEH,MAAMW,eAAe,GAAGzB,iBAAM,CAACkB,OAAO,CAACQ,wCAAmB,EAAGC,CAAC,IAAKA,CAAC,CAACC,KAAK,CAAC,CAACxB,IAAI,CAACyB,gBAAK,CAACC,aAAa,CAAC;AAE9F,MAAMC,8BAA8B,GAAGA,CAACjB,IAAI,GAAG,SAAS,KAAekB,IAAqB,IACjGA,IAAI,CACD5B,IAAI,CACHY,eAAe,CAACF,IAAI,CAAC,EACrBd,iBAAM,CAACiC,OAAO,CAACR,eAAe,CAAC,CAChC;AAAA1B,OAAA,CAAAgC,8BAAA,GAAAA,8BAAA;AAEC,SAAUG,mBAAmBA,CAAUF,IAAqB,EAAEG,cAA8B;EAChG,OAAOnC,iBAAM,CAACoC,GAAG,CAAC,aAAS;IACzB,OAAO7B,mBAAQ,CAAC8B,GAAG,CAAC5B,yBAAS,EAAE0B,cAAc,CAAC7B,MAAM,CAAC;IACrD,OAAOC,mBAAQ,CAAC8B,GAAG,CAAC1B,eAAO,EAAEwB,cAAc,CAACzB,SAAS,CAAC;IAEtD,OAAO,OAAOsB,IAAI,CACf5B,IAAI,CACHY,eAAe,CAACmB,cAAc,CAACrB,IAAI,CAAC,EACpCd,iBAAM,CAACiC,OAAO,CAACR,eAAe,CAAC,CAChC;EACL,CAAC,CAAC;AACJ","ignoreList":[]}

package/_cjs/errorReporter.cjs

@@ -10,9 +10,9 @@ exports.reportMessage = reportMessage;
 var _utils = require("@effect-app/core/utils");
 var Sentry = _interopRequireWildcard(require("@sentry/node"));
 var _effectApp = require("effect-app");
+var _setupRequest = require("./api/setupRequest.cjs");
 var _errors = require("./errors.cjs");
 var _logger = require("./logger.cjs");
-var _RequestContextContainer = require("./services/RequestContextContainer.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function reportError(name) {
@@ -33,8 +33,7 @@ function reportError(name) {
   });
 }
 function reportSentry(error, extras) {
-  return _RequestContextContainer.RequestContextContainer.getOption.pipe(_effectApp.Effect.map(ctx => {
-    const context = _effectApp.Option.getOrUndefined(ctx);
+  return _setupRequest.getRequestContext.pipe(_effectApp.Effect.map(context => {
     const scope = new Sentry.Scope();
     if (context) scope.setContext("context", context);
     if (extras) scope.setContext("extras", extras);
@@ -63,8 +62,7 @@ function captureException(error) {
   console.error(error);
 }
 function reportMessage(message, extras) {
-  return _RequestContextContainer.RequestContextContainer.getOption.pipe(_effectApp.Effect.map(ctx => {
-    const context = _effectApp.Option.getOrUndefined(ctx);
+  return _setupRequest.getRequestContext.pipe(_effectApp.Effect.map(context => {
     const scope = new Sentry.Scope();
     if (context) scope.setContext("context", context);
     if (extras) scope.setContext("extras", extras);

package/_cjs/errorReporter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_effectApp","_errors","_logger","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportError","name","cause","extras","Effect","gen","Cause","isInterrupted","InfraLogger","logDebug","pipe","annotateLogs","JSON","stringify","error","CauseException","reportSentry","logError","dropUndefined","tryToJson","__error_name__","catchAllCause","ErrorReported","RequestContextContainer","getOption","map","ctx","context","Option","getOrUndefined","scope","Scope","setContext","originalCause","captureException","logWarning","console","reportMessage","message","captureMessage","warn"],"sources":["../src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_effectApp","_setupRequest","_errors","_logger","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportError","name","cause","extras","Effect","gen","Cause","isInterrupted","InfraLogger","logDebug","pipe","annotateLogs","JSON","stringify","error","CauseException","reportSentry","logError","dropUndefined","tryToJson","__error_name__","catchAllCause","ErrorReported","getRequestContext","map","context","scope","Scope","setContext","originalCause","captureException","logWarning","console","reportMessage","message","captureMessage","warn"],"sources":["../src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/logger/jsonLogger.cjs

@@ -17,13 +17,13 @@ const jsonLogger = exports.jsonLogger = _effectApp.Logger.make(({
 }) => {
   const now = new Date();
   const nowMillis = now.getTime();
-  const c = (0, _shared.getRequestContext)(context);
+  const request = (0, _shared.getRequestContext)(context);
   const data = {
     timestamp: now,
     level: logLevel.label,
     fiber: _effectApp.FiberId.threadName(fiberId),
     message,
-    request: _effectApp.Option.getOrUndefined(c),
+    request,
     cause: cause !== null && cause !== _effectApp.Cause.empty ? _effectApp.Cause.pretty(cause, {
       renderErrorCause: true
     }) : undefined,

package/_cjs/logger/jsonLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","FiberId","threadName","request","Option","getOrUndefined","Cause","empty","pretty","renderErrorCause","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACV,OAAO,CAAC;EAEpC,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPe,OAAO,EAAEC,iBAAM,CAACC,cAAc,CAACX,CAAC,CAAC;IACjCV,KAAK,EAAEA,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKsB,gBAAK,CAACC,KAAK,GAAGD,gBAAK,CAACE,MAAM,CAACxB,KAAK,EAAE;MAAEyB,gBAAgB,EAAE;IAAI,CAAE,CAAC,GAAGC,SAAS;IAC5GrB,KAAK,EAAEsB,eAAI,CAACC,GAAG,CAACvB,KAAK,EAAGwB,CAAC,KAAM;MAAEd,KAAK,EAAEc,CAAC,CAACd,KAAK;MAAEe,MAAM,EAAEtB,SAAS,GAAGqB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,CAACC,IAAI,CAACL,eAAI,CAACM,OAAO,CAAC;IACvGlC,WAAW,EAAEmC,kBAAO,CAACC,IAAI,CAACpC,WAAW,CAAC,GAAG,CAAC,GACtC,CAAC,GAAGA,WAAW,CAAC,CAACqC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA6B,CAAC,GAC/BX;GACL;EAEDc,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAChC,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAEM,MAAMiC,OAAO,GAAAjD,OAAA,CAAAiD,OAAA,GAAGhD,iBAAM,CAACiD,OAAO,CAACjD,iBAAM,CAACkD,aAAa,EAAElD,iBAAM,CAACmD,mBAAmB,CAACrD,UAAU,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","request","getRequestContext","data","timestamp","level","label","fiber","FiberId","threadName","Cause","empty","pretty","renderErrorCause","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,OAAO,GAAG,IAAAC,yBAAiB,EAACV,OAAO,CAAC;EAE1C,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPM,OAAO;IACPV,KAAK,EAAEA,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKmB,gBAAK,CAACC,KAAK,GAAGD,gBAAK,CAACE,MAAM,CAACrB,KAAK,EAAE;MAAEsB,gBAAgB,EAAE;IAAI,CAAE,CAAC,GAAGC,SAAS;IAC5GlB,KAAK,EAAEmB,eAAI,CAACC,GAAG,CAACpB,KAAK,EAAGqB,CAAC,KAAM;MAAEX,KAAK,EAAEW,CAAC,CAACX,KAAK;MAAEY,MAAM,EAAEnB,SAAS,GAAGkB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,CAACC,IAAI,CAACL,eAAI,CAACM,OAAO,CAAC;IACvG/B,WAAW,EAAEgC,kBAAO,CAACC,IAAI,CAACjC,WAAW,CAAC,GAAG,CAAC,GACtC,CAAC,GAAGA,WAAW,CAAC,CAACkC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA6B,CAAC,GAC/BX;GACL;EAEDc,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAC7B,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAEM,MAAM8B,OAAO,GAAA9C,OAAA,CAAA8C,OAAA,GAAG7C,iBAAM,CAAC8C,OAAO,CAAC9C,iBAAM,CAAC+C,aAAa,EAAE/C,iBAAM,CAACgD,mBAAmB,CAAClD,UAAU,CAAC,CAAC","ignoreList":[]}

package/_cjs/logger/logFmtLogger.cjs

@@ -11,8 +11,7 @@ const logfmtLogger = exports.logfmtLogger = _effectApp.Logger.make(_ => {
   let {
     annotations
   } = _;
-  const c = (0, _shared.getRequestContext)(_.context);
-  const requestContext = _effectApp.Option.getOrUndefined(c);
+  const requestContext = (0, _shared.getRequestContext)(_.context);
   if (requestContext && requestContext.name !== "_root_") {
     annotations = _effectApp.HashMap.make(...[...annotations, ...Object.entries((0, _RequestContext.spanAttributes)(requestContext))]);
   }

package/_cjs/logger/logFmtLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_RequestContext","_shared","logfmtLogger","exports","Logger","make","_","annotations","c","getRequestContext","context","requestContext","Option","getOrUndefined","name","HashMap","Object","entries","spanAttributes","formatted","log","globalThis","console","logFmt","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAEO,MAAMG,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,iBAAM,CAACC,IAAI,CACpCC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAGC,iBAAM,CAACC,cAAc,CAACL,CAAC,CAAC;EAC/C,IAAIG,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDP,WAAW,GAAGQ,kBAAO,CAACV,IAAI,CAAC,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAGS,MAAM,CAACC,OAAO,CAAC,IAAAC,8BAAc,EAACP,cAAc,CAAC,CAAC,CAClD,CAAC;EACJ;EACA,MAAMQ,SAAS,GAAGf,iBAAM,CAACF,YAAY,CAACkB,GAAG,CAAC;IAAE,GAAGd,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEc,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAApB,OAAA,CAAAoB,MAAA,GAAGnB,iBAAM,CAACoB,OAAO,CAACpB,iBAAM,CAACqB,aAAa,EAAErB,iBAAM,CAACsB,mBAAmB,CAACxB,YAAY,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_RequestContext","_shared","logfmtLogger","exports","Logger","make","_","annotations","requestContext","getRequestContext","context","name","HashMap","Object","entries","spanAttributes","formatted","log","globalThis","console","logFmt","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAEO,MAAMG,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,iBAAM,CAACC,IAAI,CACpCC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,cAAc,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACnD,IAAIF,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDJ,WAAW,GAAGK,kBAAO,CAACP,IAAI,CAAC,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAGM,MAAM,CAACC,OAAO,CAAC,IAAAC,8BAAc,EAACP,cAAc,CAAC,CAAC,CAClD,CAAC;EACJ;EACA,MAAMQ,SAAS,GAAGZ,iBAAM,CAACF,YAAY,CAACe,GAAG,CAAC;IAAE,GAAGX,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEW,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAAjB,OAAA,CAAAiB,MAAA,GAAGhB,iBAAM,CAACiB,OAAO,CAACjB,iBAAM,CAACkB,aAAa,EAAElB,iBAAM,CAACmB,mBAAmB,CAACrB,YAAY,CAAC,CAAC","ignoreList":[]}

package/_cjs/logger/shared.cjs

@@ -4,24 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getRequestContext = getRequestContext;
-var _effect = require("effect");
+var _schema = require("@effect-app/schema");
 var _effectApp = require("effect-app");
 var FiberRefs = _interopRequireWildcard(require("effect/FiberRefs"));
-var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
+var _RequestContext = require("../RequestContext.cjs");
+var _Memory = require("../services/Store/Memory.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function getRequestContext(fiberRefs) {
   const context = FiberRefs.getOrDefault(fiberRefs, _effectApp.FiberRef.currentContext);
-  const a = _effectApp.Context.getOption(context, _RequestContextContainer.RequestContextContainer);
-  const c = _effectApp.Option.map(a, _ => {
-    // TODO: perhaps a litle expensive?
-    const rt = _effectApp.Runtime.make({
-      context,
-      fiberRefs,
-      runtimeFlags: _effect.RuntimeFlags.none
-    });
-    return _effectApp.Runtime.runSync(rt)(_.requestContext);
+  const span = _effectApp.Context.getOption(context, _effectApp.Tracer.ParentSpan);
+  const locale = FiberRefs.getOrDefault(fiberRefs, _RequestContext.LocaleRef);
+  const namespace = FiberRefs.getOrDefault(fiberRefs, _Memory.storeId);
+  return new _RequestContext.RequestContext({
+    span: _effectApp.Option.getOrElse(span, () => ({
+      spanId: "bogus",
+      sampled: true,
+      traceId: "bogus"
+    })),
+    name: (0, _schema.NonEmptyString255)("_"),
+    locale,
+    namespace
   });
-  return c;
 }
 //# sourceMappingURL=shared.cjs.map

package/_cjs/logger/shared.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"shared.cjs","names":["_effect","require","_effectApp","FiberRefs","_interopRequireWildcard","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getRequestContext","fiberRefs","context","getOrDefault","FiberRef","currentContext","Context","getOption","RequestContextContainer","c","Option","map","_","rt","Runtime","make","runtimeFlags","RuntimeFlags","none","runSync","requestContext"],"sources":["../../src/logger/shared.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,wBAAA,GAAAJ,OAAA;AAAgF,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE1E,SAAUW,iBAAiBA,CAACC,SAA8B;EAC9D,MAAMC,OAAO,GAAGzB,SAAS,CAAC0B,YAAY,CAACF,SAAS,EAAEG,mBAAQ,CAACC,cAAc,CAAC;EAC1E,MAAMd,CAAC,GAAGe,kBAAO,CAACC,SAAS,CAACL,OAAO,EAAEM,gDAAuB,CAAC;EAC7D,MAAMC,CAAC,GAAGC,iBAAM,CAACC,GAAG,CAACpB,CAAC,EAAGqB,CAAC,IAAI;IAC5B;IACA,MAAMC,EAAE,GAAGC,kBAAO,CAACC,IAAI,CAAC;MAAEb,OAAO;MAAED,SAAS;MAAEe,YAAY,EAAEC,oBAAY,CAACC;IAAI,CAAE,CAAC;IAChF,OAAOJ,kBAAO,CAACK,OAAO,CAACN,EAAE,CAAC,CAACD,CAAC,CAACQ,cAAc,CAAC;EAC9C,CAAC,CAAC;EACF,OAAOX,CAAC;AACV","ignoreList":[]}
+{"version":3,"file":"shared.cjs","names":["_schema","require","_effectApp","FiberRefs","_interopRequireWildcard","_RequestContext","_Memory","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getRequestContext","fiberRefs","context","getOrDefault","FiberRef","currentContext","span","Context","getOption","Tracer","ParentSpan","locale","LocaleRef","namespace","storeId","RequestContext","Option","getOrElse","spanId","sampled","traceId","name","NonEmptyString255"],"sources":["../../src/logger/shared.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAAqD,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE/C,SAAUW,iBAAiBA,CAACC,SAA8B;EAC9D,MAAMC,OAAO,GAAG1B,SAAS,CAAC2B,YAAY,CAACF,SAAS,EAAEG,mBAAQ,CAACC,cAAc,CAAC;EAC1E,MAAMC,IAAI,GAAGC,kBAAO,CAACC,SAAS,CAACN,OAAO,EAAEO,iBAAM,CAACC,UAAU,CAAC;EAC1D,MAAMC,MAAM,GAAGnC,SAAS,CAAC2B,YAAY,CAACF,SAAS,EAAEW,yBAAS,CAAC;EAC3D,MAAMC,SAAS,GAAGrC,SAAS,CAAC2B,YAAY,CAACF,SAAS,EAAEa,eAAO,CAAC;EAC5D,OAAO,IAAIC,8BAAc,CAAC;IACxBT,IAAI,EAAEU,iBAAM,CAACC,SAAS,CACpBX,IAAI,EACJ,OAAO;MAAEY,MAAM,EAAE,OAAO;MAAEC,OAAO,EAAE,IAAI;MAAEC,OAAO,EAAE;IAAO,CAAE,CAAC,CAC7D;IACDC,IAAI,EAAE,IAAAC,yBAAiB,EAAC,GAAG,CAAC;IAC5BX,MAAM;IACNE;GACD,CAAC;AACJ","ignoreList":[]}

package/_cjs/services/QueueMaker/SQLQueue.cjs

@@ -7,16 +7,12 @@ exports.QueueId = void 0;
 exports.makeSQLQueue = makeSQLQueue;
 var _SQL = require("@effect-app/infra-adapters/SQL");
 var _setupRequest = require("@effect-app/infra/api/setupRequest");
-var _RequestContext = require("@effect-app/infra/RequestContext");
 var _errors = require("@effect-app/infra/services/QueueMaker/errors");
 var _service = require("@effect-app/infra/services/QueueMaker/service");
-var _RequestContextContainer = require("@effect-app/infra/services/RequestContextContainer");
 var _sql = require("@effect/sql");
 var _crypto = require("crypto");
 var _dateFns = require("date-fns");
 var _effectApp = require("effect-app");
-var _ids = require("effect-app/ids");
-var _schema = require("effect-app/schema");
 var _utils = require("effect-app/utils");
 var _logger = require("../../logger.cjs");
 const QueueId = exports.QueueId = _effectApp.S.Number.pipe(_effectApp.S.brand("QueueId"));
@@ -102,16 +98,10 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
         finishedAt: _effectApp.Option.some(new Date())
       })) // auto in lib , etag: randomUUID()
     };
-    const rcc = yield* _RequestContextContainer.RequestContextContainer;
     return {
       publish: (...messages) => _effectApp.Effect.gen(function* () {
-        const requestContext = yield* rcc.requestContext;
-        const span = yield* _effectApp.Effect.serviceOption(_effectApp.Tracer.ParentSpan);
-        return yield* _effectApp.Effect.forEach(messages, m => q.offer(m, {
-          requestContext: new _RequestContext.RequestContext(requestContext),
-          // workaround Schema expecting exact class
-          span: _effectApp.Option.getOrUndefined(span)
-        }), {
+        const requestContext = yield* _setupRequest.getRequestContext;
+        return yield* _effectApp.Effect.forEach(messages, m => q.offer(m, requestContext), {
           discard: true
         });
       }).pipe(_effectApp.Effect.withSpan("queue.publish: " + queueName, {
@@ -132,11 +122,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
           let effect = _logger.InfraLogger.logInfo(`[${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
             body: (0, _utils.pretty)(body),
             meta: (0, _utils.pretty)(meta)
-          }), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
-            id: (0, _ids.RequestId)(body.id),
-            locale: "en",
-            name: (0, _schema.NonEmptyString255)(`${queueDrainName}.${body._tag}`)
-          })), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {
+          }), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, meta), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {
             captureStackTrace: false,
             kind: "consumer",
             attributes: {