@effect-app/infra 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @effect-app/infra
 
+## 2.0.2
+
+### Patch Changes
+
+- c2d2d9a: fix: make sure the span in RequestContext is filtered for serialization
+
+## 2.0.1
+
+### Patch Changes
+
+- Updated dependencies [39e4f3d]
+  - effect-app@2.0.1
+  - @effect-app/infra-adapters@2.0.1
+
 ## 2.0.0
 
 ### Major Changes

package/_cjs/api/internal/RequestContextMiddleware.cjs

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.RequestContextMiddleware = void 0;
 var _effectApp = require("effect-app");
 var _http = require("effect-app/http");
-var _ids = require("effect-app/ids");
 var _Schema = require("effect-app/Schema");
 var _RequestContext = require("../../RequestContext.cjs");
 var _setupRequest = require("../setupRequest.cjs");
@@ -22,8 +21,8 @@ const RequestContextMiddleware = (defaultLocale = "en") => _http.HttpMiddleware.
   const deviceId = req.headers["x-fe-device-id"];
   const requestContext = new _RequestContext.RequestContext({
     span: {
-      traceId: (0, _ids.RequestId)(currentSpan.traceId),
-      spanId: (0, _ids.RequestId)(currentSpan.spanId),
+      traceId: currentSpan.traceId,
+      spanId: currentSpan.spanId,
       sampled: currentSpan.sampled
     },
     name: (0, _Schema.NonEmptyString255)(req.originalUrl),

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

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"RequestContextMiddleware.cjs","names":["_effectApp","require","_http","_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","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,OAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AAEO,MAAMK,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,EAAEnB,WAAW,CAACmB,OAAO;MAC5BC,MAAM,EAAEpB,WAAW,CAACoB,MAAM;MAC1BC,OAAO,EAAErB,WAAW,CAACqB;KACtB;IACDC,IAAI,EAAE,IAAAV,yBAAiB,EAACd,GAAG,CAACyB,WAAW,CAAC;IAAE;IAC1Cf,MAAM;IACNG,SAAS;IACTa,QAAQ,EAAET,QAAQ,GAAG,IAAAH,yBAAiB,EAACG,QAAQ,CAAC,GAAGU;GACpD,CAAC;EACF,MAAMC,GAAG,GAAG,OAAO,IAAAC,iCAAmB,EAAChC,GAAG,EAAEqB,cAAc,CAAC;EAE3D;EACA,OAAOY,wBAAkB,CAACC,UAAU,CAACH,GAAG,EAAE;IACxC,kBAAkB,EAAEV,cAAc,CAACR;GACpC,CAAC;AACJ,CAAC,CAAC,CACH;AAAAsB,OAAA,CAAAvC,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/_cjs/api/setupRequest.cjs

@@ -20,7 +20,7 @@ const getRequestContext = exports.getRequestContext = _effectApp.Effect.all({
   namespace,
   span
 }) => new _RequestContext.RequestContext({
-  span,
+  span: _effectApp.Tracer.externalSpan(span),
   locale,
   namespace,
   // TODO: get through span context, or don't care at all.

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_effectApp","require","_Schema","_RequestContext","_ContextMapContainer","_Memory","getRequestContext","exports","Effect","all","span","currentSpan","pipe","orDie","locale","FiberRef","get","LocaleRef","namespace","storeId","map","RequestContext","name","NonEmptyString255","getRC","withRequestSpan","options","f","andThen","ctx","withSpan","attributes","spanAttributes","captureStackTrace","withLogSpan","setupContextMap","startContextMap","Layer","effectDiscard","setupRequestContextFromCurrent","self","provide","setupRequestContext","requestContext","gen","set"],"sources":["../../src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,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;AAEI,MAAMC,KAAK,GAAAjB,OAAA,CAAAiB,KAAA,GAAGhB,iBAAM,CAACC,GAAG,CAAC;EAC9BK,MAAM,EAAEC,mBAAQ,CAACC,GAAG,CAACC,yBAAS,CAAC;EAC/BC,SAAS,EAAEH,mBAAQ,CAACC,GAAG,CAACG,eAAO;CAChC,CAAC;AAEF,MAAMM,eAAe,GAAGA,CAACH,IAAI,GAAG,SAAS,EAAEI,OAA4B,KAAeC,CAAkB,IACtGnB,iBAAM,CAACoB,OAAO,CACZJ,KAAK,EACJK,GAAG,IACFF,CAAC,CAACf,IAAI,CACJJ,iBAAM,CAACsB,QAAQ,CAACR,IAAI,EAAE;EACpB,GAAGI,OAAO;EACVK,UAAU,EAAE;IAAE,GAAG,IAAAC,8BAAc,EAACH,GAAG,CAAC;IAAE,GAAGH,OAAO,EAAEK;EAAU,CAAE;EAC9DE,iBAAiB,EAAE;CACpB,CAAC;AACF;AACA;AACAzB,iBAAM,CAAC0B,WAAW,CAACZ,IAAI,CAAC,CACzB,CACJ;AAEH,MAAMa,eAAe,GAAGC,oCAAe,CAACxB,IAAI,CAACyB,gBAAK,CAACC,aAAa,CAAC;AAE1D,MAAMC,8BAA8B,GACzCA,CAACjB,IAAI,GAAG,SAAS,EAAEI,OAA4B,KAAec,IAAqB,IACjFA,IAAI,CACD5B,IAAI,CACHa,eAAe,CAACH,IAAI,EAAEI,OAAO,CAAC,EAC9BlB,iBAAM,CAACiC,OAAO,CAACN,eAAe,CAAC,CAChC;AAEP;AAAA5B,OAAA,CAAAgC,8BAAA,GAAAA,8BAAA;AACM,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,CACHa,eAAe,CAACkB,cAAc,CAACrB,IAAI,CAAC,EACpCd,iBAAM,CAACiC,OAAO,CAACN,eAAe,CAAC,CAChC;EACL,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"setupRequest.cjs","names":["_effectApp","require","_Schema","_RequestContext","_ContextMapContainer","_Memory","getRequestContext","exports","Effect","all","span","currentSpan","pipe","orDie","locale","FiberRef","get","LocaleRef","namespace","storeId","map","RequestContext","Tracer","externalSpan","name","NonEmptyString255","getRC","withRequestSpan","options","f","andThen","ctx","withSpan","attributes","spanAttributes","captureStackTrace","withLogSpan","setupContextMap","startContextMap","Layer","effectDiscard","setupRequestContextFromCurrent","self","provide","setupRequestContext","requestContext","gen","set"],"sources":["../../src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,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,EAAEY,iBAAM,CAACC,YAAY,CAACb,IAAI,CAAC;EAC/BI,MAAM;EACNI,SAAS;EACT;EACAM,IAAI,EAAE,IAAAC,yBAAiB,EAAC,QAAQ;CACjC,CAAC,CACH,CACF;AAEI,MAAMC,KAAK,GAAAnB,OAAA,CAAAmB,KAAA,GAAGlB,iBAAM,CAACC,GAAG,CAAC;EAC9BK,MAAM,EAAEC,mBAAQ,CAACC,GAAG,CAACC,yBAAS,CAAC;EAC/BC,SAAS,EAAEH,mBAAQ,CAACC,GAAG,CAACG,eAAO;CAChC,CAAC;AAEF,MAAMQ,eAAe,GAAGA,CAACH,IAAI,GAAG,SAAS,EAAEI,OAA4B,KAAeC,CAAkB,IACtGrB,iBAAM,CAACsB,OAAO,CACZJ,KAAK,EACJK,GAAG,IACFF,CAAC,CAACjB,IAAI,CACJJ,iBAAM,CAACwB,QAAQ,CAACR,IAAI,EAAE;EACpB,GAAGI,OAAO;EACVK,UAAU,EAAE;IAAE,GAAG,IAAAC,8BAAc,EAACH,GAAG,CAAC;IAAE,GAAGH,OAAO,EAAEK;EAAU,CAAE;EAC9DE,iBAAiB,EAAE;CACpB,CAAC;AACF;AACA;AACA3B,iBAAM,CAAC4B,WAAW,CAACZ,IAAI,CAAC,CACzB,CACJ;AAEH,MAAMa,eAAe,GAAGC,oCAAe,CAAC1B,IAAI,CAAC2B,gBAAK,CAACC,aAAa,CAAC;AAE1D,MAAMC,8BAA8B,GACzCA,CAACjB,IAAI,GAAG,SAAS,EAAEI,OAA4B,KAAec,IAAqB,IACjFA,IAAI,CACD9B,IAAI,CACHe,eAAe,CAACH,IAAI,EAAEI,OAAO,CAAC,EAC9BpB,iBAAM,CAACmC,OAAO,CAACN,eAAe,CAAC,CAChC;AAEP;AAAA9B,OAAA,CAAAkC,8BAAA,GAAAA,8BAAA;AACM,SAAUG,mBAAmBA,CAAUF,IAAqB,EAAEG,cAA8B;EAChG,OAAOrC,iBAAM,CAACsC,GAAG,CAAC,aAAS;IACzB,OAAO/B,mBAAQ,CAACgC,GAAG,CAAC9B,yBAAS,EAAE4B,cAAc,CAAC/B,MAAM,CAAC;IACrD,OAAOC,mBAAQ,CAACgC,GAAG,CAAC5B,eAAO,EAAE0B,cAAc,CAAC3B,SAAS,CAAC;IAEtD,OAAO,OAAOwB,IAAI,CACf9B,IAAI,CACHe,eAAe,CAACkB,cAAc,CAACrB,IAAI,CAAC,EACpChB,iBAAM,CAACmC,OAAO,CAACN,eAAe,CAAC,CAChC;EACL,CAAC,CAAC;AACJ","ignoreList":[]}

package/_cjs/logger/shared.cjs

@@ -17,11 +17,11 @@ function getRequestContextFromFiberRefs(fiberRefs) {
   const locale = FiberRefs.getOrDefault(fiberRefs, _RequestContext.LocaleRef);
   const namespace = FiberRefs.getOrDefault(fiberRefs, _Memory.storeId);
   return new _RequestContext.RequestContext({
-    span: _effectApp.Option.getOrElse(span, () => ({
+    span: _effectApp.Option.map(span, _effectApp.Tracer.externalSpan).pipe(_effectApp.Option.getOrElse(() => ({
       spanId: "bogus",
       sampled: true,
       traceId: "bogus"
-    })),
+    }))),
     name: (0, _Schema.NonEmptyString255)("_"),
     locale,
     namespace

package/_cjs/logger/shared.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"shared.cjs","names":["_effectApp","require","_Schema","FiberRefs","_interopRequireWildcard","_RequestContext","_Memory","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getRequestContextFromFiberRefs","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,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,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,8BAA8BA,CAACC,SAA8B;EAC3E,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":[]}
+{"version":3,"file":"shared.cjs","names":["_effectApp","require","_Schema","FiberRefs","_interopRequireWildcard","_RequestContext","_Memory","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getRequestContextFromFiberRefs","fiberRefs","context","getOrDefault","FiberRef","currentContext","span","Context","getOption","Tracer","ParentSpan","locale","LocaleRef","namespace","storeId","RequestContext","Option","map","externalSpan","pipe","getOrElse","spanId","sampled","traceId","name","NonEmptyString255"],"sources":["../../src/logger/shared.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,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,8BAA8BA,CAACC,SAA8B;EAC3E,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,GAAG,CAACX,IAAI,EAAEG,iBAAM,CAACS,YAAY,CAAC,CAACC,IAAI,CAC9CH,iBAAM,CAACI,SAAS,CAAC,OAAO;MAAEC,MAAM,EAAE,OAAO;MAAEC,OAAO,EAAE,IAAI;MAAEC,OAAO,EAAE;IAAO,CAAE,CAAC,CAAC,CAC/E;IACDC,IAAI,EAAE,IAAAC,yBAAiB,EAAC,GAAG,CAAC;IAC5Bd,MAAM;IACNE;GACD,CAAC;AACJ","ignoreList":[]}

package/dist/api/internal/RequestContextMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextMiddleware.d.ts","sourceRoot":"","sources":["../../../src/api/internal/RequestContextMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAkB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAGvF,OAAO,EAAE,MAAM,EAAkB,MAAM,yBAAyB,CAAA;AAGhE,eAAO,MAAM,wBAAwB,mBAAmB,MAAM,mOAmC3D,CAAA"}
+{"version":3,"file":"RequestContextMiddleware.d.ts","sourceRoot":"","sources":["../../../src/api/internal/RequestContextMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAkB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEvF,OAAO,EAAE,MAAM,EAAkB,MAAM,yBAAyB,CAAA;AAGhE,eAAO,MAAM,wBAAwB,mBAAmB,MAAM,mOAmC3D,CAAA"}

package/dist/api/internal/RequestContextMiddleware.js

@@ -1,6 +1,5 @@
 import { Effect } from "effect-app";
 import { HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-app/http";
-import { RequestId } from "effect-app/ids";
 import { NonEmptyString255 } from "effect-app/Schema";
 import { Locale, RequestContext } from "../../RequestContext.js";
 import { setupRequestContext } from "../setupRequest.js";
@@ -18,8 +17,8 @@ export const RequestContextMiddleware = (defaultLocale = "en") => HttpMiddleware
     const deviceId = req.headers["x-fe-device-id"];
     const requestContext = new RequestContext({
         span: {
-            traceId: RequestId(currentSpan.traceId),
-            spanId: RequestId(currentSpan.spanId),
+            traceId: currentSpan.traceId,
+            spanId: currentSpan.spanId,
             sampled: currentSpan.sampled
         },
         name: NonEmptyString255(req.originalUrl), // set more detailed elsewhere
@@ -33,4 +32,4 @@ export const RequestContextMiddleware = (defaultLocale = "en") => HttpMiddleware
         "Content-Language": requestContext.locale
     });
 }));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRNaWRkbGV3YXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FwaS9pbnRlcm5hbC9SZXF1ZXN0Q29udGV4dE1pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNuQyxPQUFPLEVBQUUsY0FBYyxFQUFFLGlCQUFpQixFQUFFLGtCQUFrQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDdkYsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFFeEQsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxnQkFBd0IsSUFBSSxFQUFFLEVBQUUsQ0FDdkUsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQzFCLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO0lBQ2xCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLGlCQUFpQixDQUFDLGlCQUFpQixDQUFBO0lBRXRELE1BQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUNoRSxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFBO0lBQ2pDLE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUE7SUFDN0MscUdBQXFHO0lBQ3JHLE1BQU0sTUFBTSxHQUFHLGFBQWEsSUFBSSxTQUFTLENBQUMsUUFBUSxDQUFDLGFBQW9CLENBQUM7UUFDdEUsQ0FBQyxDQUFFLGFBQTBDO1FBQzdDLENBQUMsQ0FBQyxhQUFhLENBQUE7SUFFakIsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUNwQyxNQUFNLFNBQVMsR0FBRyxpQkFBaUIsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxTQUFTLENBQUMsQ0FBQTtJQUMxRixNQUFNLFFBQVEsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFFOUMsTUFBTSxjQUFjLEdBQUcsSUFBSSxjQUFjLENBQUM7UUFDeEMsSUFBSSxFQUFFO1lBQ0osT0FBTyxFQUFFLFNBQVMsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDO1lBQ3ZDLE1BQU0sRUFBRSxTQUFTLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQztZQUNyQyxPQUFPLEVBQUUsV0FBVyxDQUFDLE9BQU87U0FDN0I7UUFDRCxJQUFJLEVBQUUsaUJBQWlCLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFLDhCQUE4QjtRQUN4RSxNQUFNO1FBQ04sU0FBUztRQUNULFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO0tBQzdELENBQUMsQ0FBQTtJQUNGLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUUzRCxtQ0FBbUM7SUFDbkMsT0FBTyxrQkFBa0IsQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFO1FBQ3hDLGtCQUFrQixFQUFFLGNBQWMsQ0FBQyxNQUFNO0tBQzFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQyxDQUNILENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRNaWRkbGV3YXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FwaS9pbnRlcm5hbC9SZXF1ZXN0Q29udGV4dE1pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNuQyxPQUFPLEVBQUUsY0FBYyxFQUFFLGlCQUFpQixFQUFFLGtCQUFrQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDdkYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDckQsT0FBTyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNoRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUV4RCxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBRyxDQUFDLGdCQUF3QixJQUFJLEVBQUUsRUFBRSxDQUN2RSxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDMUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7SUFDbEIsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUE7SUFFdEQsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUE7SUFDakMsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUM3QyxxR0FBcUc7SUFDckcsTUFBTSxNQUFNLEdBQUcsYUFBYSxJQUFJLFNBQVMsQ0FBQyxRQUFRLENBQUMsYUFBb0IsQ0FBQztRQUN0RSxDQUFDLENBQUUsYUFBMEM7UUFDN0MsQ0FBQyxDQUFDLGFBQWEsQ0FBQTtJQUVqQixNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ3BDLE1BQU0sU0FBUyxHQUFHLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxDQUFBO0lBQzFGLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUU5QyxNQUFNLGNBQWMsR0FBRyxJQUFJLGNBQWMsQ0FBQztRQUN4QyxJQUFJLEVBQUU7WUFDSixPQUFPLEVBQUUsV0FBVyxDQUFDLE9BQU87WUFDNUIsTUFBTSxFQUFFLFdBQVcsQ0FBQyxNQUFNO1lBQzFCLE9BQU8sRUFBRSxXQUFXLENBQUMsT0FBTztTQUM3QjtRQUNELElBQUksRUFBRSxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEVBQUUsOEJBQThCO1FBQ3hFLE1BQU07UUFDTixTQUFTO1FBQ1QsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7S0FDN0QsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsbUJBQW1CLENBQUMsR0FBRyxFQUFFLGNBQWMsQ0FBQyxDQUFBO0lBRTNELG1DQUFtQztJQUNuQyxPQUFPLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUU7UUFDeEMsa0JBQWtCLEVBQUUsY0FBYyxDQUFDLE1BQU07S0FDMUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFDLENBQ0gsQ0FBQSJ9

package/dist/api/setupRequest.d.ts

@@ -1,5 +1,4 @@
-import type { Tracer } from "effect-app";
-import { Effect } from "effect-app";
+import { Effect, Tracer } from "effect-app";
 import { NonEmptyString255 } from "effect-app/Schema";
 import { RequestContext } from "../RequestContext.js";
 export declare const getRequestContext: Effect.Effect<RequestContext, never, never>;

package/dist/api/setupRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../src/api/setupRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,MAAM,EAAmB,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAa,cAAc,EAAkB,MAAM,sBAAsB,CAAA;AAIhF,eAAO,MAAM,iBAAiB,6CAgB3B,CAAA;AAEH,eAAO,MAAM,KAAK;;;gBAGhB,CAAA;AAoBF,eAAO,MAAM,8BAA8B,4BACZ,MAAM,CAAC,WAAW,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uEAK9E,CAAA;AAGP,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,sEAWjG"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../src/api/setupRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,EAAE,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAa,cAAc,EAAkB,MAAM,sBAAsB,CAAA;AAIhF,eAAO,MAAM,iBAAiB,6CAgB3B,CAAA;AAEH,eAAO,MAAM,KAAK;;;gBAGhB,CAAA;AAoBF,eAAO,MAAM,8BAA8B,4BACZ,MAAM,CAAC,WAAW,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uEAK9E,CAAA;AAGP,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,sEAWjG"}

package/dist/api/setupRequest.js

@@ -1,4 +1,4 @@
-import { Effect, FiberRef, Layer } from "effect-app";
+import { Effect, FiberRef, Layer, Tracer } from "effect-app";
 import { NonEmptyString255 } from "effect-app/Schema";
 import { LocaleRef, RequestContext, spanAttributes } from "../RequestContext.js";
 import { startContextMap } from "../services/Store/ContextMapContainer.js";
@@ -10,7 +10,7 @@ export const getRequestContext = Effect
     namespace: FiberRef.get(storeId)
 })
     .pipe(Effect.map(({ locale, namespace, span }) => new RequestContext({
-    span,
+    span: Tracer.externalSpan(span),
     locale,
     namespace,
     // TODO: get through span context, or don't care at all.
@@ -40,4 +40,4 @@ export function setupRequestContext(self, requestContext) {
             .pipe(withRequestSpan(requestContext.name), Effect.provide(setupContextMap));
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9zZXR1cFJlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ2hGLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQTtBQUMxRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sNkJBQTZCLENBQUE7QUFFckQsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsTUFBTTtLQUNwQyxHQUFHLENBQUM7SUFDSCxJQUFJLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQztJQUMzQyxNQUFNLEVBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUM7SUFDL0IsU0FBUyxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDO0NBQ2pDLENBQUM7S0FDRCxJQUFJLENBQ0gsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQ3pDLElBQUksY0FBYyxDQUFDO0lBQ2pCLElBQUk7SUFDSixNQUFNO0lBQ04sU0FBUztJQUNULHdEQUF3RDtJQUN4RCxJQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDO0NBQ2xDLENBQUMsQ0FDSCxDQUNGLENBQUE7QUFFSCxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQztJQUM5QixNQUFNLEVBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUM7SUFDL0IsU0FBUyxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDO0NBQ2pDLENBQUMsQ0FBQTtBQUVGLE1BQU0sZUFBZSxHQUFHLENBQUMsSUFBSSxHQUFHLFNBQVMsRUFBRSxPQUE0QixFQUFFLEVBQUUsQ0FBQyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUMxRyxNQUFNLENBQUMsT0FBTyxDQUNaLEtBQUssRUFDTCxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ04sQ0FBQyxDQUFDLElBQUksQ0FDSixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRTtJQUNwQixHQUFHLE9BQU87SUFDVixVQUFVLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxVQUFVLEVBQUU7SUFDOUQsaUJBQWlCLEVBQUUsS0FBSztDQUN6QixDQUFDO0FBQ0YsY0FBYztBQUNkLDRFQUE0RTtBQUM1RSxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUN6QixDQUNKLENBQUE7QUFFSCxNQUFNLGVBQWUsR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUVqRSxNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FDekMsQ0FBQyxJQUFJLEdBQUcsU0FBUyxFQUFFLE9BQTRCLEVBQUUsRUFBRSxDQUFDLENBQVUsSUFBcUIsRUFBRSxFQUFFLENBQ3JGLElBQUk7S0FDRCxJQUFJLENBQ0gsZUFBZSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsRUFDOUIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FDaEMsQ0FBQTtBQUVQLG1EQUFtRDtBQUNuRCxNQUFNLFVBQVUsbUJBQW1CLENBQVUsSUFBcUIsRUFBRSxjQUE4QjtJQUNoRyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pCLEtBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNyRCxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxjQUFjLENBQUMsU0FBUyxDQUFDLENBQUE7UUFFdEQsT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJO2FBQ2YsSUFBSSxDQUNILGVBQWUsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEVBQ3BDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQ2hDLENBQUE7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9zZXR1cFJlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM1RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNoRixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sMENBQTBDLENBQUE7QUFDMUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLDZCQUE2QixDQUFBO0FBRXJELE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFHLE1BQU07S0FDcEMsR0FBRyxDQUFDO0lBQ0gsSUFBSSxFQUFFLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7SUFDM0MsTUFBTSxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDO0lBQy9CLFNBQVMsRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQztDQUNqQyxDQUFDO0tBQ0QsSUFBSSxDQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUN6QyxJQUFJLGNBQWMsQ0FBQztJQUNqQixJQUFJLEVBQUUsTUFBTSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUM7SUFDL0IsTUFBTTtJQUNOLFNBQVM7SUFDVCx3REFBd0Q7SUFDeEQsSUFBSSxFQUFFLGlCQUFpQixDQUFDLFFBQVEsQ0FBQztDQUNsQyxDQUFDLENBQ0gsQ0FDRixDQUFBO0FBRUgsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7SUFDOUIsTUFBTSxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDO0lBQy9CLFNBQVMsRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQztDQUNqQyxDQUFDLENBQUE7QUFFRixNQUFNLGVBQWUsR0FBRyxDQUFDLElBQUksR0FBRyxTQUFTLEVBQUUsT0FBNEIsRUFBRSxFQUFFLENBQUMsQ0FBVSxDQUFrQixFQUFFLEVBQUUsQ0FDMUcsTUFBTSxDQUFDLE9BQU8sQ0FDWixLQUFLLEVBQ0wsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNOLENBQUMsQ0FBQyxJQUFJLENBQ0osTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUU7SUFDcEIsR0FBRyxPQUFPO0lBQ1YsVUFBVSxFQUFFLEVBQUUsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUFDLEVBQUUsR0FBRyxPQUFPLEVBQUUsVUFBVSxFQUFFO0lBQzlELGlCQUFpQixFQUFFLEtBQUs7Q0FDekIsQ0FBQztBQUNGLGNBQWM7QUFDZCw0RUFBNEU7QUFDNUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FDekIsQ0FDSixDQUFBO0FBRUgsTUFBTSxlQUFlLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFakUsTUFBTSxDQUFDLE1BQU0sOEJBQThCLEdBQ3pDLENBQUMsSUFBSSxHQUFHLFNBQVMsRUFBRSxPQUE0QixFQUFFLEVBQUUsQ0FBQyxDQUFVLElBQXFCLEVBQUUsRUFBRSxDQUNyRixJQUFJO0tBQ0QsSUFBSSxDQUNILGVBQWUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLEVBQzlCLE1BQU0sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQ2hDLENBQUE7QUFFUCxtREFBbUQ7QUFDbkQsTUFBTSxVQUFVLG1CQUFtQixDQUFVLElBQXFCLEVBQUUsY0FBOEI7SUFDaEcsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUN6QixLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDckQsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsY0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBRXRELE9BQU8sS0FBSyxDQUFDLENBQUMsSUFBSTthQUNmLElBQUksQ0FDSCxlQUFlLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUNwQyxNQUFNLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUNoQyxDQUFBO0lBQ0wsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIn0=

package/dist/logger/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/logger/shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAa,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGhE,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,kBAc5E"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/logger/shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAa,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGhE,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,kBAa5E"}

package/dist/logger/shared.js

@@ -9,10 +9,10 @@ export function getRequestContextFromFiberRefs(fiberRefs) {
     const locale = FiberRefs.getOrDefault(fiberRefs, LocaleRef);
     const namespace = FiberRefs.getOrDefault(fiberRefs, storeId);
     return new RequestContext({
-        span: Option.getOrElse(span, () => ({ spanId: "bogus", sampled: true, traceId: "bogus" })),
+        span: Option.map(span, Tracer.externalSpan).pipe(Option.getOrElse(() => ({ spanId: "bogus", sampled: true, traceId: "bogus" }))),
         name: NonEmptyString255("_"),
         locale,
         namespace
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM5RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNyRCxPQUFPLEtBQUssU0FBUyxNQUFNLGtCQUFrQixDQUFBO0FBQzdDLE9BQU8sRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDaEUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLDZCQUE2QixDQUFBO0FBRXJELE1BQU0sVUFBVSw4QkFBOEIsQ0FBQyxTQUE4QjtJQUMzRSxNQUFNLE9BQU8sR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDMUUsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQzFELE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQzNELE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVELE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDeEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQ3BCLElBQUksRUFDSixHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUM3RDtRQUNELElBQUksRUFBRSxpQkFBaUIsQ0FBQyxHQUFHLENBQUM7UUFDNUIsTUFBTTtRQUNOLFNBQVM7S0FDVixDQUFDLENBQUE7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM5RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNyRCxPQUFPLEtBQUssU0FBUyxNQUFNLGtCQUFrQixDQUFBO0FBQzdDLE9BQU8sRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDaEUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLDZCQUE2QixDQUFBO0FBRXJELE1BQU0sVUFBVSw4QkFBOEIsQ0FBQyxTQUE4QjtJQUMzRSxNQUFNLE9BQU8sR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDMUUsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQzFELE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQzNELE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVELE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDeEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQzlDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUMvRTtRQUNELElBQUksRUFBRSxpQkFBaUIsQ0FBQyxHQUFHLENBQUM7UUFDNUIsTUFBTTtRQUNOLFNBQVM7S0FDVixDQUFDLENBQUE7QUFDSixDQUFDIn0=

package/dist/services/Repository/ext.d.ts

@@ -20,7 +20,7 @@ export declare function log<T, Encoded extends {
  */
 export declare function byIdAndSaveWithPure<T, Encoded extends {
     id: string;
-}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey]): <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, Exclude<R, {
+}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey]): <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) => Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
 }>>;
 /**
@@ -31,7 +31,7 @@ export declare function handleByIdAndSaveWithPure<T, Encoded extends {
     id: string;
 }, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>): <Req extends {
     id: T[IdKey];
-}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, Exclude<R, {
+}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
 }>>;
 /**
@@ -39,7 +39,7 @@ export declare function handleByIdAndSaveWithPure<T, Encoded extends {
  */
 export declare function saveManyWithPure_<R, T, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -47,18 +47,18 @@ export declare function saveManyWithPure_<R, T, Encoded extends {
  */
 export declare function saveWithPure_<R, T, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, S1, S2>;
 }>>;
 export declare function saveAllWithEffectInt<T, Encoded extends {
     id: string;
-}, P extends T, Evt, ItemType extends string, IdKey extends keyof T, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError, R>;
+}, P extends T, Evt, ItemType extends string, IdKey extends keyof T, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, E | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException, R>;
 /**
  * @tsplus fluent Repository saveManyWithPureBatched
  */
 export declare function saveManyWithPureBatched<T, Encoded extends {
     id: string;
-}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) => (items: Iterable<S1>) => Effect.Effect<A[], import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
+}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) => (items: Iterable<S1>) => Effect.Effect<A[], import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -66,7 +66,7 @@ export declare function saveManyWithPureBatched<T, Encoded extends {
  */
 export declare function saveManyWithPureBatched_<R, T, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>, batchSize?: number): Effect.Effect<A[], import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>, batchSize?: number): Effect.Effect<A[], import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -74,13 +74,13 @@ export declare function saveManyWithPureBatched_<R, T, Encoded extends {
  */
 export declare function save<T, Encoded extends {
     id: string;
-}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>): (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError>;
+}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>): (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException>;
 /**
  * @tsplus getter Repository saveWithEvents
  */
 export declare function saveWithEvents<T, Encoded extends {
     id: string;
-}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>): (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError>;
+}, Evt, ItemType extends string, IdKey extends keyof T>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>): (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException>;
 /**
  * @tsplus fluent Repository updateWithEffect
  */
@@ -88,7 +88,7 @@ export declare function itemUpdateWithEffect<R, E, T extends {
     id: string;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string, IdKey extends keyof T>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey], mod: (item: T) => Effect<T, E, R>): Effect.Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, R>;
