@effect-app/infra 0.232.8 → 0.232.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 0.232.10
+
+### Patch Changes
+
+- 44ab467: include quename at drain request name
+
+## 0.232.9
+
+### Patch Changes
+
+- c6942f1: improve parent span queue handling
+
 ## 0.232.8
 
 ### Patch Changes

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -36,15 +36,14 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
     return {
       publish: (...messages) => _effectApp.Effect.gen(function* ($) {
         const requestContext = yield* $(rcc.requestContext);
-        const currentSpan = yield* $(_effectApp.Effect.currentSpan.pipe(_effectApp.Effect.orDie));
-        const span = _effect.Tracer.externalSpan(currentSpan);
+        const span = yield* $(_effectApp.Effect.serviceOption(_effect.Tracer.ParentSpan));
         return yield* $(_effectApp.Effect.forEach(messages, m =>
         // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
         _effectApp.S.encode(wireSchema)({
           body: m,
           meta: {
             requestContext,
-            span
+            span: _effectApp.Option.getOrUndefined(span)
           }
         }).pipe(_effectApp.Effect.orDie, _effectApp.Effect.andThen(JSON.stringify),
         // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
@@ -61,19 +60,24 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
         _effectApp.Effect.sync(() => JSON.parse(msg)).pipe(_effectApp.Effect.flatMap(parseDrain), _effectApp.Effect.orDie, _effectApp.Effect.flatMap(({
           body,
           meta
-        }) => _effectApp.Effect.logDebug(`$$ [${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
-          body: (0, _utils.pretty)(body),
-          meta: (0, _utils.pretty)(meta)
-        }), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
-          id: (0, _ids.RequestId)(body.id),
-          locale: "en",
-          name: (0, _schema.NonEmptyString255)(body._tag)
-        })), _effectApp.Effect.withSpan("queue.drain", {
-          attributes: {
-            "queue.name": queueDrainName
-          },
-          parent: meta.span ? _effect.Tracer.externalSpan(meta.span) : undefined
-        }))));
+        }) => {
+          let effect = _effectApp.Effect.logDebug(`$$ [${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
+            body: (0, _utils.pretty)(body),
+            meta: (0, _utils.pretty)(meta)
+          }), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
+            id: (0, _ids.RequestId)(body.id),
+            locale: "en",
+            name: (0, _schema.NonEmptyString255)(`${queueDrainName}.${body._tag}`)
+          })), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
+            attributes: {
+              "queue.name": queueDrainName
+            }
+          }));
+          if (meta.span) {
+            effect = _effectApp.Effect.withParentSpan(effect, _effect.Tracer.externalSpan(meta.span));
+          }
+          return effect;
+        }));
         return yield* $(qDrain.take.pipe(_effectApp.Effect.flatMap(x => processMessage(x).pipe(_effectApp.Effect.uninterruptible, _effectApp.Effect.fork, _effectApp.Effect.flatMap(_effectApp.Fiber.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","_schema","_effect","_effectApp","_ids","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeMemQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","orDie","publish","messages","requestContext","currentSpan","pipe","span","Tracer","externalSpan","forEach","m","encode","andThen","JSON","stringify","flatMap","_","offer","discard","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","logDebug","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","parent","undefined","take","x","uninterruptible","fork","Fiber","join","forever"],"sources":["../../../src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_schema","_effect","_effectApp","_ids","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeMemQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","logDebug","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","withParentSpan","externalSpan","take","x","uninterruptible","fork","Fiber","join","forever"],"sources":["../../../src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/services/QueueMaker/sbqueue.cjs

@@ -48,21 +48,26 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
           return _effectApp.Effect.sync(() => JSON.parse(messageBody)).pipe(_effectApp.Effect.flatMap(x => parseDrain(x)), _effectApp.Effect.orDie, _effectApp.Effect.flatMap(({
             body,
             meta
-          }) => _effectApp.Effect.logDebug(`$$ [${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
-            body: (0, _utils.pretty)(body),
-            meta: (0, _utils.pretty)(meta)
-          }), _effectApp.Effect.zipRight(handleEvent(body)), _effectApp.Effect.orDie)
-          // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
-          .pipe(silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
-            id: (0, _ids.RequestId)(body.id),
-            locale: "en",
-            name: (0, _schema.NonEmptyString255)(body._tag)
-          })), _effectApp.Effect.withSpan("queue.drain", {
-            attributes: {
-              "queue.name": queueDrainName
-            },
-            parent: meta.span ? _effect.Tracer.externalSpan(meta.span) : undefined
-          }))), _effectApp.Effect
+          }) => {
+            let effect = _effectApp.Effect.logDebug(`$$ [${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
+              body: (0, _utils.pretty)(body),
+              meta: (0, _utils.pretty)(meta)
+            }), _effectApp.Effect.zipRight(handleEvent(body)), _effectApp.Effect.orDie)
+            // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
+            .pipe(silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
+              id: (0, _ids.RequestId)(body.id),
+              locale: "en",
+              name: (0, _schema.NonEmptyString255)(`${queueDrainName}.${body._tag}`)
+            })), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
+              attributes: {
+                "queue.name": queueDrainName
+              }
+            }));
+            if (meta.span) {
+              effect = _effectApp.Effect.withParentSpan(effect, _effect.Tracer.externalSpan(meta.span));
+            }
+            return effect;
+          }), _effectApp.Effect
           // we reportError here, so that we report the error only, and keep flowing
           .tapErrorCause(reportError));
         }
