rolled back to trace_id ordering

Author: mpcgrid

apps/webapp/app/presenters/v3/LogsListPresenter.server.ts

@@ -84,14 +84,14 @@ type LogCursor = {
   organizationId: string;
   environmentId: string;
   triggeredTimestamp: string; // DateTime64(9) string
-  spanId: string;
+  traceId: string;
 };
 
 const LogCursorSchema = z.object({
   organizationId: z.string(),
   environmentId: z.string(),
   triggeredTimestamp: z.string(),
-  spanId: z.string(),
+  traceId: z.string(),
 });
 
 function encodeCursor(cursor: LogCursor): string {
@@ -321,19 +321,19 @@ export class LogsListPresenter extends BasePresenter {
     }
 
     // Cursor pagination using explicit lexicographic comparison
-    // Must mirror the ORDER BY columns: (organization_id DESC, environment_id DESC, triggered_timestamp DESC, span_id DESC)
+    // Must mirror the ORDER BY columns: (organization_id, environment_id, triggered_timestamp, trace_id)
     const decodedCursor = cursor ? decodeCursor(cursor) : null;
     if (decodedCursor) {
       queryBuilder.where(
-        `(triggered_timestamp < {cursorTriggeredTimestamp: String} OR (triggered_timestamp = {cursorTriggeredTimestamp: String} AND span_id < {cursorSpanId: String}))`,
+        `(triggered_timestamp < {cursorTriggeredTimestamp: String} OR (triggered_timestamp = {cursorTriggeredTimestamp: String} AND trace_id < {cursorTraceId: String}))`,
         {
           cursorTriggeredTimestamp: decodedCursor.triggeredTimestamp,
-          cursorSpanId: decodedCursor.spanId,
+          cursorTraceId: decodedCursor.traceId,
         }
       );
     }
 
-    queryBuilder.orderBy("triggered_timestamp DESC, span_id DESC");
+    queryBuilder.orderBy("triggered_timestamp DESC, trace_id DESC");
     // Limit + 1 to check if there are more results
     queryBuilder.limit(pageSize + 1);
 
@@ -355,7 +355,7 @@ export class LogsListPresenter extends BasePresenter {
         organizationId,
         environmentId,
         triggeredTimestamp: lastLog.triggered_timestamp,
-        spanId: lastLog.span_id,
+        traceId: lastLog.trace_id,
       });
     }
 

internal-packages/clickhouse/schema/016_add_task_events_search_v1.sql

@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS trigger_dev.task_events_search_v1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(triggered_timestamp)
-ORDER BY (organization_id, environment_id, triggered_timestamp, span_id)
+ORDER BY (organization_id, environment_id, triggered_timestamp, trace_id)
 --Right now we have maximum retention of up to 30 days based on plan.
 --We put a logical limit for now, the 90 DAY TTL is just a backup
 --This might need to be updated for longer retention periods
@@ -48,7 +48,7 @@ SELECT
   status,
   duration,
   parent_span_id,
-  toJSONString(attributes) AS attributes_text,
+  attributes_text,
   fromUnixTimestamp64Nano(toUnixTimestamp64Nano(start_time) + toInt64(duration)) AS triggered_timestamp
 FROM trigger_dev.task_events_v2
 WHERE