+}, Evt, ItemType extends string, IdKey extends keyof T>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey], mod: (item: T) => Effect<T, E, R>): Effect.Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E | NotFoundError<ItemType>, R>;
 /**
  * @tsplus fluent Repository update
  */
@@ -96,7 +96,7 @@ export declare function itemUpdate<T extends {
     id: string;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string, IdKey extends keyof T>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey], mod: (item: T) => T): Effect.Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, never>;
+}, Evt, ItemType extends string, IdKey extends keyof T>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey], mod: (item: T) => T): Effect.Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, never>;
 /**
  * only use this as a shortcut if you don't have the item already
  * @tsplus fluent Repository removeById

package/dist/services/RepositoryBase.d.ts

@@ -77,8 +77,8 @@ export declare class RepositoryBaseC3<T, Encoded extends {
     get(id: T[IdKey]): Effect.Effect<T, NotFoundError<ItemType>, never>;
     readonly log: (evt: Evt) => import("effect-app/Pure").PureLogT<any>;
     removeById(id: T[IdKey]): Effect.Effect<void, NotFoundError<ItemType>, never>;
-    readonly save: (items_0: T, ...items: T[]) => Effect<void, OptimisticConcurrencyException | InvalidStateError>;
-    readonly saveWithEvents: (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, OptimisticConcurrencyException | InvalidStateError>;
+    readonly save: (items_0: T, ...items: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException>;
+    readonly saveWithEvents: (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException>;
     readonly queryAndSavePure: {
         <A, E2, R2, T2 extends T>(q: (q: Query<Encoded>) => QueryEnd<Encoded, "one">, pure: Effect<A, E2, FixEnv<R2, Evt, T, T2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2, Exclude<R2, {
             env: PureEnv<Evt, T, T2>;
@@ -95,7 +95,7 @@ export declare class RepositoryBaseC3<T, Encoded extends {
      */
     readonly handleByIdAndSaveWithPure: <Req extends {
         id: T[IdKey];
-    }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, OptimisticConcurrencyException | InvalidStateError | NotFoundError<ItemType> | E, Exclude<R, {
+    }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E, Exclude<R, {
         env: PureEnv<Evt, T, S2>;
     }>>;
     saveManyWithPure: {
@@ -111,7 +111,7 @@ export declare class RepositoryBaseC3<T, Encoded extends {
             env: PureEnv<Evt, T, S2>;
         }>>;
     };
