@effect-app/infra 0.93.6 → 0.94.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @effect-app/infra
 
+## 0.94.0
+
+### Minor Changes
+
+- 283ebbe7: update packages
+
+### Patch Changes
+
+- Updated dependencies [283ebbe7]
+  - @effect-app/infra-adapters@0.60.0
+  - @effect-app/prelude@0.72.0
+  - @effect-app/schema@0.63.0
+  - @effect-app/core@0.70.0
+
+## 0.93.7
+
+### Patch Changes
+
+- 69b7e8a6: include span across queue call
+- d1a6193b: feat: support span across client and api
+- Updated dependencies [d1a6193b]
+  - @effect-app/infra-adapters@0.59.6
+  - @effect-app/prelude@0.71.1
+  - @effect-app/core@0.69.1
+  - @effect-app/schema@0.62.5
+
 ## 0.93.6
 
 ### Patch Changes

package/_cjs/api/setupRequest.cjs

@@ -33,10 +33,13 @@ function makeInternalRequestContext(name) {
 }
 const withRequestSpan = f => tsplus_module_1.flatMap(_RequestContextContainer.RequestContextContainer.get, ctx => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, "request", {
   attributes: {
-    requestId: ctx.id,
-    requestName: ctx.name,
+    "request.id": ctx.id,
+    "request.name": ctx.name,
+    "request.locale": ctx.locale,
+    "request.namespace": ctx.namespace,
     ...(ctx.userProfile?.sub ? {
-      requestUserSub: ctx.userProfile.sub
+      "request.user.sub": ctx.userProfile.sub,
+      "request.user.roles": "roles" in ctx.userProfile ? ctx.userProfile.roles : undefined
     } : {})
   }
 })

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setupRequestContext","exports","setupRequestContext_1","setupRequestContextFromName","self","name","tsplus_module_1","flatMap","makeInternalRequestContext","rc","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_2","ReasonableString","withRequestSpan","f","RequestContextContainer","ctx","withLogSpan","withSpan","attributes","requestId","requestName","userProfile","sub","requestUserSub","setupContextMap","zipRight","ContextMapContainer","_","start","requestContext"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setupRequestContext","exports","setupRequestContext_1","setupRequestContextFromName","self","name","tsplus_module_1","flatMap","makeInternalRequestContext","rc","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_2","ReasonableString","withRequestSpan","f","RequestContextContainer","ctx","withLogSpan","withSpan","attributes","namespace","userProfile","sub","roles","undefined","setupContextMap","zipRight","ContextMapContainer","_","start","requestContext"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/logger/jsonLogger.cjs

