@effect-app/infra 1.32.1 → 1.32.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 1.32.3
+
+### Patch Changes
+
+- 5e10712: revert root queue span
+
+## 1.32.2
+
+### Patch Changes
+
+- bf7d8df: improve: silence sql tracing for drain
+
 ## 1.32.1
 
 ### Patch Changes

package/_cjs/services/QueueMaker/SQLQueue.cjs

@@ -58,13 +58,10 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
       versionColumn: "etag"
     });
     const decodeDrain = _effectApp.S.decode(Drain);
-    const drain = () => {
-      const limit = (0, _dateFns.subMinutes)(new Date(), 15);
-      return sql`SELECT *
+    const drain = _effectApp.Effect.sync(() => (0, _dateFns.subMinutes)(new Date(), 15)).pipe(_effectApp.Effect.andThen(limit => sql`SELECT *
     FROM queue
     WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
-    LIMIT 1`;
-    };
+    LIMIT 1`));
     const q = {
       offer: (body, meta) => _effectApp.Effect.gen(function* () {
         yield* queueRepo.insertVoid(Queue.insert.make({
@@ -78,7 +75,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
       }),
       take: _effectApp.Effect.gen(function* () {
         while (true) {
-          const [first] = yield* drain();
+          const [first] = yield* drain.pipe(_effectApp.Effect.withTracerEnabled(false)); // disable sql tracer otherwise we spam it..
           if (first) {
             const dec = yield* decodeDrain(first);
             const {
@@ -153,13 +150,13 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
           }
           return effect;
         }));
-        return yield* q.take.pipe(_effectApp.Effect.flatMap(x => processMessage(x).pipe(_effectApp.Effect.uninterruptible, _effectApp.Effect.fork, _effectApp.Effect.flatMap(_effectApp.Fiber.join), _effectApp.Effect.tap(q.finish(x)))), silenceAndReportError, _effectApp.Effect.forever, _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
+        return yield* q.take.pipe(_effectApp.Effect.flatMap(x => processMessage(x).pipe(_effectApp.Effect.uninterruptible, _effectApp.Effect.fork, _effectApp.Effect.flatMap(_effectApp.Fiber.join), _effectApp.Effect.tap(q.finish(x)))), silenceAndReportError, _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
           attributes: {
             "queue.type": "sql",
             "queue.name": queueDrainName,
             "queue.sessionId": sessionId
           }
-        }));
+        }), _effectApp.Effect.forever);
       })
     };
   });

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

