duron 0.3.0-beta.8 → 0.3.0

package/package.json

@@ -1,62 +1,73 @@
 {
   "name": "duron",
-  "version": "0.3.0-beta.8",
+  "version": "0.3.0",
+  "license": "MIT",
+  "files": [
+    "dist",
+    "src",
+    "migrations"
+  ],
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "dev-source": "./src/index.ts",
       "types": "./dist/index.d.ts",
+      "dev-source": "./src/index.ts",
       "default": "./dist/index.js"
     },
     "./client": {
-      "dev-source": "./src/client.ts",
       "types": "./dist/client.d.ts",
+      "dev-source": "./src/client.ts",
       "default": "./dist/client.js"
     },
     "./action": {
-      "dev-source": "./src/action.ts",
       "types": "./dist/action.d.ts",
+      "dev-source": "./src/action.ts",
       "default": "./dist/action.js"
     },
     "./constants": {
-      "dev-source": "./src/constants.ts",
       "types": "./dist/constants.d.ts",
+      "dev-source": "./src/constants.ts",
       "default": "./dist/constants.js"
     },
     "./server": {
-      "dev-source": "./src/server.ts",
       "types": "./dist/server.d.ts",
+      "dev-source": "./src/server.ts",
       "default": "./dist/server.js"
     },
     "./adapter": {
-      "dev-source": "./src/adapters/adapter.ts",
       "types": "./dist/adapters/adapter.d.ts",
+      "dev-source": "./src/adapters/adapter.ts",
       "default": "./dist/adapters/adapter.js"
     },
     "./adapters/postgres": {
-      "dev-source": "./src/adapters/postgres/postgres.ts",
       "types": "./dist/adapters/postgres/postgres.d.ts",
+      "dev-source": "./src/adapters/postgres/postgres.ts",
       "default": "./dist/adapters/postgres/postgres.js"
     },
     "./adapters/postgres/schema": {
-      "dev-source": "./src/adapters/postgres/schema.ts",
       "types": "./dist/adapters/postgres/schema.d.ts",
+      "dev-source": "./src/adapters/postgres/schema.ts",
       "default": "./dist/adapters/postgres/schema.js"
     },
     "./adapters/pglite": {
-      "dev-source": "./src/adapters/postgres/pglite.ts",
       "types": "./dist/adapters/postgres/pglite.d.ts",
+      "dev-source": "./src/adapters/postgres/pglite.ts",
       "default": "./dist/adapters/postgres/pglite.js"
+    },
+    "./errors": {
+      "types": "./dist/errors.d.ts",
+      "dev-source": "./src/errors.ts",
+      "default": "./dist/errors.js"
+    },
+    "./telemetry": {
+      "types": "./dist/telemetry/index.d.ts",
+      "dev-source": "./src/telemetry/index.ts",
+      "default": "./dist/telemetry/index.js"
     }
   },
-  "files": [
-    "dist",
-    "src",
-    "migrations"
-  ],
   "scripts": {
     "build": "tsc --project tsconfig.node.json",
     "dev": "tsc --watch --project tsconfig.node.json",
@@ -65,17 +76,14 @@
     "generate:postgres": "bunx --bun drizzle-kit generate --config ./src/adapters/postgres/drizzle.config.ts",
     "typecheck": "tsc --noEmit"
   },
-  "devDependencies": {
-    "@electric-sql/pglite": "^0.3.14",
-    "@opentelemetry/api": "^1.9.0",
-    "@types/bun": "latest",
-    "@types/node": "^24.0.15",
-    "drizzle-kit": "^1.0.0-beta.11-05230d9",
-    "drizzle-orm": "^1.0.0-beta.11-05230d9",
-    "postgres": "^3.4.7",
-    "typescript": "^5.6.3"
-  },
   "dependencies": {
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/core": "^2.4.0",
+    "@opentelemetry/resources": "^2.4.0",
+    "@opentelemetry/sdk-node": "^0.210.0",
+    "@opentelemetry/sdk-trace-base": "^2.4.0",
+    "@opentelemetry/sdk-trace-node": "^2.4.0",
+    "@opentelemetry/semantic-conventions": "^1.39.0",
     "elysia": "^1.4.22",
     "fastq": "^1.19.1",
     "jose": "^6.1.2",
@@ -86,5 +94,13 @@
     "zocker": "^3.0.0",
     "zod": "^4.1.12"
   },
-  "license": "MIT"
+  "devDependencies": {
+    "@electric-sql/pglite": "^0.3.14",
+    "@types/bun": "latest",
+    "@types/node": "^24.0.15",
+    "drizzle-kit": "^1.0.0-beta.15-859cf75",
+    "drizzle-orm": "^1.0.0-beta.15-859cf75",
+    "postgres": "^3.4.7",
+    "typescript": "^5.6.3"
+  }
 }