@@ -32,7 +32,7 @@ const jsonLogger = exports.jsonLogger = tsplus_module_6.make(({
     message,
     request: tsplus_module_2.getOrUndefined(c),
     cause: cause != null && cause != tsplus_module_3.empty ? tsplus_module_3.pretty(cause) : undefined,
-    spans: tsplus_module_4.toReadonlyArray(tsplus_module_4.map(spans, _ => ({
+    spans: tsplus_module_4.toArray(tsplus_module_4.map(spans, _ => ({
       label: _.label,
       timing: nowMillis - _.startTime
     }))),

package/_cjs/logger/jsonLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","jsonLogger","exports","tsplus_module_6","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","tsplus_module_1","threadName","request","tsplus_module_2","getOrUndefined","tsplus_module_3","empty","pretty","undefined","tsplus_module_4","toReadonlyArray","map","_","timing","startTime","tsplus_module_5","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger"],"sources":["../../_src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"jsonLogger.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","jsonLogger","exports","tsplus_module_6","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","tsplus_module_1","threadName","request","tsplus_module_2","getOrUndefined","tsplus_module_3","empty","pretty","undefined","tsplus_module_4","toArray","map","_","timing","startTime","tsplus_module_5","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger"],"sources":["../../_src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -7,16 +7,20 @@ exports.makeMemQueue = makeMemQueue;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
 var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/schema/ext"));
 var tsplus_module_3 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
-var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
-var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
-var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
-var tsplus_module_8 = _interopRequireWildcard(require("effect/Fiber"));
+var tsplus_module_4 = _interopRequireWildcard(require("effect/Option"));
+var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/core/Option"));
+var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
+var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
+var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
+var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
+var tsplus_module_10 = _interopRequireWildcard(require("effect/Fiber"));
 var _memQueue = require("@effect-app/infra-adapters/memQueue");
 var _RequestContext = require("@effect-app/infra/RequestContext");
 var _ids = require("@effect-app/prelude/ids");
+var _effect = require("effect");
 var _RequestContextContainer = require("../RequestContextContainer.cjs");
 var _errors2 = require("./errors.cjs");
+var _service = require("./service.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 && Object.prototype.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; }
 /**
@@ -30,22 +34,27 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema, makeHandle
     const rcc = yield* $(_RequestContextContainer.RequestContextContainer);
     const wireSchema = tsplus_module_1.props({
       body: schema,
-      meta: _RequestContext.RequestContext
+      meta: _service.QueueMeta
     });
     const encoder = wireSchema.Encoder;
     const drainW = tsplus_module_1.props({
       body: drainSchema,
-      meta: _RequestContext.RequestContext
+      meta: _service.QueueMeta
     });
     const parseDrain = tsplus_module_2.parseCondemnDie(drainW);
     return {
       publish: (...messages) => tsplus_module_3.gen(function* ($) {
         const requestContext = yield* $(rcc.requestContext);
-        return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_4.ext_forEach(messages, m => tsplus_module_3.asUnit(
+        const currentSpan = yield* $(tsplus_module_3.currentSpan);
+        const span = tsplus_module_5.getOrUndefined(tsplus_module_4.map(currentSpan, _effect.Tracer.externalSpan));
+        return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_6.ext_forEach(messages, m => tsplus_module_3.asUnit(
         // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
         tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.stringify(encoder({
           body: m,
-          meta: requestContext
+          meta: {
+            requestContext,
+            span
+          }
         })))
         // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
         , _ => q.offer(_))))));
@@ -60,15 +69,20 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema, makeHandle
         tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({
           body,
           meta
-        }) => tsplus_module_7.setupRequestContext(silenceAndReportError(tsplus_module_3.zipRight(tsplus_module_3.annotateLogs({
-          body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)),
-          meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta))
-        })(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body))), _RequestContext.RequestContext.inherit(meta, {
+        }) => tsplus_module_3.withSpan(tsplus_module_9.setupRequestContext(silenceAndReportError(tsplus_module_3.zipRight(tsplus_module_3.annotateLogs({
+          body: tsplus_module_8.RecordPretty(tsplus_module_8.object$(body)),
+          meta: tsplus_module_8.RecordPretty(tsplus_module_8.object$(meta))
+        })(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body))), _RequestContext.RequestContext.inherit(meta.requestContext, {
           id: (0, _ids.RequestId)(body.id),
           locale: "en",
           name: tsplus_module_1.ReasonableString(body._tag)
-        })));
-        return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(silenceAndReportError(tsplus_module_3.flatMap(qDrain.take(), x => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), _ => tsplus_module_8.join(_)))
+        })), "queue.drain", {
+          attributes: {
+            "queue.name": queueDrainName
+          },
+          parent: meta.span ? _effect.Tracer.externalSpan(meta.span) : undefined
+        }));
+        return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(silenceAndReportError(tsplus_module_3.flatMap(qDrain.take, x => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), _ => tsplus_module_10.join(_)))
         // TODO: normally a failed item would be returned to the queue and retried up to X times.
         // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
         ))));

package/_cjs/services/QueueMaker/memQueue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_RequestContextContainer","_errors2","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeMemQueue","queueName","queueDrainName","schema","drainSchema","makeHandleEvent","tsplus_module_3","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","tsplus_module_1","props","body","meta","RequestContext","encoder","Encoder","drainW","parseDrain","tsplus_module_2","parseCondemnDie","publish","messages","requestContext","tsplus_module_5","forkDaemonReportQueue","tsplus_module_4","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","_","offer","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","tsplus_module_7","setupRequestContext","zipRight","annotateLogs","tsplus_module_6","RecordPretty","object$","logDebug","inherit","id","RequestId","locale","ReasonableString","_tag","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_8","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeMemQueue","queueName","queueDrainName","schema","drainSchema","makeHandleEvent","tsplus_module_3","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","tsplus_module_1","props","body","meta","QueueMeta","encoder","Encoder","drainW","parseDrain","tsplus_module_2","parseCondemnDie","publish","messages","requestContext","currentSpan","span","tsplus_module_5","getOrUndefined","tsplus_module_4","map","Tracer","externalSpan","tsplus_module_7","forkDaemonReportQueue","tsplus_module_6","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","_","offer","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","withSpan","tsplus_module_9","setupRequestContext","zipRight","annotateLogs","tsplus_module_8","RecordPretty","object$","logDebug","RequestContext","inherit","id","RequestId","locale","ReasonableString","_tag","attributes","parent","undefined","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_10","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/QueueMaker/sbqueue.cjs

@@ -11,14 +11,18 @@ var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Tag"));
 var tsplus_module_4 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
 var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
-var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
-var tsplus_module_8 = _interopRequireWildcard(require("effect/Layer"));
+var tsplus_module_7 = _interopRequireWildcard(require("effect/Option"));
+var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/Option"));
+var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
+var tsplus_module_10 = _interopRequireWildcard(require("effect/Layer"));
 var _ServiceBus = require("@effect-app/infra-adapters/ServiceBus");
 var _errorReporter = require("@effect-app/infra/errorReporter");
 var _RequestContext = require("@effect-app/infra/RequestContext");
 var _ids = require("@effect-app/prelude/ids");
+var _effect = require("effect");
 var _RequestContextContainer = require("../RequestContextContainer.cjs");
 var _errors2 = require("./errors.cjs");
+var _service = require("./service.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 && Object.prototype.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; }
 /**
@@ -27,12 +31,12 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
   const wireSchema = tsplus_module_1.props({
     body: schema,
-    meta: _RequestContext.RequestContext
+    meta: _service.QueueMeta
   });
   const encoder = wireSchema.Encoder;
   const drainW = tsplus_module_1.props({
     body: drainSchema,
-    meta: _RequestContext.RequestContext
+    meta: _service.QueueMeta
   });
   const parseDrain = tsplus_module_2.parseCondemnDie(drainW);
   return tsplus_module_4.gen(function* ($) {
@@ -54,14 +58,19 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, ma
           return tsplus_module_4.tapErrorCause(tsplus_module_4.flatMap(tsplus_module_4.orDie(tsplus_module_4.flatMap(tsplus_module_4.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), ({
             body,
             meta
-          }) => tsplus_module_6.setupRequestContext(silenceAndReportError(tsplus_module_4.orDie(tsplus_module_4.zipRight(tsplus_module_4.annotateLogs({
+          }) => tsplus_module_4.withSpan(tsplus_module_6.setupRequestContext(silenceAndReportError(tsplus_module_4.orDie(tsplus_module_4.zipRight(tsplus_module_4.annotateLogs({
             body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)),
             meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta))
-          })(tsplus_module_4.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body)))), _RequestContext.RequestContext.inherit(meta, {
+          })(tsplus_module_4.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body)))), _RequestContext.RequestContext.inherit(meta.requestContext, {
             id: (0, _ids.RequestId)(body.id),
             locale: "en",
             name: tsplus_module_1.ReasonableString(body._tag)
-          })))
+          })), "queue.drain", {
+            attributes: {
+              "queue.name": queueDrainName
+            },
+            parent: meta.span ? _effect.Tracer.externalSpan(meta.span) : undefined
+          }))
           // we reportError here, so that we report the error only, and keep flowing
           , reportError);
         }
@@ -72,10 +81,15 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, ma
       }),
       publish: (...messages) => tsplus_module_4.gen(function* ($) {
         const requestContext = yield* $(rcc.requestContext);
-        return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_4.promise(() => s.sendMessages(messages.map(m => ({
+        const currentSpan = yield* $(tsplus_module_4.currentSpan);
+        const span = tsplus_module_8.getOrUndefined(tsplus_module_7.map(currentSpan, _effect.Tracer.externalSpan));
+        return yield* $(tsplus_module_9.forkDaemonReportQueue(tsplus_module_4.promise(() => s.sendMessages(messages.map(m => ({
           body: JSON.stringify(encoder({
             body: m,
-            meta: requestContext
+            meta: {
+              requestContext,
+              span
+            }
           })),
           messageId: m.id,
           /* correllationid: requestId */
@@ -89,6 +103,6 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, ma
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 function makeServiceBusLayers(url, queueName, queueDrainName) {
-  return tsplus_module_8.provide(tsplus_module_8.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)))((0, _ServiceBus.LiveServiceBusClient)(url));
+  return tsplus_module_10.provide(tsplus_module_10.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)))((0, _ServiceBus.LiveServiceBusClient)(url));
 }
 //# sourceMappingURL=sbqueue.cjs.map

package/_cjs/services/QueueMaker/sbqueue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_RequestContextContainer","_errors2","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","makeHandleEvent","wireSchema","tsplus_module_1","props","body","meta","RequestContext","encoder","Encoder","drainW","parseDrain","tsplus_module_2","parseCondemnDie","tsplus_module_4","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_3","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","tsplus_module_6","setupRequestContext","zipRight","annotateLogs","tsplus_module_5","RecordPretty","object$","logDebug","inherit","id","RequestId","locale","ReasonableString","_tag","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","requestContext","tsplus_module_7","forkDaemonReportQueue","promise","sendMessages","map","m","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_8","merge","LiveSender","LiveReceiver","LiveServiceBusClient"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","makeHandleEvent","wireSchema","tsplus_module_1","props","body","meta","QueueMeta","encoder","Encoder","drainW","parseDrain","tsplus_module_2","parseCondemnDie","tsplus_module_4","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_3","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","withSpan","tsplus_module_6","setupRequestContext","zipRight","annotateLogs","tsplus_module_5","RecordPretty","object$","logDebug","RequestContext","inherit","requestContext","id","RequestId","locale","ReasonableString","_tag","attributes","parent","span","Tracer","externalSpan","undefined","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","currentSpan","tsplus_module_8","getOrUndefined","tsplus_module_7","map","tsplus_module_9","forkDaemonReportQueue","promise","sendMessages","m","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_10","merge","LiveSender","LiveReceiver","LiveServiceBusClient"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/QueueMaker/service.cjs

@@ -3,6 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.QueueMaker = void 0;
+exports.QueueMeta = exports.QueueMaker = void 0;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/schema/ext"));
+var _RequestContext = require("../../RequestContext.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 && Object.prototype.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; }
 const QueueMaker = exports.QueueMaker = {};
+const QueueMeta = exports.QueueMeta = tsplus_module_1.props({
+  requestContext: _RequestContext.RequestContext,
+  span: tsplus_module_2.optionalProp(tsplus_module_1.props({
+    spanId: tsplus_module_1.string,
+    traceId: tsplus_module_1.string,
+    sampled: tsplus_module_2.optionalProp(tsplus_module_1.bool)
+  }))
+});
 //# sourceMappingURL=service.cjs.map

package/_cjs/services/QueueMaker/service.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"service.cjs","names":["QueueMaker","exports"],"sources":["../../../_src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAcO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE"}
+{"version":3,"file":"service.cjs","names":["_RequestContext","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","QueueMaker","exports","QueueMeta","tsplus_module_1","props","requestContext","RequestContext","span","tsplus_module_2","optionalProp","spanId","string","traceId","sampled","bool"],"sources":["../../../_src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAAwD,SAAAC,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,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;AAejD,MAAMY,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE;AAEpC,MAAME,SAAS,GAAAD,OAAA,CAAAC,SAAA,GAAGC,eAAA,CAAAC,KAAK,CAAC;EAC7BC,cAAc,EAAEC,8BAAc;EAC9BC,IAAI,EAAAC,eAAA,CAAAC,YAAA,CAAEN,eAAA,CAAAC,KAAK,CAAC;IACVM,MAAM,EAAAP,eAAA,CAAEQ,MAAM;IACdC,OAAO,EAAAT,eAAA,CAAEQ,MAAM;IACfE,OAAO,EAAAL,eAAA,CAAAC,YAAA,CAAAN,eAAA,CAAEW,IAAI;GACd,CAAC;CAEH,CAAC"}

package/_src/api/setupRequest.ts

@@ -29,13 +29,19 @@ const withRequestSpan = <R, E, A>(f: Effect<R, E, A>) =>
       f
         .withSpan("request", {
           attributes: {
-            requestId: ctx.id,
-            requestName: ctx.name,
+            "request.id": ctx.id,
+            "request.name": ctx.name,
+            "request.locale": ctx.locale,
+            "request.namespace": ctx.namespace,
             ...ctx.userProfile?.sub
               ? {
-                requestUserSub: ctx
+                "request.user.sub": ctx
                   .userProfile
-                  .sub
+                  .sub,
+                "request.user.roles": "roles" in ctx
+                    .userProfile
+                  ? ctx.userProfile.roles
+                  : undefined
               }
               : {}
           }

package/_src/logger/jsonLogger.ts

@@ -14,7 +14,7 @@ export const jsonLogger = Logger.make<unknown, void>(
       message,
       request: c.value,
       cause: cause != null && cause != Cause.empty ? cause.pretty : undefined,
-      spans: spans.map((_) => ({ label: _.label, timing: nowMillis - _.startTime })).toReadonlyArray,
+      spans: spans.map((_) => ({ label: _.label, timing: nowMillis - _.startTime })).toArray,
       annotations: annotations.size > 0
         ? [...annotations].reduce((prev, [k, v]) => {
           prev[k] = v

package/_src/services/QueueMaker/memQueue.ts

@@ -1,9 +1,10 @@
 import { MemQueue } from "@effect-app/infra-adapters/memQueue"
 import { RequestContext } from "@effect-app/infra/RequestContext"
 import { RequestId } from "@effect-app/prelude/ids"
+import { Tracer } from "effect"
 import { RequestContextContainer } from "../RequestContextContainer.js"
 import { reportNonInterruptedFailure } from "./errors.js"
-import type { QueueBase } from "./service.js"
+import { type QueueBase, QueueMeta } from "./service.js"
 
 /**
  * @tsplus static QueueMaker.Ops makeMem
@@ -27,21 +28,25 @@ export function makeMemQueue<
     const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName))
     const rcc = yield* $(RequestContextContainer)
 
-    const wireSchema = props({ body: schema, meta: RequestContext })
+    const wireSchema = props({ body: schema, meta: QueueMeta })
     const encoder = wireSchema.Encoder
-    const drainW = props({ body: drainSchema, meta: RequestContext })
+    const drainW = props({ body: drainSchema, meta: QueueMeta })
     const parseDrain = drainW.parseCondemnDie
 
     return {
       publish: (...messages) =>
         Effect.gen(function*($) {
           const requestContext = yield* $(rcc.requestContext)
+          const currentSpan = yield* $(Effect.currentSpan)
+          const span = currentSpan.map(Tracer.externalSpan).value
           return yield* $(
             messages
               .forEachEffect((m) =>
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
                 Effect(
-                  JSON.stringify(encoder({ body: m, meta: requestContext }))
+                  JSON.stringify(
+                    encoder({ body: m, meta: { requestContext, span } })
+                  )
                 )
                   // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
                   .flatMap((_) => q.offer(_))
@@ -64,15 +69,21 @@ export function makeMemQueue<
                 .apply(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
                 .zipRight(handleEvent(body))
                 .apply(silenceAndReportError)
-                .setupRequestContext(RequestContext.inherit(meta, {
+                .setupRequestContext(RequestContext.inherit(meta.requestContext, {
                   id: RequestId(body.id),
                   locale: "en" as const,
                   name: ReasonableString(body._tag)
                 }))
+                .withSpan("queue.drain", {
+                  attributes: { "queue.name": queueDrainName },
+                  parent: meta.span
+                    ? Tracer.externalSpan(meta.span)
+                    : undefined
+                })
             )
         return yield* $(
           qDrain
-            .take()
+            .take
             .flatMap((x) => processMessage(x).uninterruptible.fork.flatMap((_) => _.join))
             // TODO: normally a failed item would be returned to the queue and retried up to X times.
             // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.

package/_src/services/QueueMaker/sbqueue.ts

@@ -10,9 +10,10 @@ import type {} from "@azure/service-bus"
 import { captureException } from "@effect-app/infra/errorReporter"
 import { RequestContext } from "@effect-app/infra/RequestContext"
 import { RequestId } from "@effect-app/prelude/ids"
+import { Tracer } from "effect"
 import { RequestContextContainer } from "../RequestContextContainer.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
-import type { QueueBase } from "./service.js"
+import { type QueueBase, QueueMeta } from "./service.js"
 
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
@@ -30,9 +31,12 @@ export function makeServiceBusQueue<
   drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>,
   makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>
 ) {
-  const wireSchema = props({ body: schema, meta: RequestContext })
+  const wireSchema = props({
+    body: schema,
+    meta: QueueMeta
+  })
   const encoder = wireSchema.Encoder
-  const drainW = props({ body: drainSchema, meta: RequestContext })
+  const drainW = props({ body: drainSchema, meta: QueueMeta })
   const parseDrain = drainW.parseCondemnDie
 
   return Effect.gen(function*($) {
@@ -60,11 +64,17 @@ export function makeServiceBusQueue<
                 .orDie
                 // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
                 .apply(silenceAndReportError)
-                .setupRequestContext(RequestContext.inherit(meta, {
+                .setupRequestContext(RequestContext.inherit(meta.requestContext, {
                   id: RequestId(body.id),
                   locale: "en" as const,
                   name: ReasonableString(body._tag)
                 }))
+                .withSpan("queue.drain", {
+                  attributes: { "queue.name": queueDrainName },
+                  parent: meta.span
+                    ? Tracer.externalSpan(meta.span)
+                    : undefined
+                })
             )
             // we reportError here, so that we report the error only, and keep flowing
             .tapErrorCause(reportError)
@@ -82,12 +92,16 @@ export function makeServiceBusQueue<
       publish: (...messages) =>
         Effect.gen(function*($) {
           const requestContext = yield* $(rcc.requestContext)
+          const currentSpan = yield* $(Effect.currentSpan)
+          const span = currentSpan.map(Tracer.externalSpan).value
           return yield* $(
             Effect
               .promise(() =>
                 s.sendMessages(
                   messages.map((m) => ({
-                    body: JSON.stringify(encoder({ body: m, meta: requestContext })),
+                    body: JSON.stringify(
+                      encoder({ body: m, meta: { requestContext, span } })
+                    ),
                     messageId: m.id, /* correllationid: requestId */
                     contentType: "application/json"
                   }))

package/_src/services/QueueMaker/service.ts

@@ -1,3 +1,4 @@
+import { RequestContext } from "../../RequestContext.js"
 import type { RequestContextContainer } from "../RequestContextContainer.js"
 import type { ContextMapContainer } from "../Store/ContextMapContainer.js"
 
@@ -13,3 +14,13 @@ export interface QueueBase<RContext, Evt> {
  */
 export interface QueueMakerOps {}
 export const QueueMaker: QueueMakerOps = {}
+
+export const QueueMeta = props({
+  requestContext: RequestContext,
+  span: props({
+    spanId: string,
+    traceId: string,
+    sampled: bool.optional
+  })
+    .optional
+})

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

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;;;;;AAK9E,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wIAEvF;;;;;AA4CD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,wIAGjG"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;;;;;AAK9E,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wIAEvF;;;;;AAkDD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,wIAGjG"}

package/dist/api/setupRequest.js

@@ -25,13 +25,19 @@ function makeInternalRequestContext(name) {
 const withRequestSpan = (f) => tsplus_module_1.flatMap(RequestContextContainer
     .get, (ctx) => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, "request", {
     attributes: {
-        requestId: ctx.id,
-        requestName: ctx.name,
+        "request.id": ctx.id,
+        "request.name": ctx.name,
+        "request.locale": ctx.locale,
+        "request.namespace": ctx.namespace,
         ...ctx.userProfile?.sub
             ? {
-                requestUserSub: ctx
+                "request.user.sub": ctx
                     .userProfile
-                    .sub
+                    .sub,
+                "request.user.roles": "roles" in ctx
+                    .userProfile
+                    ? ctx.userProfile.roles
+                    : undefined
             }
             : {}
     }
@@ -47,4 +53,4 @@ function setupContextMap(self) {
 function setupRequestContext_1(self, requestContext) {
     return tsplus_module_1.zipRight(withRequestSpan(setupContextMap(self)))(RequestContextContainer.flatMap((_) => _.start(requestContext)));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O2FBc0RnQixtQkFBbUI7QUF0RG5DLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFDaEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUE7QUFFOUU7O0dBRUc7QUFDSCxNQUFNLFVBQVUsMkJBQTJCLENBQVUsSUFBcUIsRUFBRSxJQUFZO0lBQ3RGLE9BQU8sd0JBQUEsMEJBQTBCLENBQUMsSUFBSSxDQUFDLEVBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLHNCQUFvQixJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUN4RixDQUFDO0FBRUQsU0FBUywwQkFBMEIsQ0FBQyxJQUFZO0lBQzlDLE9BQU8scUJBQVksR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGdCQUFBLGdCQUFnQixDQUFDLElBQUksQ0FBQztTQUM3QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCx3QkFBQSx1QkFBdUI7S0FDcEIsR0FBRyxFQUNLLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDZiw0QkFBQSx5QkFBQSxDQUFDLEVBQ1csU0FBUyxFQUFFO0lBQ25CLFVBQVUsRUFBRTtRQUNWLFNBQVMsRUFBRSxHQUFHLENBQUMsRUFBRTtRQUNqQixXQUFXLEVBQUUsR0FBRyxDQUFDLElBQUk7UUFDckIsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7WUFDckIsQ0FBQyxDQUFDO2dCQUNBLGNBQWMsRUFBRSxHQUFHO3FCQUNoQixXQUFXO3FCQUNYLEdBQUc7YUFDUDtZQUNELENBQUMsQ0FBQyxFQUFFO0tBQ1A7Q0FDRixDQUFDO0FBQ0YsNEVBQTRFO0VBQy9ELFNBQVMsQ0FBQyxDQUMxQixDQUFBO0FBRUwsU0FBUyxlQUFlLENBQVUsSUFBcUI7SUFDckQsT0FBTywwQkFDSCxJQUFJLEVBREEsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQzFDLENBQUE7QUFDWCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCwrQkFBNkMsSUFBcUIsRUFBRSxjQUE4QjtJQUNoRyxnQ0FDSSxlQUFlLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBRG5DLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQyxFQUM1QjtBQUM1QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O2FBNERnQixtQkFBbUI7QUE1RG5DLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFDaEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUE7QUFFOUU7O0dBRUc7QUFDSCxNQUFNLFVBQVUsMkJBQTJCLENBQVUsSUFBcUIsRUFBRSxJQUFZO0lBQ3RGLE9BQU8sd0JBQUEsMEJBQTBCLENBQUMsSUFBSSxDQUFDLEVBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLHNCQUFvQixJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUN4RixDQUFDO0FBRUQsU0FBUywwQkFBMEIsQ0FBQyxJQUFZO0lBQzlDLE9BQU8scUJBQVksR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGdCQUFBLGdCQUFnQixDQUFDLElBQUksQ0FBQztTQUM3QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCx3QkFBQSx1QkFBdUI7S0FDcEIsR0FBRyxFQUNLLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDZiw0QkFBQSx5QkFBQSxDQUFDLEVBQ1csU0FBUyxFQUFFO0lBQ25CLFVBQVUsRUFBRTtRQUNWLFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRTtRQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLElBQUk7UUFDeEIsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDLE1BQU07UUFDNUIsbUJBQW1CLEVBQUUsR0FBRyxDQUFDLFNBQVM7UUFDbEMsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7WUFDckIsQ0FBQyxDQUFDO2dCQUNBLGtCQUFrQixFQUFFLEdBQUc7cUJBQ3BCLFdBQVc7cUJBQ1gsR0FBRztnQkFDTixvQkFBb0IsRUFBRSxPQUFPLElBQUksR0FBRztxQkFDL0IsV0FBVztvQkFDZCxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxLQUFLO29CQUN2QixDQUFDLENBQUMsU0FBUzthQUNkO1lBQ0QsQ0FBQyxDQUFDLEVBQUU7S0FDUDtDQUNGLENBQUM7QUFDRiw0RUFBNEU7RUFDL0QsU0FBUyxDQUFDLENBQzFCLENBQUE7QUFFTCxTQUFTLGVBQWUsQ0FBVSxJQUFxQjtJQUNyRCxPQUFPLDBCQUNILElBQUksRUFEQSxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsRUFDMUMsQ0FBQTtBQUNYLENBQUM7QUFFRDs7R0FFRztBQUNILCtCQUE2QyxJQUFxQixFQUFFLGNBQThCO0lBQ2hHLGdDQUNJLGVBQWUsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUMsRUFEbkMsdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBQzVCO0FBQzVDLENBQUMifQ==

package/dist/logger/jsonLogger.js

@@ -16,7 +16,7 @@ export const jsonLogger = tsplus_module_6.make(({ annotations, cause, context, f
         message,
         request: tsplus_module_2.getOrUndefined(c),
         cause: cause != null && cause != tsplus_module_3.empty ? tsplus_module_3.pretty(cause) : undefined,
-        spans: tsplus_module_4.toReadonlyArray(tsplus_module_4.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime }))),
+        spans: tsplus_module_4.toArray(tsplus_module_4.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime }))),
         annotations: tsplus_module_5.size(annotations) > 0
             ? [...annotations].reduce((prev, [k, v]) => {
                 prev[k] = v;
@@ -27,4 +27,4 @@ export const jsonLogger = tsplus_module_6.make(({ annotations, cause, context, f
     globalThis.console.log(JSON.stringify(data));
 });
 export const logJson = tsplus_module_6.replace(tsplus_module_6.defaultLogger, jsonLogger);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvbG9nZ2VyL2pzb25Mb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRS9DLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxxQkFDeEIsQ0FBQyxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUU7SUFDckUsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUN0QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUE7SUFFL0IsTUFBTSxDQUFDLEdBQUcsaUJBQWlCLENBQUMsT0FBTyxDQUFDLENBQUE7SUFFcEMsTUFBTSxJQUFJLEdBQUc7UUFDWCxTQUFTLEVBQUUsR0FBRztRQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsS0FBSztRQUNyQixLQUFLLDZCQUFFLE9BQU8sQ0FBVztRQUN6QixPQUFPO1FBQ1AsT0FBTyxpQ0FBRSxDQUFDLENBQU07UUFDaEIsS0FBSyxFQUFFLEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyx5QkFBZSxDQUFDLENBQUMsd0JBQUMsS0FBSyxFQUFRLENBQUMsQ0FBQyxTQUFTO1FBQ3ZFLEtBQUssa0NBQUUsb0JBQUEsS0FBSyxFQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFnQjtRQUM5RixXQUFXLEVBQUUscUJBQUEsV0FBVyxJQUFRLENBQUM7WUFDL0IsQ0FBQyxDQUFDLENBQUMsR0FBRyxXQUFXLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRTtnQkFDekMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDWCxPQUFPLElBQUksQ0FBQTtZQUNiLENBQUMsRUFBRSxFQUE2QixDQUFDO1lBQ2pDLENBQUMsQ0FBQyxTQUFTO0tBQ2QsQ0FBQTtJQUVELFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtBQUM5QyxDQUFDLENBQ0YsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyx1REFBcUMsVUFBVSxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvbG9nZ2VyL2pzb25Mb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRS9DLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxxQkFDeEIsQ0FBQyxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUU7SUFDckUsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUN0QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUE7SUFFL0IsTUFBTSxDQUFDLEdBQUcsaUJBQWlCLENBQUMsT0FBTyxDQUFDLENBQUE7SUFFcEMsTUFBTSxJQUFJLEdBQUc7UUFDWCxTQUFTLEVBQUUsR0FBRztRQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsS0FBSztRQUNyQixLQUFLLDZCQUFFLE9BQU8sQ0FBVztRQUN6QixPQUFPO1FBQ1AsT0FBTyxpQ0FBRSxDQUFDLENBQU07UUFDaEIsS0FBSyxFQUFFLEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyx5QkFBZSxDQUFDLENBQUMsd0JBQUMsS0FBSyxFQUFRLENBQUMsQ0FBQyxTQUFTO1FBQ3ZFLEtBQUssMEJBQUUsb0JBQUEsS0FBSyxFQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFRO1FBQ3RGLFdBQVcsRUFBRSxxQkFBQSxXQUFXLElBQVEsQ0FBQztZQUMvQixDQUFDLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUN6QyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNYLE9BQU8sSUFBSSxDQUFBO1lBQ2IsQ0FBQyxFQUFFLEVBQTZCLENBQUM7WUFDakMsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFBO0lBRUQsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzlDLENBQUMsQ0FDRixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLHVEQUFxQyxVQUFVLENBQUMsQ0FBQSJ9

package/dist/services/QueueMaker/memQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAG9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,YAAY,CAC1B,MAAM,EACN,GAAG,EACH,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GAgEtF"}
+{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAI9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,YAAY,CAC1B,MAAM,EACN,GAAG,EACH,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GA0EtF"}

package/dist/services/QueueMaker/memQueue.js

@@ -1,16 +1,20 @@
 import * as tsplus_module_1 from "@effect-app/prelude/schema";
 import * as tsplus_module_2 from "@effect-app/schema/ext";
 import * as tsplus_module_3 from "effect/Effect";
-import * as tsplus_module_4 from "@effect-app/core/_ext/Iterable";
-import * as tsplus_module_5 from "@effect-app/infra/services/QueueMaker/errors";
-import * as tsplus_module_6 from "@effect-app/prelude/utils";
-import * as tsplus_module_7 from "@effect-app/infra/api/setupRequest";
-import * as tsplus_module_8 from "effect/Fiber";
+import * as tsplus_module_4 from "effect/Option";
+import * as tsplus_module_5 from "@effect-app/core/Option";
+import * as tsplus_module_6 from "@effect-app/core/_ext/Iterable";
+import * as tsplus_module_7 from "@effect-app/infra/services/QueueMaker/errors";
+import * as tsplus_module_8 from "@effect-app/prelude/utils";
+import * as tsplus_module_9 from "@effect-app/infra/api/setupRequest";
+import * as tsplus_module_10 from "effect/Fiber";
 import { MemQueue } from "@effect-app/infra-adapters/memQueue";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { RequestId } from "@effect-app/prelude/ids";
+import { Tracer } from "effect";
 import { RequestContextContainer } from "../RequestContextContainer.js";
 import { reportNonInterruptedFailure } from "./errors.js";
+import { QueueMeta } from "./service.js";
 /**
  * @tsplus static QueueMaker.Ops makeMem
  */
@@ -20,16 +24,18 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
         const q = yield* $(mem.getOrCreateQueue(queueName));
         const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName));
         const rcc = yield* $(RequestContextContainer);
-        const wireSchema = tsplus_module_1.props({ body: schema, meta: RequestContext });
+        const wireSchema = tsplus_module_1.props({ body: schema, meta: QueueMeta });
         const encoder = wireSchema.Encoder;
-        const drainW = tsplus_module_1.props({ body: drainSchema, meta: RequestContext });
+        const drainW = tsplus_module_1.props({ body: drainSchema, meta: QueueMeta });
         const parseDrain = tsplus_module_2.parseCondemnDie(drainW);
         return {
             publish: (...messages) => tsplus_module_3.gen(function* ($) {
                 const requestContext = yield* $(rcc.requestContext);
-                return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_4.ext_forEach(messages, (m) => tsplus_module_3.asUnit(
+                const currentSpan = yield* $(tsplus_module_3.currentSpan);
+                const span = tsplus_module_5.getOrUndefined(tsplus_module_4.map(currentSpan, Tracer.externalSpan));
+                return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_6.ext_forEach(messages, (m) => tsplus_module_3.asUnit(
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.stringify(encoder({ body: m, meta: requestContext })))
+                tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.stringify(encoder({ body: m, meta: { requestContext, span } })))
                 // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
                 , (_) => q.offer(_))))));
             }),
@@ -38,13 +44,18 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
                 const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
                 const processMessage = (msg) => 
                 // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_7.setupRequestContext(silenceAndReportError(tsplus_module_3.zipRight(tsplus_module_3.annotateLogs({ body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)), meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta)) })(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body))), RequestContext.inherit(meta, {
+                tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_3.withSpan(tsplus_module_9.setupRequestContext(silenceAndReportError(tsplus_module_3.zipRight(tsplus_module_3.annotateLogs({ body: tsplus_module_8.RecordPretty(tsplus_module_8.object$(body)), meta: tsplus_module_8.RecordPretty(tsplus_module_8.object$(meta)) })(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body))), RequestContext.inherit(meta.requestContext, {
                     id: RequestId(body.id),
                     locale: "en",
                     name: tsplus_module_1.ReasonableString(body._tag)
-                })));
+                })), "queue.drain", {
+                    attributes: { "queue.name": queueDrainName },
+                    parent: meta.span
+                        ? Tracer.externalSpan(meta.span)
+                        : undefined
+                }));
                 return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(silenceAndReportError(tsplus_module_3.flatMap(qDrain
-                    .take(), (x) => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), (_) => tsplus_module_8.join(_)))
+                    .take, (x) => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), (_) => tsplus_module_10.join(_)))
                 // TODO: normally a failed item would be returned to the queue and retried up to X times.
                 // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
                 ))));