-    saveWithPure<R, A, E, S1 extends T, S2 extends T>(item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, OptimisticConcurrencyException | InvalidStateError | E, Exclude<R, {
+    saveWithPure<R, A, E, S1 extends T, S2 extends T>(item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | E, Exclude<R, {
         env: PureEnv<Evt, S1, S2>;
     }>>;
 }
@@ -132,7 +132,7 @@ export declare function makeRepo<Evt = never>(): <ItemType extends string, R, En
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string;
         };
-    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey>, E, StoreMaker | R | RInitial | R2>;
+    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey>, E, R | StoreMaker | RInitial | R2>;
     Q: Query<Encoded>;
 };
 export declare function makeStore<Encoded extends {
@@ -141,7 +141,7 @@ export declare function makeStore<Encoded extends {
     id: string;
 }, T>(name: ItemType, schema: S.Schema<T, E, R>, mapTo: (e: E, etag: string | undefined) => Encoded) => <RInitial = never, EInitial = never>(makeInitial?: Effect<readonly T[], EInitial, RInitial>, config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
     partitionValue?: (a: Encoded) => string;
-}) => Effect.Effect<import("./Store.js").Store<Encoded, string, PersistenceModelType<Encoded>>, EInitial, StoreMaker | R | RInitial>;
+}) => Effect.Effect<import("./Store.js").Store<Encoded, string, PersistenceModelType<Encoded>>, EInitial, R | StoreMaker | RInitial>;
 export interface Repos<T, Encoded extends {
     id: string;
 }, R, Evt, ItemType extends string, IdKey extends keyof T> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,8 +20,8 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/infra-adapters": "2.0.0",
