feat(supervisor): set op + kind on all wide events

Author: nicktrn

.server-changes/supervisor-op-field-coverage.md

@@ -0,0 +1,6 @@
+---
+area: supervisor
+type: improvement
+---
+
+Tag every supervisor structured event with `op` and `kind` fields for consistent filtering and aggregation.

apps/supervisor/src/index.ts

@@ -269,6 +269,8 @@ class ManagedSupervisor {
                 setMeta(state, "deployment_id", message.deployment.friendlyId);
               }
               setMeta(state, "machine_preset", message.run.machine.name);
+              state.extras.op = "dequeue";
+              state.extras.kind = "inbound";
               state.extras.iteration = "dequeue";
               state.extras.dequeue_response_ms = dequeueResponseMs;
               state.extras.polling_interval_ms = pollingIntervalMs;

apps/supervisor/src/services/computeSnapshotService.ts

@@ -78,6 +78,7 @@ export class ComputeSnapshotService {
       ...this.wideEventOpts,
       populate: (state) => {
         state.extras.op = "snapshot.schedule";
+        state.extras.kind = "event";
         state.meta.run_id = runFriendlyId;
         state.meta.snapshot_id = data.snapshotFriendlyId;
         state.extras.runner_id = data.runnerId;
@@ -99,6 +100,7 @@ export class ComputeSnapshotService {
         ...this.wideEventOpts,
         populate: (state) => {
           state.extras.op = "snapshot.canceled";
+          state.extras.kind = "event";
           state.meta.run_id = runFriendlyId;
         },
       });
@@ -247,6 +249,7 @@ export class ComputeSnapshotService {
         ...this.wideEventOpts,
         setup: (state) => {
           state.extras.op = "snapshot.dispatch";
+          state.extras.kind = "scheduled";
           state.meta.run_id = snapshot.runFriendlyId;
           state.meta.snapshot_id = snapshot.snapshotFriendlyId;
           state.extras.runner_id = snapshot.runnerId;

apps/supervisor/src/workloadServer/index.ts

@@ -184,6 +184,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
    */
   private wideRoute<T>(
     ctx: { req: IncomingMessage; res: ServerResponse; params?: unknown },
+    op: string,
     route: string,
     method: string,
     fn: () => Promise<T> | T,
@@ -199,7 +200,11 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         method,
         traceparent: this.headerValueFromRequest(ctx.req, "traceparent"),
         inboundRequestId: this.headerValueFromRequest(ctx.req, "x-request-id"),
-        setup: (state) => this.attachRouteMeta(state, ctx.params),
+        setup: (state) => {
+          state.extras.op = op;
+          state.extras.kind = "inbound";
+          this.attachRouteMeta(state, ctx.params);
+        },
       },
       fn,
       (state) => {
@@ -231,6 +236,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async (ctx) =>
             this.wideRoute(
               ctx,
+              "attempt.start",
               "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/:snapshotFriendlyId/attempts/start",
               "POST",
               async () => {
@@ -266,6 +272,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async (ctx) =>
             this.wideRoute(
               ctx,
+              "attempt.complete",
               "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/:snapshotFriendlyId/attempts/complete",
               "POST",
               async () => {
@@ -303,6 +310,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async (ctx) =>
             this.wideRoute(
               ctx,
+              "heartbeat",
               "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/:snapshotFriendlyId/heartbeat",
               "POST",
               async () => {
@@ -339,6 +347,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async (ctx) =>
             this.wideRoute(
               ctx,
+              "suspend",
               "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/:snapshotFriendlyId/suspend",
               "GET",
               async () => {
@@ -434,6 +443,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async (ctx) =>
             this.wideRoute(
               ctx,
+              "continue",
               "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/:snapshotFriendlyId/continue",
               "GET",
               async () => {
@@ -475,6 +485,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async (ctx) =>
             this.wideRoute(
               ctx,
+              "snapshots.since",
               "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/since/:snapshotFriendlyId",
               "GET",
               async () => {
@@ -510,6 +521,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         handler: async (ctx) =>
           this.wideRoute(
             ctx,
+            "deployment.dequeue",
             "/api/v1/workload-actions/deployments/:deploymentId/dequeue",
             "GET",
             async () => {
@@ -541,6 +553,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         handler: async (ctx) =>
           this.wideRoute(
             ctx,
+            "logs.debug",
             "/api/v1/workload-actions/runs/:runFriendlyId/logs/debug",
             "POST",
             async () => {
@@ -562,6 +575,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         handler: async (ctx) =>
           this.wideRoute(
             ctx,
+            "logs.debug",
             "/api/v1/workload-actions/runs/:runFriendlyId/logs/debug",
             "POST",
             async () => {
@@ -576,7 +590,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
     httpServer.route("/api/v1/compute/snapshot-complete", "POST", {
       bodySchema: SnapshotCallbackPayloadSchema,
       handler: async (ctx) =>
-        this.wideRoute(ctx, "/api/v1/compute/snapshot-complete", "POST", async () => {
+        this.wideRoute(ctx, "snapshot.callback", "/api/v1/compute/snapshot-complete", "POST", async () => {
           const { reply, body } = ctx;
           if (!this.snapshotService) {
             reply.empty(404);
@@ -666,6 +680,8 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         emitOneShot({
           ...this.wideEventOpts,
           populate: (state) => {
+            state.extras.op = event === "run_connected" ? "socket.run.connected" : "socket.run.disconnected";
+            state.extras.kind = "event";
             state.extras.event = event;
             setMeta(state, "run_id", friendlyId);
             if (socket.data.deploymentId) {