duron 0.3.0-beta.12 → 0.3.0-beta.13

package/dist/adapters/postgres/base.d.ts

@@ -183,19 +183,28 @@ export declare class PostgresBaseAdapter<Database extends DrizzleDatabase, Conne
     protected _insertSpans(spans: InsertSpanOptions[]): Promise<number>;
     /**
      * Internal method to get spans for a job or step.
+     * For step queries, uses a recursive CTE to find all descendant spans.
      */
     protected _getSpans(options: GetSpansOptions): Promise<GetSpansResult>;
+    /**
+     * Get spans for a step using a recursive CTE to traverse the span hierarchy.
+     * This returns the step's span and all its descendant spans (children, grandchildren, etc.)
+     */
+    protected _getStepSpansRecursive(stepId: string, sortField: string, sortOrder: string, _filters?: GetSpansOptions['filters']): Promise<GetSpansResult>;
     /**
      * Internal method to delete all spans for a job.
      */
     protected _deleteSpans(options: DeleteSpansOptions): Promise<number>;
     /**
-     * Build WHERE clause for spans queries.
-     * When querying by jobId or stepId, we find all spans that share the same trace_id
-     * as spans with that job/step. This includes spans from external libraries that
+     * Build WHERE clause for spans queries (used for job queries only).
+     * When querying by jobId, we find all spans that share the same trace_id
+     * as spans with that job. This includes spans from external libraries that
      * don't have the duron.job.id attribute but are part of the same trace.
+     *
+     * Note: Step queries are handled separately by _getStepSpansRecursive using
+     * a recursive CTE to traverse the span hierarchy.
      */
