@reventlessdev/reventless-core 3.0.0-alpha.174 → 3.0.0-alpha.176

package/src/adapter/Runtime/AggregateRuntime_Builder_Micro.res.mjs

@@ -14,7 +14,7 @@ function Make(RuntimeEnvironment) {
       let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
       let resource = Component$ReventlessCore.toPulumiResource(commandGenerator);
       let name = ComponentType$ReventlessCore.nameOpt(resource.__name, CommandGenerator$ReventlessCore.componentType);
-      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       }));
     };
@@ -23,7 +23,7 @@ function Make(RuntimeEnvironment) {
       let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
       let resource = Component$ReventlessCore.toPulumiResource(commandTopic);
       let name = ComponentType$ReventlessCore.nameOpt(resource.__name, CommandTopic$ReventlessCore.componentType);
-      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       }));
     };
@@ -36,7 +36,7 @@ function Make(RuntimeEnvironment) {
       let opts = {
         parent: opts_parent
       };
-      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, opts);
+      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, opts);
       EventCollectorChannel.connect(name, [{
           channel: eventCollector.channel,
           eventTopics: eventTopics,

package/src/adapter/Runtime/EventCollectorRuntime_Builder_PerEventCollector.res

@@ -22,6 +22,9 @@ module Make = (
   ) => {
     let resource = eventCollector->Component.toPulumiResource
     let name = resource.name->ComponentType.nameOpt(EventCollector.componentType)
+    // Same `comp` shape as the shared-runtime dispatchers, so a log filter reads the
+    // same whichever deployment strategy hosts the collector.
+    let comp = `EventCollector(${resource.name->Option.getOr("Unnamed")})`
     let opts = {Pulumi.ComponentResource.parent: resource}
     let runtime = RuntimeEnvironment.make(
       ~name,
@@ -31,7 +34,9 @@ module Make = (
         ->Runtime.runEffectHandler(
           ~extractCorrelationId=RuntimeEnvironment.extractCorrelationId,
           ~extractCausationId=RuntimeEnvironment.extractCausationId,
-          ~comp=name,
+          ~extractSentTimestamp=RuntimeEnvironment.extractSentTimestamp,
+          ~extractRetryCount=RuntimeEnvironment.extractRetryCount,
+          ~comp,
         )
       ),
       ~memorySize,

package/src/adapter/Runtime/EventCollectorRuntime_Builder_PerEventCollector.res.mjs

@@ -1,5 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Runtime$ReventlessCore from "./Runtime.res.mjs";
 import * as Component$ReventlessCore from "../../components/Component.res.mjs";
 import * as ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
@@ -12,11 +13,12 @@ function Make(RuntimeEnvironment) {
       let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
       let resource = Component$ReventlessCore.toPulumiResource(eventCollector);
       let name = ComponentType$ReventlessCore.nameOpt(resource.__name, EventCollector$ReventlessCore.componentType);
+      let comp = `EventCollector(` + Stdlib_Option.getOr(resource.__name, "Unnamed") + `)`;
       let opts_parent = resource;
       let opts = {
         parent: opts_parent
       };
-      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, comp, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       });
       EventCollectorChannel.connect(name, [{

package/src/adapter/Runtime/EventCollectorRuntime_Builder_Single.res

@@ -34,16 +34,24 @@ module Make = (
     maxTimeout: 0,
   })
   type effectHandler = Runtime.effectHandler<RuntimeEnvironment.event, context, unit, string>
-  let eventCollectorHandlers: dict<array<effectHandler>> = Dict.make()
+  // `comp` is the *element's* log component, resolved where the handler is registered
+  // (the event collector's own resource is in hand there). Keeping it next to the
+  // handler is what makes every collector hosted in this one runtime separable by
+  // field — the runtime-group name would be identical for all of them.
+  type registeredHandler = {comp: string, handler: effectHandler}
+  let eventCollectorHandlers: dict<array<registeredHandler>> = Dict.make()
 
   let eventCollectorHandler = parentName =>
     async (event: RuntimeEnvironment.event, context) => {
       let correlationId = event->RuntimeEnvironment.extractCorrelationId
       let causationId = event->RuntimeEnvironment.extractCausationId
-      let comp = `EventCollectorRuntime(${parentName})`
+      let timestamp = event->RuntimeEnvironment.extractSentTimestamp
+      let retryCount = event->RuntimeEnvironment.extractRetryCount
+      // Group-level comp — used only for this dispatcher's own bookkeeping lines,
+      // which describe the runtime group rather than any one collector.
+      let groupComp = `EventCollectorRuntime(${parentName})`
       // Shared dispatch helper annotates correlationId / comp / causationId so the
       // application handler's own log lines carry them (see Runtime.runEffect).
-      let runEffect = effect => Runtime.runEffect(~correlationId?, ~causationId?, ~comp, effect)
       let _ = await event
       ->RuntimeEnvironment.groupBySource
       ->Dict.toArray
@@ -52,13 +60,22 @@ module Make = (
         | Some(handlers) =>
           let count = handlers->Array.length->Int.toString
           EffectLogger.logDebug(
-            ~comp,
+            ~comp=groupComp,
             `found ${count} handler(s) for ${urn}`,
           )->Effect.runSync
           let _ = await handlers
-          ->Array.map(handler => runEffect(handler(event, context)))
+          ->Array.map(({comp, handler}) =>
+            Runtime.runEffect(
+              ~correlationId?,
+              ~causationId?,
+              ~comp,
+              ~timestamp?,
+              ~retryCount?,
+              handler(event, context),
+            )
+          )
           ->Promise.all
-        | None => EffectLogger.logWarn(~comp, `no handler found: ${urn}`)->Effect.runSync
+        | None => EffectLogger.logWarn(~comp=groupComp, `no handler found: ${urn}`)->Effect.runSync
         }
       })
       ->Promise.all
@@ -155,11 +172,12 @@ module Make = (
             ~comp="EventCollectorRuntime",
             `forEventCollector ${eventCollectorName}: set handler for ${urns->Array.join(", ")}`,
           )
+          let comp = `EventCollector(${eventCollectorName})`
           urns->Array.map(urn => {
             let handlers = eventCollectorHandlers->Dict.get(urn)->Option.getOr([])
             eventCollectorHandlers->Dict.set(
               urn,
-              handlers->Array.concat([handler->RuntimeEnvironment.asEffectHandler]),
+              handlers->Array.concat([{comp, handler: handler->RuntimeEnvironment.asEffectHandler}]),
             )
           })
         })

package/src/adapter/Runtime/EventCollectorRuntime_Builder_Single.res.mjs

@@ -30,20 +30,19 @@ function Make(RuntimeEnvironment) {
     let eventCollectorHandler = parentName => (async (event, context) => {
       let correlationId = RuntimeEnvironment.extractCorrelationId(event);
       let causationId = RuntimeEnvironment.extractCausationId(event);
-      let comp = `EventCollectorRuntime(` + parentName + `)`;
+      let timestamp = RuntimeEnvironment.extractSentTimestamp(event);
+      let retryCount = RuntimeEnvironment.extractRetryCount(event);
+      let groupComp = `EventCollectorRuntime(` + parentName + `)`;
       await Promise.all(Object.entries(RuntimeEnvironment.groupBySource(event)).map(async param => {
         let event = param[1];
         let urn = param[0];
         let handlers = eventCollectorHandlers[urn];
         if (handlers === undefined) {
-          return Effect.runSync(EffectLogger$ReventlessCore.logWarn(comp, undefined, `no handler found: ` + urn));
+          return Effect.runSync(EffectLogger$ReventlessCore.logWarn(groupComp, undefined, `no handler found: ` + urn));
         }
         let count = handlers.length.toString();
-        Effect.runSync(EffectLogger$ReventlessCore.logDebug(comp, undefined, `found ` + count + ` handler(s) for ` + urn));
-        await Promise.all(handlers.map(handler => {
-          let effect = handler(event, context);
-          return Runtime$ReventlessCore.runEffect(correlationId, causationId, comp, undefined, undefined, undefined, effect);
-        }));
+        Effect.runSync(EffectLogger$ReventlessCore.logDebug(groupComp, undefined, `found ` + count + ` handler(s) for ` + urn));
+        await Promise.all(handlers.map(param => Runtime$ReventlessCore.runEffect(correlationId, causationId, param.comp, undefined, timestamp, retryCount, undefined, undefined, param.handler(event, context))));
       }));
     });
     let validateParent = parent => {
@@ -108,9 +107,13 @@ function Make(RuntimeEnvironment) {
         let handler = param[2];
         let urns = param[1];
         log.debug("EventCollectorRuntime", undefined, `forEventCollector ` + eventCollectorName + `: set handler for ` + urns.join(", "));
+        let comp = `EventCollector(` + eventCollectorName + `)`;
         return urns.map(urn => {
           let handlers = Stdlib_Option.getOr(eventCollectorHandlers[urn], []);
-          eventCollectorHandlers[urn] = handlers.concat([RuntimeEnvironment.asEffectHandler(handler)]);
+          eventCollectorHandlers[urn] = handlers.concat([{
+              comp: comp,
+              handler: RuntimeEnvironment.asEffectHandler(handler)
+            }]);
         });
       });
     };

package/src/adapter/Runtime/ExtensionPointRuntime_Builder_PerExtensionPoint.res

@@ -31,6 +31,8 @@ module Make = (
         ->Runtime.runEffectHandler(
           ~extractCorrelationId=RuntimeEnvironment.extractCorrelationId,
           ~extractCausationId=RuntimeEnvironment.extractCausationId,
+          ~extractSentTimestamp=RuntimeEnvironment.extractSentTimestamp,
+          ~extractRetryCount=RuntimeEnvironment.extractRetryCount,
           ~comp=name,
         )
       ),

package/src/adapter/Runtime/ExtensionPointRuntime_Builder_PerExtensionPoint.res.mjs

@@ -12,7 +12,7 @@ function Make(RuntimeEnvironment) {
       let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
       let resource = Component$ReventlessCore.toPulumiResource(commandTopic);
       let name = ComponentType$ReventlessCore.nameOpt(resource.__name, CommandTopic$ReventlessCore.componentType);
-      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       }));
     };