@@ -52,4 +63,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFHekQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQU8xQixTQUFpQixFQUNqQixjQUFzQixFQUN0QixNQUFtRCxFQUNuRCxXQUE0RCxFQUM1RCxlQUFxRjtJQUVyRixPQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzlCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUNuRCxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUE7UUFDN0QsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFFN0MsTUFBTSxVQUFVLEdBQUcsZ0JBQUEsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQTtRQUNoRSxNQUFNLE9BQU8sR0FBRyxV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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FPMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQsRUFDNUQsZUFBcUY7SUFFckYsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE1BQU0sVUFBVSxHQUFHLGdCQUFBLEtB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

package/dist/services/QueueMaker/sbqueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;;AAYA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,mBAAmB,CACjC,MAAM,EACN,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GAsEtF;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAG1F"}
+{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;;AAaA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,mBAAmB,CACjC,MAAM,EACN,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GAmFtF;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAG1F"}

package/dist/services/QueueMaker/sbqueue.js

@@ -4,21 +4,28 @@ import * as tsplus_module_3 from "@effect-app/core/Tag";
 import * as tsplus_module_4 from "effect/Effect";
 import * as tsplus_module_5 from "@effect-app/prelude/utils";
 import * as tsplus_module_6 from "@effect-app/infra/api/setupRequest";
-import * as tsplus_module_7 from "@effect-app/infra/services/QueueMaker/errors";
-import * as tsplus_module_8 from "effect/Layer";
+import * as tsplus_module_7 from "effect/Option";
+import * as tsplus_module_8 from "@effect-app/core/Option";
+import * as tsplus_module_9 from "@effect-app/infra/services/QueueMaker/errors";
+import * as tsplus_module_10 from "effect/Layer";
 import { LiveReceiver, LiveSender, LiveServiceBusClient, Receiver, Sender, subscribe } from "@effect-app/infra-adapters/ServiceBus";
 import { captureException } from "@effect-app/infra/errorReporter";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { RequestId } from "@effect-app/prelude/ids";
+import { Tracer } from "effect";
 import { RequestContextContainer } from "../RequestContextContainer.js";
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js";
+import { QueueMeta } from "./service.js";
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
  */
 export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
-    const wireSchema = tsplus_module_1.props({ body: schema, meta: RequestContext });
+    const wireSchema = tsplus_module_1.props({
+        body: schema,
+        meta: QueueMeta
+    });
     const encoder = wireSchema.Encoder;
-    const drainW = tsplus_module_1.props({ body: drainSchema, meta: RequestContext });
+    const drainW = tsplus_module_1.props({ body: drainSchema, meta: QueueMeta });
     const parseDrain = tsplus_module_2.parseCondemnDie(drainW);
     return tsplus_module_4.gen(function* ($) {
         const s = yield* $(Sender);
@@ -32,11 +39,16 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
                 const handleEvent = yield* $(makeHandleEvent);
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 function processMessage(messageBody) {
-                    return tsplus_module_4.tapErrorCause(tsplus_module_4.flatMap(tsplus_module_4.orDie(tsplus_module_4.flatMap(tsplus_module_4.sync(() => JSON.parse(messageBody)), (x) => parseDrain(x))), ({ body, meta }) => tsplus_module_6.setupRequestContext(silenceAndReportError(tsplus_module_4.orDie(tsplus_module_4.zipRight(tsplus_module_4.annotateLogs({ body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)), meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta)) })(tsplus_module_4.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body)))), RequestContext.inherit(meta, {
+                    return tsplus_module_4.tapErrorCause(tsplus_module_4.flatMap(tsplus_module_4.orDie(tsplus_module_4.flatMap(tsplus_module_4.sync(() => JSON.parse(messageBody)), (x) => parseDrain(x))), ({ body, meta }) => tsplus_module_4.withSpan(tsplus_module_6.setupRequestContext(silenceAndReportError(tsplus_module_4.orDie(tsplus_module_4.zipRight(tsplus_module_4.annotateLogs({ body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)), meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta)) })(tsplus_module_4.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body)))), RequestContext.inherit(meta.requestContext, {
                         id: RequestId(body.id),
                         locale: "en",
                         name: tsplus_module_1.ReasonableString(body._tag)
-                    })))
+                    })), "queue.drain", {
+                        attributes: { "queue.name": queueDrainName },
+                        parent: meta.span
+                            ? Tracer.externalSpan(meta.span)
+                            : undefined
+                    }))
                     // we reportError here, so that we report the error only, and keep flowing
                     , reportError);
                 }