-    protected _buildSpansWhereClause(jobId?: string, stepId?: string, filters?: GetSpansOptions['filters']): import("drizzle-orm").SQL<unknown> | undefined;
+    protected _buildSpansWhereClause(jobId?: string, _stepId?: string, filters?: GetSpansOptions['filters']): import("drizzle-orm").SQL<unknown> | undefined;
     /**
      * Send a PostgreSQL notification.
      *

package/dist/adapters/postgres/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/adapters/postgres/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/adapters/postgres/base.ts"],"names":[],"mappings":"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"}

package/dist/adapters/postgres/base.js

@@ -1139,19 +1139,26 @@ export class PostgresBaseAdapter extends Adapter {
     }
     /**
      * Internal method to get spans for a job or step.
+     * For step queries, uses a recursive CTE to find all descendant spans.
      */
     async _getSpans(options) {
         const spansTable = this.tables.spansTable;
         const filters = options.filters ?? {};
-        // Build WHERE clause
-        const where = this._buildSpansWhereClause(options.jobId, options.stepId, filters);
         // Build sort
         const sortInput = options.sort ?? { field: 'startTimeUnixNano', order: 'asc' };
         const sortFieldMap = {
-            name: spansTable.name,
-            startTimeUnixNano: spansTable.start_time_unix_nano,
-            endTimeUnixNano: spansTable.end_time_unix_nano,
+            name: 'name',
+            startTimeUnixNano: 'start_time_unix_nano',
+            endTimeUnixNano: 'end_time_unix_nano',
         };
+        const sortField = sortFieldMap[sortInput.field];
+        const sortOrder = sortInput.order === 'asc' ? 'ASC' : 'DESC';
+        // For step queries, use a recursive CTE to get descendant spans
+        if (options.stepId) {
+            return this._getStepSpansRecursive(options.stepId, sortField, sortOrder, filters);
+        }
+        // Build WHERE clause for job queries
+        const where = this._buildSpansWhereClause(options.jobId, undefined, filters);
         // Get total count
         const total = await this.db.$count(spansTable, where);
         if (!total) {
@@ -1160,8 +1167,10 @@ export class PostgresBaseAdapter extends Adapter {
                 total: 0,
             };
         }
-        const sortField = sortFieldMap[sortInput.field];
-        const orderByClause = sortInput.order === 'asc' ? asc(sortField) : desc(sortField);
+        const sortFieldColumn = sortFieldMap[sortInput.field];
+        const orderByClause = sortInput.order === 'asc'
+            ? asc(spansTable[sortFieldColumn])
+            : desc(spansTable[sortFieldColumn]);
         const rows = await this.db
             .select({
             id: spansTable.id,
@@ -1196,6 +1205,61 @@ export class PostgresBaseAdapter extends Adapter {
             total,
         };
     }
+    /**
+     * Get spans for a step using a recursive CTE to traverse the span hierarchy.
+     * This returns the step's span and all its descendant spans (children, grandchildren, etc.)
+     */
+    async _getStepSpansRecursive(stepId, sortField, sortOrder, _filters) {
+        const schemaName = this.schema;
+        // Use a recursive CTE to find all descendant spans
+        // 1. Base case: find the span with step_id = stepId
+        // 2. Recursive case: find all spans where parent_span_id = span_id of a span we've already found
+        const query = sql `
+      WITH RECURSIVE span_tree AS (
+        -- Base case: the span(s) for the step
+        SELECT * FROM ${sql.identifier(schemaName)}.spans WHERE step_id = ${stepId}::uuid
+        UNION ALL
+        -- Recursive case: children of spans we've found
+        SELECT s.* FROM ${sql.identifier(schemaName)}.spans s
+        INNER JOIN span_tree st ON s.parent_span_id = st.span_id
+      )
+      SELECT
+        id,
+        trace_id as "traceId",
+        span_id as "spanId",
+        parent_span_id as "parentSpanId",
+        job_id as "jobId",
+        step_id as "stepId",
+        name,
+        kind,
+        start_time_unix_nano as "startTimeUnixNano",
+        end_time_unix_nano as "endTimeUnixNano",
+        status_code as "statusCode",
+        status_message as "statusMessage",
+        attributes,
+        events
+      FROM span_tree
+      ORDER BY ${sql.identifier(sortField)} ${sql.raw(sortOrder)}
+    `;
+        // Raw SQL returns numeric types as strings, so we type them as such
+        const rows = (await this.db.execute(query));
+        // Convert types: raw SQL returns numeric types as strings
+        const spans = rows.map((row) => ({
+            ...row,
+            // Convert id to number (bigserial comes as string from raw SQL)
+            id: typeof row.id === 'string' ? Number.parseInt(row.id, 10) : row.id,
+            // Convert kind and statusCode to proper types
+            kind: (typeof row.kind === 'string' ? Number.parseInt(row.kind, 10) : row.kind),
+            statusCode: (typeof row.statusCode === 'string' ? Number.parseInt(row.statusCode, 10) : row.statusCode),
+            // Convert BigInt to string for JSON serialization
+            startTimeUnixNano: row.startTimeUnixNano?.toString() ?? null,
+            endTimeUnixNano: row.endTimeUnixNano?.toString() ?? null,
+        }));
+        return {
+            spans,
+            total: spans.length,
+        };
+    }
     /**
      * Internal method to delete all spans for a job.
      */
@@ -1207,12 +1271,15 @@ export class PostgresBaseAdapter extends Adapter {
         return result.length;
     }
     /**
-     * Build WHERE clause for spans queries.
-     * When querying by jobId or stepId, we find all spans that share the same trace_id
-     * as spans with that job/step. This includes spans from external libraries that
+     * Build WHERE clause for spans queries (used for job queries only).
+     * When querying by jobId, we find all spans that share the same trace_id
+     * as spans with that job. This includes spans from external libraries that
      * don't have the duron.job.id attribute but are part of the same trace.
+     *
+     * Note: Step queries are handled separately by _getStepSpansRecursive using
+     * a recursive CTE to traverse the span hierarchy.
      */
-    _buildSpansWhereClause(jobId, stepId, filters) {
+    _buildSpansWhereClause(jobId, _stepId, filters) {
         const spansTable = this.tables.spansTable;
         // Build condition for finding spans by trace_id (includes external spans)
         let traceCondition;
@@ -1221,10 +1288,6 @@ export class PostgresBaseAdapter extends Adapter {
             // This includes external spans (like from AI SDK) that don't have duron.job.id
             traceCondition = inArray(spansTable.trace_id, this.db.select({ traceId: spansTable.trace_id }).from(spansTable).where(eq(spansTable.job_id, jobId)));
         }
-        else if (stepId) {
-            // Find all spans that share a trace_id with any span that has this step_id
-            traceCondition = inArray(spansTable.trace_id, this.db.select({ traceId: spansTable.trace_id }).from(spansTable).where(eq(spansTable.step_id, stepId)));
-        }
         return and(traceCondition, filters?.name
             ? Array.isArray(filters.name)
                 ? or(...filters.name.map((n) => ilike(spansTable.name, `%${n}%`)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "duron",
-  "version": "0.3.0-beta.12",
+  "version": "0.3.0-beta.13",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/adapters/postgres/base.ts

@@ -1418,22 +1418,30 @@ export class PostgresBaseAdapter<Database extends DrizzleDatabase, Connection> e
 
   /**
    * Internal method to get spans for a job or step.
+   * For step queries, uses a recursive CTE to find all descendant spans.
    */
   protected async _getSpans(options: GetSpansOptions): Promise<GetSpansResult> {
     const spansTable = this.tables.spansTable
     const filters = options.filters ?? {}
 
-    // Build WHERE clause
-    const where = this._buildSpansWhereClause(options.jobId, options.stepId, filters)
-
     // Build sort
     const sortInput = options.sort ?? { field: 'startTimeUnixNano', order: 'asc' }
-    const sortFieldMap: Record<SpanSort['field'], any> = {
-      name: spansTable.name,
-      startTimeUnixNano: spansTable.start_time_unix_nano,
-      endTimeUnixNano: spansTable.end_time_unix_nano,
+    const sortFieldMap: Record<SpanSort['field'], string> = {
+      name: 'name',
+      startTimeUnixNano: 'start_time_unix_nano',
+      endTimeUnixNano: 'end_time_unix_nano',
+    }
+    const sortField = sortFieldMap[sortInput.field]
+    const sortOrder = sortInput.order === 'asc' ? 'ASC' : 'DESC'
+
+    // For step queries, use a recursive CTE to get descendant spans
+    if (options.stepId) {
+      return this._getStepSpansRecursive(options.stepId, sortField, sortOrder, filters)
     }
 
+    // Build WHERE clause for job queries
+    const where = this._buildSpansWhereClause(options.jobId, undefined, filters)
+
     // Get total count
     const total = await this.db.$count(spansTable, where)
     if (!total) {
@@ -1443,8 +1451,11 @@ export class PostgresBaseAdapter<Database extends DrizzleDatabase, Connection> e
       }
     }
 
-    const sortField = sortFieldMap[sortInput.field]
-    const orderByClause = sortInput.order === 'asc' ? asc(sortField) : desc(sortField)
+    const sortFieldColumn = sortFieldMap[sortInput.field]
+    const orderByClause =
+      sortInput.order === 'asc'
+        ? asc(spansTable[sortFieldColumn as keyof typeof spansTable] as any)
+        : desc(spansTable[sortFieldColumn as keyof typeof spansTable] as any)
 
     const rows = await this.db
       .select({
@@ -1483,6 +1494,89 @@ export class PostgresBaseAdapter<Database extends DrizzleDatabase, Connection> e
     }
   }
 
+  /**
+   * Get spans for a step using a recursive CTE to traverse the span hierarchy.
+   * This returns the step's span and all its descendant spans (children, grandchildren, etc.)
+   */
+  protected async _getStepSpansRecursive(
+    stepId: string,
+    sortField: string,
+    sortOrder: string,
+    _filters?: GetSpansOptions['filters'],
+  ): Promise<GetSpansResult> {
+    const schemaName = this.schema
+
+    // Use a recursive CTE to find all descendant spans
+    // 1. Base case: find the span with step_id = stepId
+    // 2. Recursive case: find all spans where parent_span_id = span_id of a span we've already found
+    const query = sql`
+      WITH RECURSIVE span_tree AS (
+        -- Base case: the span(s) for the step
+        SELECT * FROM ${sql.identifier(schemaName)}.spans WHERE step_id = ${stepId}::uuid
+        UNION ALL
+        -- Recursive case: children of spans we've found
+        SELECT s.* FROM ${sql.identifier(schemaName)}.spans s
+        INNER JOIN span_tree st ON s.parent_span_id = st.span_id
+      )
+      SELECT
+        id,
+        trace_id as "traceId",
+        span_id as "spanId",
+        parent_span_id as "parentSpanId",
+        job_id as "jobId",
+        step_id as "stepId",
+        name,
+        kind,
+        start_time_unix_nano as "startTimeUnixNano",
+        end_time_unix_nano as "endTimeUnixNano",
+        status_code as "statusCode",
+        status_message as "statusMessage",
+        attributes,
+        events
+      FROM span_tree
+      ORDER BY ${sql.identifier(sortField)} ${sql.raw(sortOrder)}
+    `
+
+    // Raw SQL returns numeric types as strings, so we type them as such
+    const rows = (await this.db.execute(query)) as unknown as Array<{
+      id: string | number
+      traceId: string
+      spanId: string
+      parentSpanId: string | null
+      jobId: string | null
+      stepId: string | null
+      name: string
+      kind: string | number
+      startTimeUnixNano: string | bigint | null
+      endTimeUnixNano: string | bigint | null
+      statusCode: string | number
+      statusMessage: string | null
+      attributes: Record<string, any>
+      events: Array<{ name: string; timeUnixNano: string; attributes?: Record<string, any> }>
+    }>
+
+    // Convert types: raw SQL returns numeric types as strings
+    const spans = rows.map((row) => ({
+      ...row,
+      // Convert id to number (bigserial comes as string from raw SQL)
+      id: typeof row.id === 'string' ? Number.parseInt(row.id, 10) : row.id,
+      // Convert kind and statusCode to proper types
+      kind: (typeof row.kind === 'string' ? Number.parseInt(row.kind, 10) : row.kind) as 0 | 1 | 2 | 3 | 4,
+      statusCode: (typeof row.statusCode === 'string' ? Number.parseInt(row.statusCode, 10) : row.statusCode) as
+        | 0
+        | 1
+        | 2,
+      // Convert BigInt to string for JSON serialization
+      startTimeUnixNano: row.startTimeUnixNano?.toString() ?? null,
+      endTimeUnixNano: row.endTimeUnixNano?.toString() ?? null,
+    }))
+
+    return {
+      spans,
+      total: spans.length,
+    }
+  }
+
   /**
    * Internal method to delete all spans for a job.
    */
@@ -1496,12 +1590,15 @@ export class PostgresBaseAdapter<Database extends DrizzleDatabase, Connection> e
   }
 
   /**
-   * Build WHERE clause for spans queries.
-   * When querying by jobId or stepId, we find all spans that share the same trace_id
-   * as spans with that job/step. This includes spans from external libraries that
+   * Build WHERE clause for spans queries (used for job queries only).
+   * When querying by jobId, we find all spans that share the same trace_id
+   * as spans with that job. This includes spans from external libraries that
    * don't have the duron.job.id attribute but are part of the same trace.
+   *
+   * Note: Step queries are handled separately by _getStepSpansRecursive using
+   * a recursive CTE to traverse the span hierarchy.
    */
-  protected _buildSpansWhereClause(jobId?: string, stepId?: string, filters?: GetSpansOptions['filters']) {
+  protected _buildSpansWhereClause(jobId?: string, _stepId?: string, filters?: GetSpansOptions['filters']) {
     const spansTable = this.tables.spansTable
 
     // Build condition for finding spans by trace_id (includes external spans)
@@ -1514,12 +1611,6 @@ export class PostgresBaseAdapter<Database extends DrizzleDatabase, Connection> e
         spansTable.trace_id,
         this.db.select({ traceId: spansTable.trace_id }).from(spansTable).where(eq(spansTable.job_id, jobId)),
       )
-    } else if (stepId) {
-      // Find all spans that share a trace_id with any span that has this step_id
-      traceCondition = inArray(
-        spansTable.trace_id,
-        this.db.select({ traceId: spansTable.trace_id }).from(spansTable).where(eq(spansTable.step_id, stepId)),
-      )
     }
 
     return and(