package/src/action-job.ts

@@ -1,17 +1,17 @@
+import { context, type Span, SpanKind, SpanStatusCode, type Tracer, trace } from '@opentelemetry/api'
 import type { Logger } from 'pino'
 
 import type { Action } from './action.js'
 import type { Adapter } from './adapters/adapter.js'
-import { ActionCancelError, ActionTimeoutError, isCancelError, StepTimeoutError, serializeError } from './errors.js'
+import { ActionCancelError, ActionTimeoutError, isCancelError, isTimeoutError, serializeError } from './errors.js'
 import { StepManager } from './step-manager.js'
-import type { Span, TelemetryAdapter } from './telemetry/adapter.js'
 import waitForAbort from './utils/wait-for-abort.js'
 
 export interface ActionJobOptions<TAction extends Action<any, any, any>> {
   job: { id: string; input: any; groupKey: string; timeoutMs: number; actionName: string }
   action: TAction
   database: Adapter
-  telemetry: TelemetryAdapter
+  tracer: Tracer
   variables: Record<string, unknown>
   logger: Logger
 }
@@ -26,7 +26,7 @@ export class ActionJob<TAction extends Action<any, any, any>> {
   #job: { id: string; input: any; groupKey: string; timeoutMs: number; actionName: string }
   #action: TAction
   #database: Adapter
-  #telemetry: TelemetryAdapter
+  #tracer: Tracer
   #variables: Record<string, unknown>
   #logger: Logger
   #stepManager: StepManager
@@ -34,7 +34,7 @@ export class ActionJob<TAction extends Action<any, any, any>> {
   #timeoutId: NodeJS.Timeout | null = null
   #done: Promise<void>
   #resolve: (() => void) | null = null
-  #jobSpan: Span | null = null
+  #jobSpan!: Span
 
   // ============================================================================
   // Constructor
@@ -49,7 +49,7 @@ export class ActionJob<TAction extends Action<any, any, any>> {
     this.#job = options.job
     this.#action = options.action
     this.#database = options.database
-    this.#telemetry = options.telemetry
+    this.#tracer = options.tracer
     this.#variables = options.variables
     this.#logger = options.logger
     this.#abortController = new AbortController()
@@ -59,7 +59,7 @@ export class ActionJob<TAction extends Action<any, any, any>> {
       jobId: options.job.id,
       actionName: options.job.actionName,
       adapter: options.database,
-      telemetry: options.telemetry,
+      tracer: options.tracer,
       logger: options.logger,
       concurrencyLimit: options.action.steps.concurrency,
     })
@@ -84,12 +84,14 @@ export class ActionJob<TAction extends Action<any, any, any>> {
    * @throws Error if the job fails or output validation fails
    */
   async execute() {
-    // Start job telemetry span
-    this.#jobSpan = await this.#telemetry.startJobSpan({
-      jobId: this.#job.id,
-      actionName: this.#action.name,
-      groupKey: this.#job.groupKey,
-      input: this.#job.input,
+    // Start job span - uses no-op tracer if no SDK is configured
+    this.#jobSpan = this.#tracer.startSpan(`job:${this.#action.name}`, {
+      kind: SpanKind.INTERNAL,
+      attributes: {
+        'duron.job.id': this.#job.id,
+        'duron.action.name': this.#action.name,
+        'duron.group.key': this.#job.groupKey,
+      },
     })
 
     // Set the job span on the step manager
@@ -102,9 +104,6 @@ export class ActionJob<TAction extends Action<any, any, any>> {
         actionName: this.#action.name,
       })
 
-      // Create observe context for the action handler
-      const observeContext = this.#telemetry.createObserveContext(this.#job.id, null, this.#jobSpan)
-
       // Create action context with step manager
       const ctx = this.#stepManager.createActionContext(
         this.#job,
@@ -112,11 +111,10 @@ export class ActionJob<TAction extends Action<any, any, any>> {
         this.#variables as any,
         this.#abortController.signal,
         jobLogger,
-        observeContext,
       )
 
       this.#timeoutId = setTimeout(() => {
-        const timeoutError = new ActionTimeoutError(this.#action.name, this.#job.timeoutMs)
+        const timeoutError = new ActionTimeoutError(this.#action.name, this.#job.id, this.#job.timeoutMs)
         this.#abortController.abort(timeoutError)
       }, this.#job.timeoutMs)
 
@@ -125,9 +123,13 @@ export class ActionJob<TAction extends Action<any, any, any>> {
       // Execute handler with timeout - race between handler and abort signal
       const abortWaiter = waitForAbort(this.#abortController.signal)
       let result: any = null
+
+      // Execute handler within the job span context so that child spans inherit the trace
+      const spanContext = trace.setSpan(context.active(), this.#jobSpan)
+
       await Promise.race([
-        this.#action
-          .handler(ctx)
+        context
+          .with(spanContext, () => this.#action.handler(ctx))
           .then((res) => {
             if (res !== undefined) {
               result = res
@@ -160,10 +162,20 @@ export class ActionJob<TAction extends Action<any, any, any>> {
       )
 
       // End job span successfully
-      await this.#telemetry.endJobSpan(this.#jobSpan, { status: 'ok' })
+      this.#jobSpan.setStatus({ code: SpanStatusCode.OK })
+      this.#jobSpan.end()
 
       return result
     } catch (error) {
+      // Abort all running steps when an error occurs
+      // This ensures cascading failure and stops any steps still running
+      if (!this.#abortController.signal.aborted) {
+        this.#abortController.abort(error)
+      }
+
+      // Wait for step manager to drain (all steps to settle)
+      await this.#stepManager.drain()
+
       if (
         isCancelError(error) ||
         (error instanceof Error && error.name === 'AbortError' && isCancelError(error.cause))
@@ -172,26 +184,25 @@ export class ActionJob<TAction extends Action<any, any, any>> {
         await this.#database.cancelJob({ jobId: this.#job.id })
 
         // End job span as cancelled
-        if (this.#jobSpan) {
-          await this.#telemetry.endJobSpan(this.#jobSpan, { status: 'cancelled' })
-        }
+        this.#jobSpan.setStatus({ code: SpanStatusCode.ERROR, message: 'Job cancelled' })
+        this.#jobSpan.end()
         return
       }
 
-      const message =
-        error instanceof ActionTimeoutError
-          ? '[ActionJob] Job timed out'
-          : error instanceof StepTimeoutError
-            ? '[ActionJob] Step timed out'
-            : '[ActionJob] Job failed'
+      const message = isTimeoutError(error) ? '[ActionJob] Job timed out' : '[ActionJob] Job failed'
 
       this.#logger.error({ jobId: this.#job.id, actionName: this.#action.name }, message)
       await this.#database.failJob({ jobId: this.#job.id, error: serializeError(error) })
 
       // End job span with error
-      if (this.#jobSpan) {
-        await this.#telemetry.endJobSpan(this.#jobSpan, { status: 'error', error })
+      this.#jobSpan.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: error instanceof Error ? error.message : String(error),
+      })
+      if (error instanceof Error) {
+        this.#jobSpan.recordException(error)
       }
+      this.#jobSpan.end()
 
       throw error
     } finally {

package/src/action-manager.ts

@@ -1,15 +1,15 @@
+import type { Tracer } from '@opentelemetry/api'
 import fastq from 'fastq'
 import type { Logger } from 'pino'
 
 import type { Action } from './action.js'
 import { ActionJob } from './action-job.js'
 import type { Adapter, Job } from './adapters/adapter.js'
-import type { TelemetryAdapter } from './telemetry/adapter.js'
 
 export interface ActionManagerOptions<TAction extends Action<any, any, any>> {
   action: TAction
   database: Adapter
-  telemetry: TelemetryAdapter
+  tracer: Tracer
   variables: Record<string, unknown>
   logger: Logger
   concurrencyLimit: number
@@ -24,7 +24,7 @@ export interface ActionManagerOptions<TAction extends Action<any, any, any>> {
 export class ActionManager<TAction extends Action<any, any, any>> {
   #action: TAction
   #database: Adapter
-  #telemetry: TelemetryAdapter
+  #tracer: Tracer
   #variables: Record<string, unknown>
   #logger: Logger
   #queue: fastq.queueAsPromised<Job, void>
@@ -44,7 +44,7 @@ export class ActionManager<TAction extends Action<any, any, any>> {
   constructor(options: ActionManagerOptions<TAction>) {
     this.#action = options.action
     this.#database = options.database
-    this.#telemetry = options.telemetry
+    this.#tracer = options.tracer
     this.#variables = options.variables
     this.#logger = options.logger
     this.#concurrencyLimit = options.concurrencyLimit
@@ -153,7 +153,7 @@ export class ActionManager<TAction extends Action<any, any, any>> {
       },
       action: this.#action,
       database: this.#database,
-      telemetry: this.#telemetry,
+      tracer: this.#tracer,
       variables: this.#variables,
       logger: this.#logger,
     })