@@ -1 +1 @@
-{"version":3,"file":"SQLQueue.cjs","names":["_SQL","require","_setupRequest","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_crypto","_dateFns","_effectApp","_ids","_schema","_utils","_logger","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","etag","String","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","versionColumn","drainRepo","decodeDrain","decode","drain","limit","subMinutes","getTime","q","offer","insertVoid","insert","make","Option","none","randomUUID","take","first","dec","rest","update","some","sleep","finish","updateVoid","rcc","RequestContextContainer","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","RequestContext","getOrUndefined","discard","withSpan","captureStackTrace","kind","attributes","map","_","_tag","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","processMessage","msg","succeed","flatMap","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","inherit","RequestId","locale","withParentSpan","externalSpan","x","uninterruptible","fork","Fiber","join","tap","forever"],"sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAEA,IAAAI,QAAA,GAAAJ,OAAA;AACA,IAAAK,wBAAA,GAAAL,OAAA;AACA,IAAAM,IAAA,GAAAN,OAAA;AACA,IAAAO,OAAA,GAAAP,OAAA;AACA,IAAAQ,QAAA,GAAAR,OAAA;AACA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,IAAA,GAAAV,OAAA;AACA,IAAAW,OAAA,GAAAX,OAAA;AACA,IAAAY,MAAA,GAAAZ,OAAA;AACA,IAAAa,OAAA,GAAAb,OAAA;AAEO,MAAMc,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAGE,YAAC,CAACC,MAAM,CAACC,IAAI,CAACF,YAAC,CAACG,KAAK,CAAC,SAAS,CAAC,CAAC;AAGxD;AACM,SAAUC,YAAYA,CAM1BC,SAA4B,EAC5BC,cAAiC,EACjCC,MAA2B,EAC3BC,WAA0C;EAE1C,OAAOC,iBAAM,CAACC,GAAG,CAAC,aAAS;IACzB,MAAMC,IAAI,GAAG;MACXC,EAAE,EAAEC,UAAK,CAACC,SAAS,CAAChB,OAAO,CAAC;MAC5BiB,IAAI,EAAEF,UAAK,CAACG,cAAc,CAACC,kBAAS,CAAC;MACrCC,IAAI,EAAElB,YAAC,CAACmB,iBAAiB;MACzBC,SAAS,EAAEP,UAAK,CAACQ,cAAc;MAC/BC,SAAS,EAAET,UAAK,CAACU,cAAc;MAC/B;MACAC,YAAY,EAAEX,UAAK,CAACY,WAAW,CAACzB,YAAC,CAAC0B,IAAI,CAAC;MACvCC,UAAU,EAAEd,UAAK,CAACY,WAAW,CAACzB,YAAC,CAAC0B,IAAI,CAAC;MACrCE,IAAI,EAAE5B,YAAC,CAAC6B,MAAM,CAAC;MACf;MACA;KACD;IACD,MAAMC,KAAM,SAAQjB,UAAK,CAACkB,KAAK,CAAQ,OAAO,CAAC,CAAC;MAC9CC,IAAI,EAAEnB,UAAK,CAACG,cAAc,CAACT,MAAM,CAAC;MAClC,GAAGI;KACJ,CAAC;IACF,MAAMsB,KAAM,SAAQpB,UAAK,CAACkB,KAAK,CAAQ,OAAO,CAAC,CAAC;MAC9CC,IAAI,EAAEnB,UAAK,CAACG,cAAc,CAACR,WAAW,CAAC;MACvC,GAAGG;KACJ,CAAC;IACF,MAAMuB,GAAG,GAAG,OAAOC,cAAS,CAACA,SAAS;IAEtC,MAAMC,SAAS,GAAG,OAAOvB,UAAK,CAACwB,cAAc,CAACP,KAAK,EAAE;MACnDQ,SAAS,EAAE,OAAO;MAClBC,UAAU,EAAE,WAAW;MACvBC,QAAQ,EAAE,IAAI;MACdC,aAAa,EAAE;KAChB,CAAC;IAEF,MAAMC,SAAS,GAAG,OAAO7B,UAAK,CAACwB,cAAc,CAACJ,KAAK,EAAE;MACnDK,SAAS,EAAE,OAAO;MAClBC,UAAU,EAAE,WAAW;MACvBC,QAAQ,EAAE,IAAI;MACdC,aAAa,EAAE;KAChB,CAAC;IAEF,MAAME,WAAW,GAAG3C,YAAC,CAAC4C,MAAM,CAACX,KAAK,CAAC;IAEnC,MAAMY,KAAK,GAAGA,CAAA,KAAK;MACjB,MAAMC,KAAK,GAAG,IAAAC,mBAAU,EAAC,IAAIrB,IAAI,EAAE,EAAE,EAAE,CAAC;MACxC,OAAOQ,GAAyB;;mBAEnB5B,cAAc,uEAAuEwC,KAAK,CAACE,OAAO,EAAE;YAC3G;IACR,CAAC;IAED,MAAMC,CAAC,GAAG;MACRC,KAAK,EAAEA,CAAClB,IAAS,EAAEjB,IAA2B,KAC5CN,iBAAM,CAACC,GAAG,CAAC,aAAS;QAClB,OAAO0B,SAAS,CAACe,UAAU,CACzBrB,KAAK,CAACsB,MAAM,CAACC,IAAI,CAAC;UAChBrB,IAAI;UACJjB,IAAI;UACJG,IAAI,EAAEb,SAAS;UACfmB,YAAY,EAAE8B,iBAAM,CAACC,IAAI,EAAE;UAC3B5B,UAAU,EAAE2B,iBAAM,CAACC,IAAI,EAAE;UACzB3B,IAAI,EAAE,IAAA4B,kBAAU;SACjB,CAAC,CACH;MACH,CAAC,CAAC;MACJC,IAAI,EAAEhD,iBAAM,CAACC,GAAG,CAAC,aAAS;QACxB,OAAO,IAAI,EAAE;UACX,MAAM,CAACgD,KAAK,CAAC,GAAG,OAAOb,KAAK,EAAE;UAC9B,IAAIa,KAAK,EAAE;YACT,MAAMC,GAAG,GAAG,OAAOhB,WAAW,CAACe,KAAK,CAAC;YACrC,MAAM;cAAEtC,SAAS;cAAEE,SAAS;cAAE,GAAGsC;YAAI,CAAE,GAAGD,GAAG;YAC7C,OAAO,OAAOjB,SAAS,CAACmB,MAAM,CAC5B5B,KAAK,CAAC4B,MAAM,CAACR,IAAI,CAAC;cAAE,GAAGO,IAAI;cAAEpC,YAAY,EAAE8B,iBAAM,CAACQ,IAAI,CAAC,IAAIpC,IAAI,EAAE;YAAC,CAAE,CAAC,CAAC;aACvE;UACH;UACA,IAAIgC,KAAK,EAAE,OAAOA,KAAK;UACvB,OAAOjD,iBAAM,CAACsD,KAAK,CAAC,GAAG,CAAC;QAC1B;MACF,CAAC,CAAC;MACFC,MAAM,EAAEA,CAAC;QAAE5C,SAAS;QAAEE,SAAS;QAAE,GAAG2B;MAAC,CAAS,KAC5CP,SAAS,CAACuB,UAAU,CAAChC,KAAK,CAAC4B,MAAM,CAACR,IAAI,CAAC;QAAE,GAAGJ,CAAC;QAAEtB,UAAU,EAAE2B,iBAAM,CAACQ,IAAI,CAAC,IAAIpC,IAAI,EAAE;MAAC,CAAE,CAAC,CAAC,CAAC;KAC1F;IACD,MAAMwC,GAAG,GAAG,OAAOC,gDAAuB;IAE1C,OAAO;MACLC,OAAO,EAAEA,CAAC,GAAGC,QAAQ,KACnB5D,iBAAM,CACHC,GAAG,CAAC,aAAS;QACZ,MAAM4D,cAAc,GAAG,OAAOJ,GAAG,CAACI,cAAc;QAChD,MAAMC,IAAI,GAAG,OAAO9D,iBAAM,CAAC+D,aAAa,CAACC,iBAAM,CAACC,UAAU,CAAC;QAC3D,OAAO,OAAOjE,iBAAM,CACjBkE,OAAO,CACNN,QAAQ,EACPO,CAAC,IACA3B,CAAC,CAACC,KAAK,CAAC0B,CAAC,EAAE;UACTN,cAAc,EAAE,IAAIO,8BAAc,CAACP,cAAc,CAAC;UAAE;UACpDC,IAAI,EAAEjB,iBAAM,CAACwB,cAAc,CAACP,IAAI;SACjC,CAAC,EACJ;UACEQ,OAAO,EAAE;SACV,CACF;MACL,CAAC,CAAC,CACD7E,IAAI,CACHO,iBAAM,CAACuE,QAAQ,CAAC,iBAAiB,GAAG3E,SAAS,EAAE;QAC7C4E,iBAAiB,EAAE,KAAK;QACxBC,IAAI,EAAE,UAAU;QAChBC,UAAU,EAAE;UAAE,cAAc,EAAEd,QAAQ,CAACe,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,IAAI;QAAC;OAC1D,CAAC,CACH;MACLzC,KAAK,EAAEA,CACL0C,WAA2D,EAC3DC,SAAkB,KAElB/E,iBAAM,CAACC,GAAG,CAAC,aAAS;QAClB,MAAM+E,qBAAqB,GAAG,IAAAC,mCAA2B,EAAC;UAAExE,IAAI,EAAE,iBAAiB,GAAGZ;QAAc,CAAE,CAAC;QACvG,MAAMqF,cAAc,GAAIC,GAAU,IAChCnF,iBAAM,CACHoF,OAAO,CAACD,GAAG,CAAC,CACZ1F,IAAI,CAACO,iBAAM,CACTqF,OAAO,CAAC,CAAC;UAAE9D,IAAI;UAAEjB;QAAI,CAAE,KAAI;UAC1B,IAAIgF,MAAM,GAAGC,mBAAW,CACrBC,OAAO,CAAC,IAAI3F,cAAc,+BAA+B,CAAC,CAC1DJ,IAAI,CACHO,iBAAM,CAACyF,YAAY,CAAC;YAAElE,IAAI,EAAE,IAAAmE,aAAM,EAACnE,IAAI,CAAC;YAAEjB,IAAI,EAAE,IAAAoF,aAAM,EAACpF,IAAI;UAAC,CAAE,CAAC,EAC/DN,iBAAM,CAAC2F,QAAQ,CAACb,WAAW,CAACvD,IAAI,CAAC,CAAC,EAClCyD,qBAAqB,EACpBJ,CAAC,IACA,IAAAgB,iCAAmB,EACjBhB,CAAC,EACDR,8BAAc,CAACyB,OAAO,CAACvF,IAAI,CAACuD,cAAc,EAAE;YAC1C1D,EAAE,EAAE,IAAA2F,cAAS,EAACvE,IAAI,CAACpB,EAAE,CAAC;YACtB4F,MAAM,EAAE,IAAa;YACrBtF,IAAI,EAAE,IAAAC,yBAAiB,EAAC,GAAGb,cAAc,IAAI0B,IAAI,CAACsD,IAAI,EAAE;WACzD,CAAC,CACH,EACH7E,iBAAM,CACHuE,QAAQ,CAAC,gBAAgB1E,cAAc,IAAI0B,IAAI,CAACsD,IAAI,EAAE,EAAE;YACvDL,iBAAiB,EAAE,KAAK;YACxBC,IAAI,EAAE,UAAU;YAChBC,UAAU,EAAE;cACV,YAAY,EAAE7E,cAAc;cAC5B,iBAAiB,EAAEkF,SAAS;cAC5B,aAAa,EAAExD;;WAElB,CAAC,CACL;UACH,IAAIjB,IAAI,CAACwD,IAAI,EAAE;YACbwB,MAAM,GAAGtF,iBAAM,CAACgG,cAAc,CAACV,MAAM,EAAEtB,iBAAM,CAACiC,YAAY,CAAC3F,IAAI,CAACwD,IAAI,CAAC,CAAC;UACxE;UACA,OAAOwB,MAAM;QACf,CAAC,CAAC,CAAC;QAET,OAAO,OAAO9C,CAAC,CACZQ,IAAI,CACJvD,IAAI,CACHO,iBAAM,CAACqF,OAAO,CAAEa,CAAC,IACfhB,cAAc,CAACgB,CAAC,CAAC,CAACzG,IAAI,CACpBO,iBAAM,CAACmG,eAAe,EACtBnG,iBAAM,CAACoG,IAAI,EACXpG,iBAAM,CAACqF,OAAO,CAACgB,gBAAK,CAACC,IAAI,CAAC,EAC1BtG,iBAAM,CAACuG,GAAG,CAAC/D,CAAC,CAACe,MAAM,CAAC2C,CAAC,CAAC,CAAC,CACxB,CACF,EACDlB,qBAAqB,EACrBhF,iBAAM,CAACwG,OAAO,EACdxG,iBAAM,CAACuE,QAAQ,CAAC,gBAAgB1E,cAAc,EAAE,EAAE;UAChD6E,UAAU,EAAE;YACV,YAAY,EAAE,KAAK;YACnB,YAAY,EAAE7E,cAAc;YAC5B,iBAAiB,EAAEkF;;SAEtB,CAAC,CACH;MACL,CAAC;KAC+B;EACtC,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"SQLQueue.cjs","names":["_SQL","require","_setupRequest","_RequestContext","_errors","_service","_RequestContextContainer","_sql","_crypto","_dateFns","_effectApp","_ids","_schema","_utils","_logger","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","Model","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","etag","String","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","versionColumn","drainRepo","decodeDrain","decode","drain","sync","subMinutes","andThen","limit","getTime","q","offer","insertVoid","insert","make","Option","none","randomUUID","take","first","withTracerEnabled","dec","rest","update","some","sleep","finish","updateVoid","rcc","RequestContextContainer","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","RequestContext","getOrUndefined","discard","withSpan","captureStackTrace","kind","attributes","map","_","_tag","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","processMessage","msg","succeed","flatMap","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","inherit","RequestId","locale","withParentSpan","externalSpan","x","uninterruptible","fork","Fiber","join","tap","forever"],"sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -92,13 +92,13 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
         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.
-        silenceAndReportError, _effectApp.Effect.forever, _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
+        silenceAndReportError, _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
           attributes: {
             "queue.type": "mem",
             "queue.name": queueDrainName,
             "queue.sessionId": sessionId
           }
-        }));
+        }), _effectApp.Effect.forever);
       })
     };
   });

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