@@ -73,14 +78,13 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
       }).pipe(_effectApp.Effect.andThen(_effectApp.Effect.never)),
       publish: (...messages) => _effectApp.Effect.gen(function* ($) {
         const requestContext = yield* $(rcc.requestContext);
-        const currentSpan = yield* $(_effectApp.Effect.currentSpan.pipe(_effectApp.Effect.orDie));
-        const span = _effect.Tracer.externalSpan(currentSpan);
+        const span = yield* $(_effectApp.Effect.serviceOption(_effect.Tracer.ParentSpan));
         return yield* $(_effectApp.Effect.promise(() => s.sendMessages(messages.map(m => ({
           body: JSON.stringify(_effectApp.S.encodeSync(wireSchema)({
             body: m,
             meta: {
               requestContext,
-              span
+              span: _effectApp.Option.getOrUndefined(span)
             }
           })),
           messageId: m.id,

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

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_effect","_effectApp","_ids","_schema","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","Receiver","receiverLayer","Layer","succeed","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","logDebug","annotateLogs","pretty","zipRight","_","setupRequestContext","RequestContext","inherit","requestContext","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","parent","span","Tracer","externalSpan","undefined","tapErrorCause","subscribe","uninterruptible","processError","err","captureException","error","provide","andThen","never","publish","messages","currentSpan","promise","sendMessages","map","m","stringify","encodeSync","messageId","contentType","makeServiceBusLayers","url","queueName","merge","LiveReceiver","LiveSender","LiveServiceBusClient"],"sources":["../../../src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_effect","_effectApp","_ids","_schema","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","Receiver","receiverLayer","Layer","succeed","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","effect","logDebug","annotateLogs","pretty","zipRight","_","setupRequestContext","RequestContext","inherit","requestContext","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","span","withParentSpan","Tracer","externalSpan","tapErrorCause","subscribe","uninterruptible","processError","err","captureException","error","provide","andThen","never","publish","messages","serviceOption","ParentSpan","promise","sendMessages","map","m","stringify","encodeSync","Option","getOrUndefined","messageId","contentType","makeServiceBusLayers","url","queueName","merge","LiveReceiver","LiveSender","LiveServiceBusClient"],"sources":["../../../src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/services/QueueMaker/service.cjs

@@ -13,7 +13,7 @@ const QueueMeta = exports.QueueMeta = (0, _schema.struct)({
   span: _effectApp.S.optional((0, _schema.struct)({
     spanId: _effectApp.S.string,
     traceId: _effectApp.S.string,
-    sampled: _effectApp.S.optional(_effectApp.S.boolean)
+    sampled: _effectApp.S.boolean
   }))
 });
 //# sourceMappingURL=service.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"service.cjs","names":["_schema","require","_effectApp","_RequestContext","QueueMaker","exports","QueueMeta","struct","requestContext","RequestContext","span","S","optional","spanId","string","traceId","sampled","boolean"],"sources":["../../../src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AAiBO,MAAMG,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE;AAEpC,MAAME,SAAS,GAAAD,OAAA,CAAAC,SAAA,GAAG,IAAAC,cAAM,EAAC;EAC9BC,cAAc,EAAEC,8BAAc;EAC9BC,IAAI,EAAEC,YAAC,CAACC,QAAQ,CAAC,IAAAL,cAAM,EAAC;IACtBM,MAAM,EAAEF,YAAC,CAACG,MAAM;IAChBC,OAAO,EAAEJ,YAAC,CAACG,MAAM;IACjBE,OAAO,EAAEL,YAAC,CAACC,QAAQ,CAACD,YAAC,CAACM,OAAO;GAC9B,CAAC;CACH,CAAC","ignoreList":[]}
+{"version":3,"file":"service.cjs","names":["_schema","require","_effectApp","_RequestContext","QueueMaker","exports","QueueMeta","struct","requestContext","RequestContext","span","S","optional","spanId","string","traceId","sampled","boolean"],"sources":["../../../src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AAiBO,MAAMG,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE;AAEpC,MAAME,SAAS,GAAAD,OAAA,CAAAC,SAAA,GAAG,IAAAC,cAAM,EAAC;EAC9BC,cAAc,EAAEC,8BAAc;EAC9BC,IAAI,EAAEC,YAAC,CAACC,QAAQ,CAAC,IAAAL,cAAM,EAAC;IACtBM,MAAM,EAAEF,YAAC,CAACG,MAAM;IAChBC,OAAO,EAAEJ,YAAC,CAACG,MAAM;IACjBE,OAAO,EAAEL,YAAC,CAACM;GACZ,CAAC;CACH,CAAC","ignoreList":[]}

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,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAe,CAAC,EAAE,MAAM,YAAY,CAAA;AAInD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAIvE;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;yCAiCvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC;8CAuDlE"}
+{"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,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAuB,CAAC,EAAE,MAAM,YAAY,CAAA;AAI3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAIvE;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;yCAgCvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC;8CAuDlE"}

package/dist/services/QueueMaker/memQueue.js

@@ -2,7 +2,7 @@ import { MemQueue } from "@effect-app/infra-adapters/memQueue";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { NonEmptyString255, struct } from "@effect-app/schema";
 import { Tracer } from "effect";
-import { Effect, Fiber, flow, S } from "effect-app";
+import { Effect, Fiber, flow, Option, S } from "effect-app";
 import { RequestId } from "effect-app/ids";
 import { pretty } from "effect-app/utils";
 import { setupRequestContext } from "../../api/setupRequest.js";
@@ -25,12 +25,11 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
             publish: (...messages) => Effect
                 .gen(function* ($) {
                 const requestContext = yield* $(rcc.requestContext);
-                const currentSpan = yield* $(Effect.currentSpan.pipe(Effect.orDie));
-                const span = Tracer.externalSpan(currentSpan);
+                const span = yield* $(Effect.serviceOption(Tracer.ParentSpan));
                 return yield* $(Effect
                     .forEach(messages, (m) => 
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                S.encode(wireSchema)({ body: m, meta: { requestContext, span } }).pipe(Effect.orDie, Effect
+                S.encode(wireSchema)({ body: m, meta: { requestContext, span: Option.getOrUndefined(span) } }).pipe(Effect.orDie, Effect
                     .andThen(JSON.stringify), 
                 // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
                 Effect.flatMap((_) => q.offer(_))), { discard: true }));
@@ -41,21 +40,23 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
                 // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
                 Effect
                     .sync(() => JSON.parse(msg))
-                    .pipe(Effect.flatMap(parseDrain), Effect
-                    .orDie, Effect
-                    .flatMap(({ body, meta }) => Effect
-                    .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                    .pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.zipRight(handleEvent(body)), silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
-                    id: RequestId(body.id),
-                    locale: "en",
-                    name: NonEmptyString255(body._tag)
-                })), Effect
-                    .withSpan("queue.drain", {
-                    attributes: { "queue.name": queueDrainName },
-                    parent: meta.span
-                        ? Tracer.externalSpan(meta.span)
-                        : undefined
-                }))));
+                    .pipe(Effect.flatMap(parseDrain), Effect.orDie, Effect
+                    .flatMap(({ body, meta }) => {
+                    let effect = Effect
+                        .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                        .pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.zipRight(handleEvent(body)), silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
+                        id: RequestId(body.id),
+                        locale: "en",
+                        name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
+                    })), Effect
+                        .withSpan(`queue.drain: ${queueDrainName}`, {
+                        attributes: { "queue.name": queueDrainName }
+                    }));
+                    if (meta.span) {
+                        effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
+                    }
+                    return effect;
+                }));
                 return yield* $(qDrain
                     .take
                     .pipe(Effect.flatMap((x) => processMessage(x).pipe(Effect.uninterruptible, Effect.fork, Effect.flatMap(Fiber.join))), 
@@ -66,4 +67,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbkQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDekQsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQU0xQixTQUFpQixFQUNqQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDOUIsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO1FBQ25ELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQTtRQUM3RCxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUU3QyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFBO1FBQzVELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7UUFDN0QsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBRTlELE9BQU87WUFDTCxPQUFPLEVBQUUsQ0FBQyxHQUFHLFFBQVEsRUFBRSxFQUFFLENBQ3ZCLE1BQU07aUJBQ0gsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFDLENBQUM7Z0JBQ2QsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQTtnQkFDbkQsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFBO2dCQUNuRSxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFBO2dCQUM3QyxPQUFPLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDYixNQUFNO3FCQUNILE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRTtnQkFDdkIsdUhBQXVIO2dCQUN2SCxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDcEUsTUFBTSxDQUFDLEtBQUssRUFDWixNQUFNO3FCQUNILE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO2dCQUMxQix1RUFBdUU7Z0JBQ3ZFLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDbEMsRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUMxQixDQUFBO1lBQ0gsQ0FBQyxDQUFDO1lBQ04sS0FBSyxFQUFFLENBQ0wsV0FBMkQsRUFDM0QsRUFBRSxDQUNGLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztnQkFDcEIsTUFBTSxxQkFBcUIsR0FBRywyQkFBMkIsQ0FBQyxFQUFFLElBQUksRUFBRSxpQkFBaUIsR0FBRyxjQUFjLEVBQUUsQ0FBQyxDQUFBO2dCQUN2RyxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFO2dCQUNyQyxzSEFBc0g7Z0JBQ3RILE1BQU07cUJBQ0gsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7cUJBQzNCLElBQUksQ0FDSCxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUMxQixNQUFNO3FCQUNILEtBQUssRUFDUixNQUFNO3FCQUNILE9BQU8sQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FDMUIsTUFBTTtxQkFDSCxRQUFRLENBQUMsT0FBTyxjQUFjLCtCQUErQixDQUFDO3FCQUM5RCxJQUFJLENBQ0gsTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEVBQy9ELE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQ2xDLHFCQUFxQixFQUNyQixDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osbUJBQW1CLENBQ2pCLENBQUMsRUFDRCxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUU7b0JBQzFDLEVBQUUsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztvQkFDdEIsTUFBTSxFQUFFLElBQWE7b0JBQ3JCLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2lCQUNuQyxDQUFDLENBQ0gsRUFDSCxNQUFNO3FCQUNILFFBQVEsQ0FBQyxhQUFhLEVBQUU7b0JBQ3ZCLFVBQVUsRUFBRSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUU7b0JBQzVDLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSTt3QkFDZixDQUFDLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO3dCQUNoQyxDQUFDLENBQUMsU0FBUztpQkFDZCxDQUFDLENBQ0wsQ0FDSixDQUNKLENBQUE7Z0JBQ0wsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ2IsTUFBTTtxQkFDSCxJQUFJO3FCQUNKLElBQUksQ0FDSCxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDbkIsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsZUFBZSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FDeEY7Z0JBQ0QseUZBQXlGO2dCQUN6Rix1SUFBdUk7Z0JBQ3ZJLHFCQUFxQixFQUNyQixNQUFNLENBQUMsT0FBTyxDQUNmLENBQ0osQ0FBQTtZQUNILENBQUMsQ0FBQztTQUM4QixDQUFBO0lBQ3RDLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzNELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDL0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FNMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBMkIsRUFDM0IsV0FBMEM7SUFFMUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzlCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENB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

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

@@ -12,7 +12,7 @@ export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, EvtE, DrainEvtE>(_queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>) => Effect.Effect<never, never, import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, {
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>) => Effect.Effect<never, never, RequestContextContainer | import("effect/Scope").Scope | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, {
         make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
     }>>;
     publish: (messages_0: Evt, ...messages_1: Evt[]) => Effect.Effect<void, never, never>;
@@ -23,8 +23,6 @@ export declare function makeServiceBusQueue<Evt extends {
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<import("@azure/service-bus").ServiceBusSender | {
-    make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>; /**
-     * @tsplus static QueueMaker.Ops makeServiceBus
-     */
+    make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
 }, never, never>;
 //# sourceMappingURL=sbqueue.d.ts.map

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":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAQ,KAAK,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAIvE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,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,SAAS,EAET,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;yCAmBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC;;;;;;mDAqFlE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;wGAzH3F;;OAEG;iBAyHF"}
+{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAIvE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,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,SAAS,EAET,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;yCAmBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC;;;;;;mDAsFlE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;;iBAE1F"}

package/dist/services/QueueMaker/sbqueue.js

@@ -2,7 +2,7 @@ import { LiveReceiver, LiveSender, LiveServiceBusClient, Receiver, Sender, subsc
 import { captureException } from "@effect-app/infra/errorReporter";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { Tracer } from "effect";
-import { Effect, flow, Layer, S } from "effect-app";
+import { Effect, flow, Layer, Option, S } from "effect-app";
 import { RequestId } from "effect-app/ids";
 import { NonEmptyString255, struct } from "effect-app/schema";
 import { pretty } from "effect-app/utils";
@@ -35,26 +35,27 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
                     return Effect
                         .sync(() => JSON.parse(messageBody))
                         .pipe(Effect.flatMap((x) => parseDrain(x)), Effect.orDie, Effect
-                        .flatMap(({ body, meta }) => Effect
-                        .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                        .pipe(Effect.annotateLogs({
-                        body: pretty(body),
-                        meta: pretty(meta)
+                        .flatMap(({ body, meta }) => {
+                        let effect = Effect
+                            .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                            .pipe(Effect.annotateLogs({
+                            body: pretty(body),
+                            meta: pretty(meta)
+                        }), Effect.zipRight(handleEvent(body)), Effect.orDie)
+                            // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
+                            .pipe(silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
+                            id: RequestId(body.id),
+                            locale: "en",
+                            name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
+                        })), Effect
+                            .withSpan(`queue.drain: ${queueDrainName}`, {
+                            attributes: { "queue.name": queueDrainName }
+                        }));
+                        if (meta.span) {
+                            effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
+                        }
+                        return effect;
                     }), Effect
-                        .zipRight(handleEvent(body)), Effect
-                        .orDie)
-                        // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
-                        .pipe(silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
-                        id: RequestId(body.id),
-                        locale: "en",
-                        name: NonEmptyString255(body._tag)
-                    })), Effect
-                        .withSpan("queue.drain", {
-                        attributes: { "queue.name": queueDrainName },
-                        parent: meta.span
-                            ? Tracer.externalSpan(meta.span)
-                            : undefined
-                    }))), Effect
                         // we reportError here, so that we report the error only, and keep flowing
                         .tapErrorCause(reportError));
                 }
@@ -68,11 +69,13 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
             publish: (...messages) => Effect
                 .gen(function* ($) {
                 const requestContext = yield* $(rcc.requestContext);
-                const currentSpan = yield* $(Effect.currentSpan.pipe(Effect.orDie));
-                const span = Tracer.externalSpan(currentSpan);
+                const span = yield* $(Effect.serviceOption(Tracer.ParentSpan));
                 return yield* $(Effect
                     .promise(() => s.sendMessages(messages.map((m) => ({
-                    body: JSON.stringify(S.encodeSync(wireSchema)({ body: m, meta: { requestContext, span } })),
+                    body: JSON.stringify(S.encodeSync(wireSchema)({
+                        body: m,
+                        meta: { requestContext, span: Option.getOrUndefined(span) }
+                    })),
                     messageId: m.id, /* correllationid: requestId */
                     contentType: "application/json"
                 })))));
@@ -86,4 +89,4 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
 export function makeServiceBusLayers(url, queueName, queueDrainName) {
     return Layer.merge(LiveReceiver(queueDrainName), LiveSender(queueName)).pipe(Layer.provide(LiveServiceBusClient(url)));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFMUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQzdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDM0YsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBTWpDLFVBQWtCLEVBQ2xCLGNBQXNCLEVBQ3RCLE1BQTJCLEVBQzNCLFdBQTBDO0lBRTFDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQztRQUN4QixJQUFJLEVBQUUsTUFBTTtRQUNaLElBQUksRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRTFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUM3RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDL0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzNGLE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQU1qQyxVQUFrQixFQUNsQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUM7UUFDeEIsSUFBSSxFQUFFLE1BQU07UUFD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

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

@@ -16,13 +16,13 @@ export declare const QueueMaker: QueueMakerOps;
 export declare const QueueMeta: import("@effect/schema/Schema").struct<{
     requestContext: typeof RequestContext;
     span: S.PropertySignature<"?:", {
-        readonly sampled?: boolean | undefined;
+        readonly sampled: boolean;
         readonly spanId: string;
         readonly traceId: string;
     } | undefined, never, "?:", {
+        readonly sampled: boolean;
         readonly spanId: string;
         readonly traceId: string;
-        readonly sampled?: boolean | undefined;
     } | undefined, false, never>;
 }>;
 //# sourceMappingURL=service.d.ts.map

package/dist/services/QueueMaker/service.js

@@ -7,7 +7,7 @@ export const QueueMeta = struct({
     span: S.optional(struct({
         spanId: S.string,
         traceId: S.string,
-        sampled: S.optional(S.boolean)
+        sampled: S.boolean
     }))
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzNDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFOUIsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBaUJ4RCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQWtCLEVBQUUsQ0FBQTtBQUUzQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDO0lBQzlCLGNBQWMsRUFBRSxjQUFjO0lBQzlCLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQztRQUN0QixNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU07UUFDaEIsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNO1FBQ2pCLE9BQU8sRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUM7S0FDL0IsQ0FBQyxDQUFDO0NBQ0osQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzNDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFOUIsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBaUJ4RCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQWtCLEVBQUUsQ0FBQTtBQUUzQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDO0lBQzlCLGNBQWMsRUFBRSxjQUFjO0lBQzlCLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQztRQUN0QixNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU07UUFDaEIsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNO1FBQ2pCLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTztLQUNuQixDQUFDLENBQUM7Q0FDSixDQUFDLENBQUEifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.232.8",
+  "version": "0.232.10",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,9 +19,9 @@
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.169.0",
+    "@effect-app/schema": "0.220.3",
     "@effect-app/infra-adapters": "0.153.4",
-    "effect-app": "0.201.3",
-    "@effect-app/schema": "0.220.3"
+    "effect-app": "0.201.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",

package/src/services/QueueMaker/memQueue.ts

@@ -2,7 +2,7 @@ import { MemQueue } from "@effect-app/infra-adapters/memQueue"
 import { RequestContext } from "@effect-app/infra/RequestContext"
 import { NonEmptyString255, struct } from "@effect-app/schema"
 import { Tracer } from "effect"
-import { Effect, Fiber, flow, S } from "effect-app"
+import { Effect, Fiber, flow, Option, S } from "effect-app"
 import { RequestId } from "effect-app/ids"
 import { pretty } from "effect-app/utils"
 import { setupRequestContext } from "../../api/setupRequest.js"
@@ -39,13 +39,12 @@ export function makeMemQueue<
         Effect
           .gen(function*($) {
             const requestContext = yield* $(rcc.requestContext)
-            const currentSpan = yield* $(Effect.currentSpan.pipe(Effect.orDie))
-            const span = Tracer.externalSpan(currentSpan)
+            const span = yield* $(Effect.serviceOption(Tracer.ParentSpan))
             return yield* $(
               Effect
                 .forEach(messages, (m) =>
                   // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                  S.encode(wireSchema)({ body: m, meta: { requestContext, span } }).pipe(
+                  S.encode(wireSchema)({ body: m, meta: { requestContext, span: Option.getOrUndefined(span) } }).pipe(
                     Effect.orDie,
                     Effect
                       .andThen(JSON.stringify),
@@ -65,11 +64,10 @@ export function makeMemQueue<
               .sync(() => JSON.parse(msg))
               .pipe(
                 Effect.flatMap(parseDrain),
+                Effect.orDie,
                 Effect
-                  .orDie,
-                Effect
-                  .flatMap(({ body, meta }) =>
-                    Effect
+                  .flatMap(({ body, meta }) => {
+                    let effect = Effect
                       .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
                       .pipe(
                         Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }),
@@ -81,18 +79,19 @@ export function makeMemQueue<
                             RequestContext.inherit(meta.requestContext, {
                               id: RequestId(body.id),
                               locale: "en" as const,
-                              name: NonEmptyString255(body._tag)
+                              name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
                             })
                           ),
                         Effect
-                          .withSpan("queue.drain", {
-                            attributes: { "queue.name": queueDrainName },
-                            parent: meta.span
-                              ? Tracer.externalSpan(meta.span)
-                              : undefined
+                          .withSpan(`queue.drain: ${queueDrainName}`, {
+                            attributes: { "queue.name": queueDrainName }
                           })
                       )
-                  )
+                    if (meta.span) {
+                      effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
+                    }
+                    return effect
+                  })
               )
           return yield* $(
             qDrain

package/src/services/QueueMaker/sbqueue.ts

@@ -10,7 +10,7 @@ import type {} from "@azure/service-bus"
 import { captureException } from "@effect-app/infra/errorReporter"
 import { RequestContext } from "@effect-app/infra/RequestContext"
 import { Tracer } from "effect"
-import { Effect, flow, Layer, S } from "effect-app"
+import { Effect, flow, Layer, Option, S } from "effect-app"
 import { RequestId } from "effect-app/ids"
 import type { StringId } from "effect-app/schema"
 import { NonEmptyString255, struct } from "effect-app/schema"
@@ -63,18 +63,16 @@ export function makeServiceBusQueue<
                   Effect.flatMap((x) => parseDrain(x)),
                   Effect.orDie,
                   Effect
-                    .flatMap(({ body, meta }) =>
-                      Effect
+                    .flatMap(({ body, meta }) => {
+                      let effect = Effect
                         .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
                         .pipe(
                           Effect.annotateLogs({
                             body: pretty(body),
                             meta: pretty(meta)
                           }),
-                          Effect
-                            .zipRight(handleEvent(body)),
-                          Effect
-                            .orDie
+                          Effect.zipRight(handleEvent(body)),
+                          Effect.orDie
                         )
                         // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
                         .pipe(
@@ -85,18 +83,19 @@ export function makeServiceBusQueue<
                               RequestContext.inherit(meta.requestContext, {
                                 id: RequestId(body.id),
                                 locale: "en" as const,
-                                name: NonEmptyString255(body._tag)
+                                name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
                               })
                             ),
                           Effect
-                            .withSpan("queue.drain", {
-                              attributes: { "queue.name": queueDrainName },
-                              parent: meta.span
-                                ? Tracer.externalSpan(meta.span)
-                                : undefined
+                            .withSpan(`queue.drain: ${queueDrainName}`, {
+                              attributes: { "queue.name": queueDrainName }
                             })
                         )
-                    ),
+                      if (meta.span) {
+                        effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
+                      }
+                      return effect
+                    }),
                   Effect
                     // we reportError here, so that we report the error only, and keep flowing
                     .tapErrorCause(reportError)
@@ -117,15 +116,17 @@ export function makeServiceBusQueue<
         Effect
           .gen(function*($) {
             const requestContext = yield* $(rcc.requestContext)
-            const currentSpan = yield* $(Effect.currentSpan.pipe(Effect.orDie))
-            const span = Tracer.externalSpan(currentSpan)
+            const span = yield* $(Effect.serviceOption(Tracer.ParentSpan))
             return yield* $(
               Effect
                 .promise(() =>
                   s.sendMessages(
                     messages.map((m) => ({
                       body: JSON.stringify(
-                        S.encodeSync(wireSchema)({ body: m, meta: { requestContext, span } })
+                        S.encodeSync(wireSchema)({
+                          body: m,
+                          meta: { requestContext, span: Option.getOrUndefined(span) }
+                        })
                       ),
                       messageId: m.id, /* correllationid: requestId */
                       contentType: "application/json"

package/src/services/QueueMaker/service.ts

@@ -25,6 +25,6 @@ export const QueueMeta = struct({
   span: S.optional(struct({
     spanId: S.string,
     traceId: S.string,
-    sampled: S.optional(S.boolean)
+    sampled: S.boolean
   }))
 })