package/src/adapter/Runtime/PluginRuntime_Builder_Micro.res

@@ -31,6 +31,8 @@ module Make = (
         ->Runtime.runEffectHandler(
           ~extractCorrelationId=RuntimeEnvironment.extractCorrelationId,
           ~extractCausationId=RuntimeEnvironment.extractCausationId,
+          ~extractSentTimestamp=RuntimeEnvironment.extractSentTimestamp,
+          ~extractRetryCount=RuntimeEnvironment.extractRetryCount,
           ~comp=name,
         )
       ),
@@ -85,6 +87,8 @@ module Make = (
         ->Runtime.runEffectHandler(
           ~extractCorrelationId=RuntimeEnvironment.extractCorrelationId,
           ~extractCausationId=RuntimeEnvironment.extractCausationId,
+          ~extractSentTimestamp=RuntimeEnvironment.extractSentTimestamp,
+          ~extractRetryCount=RuntimeEnvironment.extractRetryCount,
           ~comp=name,
         )
       ),

package/src/adapter/Runtime/PluginRuntime_Builder_Micro.res.mjs

@@ -18,7 +18,7 @@ function Make(RuntimeEnvironment) {
       let opts = {
         parent: opts_parent
       };
-      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       });
       EventCollectorChannel.connect(name, [{
@@ -41,7 +41,7 @@ function Make(RuntimeEnvironment) {
       let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
       let resource = Component$ReventlessCore.toPulumiResource(dcbCommandTopic);
       let name = ComponentType$ReventlessCore.nameOpt(resource.__name, CommandTopic$ReventlessCore.componentType);
-      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       }));
     };

