@reventlessdev/reventless-aws 3.0.0-alpha.219 → 3.0.0-alpha.221

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

@@ -1,8 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as Aws from "@pulumi/aws";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
+import * as Stdlib_Float from "@rescript/runtime/lib/es6/Stdlib_Float.js";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
@@ -17,7 +19,6 @@ import * as Monitoring$ReventlessCore from "@reventlessdev/reventless-core/src/a
 import * as Util_Bundle$ReventlessAws from "../../util/Util_Bundle.res.mjs";
 import * as Util_Lambda$ReventlessAws from "../../util/Util_Lambda.res.mjs";
 import * as Util_Pulumi$ReventlessCore from "@reventlessdev/reventless-core/src/util/Util_Pulumi.res.mjs";
-import * as CommandTopic$ReventlessCore from "@reventlessdev/reventless-core/src/components/CommandTopic/CommandTopic.res.mjs";
 import * as Util_IAM_Role$ReventlessAws from "../../util/Util_IAM_Role.res.mjs";
 
 let additionalEnvVars = {};
@@ -28,8 +29,8 @@ function make(name, handler, memorySizeOpt, timeoutOpt, opts) {
   let memorySize = memorySizeOpt !== undefined ? memorySizeOpt : 1024;
   let timeout = timeoutOpt !== undefined ? timeoutOpt : 30;
   let opts$1 = Stdlib_Option.map(opts, Util_Pulumi$ReventlessCore.ComponentResourceOptions.toCustomResourceOptions);
-  let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name, Pulumi.output(AWS$ReventlessAws.Lambda.principal), opts$1);
-  let tags = AWS_Tags$ReventlessAws.make(name, CommandTopic$ReventlessCore.componentType);
+  let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name, Pulumi.output(AWS$ReventlessAws.Lambda.principal), undefined, opts$1);
+  let tags = AWS_Tags$ReventlessAws.make(name, "Platform", "Runtime", "Platform", undefined, undefined, undefined, undefined);
   let lambda = handler.apply(handler => new (Aws.lambda.CallbackFunction)(name, Lambda$PulumiAws.CallbackFunction.Args.make(handler, lambdaRole, undefined, undefined, undefined, memorySize, timeout, undefined, undefined, undefined, tags, undefined), opts$1 !== undefined ? Primitive_option.valFromOption(opts$1) : undefined));
   return {
     parts: {
@@ -43,13 +44,14 @@ function make(name, handler, memorySizeOpt, timeoutOpt, opts) {
   };
 }
 
-function makeFromCodeAsset(name, unitKind, code, sourceCodeHash, envVarsOpt, memorySizeOpt, timeoutOpt, reservedConcurrency, ephemeralStorageMb, logRetentionDays, dcbMetricsOpt, vpcConfig, opts) {
+function makeFromCodeAsset(name, unitKind, componentKind, code, sourceCodeHash, envVarsOpt, memorySizeOpt, timeoutOpt, reservedConcurrency, ephemeralStorageMb, logRetentionDays, dcbMetricsOpt, vpcConfig, opts) {
   let envVars = envVarsOpt !== undefined ? envVarsOpt : ({});
   let memorySize = memorySizeOpt !== undefined ? memorySizeOpt : Runtime$ReventlessCore.CommandHandlerDefaults.memorySize;
   let timeout = timeoutOpt !== undefined ? timeoutOpt : Runtime$ReventlessCore.CommandHandlerDefaults.timeout;
   let dcbMetrics = dcbMetricsOpt !== undefined ? dcbMetricsOpt : false;
   let opts$1 = Stdlib_Option.map(opts, Util_Pulumi$ReventlessCore.ComponentResourceOptions.toCustomResourceOptions);
-  let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name, Pulumi.output(AWS$ReventlessAws.Lambda.principal), opts$1);
+  let tagsFor = (resourceName, role) => AWS_Tags$ReventlessAws.make(resourceName, componentKind, role, undefined, name, undefined, undefined, undefined);
+  let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name, Pulumi.output(AWS$ReventlessAws.Lambda.principal), tagsFor(name, "Identity"), opts$1);
   Stdlib_Option.forEach(vpcConfig, param => {
     new (Aws.iam.RolePolicy)(name + `VpcAccess`, {
       policy: PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, name + `VpcAccessPolicy`, [{
@@ -95,7 +97,7 @@ function makeFromCodeAsset(name, unitKind, code, sourceCodeHash, envVarsOpt, mem
   });
   variables["NODE_OPTIONS"] = Util_Bundle$ReventlessAws.esmLoaderNodeOptions;
   variables["ESM_FALLBACK_DIRS"] = Util_Bundle$ReventlessAws.esmFallbackDirs;
-  let tags = AWS_Tags$ReventlessAws.make(name, CommandTopic$ReventlessCore.componentType);
+  let tags = tagsFor(name, "Runtime");
   let lambda = new (Aws.lambda.Function)(name, {
     handler: "index.handler",
     runtime: "nodejs22.x",
@@ -118,7 +120,8 @@ function makeFromCodeAsset(name, unitKind, code, sourceCodeHash, envVarsOpt, mem
   Stdlib_Option.forEach(logRetentionDays, days => {
     let logGroup = new (Aws.cloudwatch.LogGroup)(name + `LogGroup`, {
       name: `/aws/lambda/` + name,
-      retentionInDays: days
+      retentionInDays: days,
+      tags: tagsFor(name + `LogGroup`, "Logs")
     }, opts$1 !== undefined ? Primitive_option.valFromOption(opts$1) : undefined);
     if (dcbMetrics) {
       [
@@ -190,6 +193,18 @@ function extractCausationId(event) {
   return extractMetaField(event, "causationId");
 }
 
+function firstRecordAttributes(event) {
+  return Stdlib_Option.flatMap(event.Records[0], prim => prim.attributes);
+}
+
+function extractSentTimestamp(event) {
+  return Stdlib_Option.flatMap(Stdlib_Option.flatMap(firstRecordAttributes(event), attrs => attrs.SentTimestamp), Stdlib_Float.fromString);
+}
+
+function extractRetryCount(event) {
+  return Stdlib_Option.flatMap(Stdlib_Option.flatMap(firstRecordAttributes(event), attrs => attrs.ApproximateReceiveCount), __x => Stdlib_Int.fromString(__x, undefined));
+}
+
 export {
   additionalEnvVars,
   additionalIamPolicies,
@@ -199,5 +214,8 @@ export {
   extractMetaField,
   extractCorrelationId,
   extractCausationId,
+  firstRecordAttributes,
+  extractSentTimestamp,
+  extractRetryCount,
 }
 /* @pulumi/aws Not a pure module */

package/src/adapter/Runtime/SideEffectEntryPoint.mjs

@@ -2,30 +2,19 @@
 // At cold start: reads HANDLER_CONFIG, dynamically imports SideEffect modules,
 // wires SideEffectHandler_Callback.Make, builds handler map keyed by source URN.
 
-import * as Effect from "effect/Effect";
-import { log, pluginName } from "./HandlerFactoryHelpers.mjs";
-import { tag as requestContextTag } from "@reventlessdev/reventless-core/src/RequestContext.res.mjs";
+import {
+  log,
+  runEffect,
+  setRequestId,
+  extractMetaField,
+  extractSentTimestamp,
+  extractRetryCount,
+} from "./HandlerFactoryHelpers.mjs";
 import { Make as sideEffectHandlerCallbackMake } from "@reventlessdev/reventless-core/src/components/SideEffectHandler/SideEffectHandler_Callback.res.mjs";
 import { handleStreamEvent } from "@reventlessdev/reventless-aws/src/adapter/EventCollector/EventCollectorChannel_DynamoDbStream_Runtime.res.mjs";
 
 const dynamicImport = (specifier) => import('/var/task/node_modules/' + specifier);
 
-// Set at handler entry; read by runEffect to tag logs with the Lambda request id.
-let _currentRequestId = "unknown";
-
-function runEffect(correlationId, effect) {
-  let e = effect
-    // Promote correlationId/requestId/plugin to top-level JSON log fields —
-    // decoded by EffectLogger.install() from Effect log annotations. Harmless
-    // no-op if the unified logger isn't installed.
-    .pipe(Effect.annotateLogs("correlationId", correlationId || "unknown"))
-    .pipe(Effect.annotateLogs("requestId", _currentRequestId));
-  if (pluginName) e = e.pipe(Effect.annotateLogs("plugin", pluginName));
-  return e
-    .pipe(Effect.provideService(requestContextTag, { correlationId: correlationId || "unknown" }))
-    .pipe(Effect.runPromise);
-}
-
 function groupBySource(records) {
   const dict = {};
   records.forEach(record => {
@@ -50,8 +39,9 @@ async function buildAllHandlers() {
     const handler = (event, context) => handleStreamEvent(callback.handleJsonEvents, event, context);
     // Multiple side-effect handlers can share one source stream. Accumulate all
     // per source ARN; a plain assignment collapses them to one (Promise.all
-    // race), silently dropping the rest.
-    (handlers[h.sourceUrn] ||= []).push(handler);
+    // race), silently dropping the rest. `comp`/`plugin` come from
+    // HANDLER_CONFIG — the shell has only module paths to identify a handler by.
+    (handlers[h.sourceUrn] ||= []).push({ handler, comp: h.comp, plugin: h.plugin });
   }));
 
   return handlers;
@@ -60,7 +50,7 @@ async function buildAllHandlers() {
 const initPromise = buildAllHandlers();
 
 export async function handler(event, context) {
-  _currentRequestId = context?.awsRequestId || "unknown";
+  setRequestId(context?.awsRequestId);
   const handlers = await initPromise;
   const records = event.Records || [];
   const grouped = groupBySource(records);
@@ -69,8 +59,19 @@ export async function handler(event, context) {
     const streamHandlers = handlers[arn];
     if (streamHandlers !== undefined && streamHandlers.length > 0) {
       log.debug("found " + streamHandlers.length + " handler(s) for " + arn, { comp: "SideEffectRuntime" });
-      await Promise.all(streamHandlers.map(h =>
-        runEffect(undefined, h({ Records: subRecords }, context))
+      const correlationId = extractMetaField(subRecords, "correlationId");
+      const causationId = extractMetaField(subRecords, "causationId");
+      const timestamp = extractSentTimestamp(subRecords);
+      const retryCount = extractRetryCount(subRecords);
+      await Promise.all(streamHandlers.map(({ handler: h, comp, plugin }) =>
+        runEffect(h({ Records: subRecords }, context), {
+          correlationId,
+          causationId,
+          comp,
+          plugin,
+          timestamp,
+          retryCount,
+        })
       ));
     } else {
       log.warn("no handler found: " + arn, { comp: "SideEffectRuntime" });

package/src/adapter/Runtime/SideEffectHandlerRuntime_Builder_Single.res

@@ -129,11 +129,18 @@ let finish = () =>
               ->Array.map(p => p->JSON.stringifyAny->Option.getOr(`""`))
               ->Array.join(",")
 
+            // Log attribution for the shared Lambda, resolved at deploy time —
+            // the shell has only module paths to go on, and LogPrefix's registry
+            // is a deploy-time structure
+            // (docs/plans/entrypoint-dispatch-parity-and-latency-fields.md).
+            let attribution = Util_LogAttribution.fragments(
+              ~comp=`SideEffectHandler(${spec.componentName})`,
+            )
             let handlerJson =
               spec.sourceUrns
               ->Pulumi.Output.apply(urns => {
                 let sourceUrn = urns->Array.getUnsafe(0)
-                `{"sideEffectModules":[${modulesJson}],"sourceUrn":"${sourceUrn}"}`
+                `{"sideEffectModules":[${modulesJson}],"sourceUrn":"${sourceUrn}"${attribution}}`
               })
             let _ = handlerOutputs->Array.push(handlerJson)
           | None =>
@@ -168,6 +175,7 @@ let finish = () =>
         let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
           ~name="AllSideEffectHandlers",
           ~unitKind=ReventlessCore.Monitoring.Reactor,
+          ~componentKind=ReventlessCore.ComponentType.SideEffectHandler,
           ~code,
           ~sourceCodeHash,
           ~envVars,

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

@@ -10,6 +10,7 @@ import * as Logger$ReventlessCore from "@reventlessdev/reventless-core/src/util/
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as PolicyDocument$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/PolicyDocument.res.mjs";
 import * as Util_Bundle$ReventlessAws from "../../util/Util_Bundle.res.mjs";
+import * as Util_LogAttribution$ReventlessAws from "../../util/Util_LogAttribution.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "./RuntimeEnvironment_Lambda.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 
@@ -101,9 +102,10 @@ function finish() {
           packageDirs[pkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(pkg);
         });
         let modulesJson = info.sideEffectModulePaths.map(p => Stdlib_Option.getOr(JSON.stringify(p), `""`)).join(",");
+        let attribution = Util_LogAttribution$ReventlessAws.fragments(`SideEffectHandler(` + spec.componentName + `)`);
         let handlerJson = spec.sourceUrns.apply(urns => {
           let sourceUrn = urns[0];
-          return `{"sideEffectModules":[` + modulesJson + `],"sourceUrn":"` + sourceUrn + `"}`;
+          return `{"sideEffectModules":[` + modulesJson + `],"sourceUrn":"` + sourceUrn + `"` + attribution + `}`;
         });
         handlerOutputs.push(handlerJson);
       });
@@ -117,7 +119,7 @@ function finish() {
         }
       });
       let match$1 = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/SideEffectEntryPoint.mjs", packageDirs, undefined);
-      let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset("AllSideEffectHandlers", "Reactor", match$1.code, match$1.sourceCodeHash, envVars, match[0], match[1], undefined, undefined, undefined, undefined, undefined, opts);
+      let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset("AllSideEffectHandlers", "Reactor", "SideEffectHandler", match$1.code, match$1.sourceCodeHash, envVars, match[0], match[1], undefined, undefined, undefined, undefined, undefined, opts);
       if (Object.keys(extraEnvVarsAll).length !== 0) {
         new (Aws.iam.RolePolicy)("AllSideEffectHandlers-appsyncSchemaPush", {
           policy: PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, "AllSideEffectHandlersAppsyncSchemaPushPolicy", [{

package/src/adapter/Runtime/StateChangeSliceRuntime_Builder_Single.res

@@ -182,6 +182,7 @@ let forDcbCommandTopic = (
     let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
       ~name,
       ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+      ~componentKind=ReventlessCore.ComponentType.StateChangeSlice,
       ~code,
       ~sourceCodeHash,
       ~envVars,

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

@@ -82,7 +82,7 @@ function forDcbCommandTopic(slicePaths, dcbTableName, pluginName, syncConfig, as
       subnetIds: pgSelection.subnetIds,
       securityGroupIds: [sgId]
     })) : undefined;
-  let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "CommandHandler", match.code, match.sourceCodeHash, envVars, memorySize, timeout, cfg.reservedConcurrency, cfg.ephemeralStorageMb, cfg.logRetentionDays, true, vpcConfig, opts);
+  let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "CommandHandler", "StateChangeSlice", match.code, match.sourceCodeHash, envVars, memorySize, timeout, cfg.reservedConcurrency, cfg.ephemeralStorageMb, cfg.logRetentionDays, true, vpcConfig, opts);
   if (pgSelection !== undefined) {
     pgSelection.connectionConfig.apply(cc => new (Aws.iam.RolePolicy)(name + `-pgSecret`, {
       policy: PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, name + `-pgSecretPolicy`, [{

package/src/adapter/Runtime/StateViewSliceEntryPoint.mjs

@@ -6,8 +6,14 @@
 import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 import { parseJsonOrThrow } from "sury/src/S.res.mjs";
-import { log, pluginName } from "./HandlerFactoryHelpers.mjs";
-import { tag as requestContextTag } from "@reventlessdev/reventless-core/src/RequestContext.res.mjs";
+import {
+  log,
+  runEffect,
+  setRequestId,
+  extractMetaField,
+  extractSentTimestamp,
+  extractRetryCount,
+} from "./HandlerFactoryHelpers.mjs";
 import { handleAction } from "@reventlessdev/reventless-core/src/Projection.res.mjs";
 // Typed cold-start core — DynamoDB QueryDb ops, compiler-checked against the
 // framework signatures (see the module header and
@@ -19,21 +25,10 @@ import { handleStreamEvent } from "@reventlessdev/reventless-aws/src/adapter/Eve
 
 const dynamicImport = (specifier) => import('/var/task/node_modules/' + specifier);
 
-// Set at handler entry; read by runEffect to tag logs with the Lambda request id.
-let _currentRequestId = "unknown";
-
-function runEffect(correlationId, effect) {
-  let e = effect
-    // Promote correlationId/requestId/plugin to top-level JSON log fields —
-    // decoded by EffectLogger.install() from Effect log annotations. Harmless
-    // no-op if the unified logger isn't installed.
-    .pipe(Effect.annotateLogs("correlationId", correlationId || "unknown"))
-    .pipe(Effect.annotateLogs("requestId", _currentRequestId));
-  if (pluginName) e = e.pipe(Effect.annotateLogs("plugin", pluginName));
-  return e
-    .pipe(Effect.provideService(requestContextTag, { correlationId: correlationId || "unknown" }))
-    .pipe(Effect.runPromise);
-}
+// One Lambda hosts every state-view slice of a plugin, so each handler carries
+// the comp of the slice it projects — matching the `StateViewSlice(<name>)`
+// shape the rest of the framework logs under.
+const stateViewComp = (sliceName) => `StateViewSlice(${sliceName})`;
 
 function groupBySource(records) {
   const dict = {};
@@ -137,7 +132,7 @@ async function buildAllHandlers() {
     const jsonEventsHandler = buildJsonEventsHandler(specModule, projectionModule, h.queryDbTableName, h.pgConnection, h.stateTopicName);
     const streamHandler = (event, context) => handleStreamEvent(jsonEventsHandler, event, context);
     const existing = handlers[h.sourceUrn] || [];
-    existing.push(streamHandler);
+    existing.push({ handler: streamHandler, comp: stateViewComp(specModule.name) });
     handlers[h.sourceUrn] = existing;
   }));
   return handlers;
@@ -146,7 +141,7 @@ async function buildAllHandlers() {
 const initPromise = buildAllHandlers();
 
 export async function handler(event, context) {
-  _currentRequestId = context?.awsRequestId || "unknown";
+  setRequestId(context?.awsRequestId);
   const handlers = await initPromise;
   const records = event.Records || [];
   const grouped = groupBySource(records);
@@ -155,8 +150,18 @@ export async function handler(event, context) {
     const streamHandlers = handlers[arn];
     if (streamHandlers !== undefined && streamHandlers.length > 0) {
       log.debug("found " + streamHandlers.length + " handler(s) for " + arn, { comp: "StateViewSliceRuntime" });
-      await Promise.all(streamHandlers.map(h =>
-        runEffect(undefined, h({ Records: subRecords }, context))
+      const correlationId = extractMetaField(subRecords, "correlationId");
+      const causationId = extractMetaField(subRecords, "causationId");
+      const timestamp = extractSentTimestamp(subRecords);
+      const retryCount = extractRetryCount(subRecords);
+      await Promise.all(streamHandlers.map(({ handler: h, comp }) =>
+        runEffect(h({ Records: subRecords }, context), {
+          correlationId,
+          causationId,
+          comp,
+          timestamp,
+          retryCount,
+        })
       ));
     } else {
       log.warn("no handler found: " + arn, { comp: "StateViewSliceRuntime" });

package/src/adapter/Runtime/StateViewSliceRuntime_Builder_Single.res

@@ -277,6 +277,7 @@ let buildLambda = (
   let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
     ~name="AllStateViewSlices",
     ~unitKind=ReventlessCore.Monitoring.Projection,
+    ~componentKind=ReventlessCore.ComponentType.StateViewSlice,
     ~code,
     ~sourceCodeHash,
     ~envVars,
@@ -379,7 +380,7 @@ let finishWithDcbEventLog = (dcbEventLog: ReventlessCore.DcbEventLog.component)
         let channel = EventCollectorChannel.make(
           ~name="AllStateViewSlices",
           ~eventTopics,
-          ~opts={Pulumi.ComponentResource.parent: parent},
+          ~owner=None, ~opts={Pulumi.ComponentResource.parent: parent},
         )
 
         // B3.0: a Postgres-backed DCB log has no stream resource — provision the

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

@@ -158,7 +158,7 @@ function buildLambda(parent, handlerOutputs, packageDirs, channelSpecs, feedQueu
       subnetIds: qdbSelection.subnetIds,
       securityGroupIds: [sgId]
     })) : undefined;
-  let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset("AllStateViewSlices", "Projection", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, vpcConfig, opts);
+  let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset("AllStateViewSlices", "Projection", "StateViewSlice", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, vpcConfig, opts);
   if (qdbSelection !== undefined) {
     qdbSelection.connectionConfig.apply(cc => new (Aws.iam.RolePolicy)("AllStateViewSlices-pgSecret", {
       policy: PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, "AllStateViewSlices-pgSecretPolicy", [{
@@ -201,7 +201,7 @@ function finishWithDcbEventLog(dcbEventLog) {
           "DcbEventLog",
           dcbOutputs.eventTopic
         ]]);
-      let channel = EventCollectorChannel_DynamoDbStream$ReventlessAws.make("AllStateViewSlices", eventTopics, {
+      let channel = EventCollectorChannel_DynamoDbStream$ReventlessAws.make("AllStateViewSlices", eventTopics, undefined, {
         parent: parent
       });
       let feedQueue = DcbBackend$ReventlessAws.isPostgres() ? PgProjectionFeed$ReventlessAws.makeQueue("AllStateViewSlicesFeed", "aws-svs-feed", false, true, {

package/src/adapter/Runtime/TaskRuntime_Builder_PerBucket.res

@@ -74,6 +74,7 @@ let forBucketCallback = (
   let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
     ~name=fullName,
     ~unitKind=ReventlessCore.Monitoring.Task,
+    ~componentKind=ReventlessCore.ComponentType.Task,
     ~code,
     ~sourceCodeHash,
     ~envVars,

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

@@ -29,7 +29,7 @@ function forBucketCallback(param, connect, memorySizeOpt, timeoutOpt, name, call
   let pkg = Util_Bundle$ReventlessAws.extractPackageName(callbackModulePath);
   packageDirs[pkg] = Util_Bundle$ReventlessAws.resolvePackageRoot(pkg);
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/TaskBucketEntryPoint.mjs", packageDirs, undefined);
-  let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(fullName, "Task", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, {
+  let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(fullName, "Task", "Task", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, {
     parent: resource
   });
   if (schedulerConfig !== undefined) {

package/src/adapter/ScheduledPublisher/ScheduledPublisher_CloudWatchEvents.res

@@ -2,6 +2,12 @@ let make: ReventlessCore.Scheduler_Adapter.scheduledPublisherMaker = (~name, ~op
   let role = PulumiAws.IAM.Role.makeWithDefaultPolicy(
     ~name="CloudWatchEventsRole",
     ~servicePrincipal=AWS.CloudwatchEventRule.principal->Pulumi.Output.make,
+    ~tags=AWS.Tags.make(
+      ~name="CloudWatchEventsRole",
+      ~kind=ReventlessCore.ComponentType.Platform,
+      ~role=Identity,
+      ~scope=Platform,
+    ),
     ~opts,
   )
 
@@ -30,6 +36,12 @@ let make: ReventlessCore.Scheduler_Adapter.scheduledPublisherMaker = (~name, ~op
         )->toJsonString
       })
       ->Pulumi.Output.asInput,
+      tags: AWS.Tags.make(
+        ~name=name ++ "CloudWatchEventsPolicy",
+        ~kind=ReventlessCore.ComponentType.Platform,
+        ~role=Identity,
+        ~scope=Platform,
+      ),
     },
     ~opts,
   )

package/src/adapter/ScheduledPublisher/ScheduledPublisher_CloudWatchEvents.res.mjs

@@ -4,12 +4,13 @@ import * as Aws from "@pulumi/aws";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
 import * as Pulumi from "@pulumi/pulumi";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
+import * as AWS_Tags$ReventlessAws from "../AWS_Tags.res.mjs";
 import * as Adapter$ReventlessInfra from "@reventlessdev/reventless-infra/src/adapter/Adapter.res.mjs";
 import * as PolicyDocument$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/PolicyDocument.res.mjs";
 import * as ScheduledPublisher_CloudWatchEvents_Runtime$ReventlessAws from "./ScheduledPublisher_CloudWatchEvents_Runtime.res.mjs";
 
 function make(name, opts) {
-  let role = IAM$PulumiAws.Role.makeWithDefaultPolicy("CloudWatchEventsRole", Pulumi.output(AWS$ReventlessAws.CloudwatchEventRule.principal), opts);
+  let role = IAM$PulumiAws.Role.makeWithDefaultPolicy("CloudWatchEventsRole", Pulumi.output(AWS$ReventlessAws.CloudwatchEventRule.principal), AWS_Tags$ReventlessAws.make("CloudWatchEventsRole", "Platform", "Identity", "Platform", undefined, undefined, undefined, undefined), opts);
   new (Aws.iam.Policy)(name + "CloudWatchEventsPolicy", {
     policy: role.arn.apply(roleArn => PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, name + "CloudWatchEventsPolicy", [
       {
@@ -24,7 +25,8 @@ function make(name, opts) {
         Action: "iam:PassRole",
         Resource: roleArn
       }
-    ])))
+    ]))),
+    tags: AWS_Tags$ReventlessAws.make(name + "CloudWatchEventsPolicy", "Platform", "Identity", "Platform", undefined, undefined, undefined, undefined)
   }, opts);
   return {
     resource: Adapter$ReventlessInfra.make(role.name, role.id, role.arn, Pulumi.output("CloudWatchEvents"), undefined, undefined, undefined, Pulumi.output("aws:cloudwatch:EventRule"), undefined, undefined),

package/src/adapter/StateTopic/StateTopic_AppSync.res

@@ -281,6 +281,12 @@ let finish = (
     let lambdaRole = IAM.Role.makeWithDefaultPolicy(
       ~name=name ++ "StateTopicRole",
       ~servicePrincipal=AWS.Lambda.principal->Pulumi.Output.make,
+      ~tags=AWS.Tags.make(
+        ~name=name ++ "StateTopicRole",
+        ~kind=ReventlessCore.QueryDb.componentType,
+        ~role=Identity,
+        ~component=name,
+      ),
       ~opts,
     )
 
@@ -380,7 +386,7 @@ let finish = (
         memorySize: 256->Pulumi.Input.make,
         timeout: 30->Pulumi.Input.make,
         layers,
-        tags: AWS.Tags.make(~name=name ++ "StateTopic", ReventlessCore.QueryDb.componentType),
+        tags: AWS.Tags.make(~name=name ++ "StateTopic", ~kind=ReventlessCore.QueryDb.componentType, ~role=StateTopic, ~component=name),
         environment: (
           {
             Lambda.Function.variables: Dict.fromArray([

package/src/adapter/StateTopic/StateTopic_AppSync.res.mjs

@@ -198,7 +198,7 @@ function finish(eventsApi, opts) {
     return;
   }
   let name = eventsApi.name;
-  let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name + "StateTopicRole", Pulumi.output(AWS$ReventlessAws.Lambda.principal), opts);
+  let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name + "StateTopicRole", Pulumi.output(AWS$ReventlessAws.Lambda.principal), AWS_Tags$ReventlessAws.make(name + "StateTopicRole", QueryDb$ReventlessCore.componentType, "Identity", undefined, name, undefined, undefined, undefined), opts);
   let streamArnsOutput = Pulumi.all(entries.map(e => e.streamArn));
   Pulumi.all([
     streamArnsOutput,
@@ -256,7 +256,7 @@ function finish(eventsApi, opts) {
     memorySize: 256,
     timeout: 30,
     layers: layers,
-    tags: AWS_Tags$ReventlessAws.make(name + "StateTopic", QueryDb$ReventlessCore.componentType),
+    tags: AWS_Tags$ReventlessAws.make(name + "StateTopic", QueryDb$ReventlessCore.componentType, "StateTopic", undefined, name, undefined, undefined, undefined),
     environment: {
       variables: Object.fromEntries([
         [

package/src/adapter/Task/TaskBucket_S3.res

@@ -143,6 +143,7 @@ let make: ReventlessCore.Task_Adapter.bucketMaker<bucketParts> = (~name, ~opts)
             maxAgeSeconds: 3000,
           },
         ]->Pulumi.Input.make,
+        tags: AWS.Tags.make(~name, ~kind=ReventlessCore.Task.componentType, ~role=Other("Bucket")),
       },
       ~opts,
     )

package/src/adapter/Task/TaskBucket_S3.res.mjs

@@ -4,7 +4,9 @@ import * as Aws from "@pulumi/aws";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
+import * as Task$ReventlessCore from "@reventlessdev/reventless-core/src/components/Task/Task.res.mjs";
 import * as Util_S3$ReventlessAws from "../../util/Util_S3.res.mjs";
+import * as AWS_Tags$ReventlessAws from "../AWS_Tags.res.mjs";
 import * as Adapter$ReventlessCore from "@reventlessdev/reventless-core/src/adapter/Adapter.res.mjs";
 import * as PolicyDocument$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/PolicyDocument.res.mjs";
 import * as Util_Pulumi$ReventlessCore from "@reventlessdev/reventless-core/src/util/Util_Pulumi.res.mjs";
@@ -88,7 +90,11 @@ function make(name, opts) {
           "ETag"
         ],
         maxAgeSeconds: 3000
-      }]
+      }],
+    tags: AWS_Tags$ReventlessAws.make(name, Task$ReventlessCore.componentType, {
+      TAG: "Other",
+      _0: "Bucket"
+    }, undefined, undefined, undefined, undefined, undefined)
   }, opts$1);
   return {
     resources: [Util_S3$ReventlessAws.toResource(bucket)],

package/src/components/Aggregate_Builder_Micro.res.mjs

@@ -21,6 +21,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Aggregate_Builder_NoResolver.res.mjs

@@ -21,6 +21,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync_NoOp$ReventlessAws)({

package/src/components/Aggregate_Builder_PerAggregate.res.mjs

@@ -21,6 +21,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Aggregate_Builder_Single.res.mjs

@@ -23,6 +23,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Aggregate_Builder_Single_Async.res.mjs

@@ -23,6 +23,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(CommandGeneratorResolvers_AppSync$ReventlessAws)({

package/src/components/Api/AppSync_Adapter.res

@@ -482,6 +482,12 @@ let _makeApiResourceWith = (
     ~args={
       assumeRolePolicy: `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"appsync.amazonaws.com"},"Action":"sts:AssumeRole"}]}`
         ->Pulumi.Input.make,
+      tags: AWS.Tags.make(
+        ~name=`${name}-appsync-role`,
+        ~kind=ReventlessCore.ComponentType.Platform,
+        ~role=Identity,
+        ~scope=Platform,
+      ),
     },
     ~opts=Some(customOpts),
   )
@@ -539,6 +545,12 @@ let _makeApiResourceWith = (
     ]->Pulumi.Input.make,
     schema: ?(schema->Option.map(Pulumi.Input.make)),
     logConfig: appsyncLogConfig->Pulumi.Input.make,
+    tags: AWS.Tags.make(
+      ~name,
+      ~kind=ReventlessCore.ComponentType.Plugin,
+      ~role=Api,
+      ~scope=Plugin,
+    ),
   }
   let graphQLApi = AppSync.GraphQLApi.make(~name, ~args=apiArgs, ~opts=Some(customOpts))
 

package/src/components/Api/AppSync_Adapter.res.mjs

@@ -11,6 +11,7 @@ import * as Pulumi from "@pulumi/pulumi";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Logger$ReventlessCore from "@reventlessdev/reventless-core/src/util/Logger.res.mjs";
+import * as AWS_Tags$ReventlessAws from "../../adapter/AWS_Tags.res.mjs";
 import * as ClientAppsync from "@aws-sdk/client-appsync";
 import * as Auth_Cognito$ReventlessAws from "../../adapter/Auth/Auth_Cognito.res.mjs";
 import * as AppSync_Error$ReventlessAws from "../../errors/AppSync_Error.res.mjs";
@@ -274,7 +275,8 @@ function _makeApiResourceWith(name, schema, userPoolConfig, opts) {
     parent: customOpts_parent
   };
   let iamRole = new (Aws.iam.Role)(name + `-appsync-role`, {
-    assumeRolePolicy: `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"appsync.amazonaws.com"},"Action":"sts:AssumeRole"}]}`
+    assumeRolePolicy: `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"appsync.amazonaws.com"},"Action":"sts:AssumeRole"}]}`,
+    tags: AWS_Tags$ReventlessAws.make(name + `-appsync-role`, "Platform", "Identity", "Platform", undefined, undefined, undefined, undefined)
   }, customOpts);
   new (Aws.iam.RolePolicyAttachment)(name + `-appsync-cwlogs`, {
     policyArn: "arn:aws:iam::aws:policy/service-role/AWSAppSyncPushToCloudWatchLogs",
@@ -296,12 +298,14 @@ function _makeApiResourceWith(name, schema, userPoolConfig, opts) {
       authenticationType: "AWS_IAM"
     }];
   let apiArgs_logConfig = appsyncLogConfig;
+  let apiArgs_tags = AWS_Tags$ReventlessAws.make(name, "Plugin", "Api", "Plugin", undefined, undefined, undefined, undefined);
   let apiArgs = {
     authenticationType: "AMAZON_COGNITO_USER_POOLS",
     schema: apiArgs_schema,
     userPoolConfig: apiArgs_userPoolConfig,
     additionalAuthenticationProviders: apiArgs_additionalAuthenticationProviders,
-    logConfig: apiArgs_logConfig
+    logConfig: apiArgs_logConfig,
+    tags: apiArgs_tags
   };
   let graphQLApi = new (Aws.appsync.GraphQLApi)(name, apiArgs, customOpts);
   return [