Review fixes

Author: mpcgrid

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

@@ -116,7 +116,7 @@ function decodeCursor(cursor: string): LogCursor | null {
 function levelToKindsAndStatuses(level: LogLevel): { kinds?: string[]; statuses?: string[] } {
   switch (level) {
     case "DEBUG":
-      return { kinds: ["DEBUG_EVENT", "LOG_DEBUG"] };
+      return { kinds: ["LOG_DEBUG"] };
     case "INFO":
       return { kinds: ["LOG_INFO", "LOG_LOG"] };
     case "WARN":
@@ -352,18 +352,18 @@ export class LogsListPresenter extends BasePresenter {
     // Must mirror the ORDER BY columns: (organization_id DESC, environment_id DESC, triggered_timestamp DESC, span_id DESC)
     const decodedCursor = cursor ? decodeCursor(cursor) : null;
     if (decodedCursor) {
+      // organization_id and environment_id are already pinned by equality filters above,
+      // so cursor only needs to compare triggered_timestamp and span_id
       queryBuilder.where(
-        `((organization_id = {cursorOrgId: String} AND environment_id = {cursorEnvId: String} AND triggered_timestamp = {cursorTriggeredTimestamp: String} AND span_id < {cursorSpanId: String}) OR (organization_id = {cursorOrgId: String} AND environment_id = {cursorEnvId: String} AND triggered_timestamp < {cursorTriggeredTimestamp: String}) OR (organization_id = {cursorOrgId: String} AND environment_id < {cursorEnvId: String}) OR (organization_id < {cursorOrgId: String}))`,
+        `(triggered_timestamp < {cursorTriggeredTimestamp: String} OR (triggered_timestamp = {cursorTriggeredTimestamp: String} AND span_id < {cursorSpanId: String}))`,
         {
-          cursorOrgId: decodedCursor.organizationId,
-          cursorEnvId: decodedCursor.environmentId,
           cursorTriggeredTimestamp: decodedCursor.triggeredTimestamp,
           cursorSpanId: decodedCursor.spanId,
         }
       );
     }
 
-    queryBuilder.orderBy("organization_id DESC, environment_id DESC, triggered_timestamp DESC, span_id DESC");
+    queryBuilder.orderBy("triggered_timestamp DESC, span_id DESC");
     // Limit + 1 to check if there are more results
     queryBuilder.limit(pageSize + 1);
 

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.$logId.spans.tsx

@@ -5,13 +5,13 @@ import { EnvironmentParamSchema } from "~/utils/pathBuilder";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { convertClickhouseDateTime64ToJsDate } from "~/v3/eventRepository/clickhouseEventRepository.server";
 
 // Convert ClickHouse kind to display level
 function kindToLevel(
   kind: string
 ): "TRACE" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "LOG" {
   switch (kind) {
-    case "DEBUG_EVENT":
     case "LOG_DEBUG":
       return "DEBUG";
     case "LOG_INFO":
@@ -23,7 +23,6 @@ function kindToLevel(
     case "LOG_LOG":
       return "LOG";
     case "SPAN":
-    case "ANCESTOR_OVERRIDE":
     case "SPAN_EVENT":
     default:
       return "TRACE";
@@ -91,7 +90,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     kind: row.kind,
     level: kindToLevel(row.kind),
     status: row.status,
-    startTime: new Date(Number(row.start_time) / 1_000_000).toISOString(),
+    startTime: convertClickhouseDateTime64ToJsDate(row.start_time).toISOString(),
     duration: Number(row.duration),
     isCurrent: row.span_id === currentSpanId,
   }));