package/src/adapter/Runtime/PluginRuntime_Builder_Single.res

@@ -31,6 +31,8 @@ module Make = (
         ->Runtime.runEffectHandler(
           ~extractCorrelationId=RuntimeEnvironment.extractCorrelationId,
           ~extractCausationId=RuntimeEnvironment.extractCausationId,
+          ~extractSentTimestamp=RuntimeEnvironment.extractSentTimestamp,
+          ~extractRetryCount=RuntimeEnvironment.extractRetryCount,
           ~comp=name,
         )
       ),
@@ -85,6 +87,8 @@ module Make = (
         ->Runtime.runEffectHandler(
           ~extractCorrelationId=RuntimeEnvironment.extractCorrelationId,
           ~extractCausationId=RuntimeEnvironment.extractCausationId,
+          ~extractSentTimestamp=RuntimeEnvironment.extractSentTimestamp,
+          ~extractRetryCount=RuntimeEnvironment.extractRetryCount,
           ~comp=name,
         )
       ),

package/src/adapter/Runtime/PluginRuntime_Builder_Single.res.mjs

@@ -18,7 +18,7 @@ function Make(RuntimeEnvironment) {
       let opts = {
         parent: opts_parent
       };
-      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      let runtime = RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       });
       EventCollectorChannel.connect(name, [{
@@ -41,7 +41,7 @@ function Make(RuntimeEnvironment) {
       let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
       let resource = Component$ReventlessCore.toPulumiResource(dcbCommandTopic);
       let name = ComponentType$ReventlessCore.nameOpt(resource.__name, CommandTopic$ReventlessCore.componentType);
-      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
+      return connect(RuntimeEnvironment.make(name, handler.apply(handler => Runtime$ReventlessCore.runEffectHandler(RuntimeEnvironment.extractCorrelationId, RuntimeEnvironment.extractCausationId, RuntimeEnvironment.extractSentTimestamp, RuntimeEnvironment.extractRetryCount, name, undefined, RuntimeEnvironment.asEffectHandler(handler))), memorySize, timeout, {
         parent: resource
       }));
     };

package/src/adapter/Runtime/Runtime.res

@@ -18,6 +18,8 @@ let annotateInvocation = (
   ~causationId=?,
   ~comp=?,
   ~pluginName=?,
+  ~timestamp=?,
+  ~retryCount=?,
   ~identity=?,
   ~claims=?,
 ) => {
@@ -34,10 +36,20 @@ let annotateInvocation = (
     | Some(v) => eff->Effect.annotateLogs(key, v)
     | None => eff
     }
+  // Only a redelivery is annotated: a constant "1" on every line is noise, and
+  // its absence is what makes `retryCount > 1` a usable filter. `timestamp` is
+  // never annotated — it is a context field for computing latency, not a key
+  // anyone filters on.
+  let annotateRetry = eff =>
+    switch retryCount {
+    | Some(count) if count > 1 => eff->Effect.annotateLogs("retryCount", count->Int.toString)
+    | _ => eff
+    }
   effect
   ->Effect.annotateLogs("correlationId", cid)
   ->annotateOpt("comp", comp)
   ->annotateOpt("causationId", causationId)
+  ->annotateRetry
   ->Effect.provideService(
     RequestContext.tag,
     RequestContext.make(
@@ -45,6 +57,8 @@ let annotateInvocation = (
       ~causationId?,
       ~component=?comp,
       ~pluginName=?resolvedPlugin,
+      ~timestamp?,
+      ~retryCount?,
       ~identity?,
       ~claims?,
     ),
@@ -59,12 +73,23 @@ let runEffect = (
   ~causationId=?,
   ~comp=?,
   ~pluginName=?,
+  ~timestamp=?,
+  ~retryCount=?,
   ~identity=?,
   ~claims=?,
   effect,
 ) =>
   effect
-  ->annotateInvocation(~correlationId?, ~causationId?, ~comp?, ~pluginName?, ~identity?, ~claims?)
+  ->annotateInvocation(
+    ~correlationId?,
+    ~causationId?,
+    ~comp?,
+    ~pluginName?,
+    ~timestamp?,
+    ~retryCount?,
+    ~identity?,
+    ~claims?,
+  )
   ->Effect.runPromise
 
 // Convert an effectHandler to an eventHandler at build time, annotating the
@@ -76,21 +101,31 @@ let runEffect = (
 let runEffectHandler = (
   ~extractCorrelationId: option<'event => option<string>>=?,
   ~extractCausationId: option<'event => option<string>>=?,
+  ~extractSentTimestamp: option<'event => option<float>>=?,
+  ~extractRetryCount: option<'event => option<int>>=?,
   ~comp=?,
   ~pluginName=?,
   handler: effectHandler<'event, 'context, 'result, 'error>,
 ): eventHandler<'event, 'context, 'result> =>
   (event, ctx) => {
-    let correlationId = switch extractCorrelationId {
-    | Some(f) => f(event)
-    | None => None
-    }
-    let causationId = switch extractCausationId {
-    | Some(f) => f(event)
-    | None => None
-    }
+    let extract = (f, event) =>
+      switch f {
+      | Some(f) => f(event)
+      | None => None
+      }
+    let correlationId = extractCorrelationId->extract(event)
+    let causationId = extractCausationId->extract(event)
+    let timestamp = extractSentTimestamp->extract(event)
+    let retryCount = extractRetryCount->extract(event)
     handler(event, ctx)
-    ->annotateInvocation(~correlationId?, ~causationId?, ~comp?, ~pluginName?)
+    ->annotateInvocation(
+      ~correlationId?,
+      ~causationId?,
+      ~comp?,
+      ~pluginName?,
+      ~timestamp?,
+      ~retryCount?,
+    )
     ->Effect.runPromise
   }
 
@@ -115,6 +150,10 @@ module type Environment = {
   let groupBySource: event => dict<event>
   let extractCorrelationId: event => option<string>
   let extractCausationId: event => option<string>
+  // Transport-level delivery facts, for RequestContext.timestamp / .retryCount.
+  // `None` where the transport carries no such notion (see each implementation).
+  let extractSentTimestamp: event => option<float>
+  let extractRetryCount: event => option<int>
   let asEventHandler: 'a => eventHandler<event, context, 'result>
   let asEffectHandler: 'a => effectHandler<event, context, 'result, 'error>
 }

package/src/adapter/Runtime/Runtime.res.mjs

@@ -5,7 +5,7 @@ import * as Effect from "effect/Effect";
 import * as LogPrefix$Reventless from "@reventlessdev/reventless-spec/src/LogPrefix.res.mjs";
 import * as RequestContext$ReventlessCore from "../../RequestContext.res.mjs";
 
-function annotateInvocation(effect, correlationId, causationId, comp, pluginName, identity, claims) {
+function annotateInvocation(effect, correlationId, causationId, comp, pluginName, timestamp, retryCount, identity, claims) {
   let cid = Stdlib_Option.getOr(correlationId, "unknown");
   let resolvedPlugin = pluginName !== undefined ? pluginName : LogPrefix$Reventless.resolvePlugin(comp, undefined);
   let annotateOpt = (eff, key, value) => {
@@ -15,18 +15,32 @@ function annotateInvocation(effect, correlationId, causationId, comp, pluginName
       return eff;
     }
   };
-  return Effect.provideService(annotateOpt(annotateOpt(Effect.annotateLogs(effect, "correlationId", cid), "comp", comp), "causationId", causationId), RequestContext$ReventlessCore.tag, RequestContext$ReventlessCore.make(cid, causationId, comp, resolvedPlugin, identity, claims));
+  let annotateRetry = eff => {
+    if (retryCount !== undefined && retryCount > 1) {
+      return Effect.annotateLogs(eff, "retryCount", retryCount.toString());
+    } else {
+      return eff;
+    }
+  };
+  return Effect.provideService(annotateRetry(annotateOpt(annotateOpt(Effect.annotateLogs(effect, "correlationId", cid), "comp", comp), "causationId", causationId)), RequestContext$ReventlessCore.tag, RequestContext$ReventlessCore.make(cid, causationId, comp, resolvedPlugin, timestamp, retryCount, identity, claims));
 }
 
-function runEffect(correlationId, causationId, comp, pluginName, identity, claims, effect) {
-  return Effect.runPromise(annotateInvocation(effect, correlationId, causationId, comp, pluginName, identity, claims));
+function runEffect(correlationId, causationId, comp, pluginName, timestamp, retryCount, identity, claims, effect) {
+  return Effect.runPromise(annotateInvocation(effect, correlationId, causationId, comp, pluginName, timestamp, retryCount, identity, claims));
 }
 
-function runEffectHandler(extractCorrelationId, extractCausationId, comp, pluginName, handler) {
+function runEffectHandler(extractCorrelationId, extractCausationId, extractSentTimestamp, extractRetryCount, comp, pluginName, handler) {
   return (event, ctx) => {
-    let correlationId = extractCorrelationId !== undefined ? extractCorrelationId(event) : undefined;
-    let causationId = extractCausationId !== undefined ? extractCausationId(event) : undefined;
-    return Effect.runPromise(annotateInvocation(handler(event, ctx), correlationId, causationId, comp, pluginName, undefined, undefined));
+    let extract = (f, event) => {
+      if (f !== undefined) {
+        return f(event);
+      }
+    };
+    let correlationId = extract(extractCorrelationId, event);
+    let causationId = extract(extractCausationId, event);
+    let timestamp = extract(extractSentTimestamp, event);
+    let retryCount = extract(extractRetryCount, event);
+    return Effect.runPromise(annotateInvocation(handler(event, ctx), correlationId, causationId, comp, pluginName, timestamp, retryCount, undefined, undefined));
   };
 }
 

package/src/admin/Platform_Admin.res

@@ -53,7 +53,7 @@ module Make = (
   ) => {
     module AdminEventCollector = EventCollector_Builder.Make(RE, ECC)
     let make = (~name, ~eventTopics, ~opts) => {
-      let eventCollector = AdminEventCollector.make(~name, ~eventTopics, ~opts)
+      let eventCollector = AdminEventCollector.make(~name, ~eventTopics, ~owner={kind: ComponentType.Plugin, name}, ~opts)
       let eventCollectorOutputs = eventCollector->Component.outputs
       (eventCollector, eventCollectorOutputs)
     }

package/src/admin/Platform_Admin.res.mjs

@@ -24,7 +24,10 @@ function Make(RuntimeEnvironment) {
     let MakeEventCollectorHelper = RE => (ECC => (RB => {
       let AdminEventCollector = EventCollector_Builder$ReventlessCore.Make(RE)(ECC);
       let make = (name, eventTopics, opts) => {
-        let eventCollector = AdminEventCollector.make(name, eventTopics, opts);
+        let eventCollector = AdminEventCollector.make(name, eventTopics, {
+          kind: "Plugin",
+          name: name
+        }, opts);
         let eventCollectorOutputs = Component$ReventlessCore.outputs(eventCollector);
         return [
           eventCollector,
@@ -174,7 +177,10 @@ function Make(RuntimeEnvironment) {
         let eventTopics = Aggregate$ReventlessCore.filterEventTopics(aggregatesOutputs, aggregateNames);
         let AdminEventCollector = EventCollector_Builder$ReventlessCore.Make(RuntimeEnvironment)(EventCollectorChannel);
         let make = (name, eventTopics, opts) => {
-          let eventCollector = AdminEventCollector.make(name, eventTopics, opts);
+          let eventCollector = AdminEventCollector.make(name, eventTopics, {
+            kind: "Plugin",
+            name: name
+          }, opts);
           let eventCollectorOutputs = Component$ReventlessCore.outputs(eventCollector);
           return [
             eventCollector,

package/src/components/Aggregate/Aggregate_Builder.res

@@ -79,7 +79,11 @@ module Make = (
           let eventLog = eventLogOps
         },
       )
-      let commandTopic = SpecificCommandTopic.make(~name, ~opts)
+      let commandTopic = SpecificCommandTopic.make(
+        ~name,
+        ~owner={kind: ComponentType.Aggregate, name: Spec.name},
+        ~opts,
+      )
       let handler = SpecificCommandTopic.makeHandler(
         ~commandTopic,
         ~commandsHandler=AggregateCallback.handleCommands,
@@ -148,7 +152,11 @@ module Make = (
     let memorySize = ReventlessInfra.RuntimeHints.resolveMemory(runtime, ~default=1024)
     let timeout = ReventlessInfra.RuntimeHints.resolveTimeout(runtime, ~default=30)
 
-    let eventLog = SpecificEventLog.make(~name, ~opts)
+    let eventLog = SpecificEventLog.make(
+      ~name,
+      ~owner={kind: ComponentType.Aggregate, name: Spec.name},
+      ~opts,
+    )
     let commandTopic = eventLog->createCommandTopic(name, opts, ~memorySize, ~timeout)
     let commandGenerator = commandTopic->createCommandGenerator(~api, name, opts, ~memorySize, ~timeout)
 

package/src/components/Aggregate/Aggregate_Builder.res.mjs

@@ -36,7 +36,10 @@ function Make(Spec) {
         EventLog: SpecificEventLog,
         eventLog: eventLogOps
       });
-      let commandTopic = SpecificCommandTopic.make(name, opts);
+      let commandTopic = SpecificCommandTopic.make(name, {
+        kind: "Aggregate",
+        name: Spec.name
+      }, opts);
       let handler = SpecificCommandTopic.makeHandler(commandTopic, AggregateCallback.handleCommands);
       let eventLog$1 = Component$ReventlessCore.outputs(eventLog);
       let resources = [
@@ -72,7 +75,10 @@ function Make(Spec) {
       let name = ComponentType$ReventlessCore.name(extra$1, Aggregate$ReventlessCore.componentType);
       let memorySize = RuntimeHints$ReventlessInfra.resolveMemory(runtime, 1024);
       let timeout = RuntimeHints$ReventlessInfra.resolveTimeout(runtime, 30);
-      let eventLog = SpecificEventLog.make(name, opts);
+      let eventLog = SpecificEventLog.make(name, {
+        kind: "Aggregate",
+        name: Spec.name
+      }, opts);
       let commandTopic = createCommandTopic(eventLog, name, opts, memorySize, timeout);
       let commandGenerator = createCommandGenerator(commandTopic, api, name, opts, memorySize, timeout);
       Component$ReventlessCore.setOperations(extra, Output$Pulumi.flatMap(commandTopic, commandTopic => Component$ReventlessCore.operations(commandTopic).apply(param => ({

package/src/components/AutomationSlice/AutomationSlice_Builder.res

@@ -89,7 +89,12 @@ module Make = (
       let memorySize = ReventlessInfra.RuntimeHints.resolveMemory(runtime, ~default=1024)
       let timeout = ReventlessInfra.RuntimeHints.resolveTimeout(runtime, ~default=30)
 
-      let queryDb = SpecificQueryDb.make(~api=Api.api(), ~apiRole=Api.apiRole(), ~opts)
+      let queryDb = SpecificQueryDb.make(
+        ~api=Api.api(),
+        ~apiRole=Api.apiRole(),
+        ~owner={kind: ComponentType.AutomationSlice, name: Spec.name},
+        ~opts,
+      )
 
       // Fail-fast: every Mapping.sourceName must resolve to a topic in
       // `allEventTopics`. Catches Aggregate-name typos and DCB-source-name
@@ -125,7 +130,12 @@ module Make = (
         (queryDb->Component.operations, publishJsons)
         ->Pulumi.Output.all2
         ->Pulumi.Output.apply(((queryDbOps, publishJsonsFn)) => {
-          let ec = SpecificEventCollector.make(~name=Spec.name, ~eventTopics, ~opts)
+          let ec = SpecificEventCollector.make(
+            ~name=Spec.name,
+            ~eventTopics,
+            ~owner={kind: ComponentType.AutomationSlice, name: Spec.name},
+            ~opts,
+          )
 
           let jsonEventsHandler: EventCollector.jsonEventsHandler = stream =>
             stream

package/src/components/AutomationSlice/AutomationSlice_Builder.res.mjs

@@ -56,7 +56,10 @@ function Make(RuntimeEnvironment) {
         };
         let memorySize = RuntimeHints$ReventlessInfra.resolveMemory(runtime, 1024);
         let timeout = RuntimeHints$ReventlessInfra.resolveTimeout(runtime, 30);
-        let queryDb = SpecificQueryDb.make(Api.api(), Api.apiRole(), undefined, opts);
+        let queryDb = SpecificQueryDb.make(Api.api(), Api.apiRole(), undefined, {
+          kind: "AutomationSlice",
+          name: Spec.name
+        }, opts);
         sourceNames.forEach(sourceName => {
           if (sourceName in allEventTopics) {
             return;
@@ -72,7 +75,10 @@ function Make(RuntimeEnvironment) {
         ]).apply(param => {
           let publishJsonsFn = param[1];
           let queryDbOps = param[0];
-          let ec = SpecificEventCollector.make(Spec.name, eventTopics, opts);
+          let ec = SpecificEventCollector.make(Spec.name, eventTopics, {
+            kind: "AutomationSlice",
+            name: Spec.name
+          }, opts);
           let jsonEventsHandler = stream => Effect.flatMap(Stream.runCollect(stream), jsons => Effect.promise(async () => {
             Callback.phase1(jsons, context);
             await syncToQueryDb(queryDbOps);

package/src/components/CommandTopic/CommandTopic.res

@@ -56,7 +56,11 @@ module type T = {
     Runtime.effectHandler<callbackEvent, 'context, unit, string>,
   >
 
-  let make: (~name: string, ~opts: Pulumi.ComponentResource.options=?) => component
+  let make: (
+    ~name: string,
+    ~owner: ResourceAttribution.owner=?,
+    ~opts: Pulumi.ComponentResource.options=?,
+  ) => component
 }
 
 let toResolvedOutputs = (

package/src/components/CommandTopic/CommandTopic_Adapter.res

@@ -32,6 +32,7 @@ external channel: Component.t<CommandTopic.t, CommandTopic.outputs, 'operations>
 
 type channelMaker<'callbackEvent, 'context, 'channelParts, 'runtimeParts> = (
   ~name: string,
+  ~owner: option<ResourceAttribution.owner>,
   ~opts: Pulumi.ComponentResource.options=?,
 ) => channel<'callbackEvent, 'context, 'channelParts, 'runtimeParts>
 

package/src/components/CommandTopic/CommandTopic_Builder.res

@@ -70,11 +70,11 @@ module Make = (Spec: ReventlessInfra.CommandTopic.T, Channel: CommandTopic_Adapt
     ->Stream.runCollect
     ->Effect.map(Array.flat)
 
-  let construct = (self, name) => {
+  let construct = (~owner=?, self, name) => {
     let opts = {Pulumi.ComponentResource.parent: self->Component.toPulumiResource}
     let name = name->ComponentType.name(CommandTopic.componentType)
 
-    let channel = Channel.make(~name, ~opts)
+    let channel = Channel.make(~name, ~owner, ~opts)
     self->CommandTopic_Adapter.setChannel(channel)
 
     self->Component.setOperations(
@@ -136,11 +136,11 @@ module Make = (Spec: ReventlessInfra.CommandTopic.T, Channel: CommandTopic_Adapt
     channel.handleChannelEvent(filteringHandler)
   }
 
-  let make = (~name, ~opts=?): component =>
+  let make = (~name, ~owner=?, ~opts=?): component =>
     Component.make(
       ~componentType=CommandTopic.componentType->ComponentType.toString,
       ~name,
-      ~construct,
+      ~construct=construct(~owner?, ...),
       ~opts,
     )
 }