@blokjs/runner 0.6.20 → 0.7.0

package/dist/Blok.d.ts

@@ -3,6 +3,8 @@ import { type Schema } from "jsonschema";
 import type { IBlokResponse } from "./BlokResponse";
 import type Condition from "./types/Condition";
 import type JsonLikeObject from "./types/JsonLikeObject";
+/** Test-only: drop the cached node instruments so a fresh MeterProvider is picked up. */
+export declare function _resetNodeInstrumentsForTests(): void;
 export default abstract class BlokService<T> extends NodeBase {
     inputSchema: Schema;
     outputSchema: Schema;

package/dist/Blok.js

@@ -3,6 +3,33 @@ import { metrics } from "@opentelemetry/api";
 import { Validator } from "jsonschema";
 import _ from "lodash";
 import { applyStepOutput } from "./workflow/PersistenceHelper";
+let _nodeInstruments = null;
+function nodeInstruments() {
+    if (!_nodeInstruments) {
+        const meter = metrics.getMeter("blok");
+        _nodeInstruments = {
+            executions: meter.createCounter("blok_node_executions_total", {
+                description: "Total node executions",
+                unit: "1",
+            }),
+            duration: meter.createHistogram("blok_node_duration_seconds", {
+                description: "Node execution duration in seconds",
+                unit: "s",
+            }),
+            errors: meter.createCounter("blok_node_errors_total", { description: "Total node execution errors", unit: "1" }),
+            memory: meter.createGauge("blok_node_memory_bytes", {
+                description: "Peak node heap memory, in bytes",
+                unit: "By",
+            }),
+            cpu: meter.createGauge("blok_node_cpu_usage", { description: "Node CPU usage", unit: "1" }),
+        };
+    }
+    return _nodeInstruments;
+}
+/** Test-only: drop the cached node instruments so a fresh MeterProvider is picked up. */
+export function _resetNodeInstrumentsForTests() {
+    _nodeInstruments = null;
+}
 export default class BlokService extends NodeBase {
     inputSchema;
     outputSchema;
@@ -24,42 +51,12 @@ export default class BlokService extends NodeBase {
         };
     }
     async run(ctx) {
-        const defaultMeter = metrics.getMeter("default");
+        const inst = nodeInstruments();
         const globalMetrics = new Metrics();
         globalMetrics.start();
         const response = { success: true, data: {}, error: null };
         const start = performance.now();
         ctx.logger.log(`Running node: ${this.name} [${JSON.stringify(this.originalConfig)}]`);
-        const node_execution = defaultMeter.createCounter("node", {
-            description: "Node requests",
-        });
-        const node_time = defaultMeter.createGauge("node_time", {
-            description: "Node elapsed time",
-        });
-        const node_mem = defaultMeter.createGauge("node_memory", {
-            description: "Node memory usage",
-        });
-        const node_mem_average = defaultMeter.createGauge("node_memory_average", {
-            description: "Node memory average",
-        });
-        const node_memory_usage_min = defaultMeter.createGauge("node_memory_usage_min", {
-            description: "Node memory usage min",
-        });
-        const node_memory_total = defaultMeter.createGauge("node_memory_total", {
-            description: "Node memory total",
-        });
-        const node_memory_free = defaultMeter.createGauge("node_memory_free", {
-            description: "Node memory free",
-        });
-        const node_cpu = defaultMeter.createGauge("node_cpu", {
-            description: "Node cpu usage",
-        });
-        const node_cpu_average = defaultMeter.createGauge("node_cpu_average", {
-            description: "Node cpu average",
-        });
-        const node_cpu_total = defaultMeter.createGauge("node_cpu_total", {
-            description: "Node cpu total",
-        });
         const config = _.cloneDeep(ctx.config);
         let opts = config[this.name];
         const data = ctx.response?.data || ctx.request?.body;
@@ -79,20 +76,19 @@ export default class BlokService extends NodeBase {
         // method use it consistently.
         const blokResponse = result;
         const errored = blokResponse.error !== undefined && blokResponse.error !== null;
-        node_execution.add(1, {
-            env: process.env.NODE_ENV,
+        // Per-node metrics on the `blok` meter. Duration is in seconds
+        // (Prometheus histogram convention).
+        const blokNodeAttrs = {
+            env: process.env.NODE_ENV ?? "development",
             workflow_path: `${ctx.workflow_path}`,
             workflow_name: `${ctx.workflow_name}`,
             node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_time.record(end - start, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
+        };
+        inst.executions.add(1, blokNodeAttrs);
+        inst.duration.record((end - start) / 1000, blokNodeAttrs);
+        if (errored) {
+            inst.errors.add(1, blokNodeAttrs);
+        }
         // Surface failures clearly on the per-node log so operators don't
         // see a misleading "Executed node" line followed by a contradictory
         // "FAILED" line from RunnerSteps. The structured per-step log
@@ -127,75 +123,11 @@ export default class BlokService extends NodeBase {
         globalMetrics.retry();
         globalMetrics.stop();
         const average = await globalMetrics.getMetrics();
-        node_mem.record(average.memory.max, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_mem_average.record(average.memory.total, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_memory_usage_min.record(average.memory.min, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_memory_total.record(average.memory.global_memory, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_memory_free.record(average.memory.global_free_memory, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_cpu.record(average.cpu.usage, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_cpu_average.record(average.cpu.average, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
-        node_cpu_total.record(average.cpu.total, {
-            env: process.env.NODE_ENV,
-            workflow_path: `${ctx.workflow_path}`,
-            workflow_name: `${ctx.workflow_name}`,
-            node_name: `${this.name}`,
-            node: this.node,
-        });
+        // `average.memory.max` is MB (MemoryUsage divides heapUsed by 1e6);
+        // re-expand to bytes for the Prometheus base-unit `_bytes` convention.
+        inst.memory.record(average.memory.max * 1_000_000, blokNodeAttrs);
+        inst.cpu.record(average.cpu.usage, blokNodeAttrs);
         globalMetrics.clear();
-        if (response.success === false) {
-            const node_errors = defaultMeter.createCounter("node_errors", {
-                description: "Node errors",
-            });
-            node_errors.add(1, {
-                env: process.env.NODE_ENV,
-                workflow_path: `${ctx.workflow_path}`,
-                workflow_name: `${ctx.workflow_name}`,
-                node_name: `${this.name}`,
-                node: this.node,
-            });
-        }
         return response;
     }
     async validate(obj, schema) {

package/dist/Blok.js.map

@@ -1 +1 @@
-{"version":3,"file":"Blok.js","sourceRoot":"","sources":["../src/Blok.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,OAAO,EAAE,QAAQ,EAAwB,MAAM,gBAAgB,CAAC;AAE3G,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAqC,SAAS,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,CAAC,MAAM,QAAQ,CAAC;AAKvB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAgB,WAAe,SAAQ,QAAQ;IACrD,WAAW,CAAS;IACpB,YAAY,CAAS;IACpB,CAAC,CAAY;IAErB;QACC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,CAAC,GAAG,IAAI,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEM,UAAU,CAAC,KAAa,EAAE,MAAc;QAC9C,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;IAC5B,CAAC;IAEM,UAAU;QAChB,OAAO;YACN,KAAK,EAAE,IAAI,CAAC,WAAW;YACvB,MAAM,EAAE,IAAI,CAAC,YAAY;SACzB,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAY;QAC5B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEjD,MAAM,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;QACpC,aAAa,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAoB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAE3E,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEtF,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE;YACzD,WAAW,EAAE,eAAe;SAC5B,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,EAAE;YACvD,WAAW,EAAE,mBAAmB;SAChC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,aAAa,EAAE;YACxD,WAAW,EAAE,mBAAmB;SAChC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,qBAAqB,EAAE;YACxE,WAAW,EAAE,qBAAqB;SAClC,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAG,YAAY,CAAC,WAAW,CAAC,uBAAuB,EAAE;YAC/E,WAAW,EAAE,uBAAuB;SACpC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,mBAAmB,EAAE;YACvE,WAAW,EAAE,mBAAmB;SAChC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,kBAAkB,EAAE;YACrE,WAAW,EAAE,kBAAkB;SAC/B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE;YACrD,WAAW,EAAE,gBAAgB;SAC7B,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,kBAAkB,EAAE;YACrE,WAAW,EAAE,kBAAkB;SAC/B,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,CAAC,gBAAgB,EAAE;YACjE,WAAW,EAAE,gBAAgB;SAC7B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAkB,CAAC;QACxD,IAAI,IAAI,GAAoB,MAAyB,CAAC,IAAI,CAAC,IAAI,CAA8B,CAAC;QAC9F,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC;QAE9C,IAAI,GAAG,IAAI,CAAC,eAAe,CAC1B,IAAmC,EACnC,GAAG,EACH,IAAwB,CACK,CAAC;QAC/B,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAwB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhE,4BAA4B;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAwB,CAAC,CAAC;QAChE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAE9B,kEAAkE;QAClE,kEAAkE;QAClE,gEAAgE;QAChE,gEAAgE;QAChE,+DAA+D;QAC/D,mEAAmE;QACnE,8BAA8B;QAC9B,MAAM,YAAY,GAAG,MAAuB,CAAC;QAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,KAAK,SAAS,IAAI,YAAY,CAAC,KAAK,KAAK,IAAI,CAAC;QAEhF,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE;YACrB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,SAAS,CAAC,MAAM,CAAC,GAAG,GAAG,KAAK,EAAE;YAC7B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,kEAAkE;QAClE,oEAAoE;QACpE,8DAA8D;QAC9D,iEAAiE;QACjE,wCAAwC;QACxC,IAAI,OAAO,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC7G,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,IAAI,cAAc,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,MAAM,EAAE,CAAC,CAAC;QACxF,CAAC;aAAM,CAAC;YACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAChF,CAAC;QAED,8CAA8C;QAC9C,mEAAmE;QACnE,kBAAkB;QAClB,kEAAkE;QAClE,mEAAmE;QACnE,4DAA4D;QAC5D,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,MAAuB,CAAC,CAAC;QAEpD,8DAA8D;QAC9D,8DAA8D;QAC9D,uCAAuC;QACvC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;QACvB,oEAAoE;QACpE,oEAAoE;QACpE,gEAAgE;QAChE,oEAAoE;QACpE,sCAAsC;QACtC,QAAQ,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC;QAC5B,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QACpD,QAAQ,CAAC,IAAkC,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAE5E,aAAa,CAAC,KAAK,EAAE,CAAC;QACtB,aAAa,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAEjD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YACnC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE;YAC7C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAChD,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE;YACtD,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC1D,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;YAClC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;YAC5C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;YACxC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;YACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;SAC1C,CAAC,CAAC;QAEH,aAAa,CAAC,KAAK,EAAE,CAAC;QAEtB,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAChC,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC,aAAa,EAAE;gBAC7D,WAAW,EAAE,aAAa;aAC1B,CAAC,CAAC;YAEH,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE;gBAClB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;gBACzB,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;gBACrC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE;gBACrC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;gBACzB,IAAI,EAAG,IAA8B,CAAC,IAAI;aAC1C,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAOM,KAAK,CAAC,QAAQ,CAAC,GAAmB,EAAE,MAAc;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/C,MAAM,KAAK,GAAoB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAChD,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;CACD"}
+{"version":3,"file":"Blok.js","sourceRoot":"","sources":["../src/Blok.ts"],"names":[],"mappings":"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"}

package/dist/DefaultLogger.d.ts

@@ -25,6 +25,19 @@ export default class DefaultLogger extends GlobalLogger {
      * The name of the application.
      */
     appName: string | undefined;
+    /**
+     * OBS-03 — correlation keys. `runId` ties a stdout line to the Studio run;
+     * `traceId`/`spanId` tie it to the OTel trace in Tempo. Set by `TracingLogger`
+     * after `tracker.startRun()` (run id) + from the active span (trace ids), so
+     * Studio ↔ Tempo ↔ Loki become one joined view. Unset → simply omitted.
+     */
+    runId: string | undefined;
+    traceId: string | undefined;
+    spanId: string | undefined;
+    /** OBS-03 — set the Studio run id on subsequent log lines. */
+    setRunId(runId?: string): void;
+    /** OBS-03 — set the active OTel trace/span ids on subsequent log lines. */
+    setTraceContext(traceId?: string, spanId?: string): void;
     /**
      * Constructs a new DefaultLogger instance.
      *

package/dist/DefaultLogger.js

@@ -25,6 +25,24 @@ export default class DefaultLogger extends GlobalLogger {
      * The name of the application.
      */
     appName = "";
+    /**
+     * OBS-03 — correlation keys. `runId` ties a stdout line to the Studio run;
+     * `traceId`/`spanId` tie it to the OTel trace in Tempo. Set by `TracingLogger`
+     * after `tracker.startRun()` (run id) + from the active span (trace ids), so
+     * Studio ↔ Tempo ↔ Loki become one joined view. Unset → simply omitted.
+     */
+    runId = undefined;
+    traceId = undefined;
+    spanId = undefined;
+    /** OBS-03 — set the Studio run id on subsequent log lines. */
+    setRunId(runId) {
+        this.runId = runId;
+    }
+    /** OBS-03 — set the active OTel trace/span ids on subsequent log lines. */
+    setTraceContext(traceId, spanId) {
+        this.traceId = traceId;
+        this.spanId = spanId;
+    }
     /**
      * Constructs a new DefaultLogger instance.
      *
@@ -93,6 +111,13 @@ export default class DefaultLogger extends GlobalLogger {
             logEntry.workflow_path = this.workflowPath;
         if (this.requestId)
             logEntry.request_id = this.requestId;
+        // OBS-03 — correlation keys so a log line joins to its Studio run + Tempo trace.
+        if (this.runId)
+            logEntry.run_id = this.runId;
+        if (this.traceId)
+            logEntry.trace_id = this.traceId;
+        if (this.spanId)
+            logEntry.span_id = this.spanId;
         if (stack !== "")
             logEntry.stack = stack;
         return JSON.stringify(logEntry);

package/dist/DefaultLogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultLogger.js","sourceRoot":"","sources":["../src/DefaultLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,YAAY;IACtD;;OAEG;IACH,YAAY,GAAuB,EAAE,CAAC;IAEtC;;OAEG;IACH,YAAY,GAAuB,EAAE,CAAC;IAEtC;;OAEG;IACH,SAAS,GAAuB,EAAE,CAAC;IAEnC;;OAEG;IACH,GAAG,GAAuB,EAAE,CAAC;IAE7B;;OAEG;IACH,OAAO,GAAuB,EAAE,CAAC;IAEjC;;;;;;OAMG;IACH,YAAY,YAAqB,EAAE,YAAqB,EAAE,SAAkB;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,OAAe;QAClB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,OAAO;YAAE,OAAO;QACvD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,KAAa,EAAE,OAAe;QACtC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,OAAO;YAAE,OAAO;QACvD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAe,EAAE,KAAK,GAAG,EAAE;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,OAAO;YAAE,OAAO;QACvD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;OAOG;IACH,cAAc,CAAC,OAAe,EAAE,KAAK,GAAG,MAAM,EAAE,KAAK,GAAG,EAAE;QACzD,MAAM,QAAQ,GAA4B;YACzC,KAAK;YACL,GAAG,EAAE,IAAI,CAAC,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,OAAO;SACP,CAAC;QAEF,IAAI,IAAI,CAAC,YAAY;YAAE,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAClE,IAAI,IAAI,CAAC,YAAY;YAAE,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAClE,IAAI,IAAI,CAAC,SAAS;YAAE,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;QACzD,IAAI,KAAK,KAAK,EAAE;YAAE,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;QAEzC,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;CACD"}
+{"version":3,"file":"DefaultLogger.js","sourceRoot":"","sources":["../src/DefaultLogger.ts"],"names":[],"mappings":"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"}

package/dist/RunnerSteps.d.ts

@@ -11,4 +11,27 @@ export default abstract class RunnerSteps {
      * @throws {GlobalError} Throws a GlobalError if any step results in an error.
      */
     runSteps(ctx: Context, steps: NodeBase[], deep?: boolean, step_name?: string): Promise<Context>;
+    /**
+     * PR 4 — wait.for / wait.until resume cursor.
+     *
+     * On `dispatchDeferred` re-entry from a wait step, the runner must skip
+     * past pre-wait steps that already completed in the previous pass.
+     * `lastCompletedStepIndex` is set on the run record before each
+     * WaitDispatchRequest throw and read here at runSteps entry. Default
+     * `-1` = no resume; runner starts at i = 0. Extracted verbatim from the
+     * top of `runSteps` (E06-T002) — the only mutation is clearing the
+     * `_blokInnerResumeIndex` sentinel.
+     */
+    private resolveResumeCursor;
+    /**
+     * Unwrap + enrich a caught error into a `GlobalError`: walk the
+     * `.cause` chain looking for an inner `GlobalError` (so an author's
+     * structured rejection survives the framework's `[step N/M] X
+     * failed: ...` wrap), otherwise build a fresh `GlobalError` that
+     * preserves the original chain via `.cause`, then stamp the wrap's
+     * `_blokStepId` back on so `TryCatchNode.toErrorEnvelope` can surface
+     * it as `$.error.stepId`. Pure — no ctx mutation. Extracted verbatim
+     * from the `runSteps` catch arm (E06-T002).
+     */
+    private unwrapAndEnrichError;
 }

package/dist/RunnerSteps.js

@@ -1,4 +1,5 @@
 import { GlobalError } from "@blokjs/shared";
+import { SpanKind, SpanStatusCode, context, trace } from "@opentelemetry/api";
 import { RunCancelledError } from "./RunCancelledError";
 import { WaitDispatchRequest } from "./WaitDispatchRequest";
 import { resolveIdempotencyKey } from "./idempotency/resolveIdempotencyKey";
@@ -13,6 +14,12 @@ import { applyStepOutput } from "./workflow/PersistenceHelper";
  * default and the decision recorded in the Tier 1 ROADMAP session.
  */
 const DEFAULT_IDEMPOTENCY_TTL_MS = 24 * 60 * 60 * 1000;
+/**
+ * OBS-02 B4 — module-level tracer for per-step child spans. Returns a no-op
+ * tracer (zero overhead) until a real TracerProvider is registered at trigger
+ * boot, so free-running deployments are unaffected.
+ */
+const stepTracer = trace.getTracer("@blokjs/runner.steps", "1.0.0");
 /**
  * Compute the delay before retry attempt N+1 using capped exponential
  * backoff. Mirrors Trigger.dev's `retry` semantics — no jitter by default.
@@ -129,35 +136,7 @@ export default class RunnerSteps {
             let flow_steps = [];
             let flow_step = 0;
             let stepName = "";
-            // PR 4 — wait.for / wait.until resume cursor.
-            //
-            // On `dispatchDeferred` re-entry from a wait step, the runner
-            // must skip past pre-wait steps that already completed in the
-            // previous pass. `lastCompletedStepIndex` is set on the run
-            // record before each WaitDispatchRequest throw and read here
-            // at runSteps entry. Default `-1` = no resume; runner starts
-            // at i = 0.
-            const persistedRun = !deep && tracker && traceRunId ? tracker.getStore().getRun(traceRunId) : undefined;
-            // Two cursor sources:
-            //   - Top-level (deep === false): workflow_runs.lastCompletedStepIndex.
-            //   - Nested inside a primitive iterator (deep === true, v0.6
-            //     Phase 2): `_blokInnerResumeIndex` stamped on the child ctx
-            //     by ForEachNode.runIteration when resuming at a specific
-            //     inner step. Undefined = start at 0 (fresh iteration body).
-            const innerResumeIndexRaw = ctx._blokInnerResumeIndex;
-            const innerResumeIndex = typeof innerResumeIndexRaw === "number" ? innerResumeIndexRaw : undefined;
-            const resumeFromIndex = !deep
-                ? persistedRun?.lastCompletedStepIndex !== undefined
-                    ? persistedRun.lastCompletedStepIndex + 1
-                    : 0
-                : (innerResumeIndex ?? 0);
-            // Clear the sentinel so a re-runner started fresh from this
-            // childCtx (e.g. the nested branch flow path) doesn't inherit
-            // a stale resume hint. ForEachNode set it for THIS one re-entry
-            // only; it should not propagate further.
-            if (deep && innerResumeIndex !== undefined) {
-                ctx._blokInnerResumeIndex = undefined;
-            }
+            const { resumeFromIndex, persistedRun, innerResumeIndex } = this.resolveResumeCursor(ctx, deep, tracker, traceRunId);
             for (let i = 0; i < steps.length; i++) {
                 const step = steps[i];
                 // PR 4 — skip pre-wait steps on resume. State + NodeRuns
@@ -551,16 +530,31 @@ export default class RunnerSteps {
                     // finally). The Phase 2/3 single-slot
                     // `_blokActivePrimitiveNodeRunId` mechanism is gone —
                     // nested primitives each register their own frame, and
-                    // the wait-throw site walks the full stack. We keep
-                    // `isIteratingPrimitive` only as a hook for legacy
-                    // readers (none in core today) — wait-cursor writes no
-                    // longer depend on it.
-                    const isIteratingPrimitive = step.isPrimitiveIterator === true;
+                    // the wait-throw site walks the full stack.
+                    // === OBS-02 B4 — per-step OTel child span ===
+                    // One span per EXECUTING leaf step, nested under the workflow span.
+                    // `wait` + idempotency-cache-hit steps continue above this point, so only
+                    // steps that actually invoke process() reach here. Made active around
+                    // process() so a gRPC runtime call / http-self sub-workflow dispatch
+                    // (B2.2/B2.3) nests beneath it. No-op + zero overhead when no provider
+                    // is registered (OTel API guarantee).
+                    const stepSpan = stepTracer.startSpan(`step ${step.name}`, {
+                        kind: SpanKind.INTERNAL,
+                        attributes: {
+                            "blok.step.id": step.name,
+                            "blok.step.index": i,
+                            "blok.node.name": step.name,
+                            "blok.node.type": stepType,
+                            ...(stepAny.runtime ? { "blok.runtime.kind": stepAny.runtime } : {}),
+                        },
+                    });
                     try {
                         while (true) {
                             attempt += 1;
                             try {
-                                const processInvocation = () => step.process(ctx, step);
+                                // Run process() inside the step span's context so child spans
+                                // (gRPC runtime / sub-workflow dispatch) nest under it.
+                                const processInvocation = () => context.with(trace.setSpan(context.active(), stepSpan), () => step.process(ctx, step));
                                 const model = typeof maxDurationMs === "number" && maxDurationMs > 0
                                     ? await wrapWithTimeout(processInvocation, maxDurationMs, step.name)
                                     : await processInvocation();
@@ -612,6 +606,7 @@ export default class RunnerSteps {
                                 }
                                 const attemptSuffix = attempt > 1 ? ` after ${attempt} attempts` : "";
                                 ctx.logger.log(`${stepPrefix} → completed (${stepDuration}ms${attemptSuffix})`);
+                                stepSpan.setStatus({ code: SpanStatusCode.OK });
                                 break;
                             }
                             catch (nodeErr) {
@@ -680,18 +675,16 @@ export default class RunnerSteps {
                                 const enrichedAny = enrichedError;
                                 enrichedAny.cause = nodeErr;
                                 enrichedAny._blokStepId = step.name;
+                                stepSpan.recordException(nodeErr instanceof Error ? nodeErr : new Error(String(nodeErr)));
+                                stepSpan.setStatus({ code: SpanStatusCode.ERROR, message: originalMsg });
                                 throw enrichedError;
                             }
                         }
                     }
                     finally {
-                        // v0.6 Phase 4 — primitives own their stack frame
-                        // lifecycle now (push on entry, pop in finally), so
-                        // there's nothing to restore here. The
-                        // `isIteratingPrimitive` flag stays in the type
-                        // system for documentation but no longer drives
-                        // cursor accounting.
-                        void isIteratingPrimitive;
+                        // OBS-02 B4 — close the per-step span on every exit (success / failure /
+                        // wait / cancel / timeout).
+                        stepSpan.end();
                     }
                 }
                 else {
@@ -733,55 +726,103 @@ export default class RunnerSteps {
             const wrapStepId = typeof e === "object" && e !== null && "_blokStepId" in e
                 ? e._blokStepId
                 : undefined;
-            let error_context = {};
-            if (e instanceof GlobalError) {
-                error_context = e;
-            }
-            else {
-                // Walk the `.cause` chain looking for a GlobalError. The
-                // step-enrichment wrap at line ~465 sets `cause = nodeErr`,
-                // and `nodeErr` may itself be a GlobalError thrown from
-                // `defineNode`-built nodes (e.g. `@blokjs/throw` setting
-                // `code: 401` for an auth-check middleware). Without this
-                // walk, the outer wrap below would force the framework's
-                // generic `[step N/M] X failed: ...` message + default 500
-                // code, clobbering the author's structured rejection.
-                let inner = e;
-                let foundGlobal = null;
-                while (typeof inner === "object" &&
-                    inner !== null &&
-                    "cause" in inner &&
-                    inner.cause !== undefined &&
-                    inner.cause !== inner) {
-                    inner = inner.cause;
-                    if (inner instanceof GlobalError) {
-                        foundGlobal = inner;
-                        break;
-                    }
-                }
-                if (foundGlobal) {
-                    error_context = foundGlobal;
-                }
-                else {
-                    error_context = new GlobalError(e.message);
-                    // Preserve the original error chain so outer handlers
-                    // (notably v0.5 TryCatchNode's `$.error.message` resolution)
-                    // can peel back through `.cause` to the author's original
-                    // `throw new Error("...")` text instead of the runner's
-                    // `[step N/M] <name> failed: ...` enriched prefix.
-                    error_context.cause = e;
+            throw this.unwrapAndEnrichError(e, wrapStepId);
+        }
+        return ctx;
+    }
+    /**
+     * PR 4 — wait.for / wait.until resume cursor.
+     *
+     * On `dispatchDeferred` re-entry from a wait step, the runner must skip
+     * past pre-wait steps that already completed in the previous pass.
+     * `lastCompletedStepIndex` is set on the run record before each
+     * WaitDispatchRequest throw and read here at runSteps entry. Default
+     * `-1` = no resume; runner starts at i = 0. Extracted verbatim from the
+     * top of `runSteps` (E06-T002) — the only mutation is clearing the
+     * `_blokInnerResumeIndex` sentinel.
+     */
+    resolveResumeCursor(ctx, deep, tracker, traceRunId) {
+        const persistedRun = !deep && tracker && traceRunId ? tracker.getStore().getRun(traceRunId) : undefined;
+        // Two cursor sources:
+        //   - Top-level (deep === false): workflow_runs.lastCompletedStepIndex.
+        //   - Nested inside a primitive iterator (deep === true, v0.6
+        //     Phase 2): `_blokInnerResumeIndex` stamped on the child ctx
+        //     by ForEachNode.runIteration when resuming at a specific
+        //     inner step. Undefined = start at 0 (fresh iteration body).
+        const innerResumeIndexRaw = ctx._blokInnerResumeIndex;
+        const innerResumeIndex = typeof innerResumeIndexRaw === "number" ? innerResumeIndexRaw : undefined;
+        const resumeFromIndex = !deep
+            ? persistedRun?.lastCompletedStepIndex !== undefined
+                ? persistedRun.lastCompletedStepIndex + 1
+                : 0
+            : (innerResumeIndex ?? 0);
+        // Clear the sentinel so a re-runner started fresh from this
+        // childCtx (e.g. the nested branch flow path) doesn't inherit
+        // a stale resume hint. ForEachNode set it for THIS one re-entry
+        // only; it should not propagate further.
+        if (deep && innerResumeIndex !== undefined) {
+            ctx._blokInnerResumeIndex = undefined;
+        }
+        return { resumeFromIndex, persistedRun, innerResumeIndex };
+    }
+    /**
+     * Unwrap + enrich a caught error into a `GlobalError`: walk the
+     * `.cause` chain looking for an inner `GlobalError` (so an author's
+     * structured rejection survives the framework's `[step N/M] X
+     * failed: ...` wrap), otherwise build a fresh `GlobalError` that
+     * preserves the original chain via `.cause`, then stamp the wrap's
+     * `_blokStepId` back on so `TryCatchNode.toErrorEnvelope` can surface
+     * it as `$.error.stepId`. Pure — no ctx mutation. Extracted verbatim
+     * from the `runSteps` catch arm (E06-T002).
+     */
+    unwrapAndEnrichError(e, wrapStepId) {
+        let error_context = {};
+        if (e instanceof GlobalError) {
+            error_context = e;
+        }
+        else {
+            // Walk the `.cause` chain looking for a GlobalError. The
+            // step-enrichment wrap at line ~465 sets `cause = nodeErr`,
+            // and `nodeErr` may itself be a GlobalError thrown from
+            // `defineNode`-built nodes (e.g. `@blokjs/throw` setting
+            // `code: 401` for an auth-check middleware). Without this
+            // walk, the outer wrap below would force the framework's
+            // generic `[step N/M] X failed: ...` message + default 500
+            // code, clobbering the author's structured rejection.
+            let inner = e;
+            let foundGlobal = null;
+            while (typeof inner === "object" &&
+                inner !== null &&
+                "cause" in inner &&
+                inner.cause !== undefined &&
+                inner.cause !== inner) {
+                inner = inner.cause;
+                if (inner instanceof GlobalError) {
+                    foundGlobal = inner;
+                    break;
                 }
             }
-            // Stamp the wrap's stepId on the unwrapped error so TryCatchNode's
-            // `toErrorEnvelope` walk can surface it as `$.error.stepId`. The
-            // inner-try wrap layer is gone by this point; this is the only
-            // place where the runner can identify which sub-step failed.
-            if (typeof wrapStepId === "string" && wrapStepId.length > 0) {
-                error_context._blokStepId = wrapStepId;
+            if (foundGlobal) {
+                error_context = foundGlobal;
+            }
+            else {
+                error_context = new GlobalError(e.message);
+                // Preserve the original error chain so outer handlers
+                // (notably v0.5 TryCatchNode's `$.error.message` resolution)
+                // can peel back through `.cause` to the author's original
+                // `throw new Error("...")` text instead of the runner's
+                // `[step N/M] <name> failed: ...` enriched prefix.
+                error_context.cause = e;
             }
-            throw error_context;
         }
-        return ctx;
+        // Stamp the wrap's stepId on the unwrapped error so TryCatchNode's
+        // `toErrorEnvelope` walk can surface it as `$.error.stepId`. The
+        // inner-try wrap layer is gone by this point; this is the only
+        // place where the runner can identify which sub-step failed.
+        if (typeof wrapStepId === "string" && wrapStepId.length > 0) {
+            error_context._blokStepId = wrapStepId;
+        }
+        return error_context;
     }
 }
 //# sourceMappingURL=RunnerSteps.js.map