query optimization

Author: mpcgrid

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

@@ -84,15 +84,10 @@ export class LogDetailPresenter {
     }
 
     try {
-      // Handle attributes which could be a JSON object or string
-      if (log.attributes) {
-        if (typeof log.attributes === "string") {
-          parsedAttributes = JSON.parse(log.attributes) as Record<string, unknown>;
-          rawAttributesString = log.attributes;
-        } else if (typeof log.attributes === "object") {
-          parsedAttributes = log.attributes as Record<string, unknown>;
-          rawAttributesString = JSON.stringify(log.attributes);
-        }
+      // Handle attributes_text which is a string
+      if (log.attributes_text) {
+        parsedAttributes = JSON.parse(log.attributes_text) as Record<string, unknown>;
+        rawAttributesString = log.attributes_text;
       }
     } catch {
       // Ignore parse errors

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

@@ -19,12 +19,12 @@ import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
 import { getAllTaskIdentifiers } from "~/models/task.server";
 import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
+import { kindToLevel, type LogLevel, LogLevelSchema } from "~/utils/logUtils";
+import { BasePresenter } from "~/presenters/v3/basePresenter.server";
 import {
   convertDateToClickhouseDateTime,
   convertClickhouseDateTime64ToJsDate,
 } from "~/v3/eventRepository/clickhouseEventRepository.server";
-import { kindToLevel, type LogLevel, LogLevelSchema } from "~/utils/logUtils";
-import { BasePresenter } from "~/presenters/v3/basePresenter.server";
 
 
 export type { LogLevel };
@@ -542,9 +542,9 @@ export class LogsListPresenter extends BasePresenter {
       let displayMessage = log.message;
 
       // For error logs with status ERROR, try to extract error message from attributes
-      if (log.status === "ERROR" && log.attributes) {
+      if (log.status === "ERROR" && log.attributes_text) {
         try {
-          let attributes = log.attributes as ErrorAttributes;
+          let attributes = JSON.parse(log.attributes_text) as ErrorAttributes;
 
           if (attributes?.error?.message && typeof attributes.error.message === "string") {
             displayMessage = attributes.error.message;

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx

@@ -227,7 +227,7 @@ function LogsList({
   showDebug,
   defaultPeriod,
 }: {
-  list: Awaited<UseDataFunctionReturn<typeof loader>["data"]>;
+  list: Exclude<Awaited<UseDataFunctionReturn<typeof loader>["data"]>, { error: string }>; //exclude error, it is handled
   rootOnlyDefault: boolean;
   isAdmin: boolean;
   showDebug: boolean;

internal-packages/clickhouse/src/taskEvents.ts

@@ -250,7 +250,7 @@ export const LogsListResult = z.object({
   status: z.string(),
   duration: z.number().or(z.string()),
   metadata: z.string(),
-  attributes: z.any(),
+  attributes_text: z.string(),
 });
 
 export type LogsListResult = z.output<typeof LogsListResult>;
@@ -274,7 +274,7 @@ export function getLogsListQueryBuilderV2(ch: ClickhouseReader, settings?: Click
       "status",
       "duration",
       "metadata",
-      "attributes"
+      "attributes_text"
     ],
     settings,
   });
@@ -296,7 +296,7 @@ export const LogDetailV2Result = z.object({
   status: z.string(),
   duration: z.number().or(z.string()),
   metadata: z.string(),
-  attributes: z.any()
+  attributes_text: z.string()
 });
 
 export type LogDetailV2Result = z.output<typeof LogDetailV2Result>;
@@ -320,7 +320,7 @@ export function getLogDetailQueryBuilderV2(ch: ClickhouseReader, settings?: Clic
       "status",
       "duration",
       "metadata",
-      "attributes",
+      "attributes_text",
     ],
     settings,
   });
@@ -349,7 +349,7 @@ export function getLogsListQueryBuilderV1(ch: ClickhouseReader, settings?: Click
       "status",
       "duration",
       "metadata",
-      "attributes"
+      "attributes_text"
     ],
     settings,
   });
@@ -374,7 +374,7 @@ export function getLogDetailQueryBuilderV1(ch: ClickhouseReader, settings?: Clic
       "status",
       "duration",
       "metadata",
-      "attributes",
+      "attributes_text",
     ],
     settings,
   });