@@ -47,8 +59,10 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
             }),
             publish: (...messages) => tsplus_module_4.gen(function* ($) {
                 const requestContext = yield* $(rcc.requestContext);
-                return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_4.promise(() => s.sendMessages(messages.map((m) => ({
-                    body: JSON.stringify(encoder({ body: m, meta: requestContext })),
+                const currentSpan = yield* $(tsplus_module_4.currentSpan);
+                const span = tsplus_module_8.getOrUndefined(tsplus_module_7.map(currentSpan, Tracer.externalSpan));
+                return yield* $(tsplus_module_9.forkDaemonReportQueue(tsplus_module_4.promise(() => s.sendMessages(messages.map((m) => ({
+                    body: JSON.stringify(encoder({ body: m, meta: { requestContext, span } })),
                     messageId: m.id, /* correllationid: requestId */
                     contentType: "application/json"
                 }))))));
@@ -60,6 +74,6 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 export function makeServiceBusLayers(url, queueName, queueDrainName) {
-    return tsplus_module_8.provide((tsplus_module_8.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))))(LiveServiceBusClient(url));
+    return tsplus_module_10.provide((tsplus_module_10.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))))(LiveServiceBusClient(url));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFHM0Y7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBT2pDLFVBQWtCLEVBQ2xCLGNBQXNCLEVBQ3RCLE1BQW1ELEVBQ25ELFdBQTRELEVBQzVELGVBQXFGO0lBRXJGLE1BQU0sVUFBVSxHQUFHLGdCQUFBLEtBQUssQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxDQUFDLENBQUE7SUFDaEUsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQTtJQUNsQyxNQUFNLE1BQU0sR0FBRyxnQkFBQSxLQUFLLENBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFBO0lBQ2pFLE1BQU0sVUFBVSxtQ0FBRyxNQUFNLENBQWdCLENBQUE7SUFFekMsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzNGLE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQU9qQyxVQUFrQixFQUNsQixjQUFzQixFQUN0QixNQUFtRCxFQUNuRCxXQUE0RCxFQUM1RCxlQUFxRjtJQUVyRixNQUFNLFVBQVUsR0FBRyxnQkFBQSxLQUFLLENBQUM7UUFDdkIsSUFBSSxFQUFFLE1BQU07UUFDWixJQUFJLEVBQUUsU0FBUztLQUNoQixDQUFDLENBQUE7SUFDRixNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFBO0lBQ2xDLE1BQU0sTUFBTSxHQUFHLGdCQUFBLEtBQUssQ0FBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7SUFDNUQsTUFBTSxVQUFVLG1DQUFHLE1BQU0sQ0FB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

package/dist/services/QueueMaker/service.d.ts

@@ -1,6 +1,7 @@
 import { Effect } from "effect/Effect";
 import { Scope } from "effect/Scope";
 import { NonEmptyReadonlyArray } from "effect/ReadonlyArray";
+import { RequestContext } from "../../RequestContext.js";
 import type { RequestContextContainer } from "../RequestContextContainer.js";
 import type { ContextMapContainer } from "../Store/ContextMapContainer.js";
 export interface QueueBase<RContext, Evt> {
@@ -13,4 +14,26 @@ export interface QueueBase<RContext, Evt> {
 export interface QueueMakerOps {
 }
 export declare const QueueMaker: QueueMakerOps;
+export declare const QueueMeta: import("@effect-app/schema").SchemaProperties<import("@effect-app/schema").ToProps<{
+    requestContext: typeof RequestContext;
+    span: import("@effect-app/schema").Property<import("@effect-app/schema").Schema<unknown, {
+        readonly spanId: string;
+        readonly traceId: string;
+        readonly sampled?: boolean | undefined;
+    }, {
+        readonly spanId: string;
+        readonly traceId: string;
+        readonly sampled?: boolean | undefined;
+    }, {
+        readonly spanId: string;
+        readonly traceId: string;
+        readonly sampled?: boolean | undefined;
+    }, {
+        props: import("@effect-app/schema").ToProps<{
+            spanId: import("@effect-app/schema").SchemaDefaultSchema<unknown, string, string, string, {}>;
+            traceId: import("@effect-app/schema").SchemaDefaultSchema<unknown, string, string, string, {}>;
+            sampled: import("@effect-app/schema").Property<import("@effect-app/schema").Schema<unknown, boolean, boolean, boolean, {}>, "optional", import("effect/Option").None<any>, import("effect/Option").None<any>>;
+        }>;
+    }>, "optional", import("effect/Option").None<any>, import("effect/Option").None<any>>;
+}>>;
 //# sourceMappingURL=service.d.ts.map

package/dist/services/QueueMaker/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/service.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAE1E,MAAM,WAAW,SAAS,CAAC,QAAQ,EAAE,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,uBAAuB,GAAG,mBAAmB,GAAG,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC5F,OAAO,EAAE,CACP,GAAG,QAAQ,EAAE,qBAAqB,CAAC,GAAG,CAAC,KACpC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AACjC,eAAO,MAAM,UAAU,EAAE,aAAkB,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/service.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAE1E,MAAM,WAAW,SAAS,CAAC,QAAQ,EAAE,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,uBAAuB,GAAG,mBAAmB,GAAG,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC5F,OAAO,EAAE,CACP,GAAG,QAAQ,EAAE,qBAAqB,CAAC,GAAG,CAAC,KACpC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AACjC,eAAO,MAAM,UAAU,EAAE,aAAkB,CAAA;AAE3C,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;GAQpB,CAAA"}

package/dist/services/QueueMaker/service.js

@@ -1,2 +1,13 @@
+import * as tsplus_module_1 from "@effect-app/prelude/schema";
+import * as tsplus_module_2 from "@effect-app/schema/ext";
+import { RequestContext } from "../../RequestContext.js";
 export const QueueMaker = {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWNBLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBa0IsRUFBRSxDQUFBIn0=
+export const QueueMeta = tsplus_module_1.props({
+    requestContext: RequestContext,
+    span: tsplus_module_2.optionalProp(tsplus_module_1.props({
+        spanId: tsplus_module_1.string,
+        traceId: tsplus_module_1.string,
+        sampled: tsplus_module_2.optionalProp(tsplus_module_1.bool)
+    }))
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBZXhELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBa0IsRUFBRSxDQUFBO0FBRTNDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxnQkFBQSxLQUFLLENBQUM7SUFDN0IsY0FBYyxFQUFFLGNBQWM7SUFDOUIsSUFBSSwrQkFBRSxnQkFBQSxLQUFLLENBQUM7UUFDVixNQUFNLGtCQUFFLE1BQU07UUFDZCxPQUFPLGtCQUFFLE1BQU07UUFDZixPQUFPLCtDQUFFLElBQUksQ0FBUztLQUN2QixDQUFDLENBQ1M7Q0FDWixDQUFDLENBQUEifQ==

package/dist/services/Repository.d.ts

@@ -344,8 +344,8 @@ export declare function updateWithOne<T, Evt, S1 extends T, S2 extends T>(self:
 export declare function updateWith<T, Evt, S1 extends T, S2 extends T>(self: AllDSL<T, Evt>, upd: (item: S1[]) => S2[]): import("effect/Effect").Effect<import("@effect-app/prelude/Pure").PureEnvEnv<Evt, S1[], S2[]>, never, S2[]>;
 export declare function makeOneDSL<T, Evt>(): OneDSL<T, Evt>;
 export declare function makeDSL<S1, S2, Evt>(): (<R, A, E>(pure: (dsl: PureDSL<S1, S2, Evt>) => Effect<R, E, A>) => Effect<FixEnv<R, Evt, S1, S2>, E, A>) & {
-    modify: <R, E, A>(pure: (items: S1, dsl: PureDSL<S1, S2, Evt>) => Effect<R, E, A>) => Effect<FixEnv<R, Evt, S1, S2>, E, A>;
-    update: <R_1, E_1>(pure: (items: S1, log: (...evt: Evt[]) => PureLogT<Evt>) => import("effect/Effect").Effect<R_1, E_1, S2>) => import("effect/Effect").Effect<FixEnv<R_1, Evt, S1, S2>, E_1, S2>;
+    modify: <R_1, E_1, A_1>(pure: (items: S1, dsl: PureDSL<S1, S2, Evt>) => import("effect/Effect").Effect<R_1, E_1, A_1>) => import("effect/Effect").Effect<FixEnv<R_1, Evt, S1, S2>, E_1, A_1>;
+    update: <R_2, E_2>(pure: (items: S1, log: (...evt: Evt[]) => PureLogT<Evt>) => import("effect/Effect").Effect<R_2, E_2, S2>) => import("effect/Effect").Effect<FixEnv<R_2, Evt, S1, S2>, E_2, S2>;
 };
 export interface DSLExt<S1, S2, Evt> extends ReturnType<typeof makeDSL<S1, S2, Evt>> {
 }

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

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

package/dist/services/RepositoryBase.d.ts

@@ -112,7 +112,7 @@ export declare function makeRepo<PM extends {
             value: A_1;
             readonly S: PM;
         };
-    }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | undefined) => Filter<PM>;
+    }) => Where | readonly [Where, ...Where[]], mode?: "and" | "or" | undefined) => Filter<PM>;
 };
 /**
  * only use this as a shortcut if you don't have the item already

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.93.6",
+  "version": "0.94.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^4.0.0",
     "@azure/service-bus": "^7.9.3",
-    "effect": "^2.0.0-next.54",
-    "@faker-js/faker": "^8.2.0",
+    "effect": "^2.0.0-next.55",
+    "@faker-js/faker": "^8.3.1",
     "@sendgrid/helpers": "^7.7.0",
     "@sendgrid/mail": "^7.7.0",
     "change-case": "^5.1.2",
@@ -18,10 +18,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/core": "0.69.0",
-    "@effect-app/infra-adapters": "0.59.5",
-    "@effect-app/prelude": "0.71.0",
-    "@effect-app/schema": "0.62.4"
+    "@effect-app/infra-adapters": "0.60.0",
+    "@effect-app/core": "0.70.0",
+    "@effect-app/prelude": "0.72.0",
+    "@effect-app/schema": "0.63.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.0",