-    "effect-app": "2.0.0"
+    "@effect-app/infra-adapters": "2.0.1",
+    "effect-app": "2.0.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",

package/src/api/internal/RequestContextMiddleware.ts

@@ -1,6 +1,5 @@
 import { Effect } from "effect-app"
 import { HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-app/http"
-import { RequestId } from "effect-app/ids"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { Locale, RequestContext } from "../../RequestContext.js"
 import { setupRequestContext } from "../setupRequest.js"
@@ -24,8 +23,8 @@ export const RequestContextMiddleware = (defaultLocale: Locale = "en") =>
 
       const requestContext = new RequestContext({
         span: {
-          traceId: RequestId(currentSpan.traceId),
-          spanId: RequestId(currentSpan.spanId),
+          traceId: currentSpan.traceId,
+          spanId: currentSpan.spanId,
           sampled: currentSpan.sampled
         },
         name: NonEmptyString255(req.originalUrl), // set more detailed elsewhere

package/src/api/setupRequest.ts

@@ -1,5 +1,4 @@
-import type { Tracer } from "effect-app"
-import { Effect, FiberRef, Layer } from "effect-app"
+import { Effect, FiberRef, Layer, Tracer } from "effect-app"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { LocaleRef, RequestContext, spanAttributes } from "../RequestContext.js"
 import { startContextMap } from "../services/Store/ContextMapContainer.js"
@@ -14,7 +13,7 @@ export const getRequestContext = Effect
   .pipe(
     Effect.map(({ locale, namespace, span }) =>
       new RequestContext({
-        span,
+        span: Tracer.externalSpan(span),
         locale,
         namespace,
         // TODO: get through span context, or don't care at all.

package/src/logger/shared.ts

@@ -10,9 +10,8 @@ export function getRequestContextFromFiberRefs(fiberRefs: FiberRefs.FiberRefs) {
   const locale = FiberRefs.getOrDefault(fiberRefs, LocaleRef)
   const namespace = FiberRefs.getOrDefault(fiberRefs, storeId)
   return new RequestContext({
-    span: Option.getOrElse(
-      span,
-      () => ({ spanId: "bogus", sampled: true, traceId: "bogus" })
+    span: Option.map(span, Tracer.externalSpan).pipe(
+      Option.getOrElse(() => ({ spanId: "bogus", sampled: true, traceId: "bogus" }))
     ),
     name: NonEmptyString255("_"),
     locale,