@@ -1 +1 @@
-{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_schema","_effect","_effectApp","_ids","_utils","_setupRequest","_logger","_RequestContextContainer","_errors","_service","makeMemQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","withSpan","captureStackTrace","kind","attributes","map","_tag","drain","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","withParentSpan","externalSpan","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","_logger","_RequestContextContainer","_errors","_service","makeMemQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","withSpan","captureStackTrace","kind","attributes","map","_tag","drain","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","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

@@ -88,13 +88,7 @@ function makeServiceBusQueue(queueName, queueDrainName, schema, drainSchema) {
         }, sessionId).pipe(_effectApp.Effect.provideService(_ServiceBus.ServiceBusReceiverFactory, receiver));
       })
       // .pipe(Effect.andThen(Deferred.await(deferred).pipe(Effect.orDie))),
-      .pipe(_effectApp.Effect.andThen(_effectApp.Effect.never), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
-        attributes: {
-          "queue.type": "servicebus",
-          "queue.name": queueDrainName,
-          "queue.sessionId": sessionId
-        }
-      })),
+      .pipe(_effectApp.Effect.andThen(_effectApp.Effect.never)),
       publish: (...messages) => _effectApp.Effect.gen(function* () {
         const requestContext = yield* rcc.requestContext;
         const span = yield* _effectApp.Effect.serviceOption(_effect.Tracer.ParentSpan);

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

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

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAG9B,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;;;;;;qBAW/B,EAAG,iBAAiB,eAI3B,EAAE,sBAAqB;;;qBAKb,EAAG,iBACL,eACP,EAAA,sBAAsB;;;;;;yBAaR,EAAE,iBAAiB;;;yBAcA,EAAG,iBAAiB;;;;;;;;;;;;;;AA9CvD,qBAAa,oBAAqB,SAAQ,yBASxC;CAAG;;;;;;;qBADG,EAAG,iBAAiB,eAI3B,EAAE,sBAAqB;;;qBAKb,EAAG,iBACL,eACP,EAAA,sBAAsB;;;;;;;;;;;yBAaR,EAAE,iBAAiB;;;yBAcA,EAAG,iBAAiB;;;;;;;;;;;;;;;;AAnCvD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAgBlC;IAEA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAED,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;;;CAkBhD,CAAA;AAKF,yBAAiB,oBAAoB,CAAC;IACpC,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACzF;AACD,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACnF"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAG9B,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;;;;;;uBAW5B,iBAAiB,iBAIzB,sBAAqB;;;uBAKV,iBACL,iBACP,sBAAsB;;;;;;2BAaN,iBAAiB;;;2BAcG,iBAAiB;;;;;;;;;;;;;;AA9CvD,qBAAa,oBAAqB,SAAQ,yBASxC;CAAG;;;;;;;uBADM,iBAAiB,iBAIzB,sBAAqB;;;uBAKV,iBACL,iBACP,sBAAsB;;;;;;;;;;;2BAaN,iBAAiB;;;2BAcG,iBAAiB;;;;;;;;;;;;;;;;AAnCvD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAgBlC;IAEA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAED,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;;;CAkBhD,CAAA;AAKF,yBAAiB,oBAAoB,CAAC;IACpC,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACzF;AACD,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACnF"}

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

@@ -15,5 +15,5 @@ export declare function makeSQLQueue<Evt extends {
 }, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
     drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, Tracer.ParentSpan>>;
-}, never, RequestContextContainer | SqlClient.SqlClient>;
+}, never, SqlClient.SqlClient | RequestContextContainer>;
 //# sourceMappingURL=SQLQueue.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAA;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,EAAE,MAAM,EAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIrD,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,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,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;YA6G9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;yDAiEzB"}
+{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAA;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,EAAE,MAAM,EAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIrD,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,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,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;YAiH9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;yDAiEzB"}

package/dist/services/QueueMaker/SQLQueue.js

@@ -53,13 +53,13 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
             versionColumn: "etag"
         });
         const decodeDrain = S.decode(Drain);
-        const drain = () => {
-            const limit = subMinutes(new Date(), 15);
-            return sql `SELECT *
+        const drain = Effect
+            .sync(() => subMinutes(new Date(), 15))
+            .pipe(Effect
+            .andThen((limit) => sql `SELECT *
     FROM queue
     WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
-    LIMIT 1`;
-        };
+    LIMIT 1`));
         const q = {
             offer: (body, meta) => Effect.gen(function* () {
                 yield* queueRepo.insertVoid(Queue.insert.make({
@@ -73,7 +73,7 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
             }),
             take: Effect.gen(function* () {
                 while (true) {
-                    const [first] = yield* drain();
+                    const [first] = yield* drain.pipe(Effect.withTracerEnabled(false)); // disable sql tracer otherwise we spam it..
                     if (first) {
                         const dec = yield* decodeDrain(first);
                         const { createdAt, updatedAt, ...rest } = dec;
@@ -135,15 +135,15 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
                 }));
                 return yield* q
                     .take
-                    .pipe(Effect.flatMap((x) => processMessage(x).pipe(Effect.uninterruptible, Effect.fork, Effect.flatMap(Fiber.join), Effect.tap(q.finish(x)))), silenceAndReportError, Effect.forever, Effect.withSpan(`queue.drain: ${queueDrainName}`, {
+                    .pipe(Effect.flatMap((x) => processMessage(x).pipe(Effect.uninterruptible, Effect.fork, Effect.flatMap(Fiber.join), Effect.tap(q.finish(x)))), silenceAndReportError, Effect.withSpan(`queue.drain: ${queueDrainName}`, {
                     attributes: {
                         "queue.type": "sql",
                         "queue.name": queueDrainName,
                         "queue.sessionId": sessionId
                     }
-                }));
+                }), Effect.forever);
             })
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQLQueue.js","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQLQueue.js","sourceRoot":"","sources":["../../../src/services/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"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"}

package/dist/services/QueueMaker/memQueue.js

@@ -74,15 +74,15 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
                     .pipe(Effect.flatMap((x) => processMessage(x).pipe(Effect.uninterruptible, Effect.fork, Effect.flatMap(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.
-                silenceAndReportError, Effect.forever, Effect.withSpan(`queue.drain: ${queueDrainName}`, {
+                silenceAndReportError, Effect.withSpan(`queue.drain: ${queueDrainName}`, {
                     attributes: {
                         "queue.type": "mem",
                         "queue.name": queueDrainName,
                         "queue.sessionId": sessionId
                     }
-                }));
+                }), Effect.forever);
             })
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ3RELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDN0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FNMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBMkIsRUFDM0IsV0FBMEM7SUFFMUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUN6QixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUE7UUFDM0IsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ3RELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDN0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FNMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBMkIsRUFDM0IsV0FBMEM7SUFFMUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUN6QixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUE7UUFDM0IsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFD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

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

@@ -13,7 +13,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>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, ServiceBusReceiverFactory>, Tracer.ParentSpan>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, ServiceBusReceiverFactory>>;
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
 }, never, RequestContextContainer | ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender>;
 /**

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":"AACA,OAAO,EAIL,yBAAyB,EAE1B,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAS,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAKjD,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,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;YAqB9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;;+GAiHzB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wGAI1F"}
+{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,yBAAyB,EAE1B,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAS,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAKjD,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,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;YAqB9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;;+GA0GzB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wGAI1F"}

package/dist/services/QueueMaker/sbqueue.js

@@ -79,13 +79,7 @@ export function makeServiceBusQueue(queueName, queueDrainName, schema, drainSche
                     .pipe(Effect.provideService(ServiceBusReceiverFactory, receiver));
             })
                 // .pipe(Effect.andThen(Deferred.await(deferred).pipe(Effect.orDie))),
-                .pipe(Effect.andThen(Effect.never), Effect.withSpan(`queue.drain: ${queueDrainName}`, {
-                attributes: {
-                    "queue.type": "servicebus",
-                    "queue.name": queueDrainName,
-                    "queue.sessionId": sessionId
-                }
-            })),
+                .pipe(Effect.andThen(Effect.never)),
             publish: (...messages) => Effect
                 .gen(function* () {
                 const requestContext = yield* rcc.requestContext;
@@ -115,4 +109,4 @@ export function makeServiceBusQueue(queueName, queueDrainName, schema, drainSche
 export function makeServiceBusLayers(url, queueName, queueDrainName) {
     return Layer.merge(ServiceBusReceiverFactory.Live(queueDrainName), LiveSender(queueName)).pipe(Layer.provide(LiveServiceBusClient(url)));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUM5QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRTFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDN0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzdHLE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQU1qQyxTQUFpQixFQUNqQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUks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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUM5QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRTFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDN0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzdHLE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQU1qQyxTQUFpQixFQUNqQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUks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

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

@@ -39,7 +39,7 @@ export declare function handleByIdAndSaveWithPure<T extends {
     id: string;
 }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): <Req extends {
     id: T["id"];
-}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, Exclude<R, {
+}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
 }>>;
 /**
@@ -49,7 +49,7 @@ export declare function saveManyWithPure_<R, T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -66,7 +66,7 @@ export declare function saveAllWithEffectInt<T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError, R>;
+}, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, R>;
 /**
  * @tsplus fluent Repository saveManyWithPureBatched
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.32.1",
+  "version": "1.32.3",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,8 +20,8 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/infra-adapters": "1.16.1",
     "@effect-app/core": "1.13.1",
+    "@effect-app/infra-adapters": "1.16.1",
     "effect-app": "1.24.1",
     "@effect-app/schema": "1.16.1"
   },

package/src/services/QueueMaker/SQLQueue.ts

@@ -69,13 +69,17 @@ export function makeSQLQueue<
 
     const decodeDrain = S.decode(Drain)
 
-    const drain = () => {
-      const limit = subMinutes(new Date(), 15)
-      return sql<typeof Drain.Encoded>`SELECT *
+    const drain = Effect
+      .sync(() => subMinutes(new Date(), 15))
+      .pipe(
+        Effect
+          .andThen((limit) =>
+            sql<typeof Drain.Encoded>`SELECT *
     FROM queue
     WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
     LIMIT 1`
-    }
+          )
+      )
 
     const q = {
       offer: (body: Evt, meta: typeof QueueMeta.Type) =>
@@ -93,7 +97,7 @@ export function makeSQLQueue<
         }),
       take: Effect.gen(function*() {
         while (true) {
-          const [first] = yield* drain()
+          const [first] = yield* drain.pipe(Effect.withTracerEnabled(false)) // disable sql tracer otherwise we spam it..
           if (first) {
             const dec = yield* decodeDrain(first)
             const { createdAt, updatedAt, ...rest } = dec
@@ -191,14 +195,14 @@ export function makeSQLQueue<
                 )
               ),
               silenceAndReportError,
-              Effect.forever,
               Effect.withSpan(`queue.drain: ${queueDrainName}`, {
                 attributes: {
                   "queue.type": "sql",
                   "queue.name": queueDrainName,
                   "queue.sessionId": sessionId
                 }
-              })
+              }),
+              Effect.forever
             )
         })
     } satisfies QueueBase<Evt, DrainEvt>

package/src/services/QueueMaker/memQueue.ts

@@ -115,14 +115,14 @@ export function makeMemQueue<
               // 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.
               silenceAndReportError,
-              Effect.forever,
               Effect.withSpan(`queue.drain: ${queueDrainName}`, {
                 attributes: {
                   "queue.type": "mem",
                   "queue.name": queueDrainName,
                   "queue.sessionId": sessionId
                 }
-              })
+              }),
+              Effect.forever
             )
         })
     } satisfies QueueBase<Evt, DrainEvt>

package/src/services/QueueMaker/sbqueue.ts

@@ -127,14 +127,7 @@ export function makeServiceBusQueue<
           })
           // .pipe(Effect.andThen(Deferred.await(deferred).pipe(Effect.orDie))),
           .pipe(
-            Effect.andThen(Effect.never),
-            Effect.withSpan(`queue.drain: ${queueDrainName}`, {
-              attributes: {
-                "queue.type": "servicebus",
-                "queue.name": queueDrainName,
-                "queue.sessionId": sessionId
-              }
-            })
+            Effect.andThen(Effect.never)
           ),
 
       publish: (...messages) =>