removed EVENT_REPOSITORY_CLICKHOUSE_ROLLOUT_PERCENT

added support for tasks_v1 for logs
cleaned the No logs message
extended LogsPresenter with BasePresenter for spans

Author: mpcgrid

apps/webapp/app/components/logs/LogsTable.tsx

@@ -27,7 +27,6 @@ import { PopoverMenuItem } from "~/components/primitives/Popover";
 
 type LogsTableProps = {
   logs: LogEntry[];
-  hasFilters: boolean;
   searchTerm?: string;
   isLoading?: boolean;
   isLoadingMore?: boolean;
@@ -59,7 +58,6 @@ function getLevelBorderColor(level: LogEntry["level"]): string {
 
 export function LogsTable({
   logs,
-  hasFilters,
   searchTerm,
   isLoading = false,
   isLoadingMore = false,
@@ -126,11 +124,7 @@ export function LogsTable({
           </TableRow>
         </TableHeader>
         <TableBody>
-          {logs.length === 0 && !hasFilters ? (
-            <TableBlankRow colSpan={6}>
-              {!isLoading && <NoLogs title="No logs found" />}
-            </TableBlankRow>
-          ) : logs.length === 0 ? (
+          {logs.length === 0 ? (
             <BlankState isLoading={isLoading} onRefresh={() => window.location.reload()} />
           ) : (
             logs.map((log) => {
@@ -214,14 +208,6 @@ export function LogsTable({
   );
 }
 
-function NoLogs({ title }: { title: string }) {
-  return (
-    <div className="flex items-center justify-center">
-      <Paragraph className="w-auto">{title}</Paragraph>
-    </div>
-  );
-}
-
 function BlankState({ isLoading, onRefresh }: { isLoading?: boolean; onRefresh?: () => void }) {
   if (isLoading) return <TableBlankRow colSpan={6}></TableBlankRow>;
 

apps/webapp/app/env.server.ts

@@ -1220,7 +1220,6 @@ const EnvironmentSchema = z
       .number()
       .int()
       .default(60_000 * 5), // 5 minutes
-    EVENT_REPOSITORY_CLICKHOUSE_ROLLOUT_PERCENT: z.coerce.number().optional(),
     EVENT_REPOSITORY_DEFAULT_STORE: z
       .enum(["postgres", "clickhouse", "clickhouse_v2"])
       .default("postgres"),

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

@@ -2,6 +2,8 @@ import { type ClickHouse } from "@internal/clickhouse";
 import { type PrismaClientOrTransaction } from "@trigger.dev/database";
 import { convertClickhouseDateTime64ToJsDate } from "~/v3/eventRepository/clickhouseEventRepository.server";
 import { kindToLevel } from "~/utils/logUtils";
+import { getConfiguredEventRepository } from "~/v3/eventRepository/index.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
 
 export type LogDetailOptions = {
   environmentId: string;
@@ -24,8 +26,28 @@ export class LogDetailPresenter {
   public async call(options: LogDetailOptions) {
     const { environmentId, organizationId, projectId, spanId, traceId, startTime } = options;
 
-    // Build ClickHouse query
-    const queryBuilder = this.clickhouse.taskEventsV2.logDetailQueryBuilder();
+    // Determine which store to use based on organization configuration
+    const { store } = await getConfiguredEventRepository(organizationId);
+
+    // Throw error if postgres is detected
+    if (store === "postgres") {
+      throw new ServiceValidationError(
+        "Log details are not available for PostgreSQL event store. Please contact support."
+      );
+    }
+
+    // Throw error if clickhouse v1 is detected (not supported)
+    if (store === "postgres") {
+      throw new ServiceValidationError(
+        "Log details are not available for postgres event store. Please contact support."
+      );
+    }
+
+    // Build ClickHouse query - only v2 is supported for log details
+    const isClickhouseV2 = store === "clickhouse_v2";
+    const queryBuilder = isClickhouseV2
+      ? this.clickhouse.taskEventsV2.logDetailQueryBuilder()
+      : this.clickhouse.taskEvents.logDetailQueryBuilder();
 
     // Required filters - spanId, traceId, and startTime uniquely identify the log
     // Multiple events can share the same spanId (span, span events, logs), so startTime is needed

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

@@ -8,6 +8,7 @@ import {
   TaskRunStatus as TaskRunStatusEnum,
   TaskTriggerSource,
 } from "@trigger.dev/database";
+import { getConfiguredEventRepository } from "~/v3/eventRepository/index.server";
 
 // Create a schema that validates TaskRunStatus enum values
 const TaskRunStatusSchema = z.array(z.nativeEnum(TaskRunStatusEnum));
@@ -23,6 +24,8 @@ import {
   convertClickhouseDateTime64ToJsDate,
 } from "~/v3/eventRepository/clickhouseEventRepository.server";
 import { kindToLevel, type LogLevel, LogLevelSchema } from "~/utils/logUtils";
+import { BasePresenter } from "~/presenters/v3/basePresenter.server";
+
 
 export type { LogLevel };
 
@@ -131,9 +134,7 @@ function decodeCursor(cursor: string): LogCursor | null {
 }
 
 // Convert display level to ClickHouse kinds and statuses
-function levelToKindsAndStatuses(
-  level: LogLevel
-): { kinds?: string[]; statuses?: string[] } {
+function levelToKindsAndStatuses(level: LogLevel): { kinds?: string[]; statuses?: string[] } {
   switch (level) {
     case "DEBUG":
       return { kinds: ["DEBUG_EVENT", "LOG_DEBUG"] };
@@ -150,7 +151,6 @@ function levelToKindsAndStatuses(
   }
 }
 
-
 function convertDateToNanoseconds(date: Date): bigint {
   return BigInt(date.getTime()) * 1_000_000n;
 }
@@ -168,11 +168,13 @@ function formatNanosecondsForClickhouse(ns: bigint): string {
   return padded.slice(0, 10) + "." + padded.slice(10);
 }
 
-export class LogsListPresenter {
+export class LogsListPresenter extends BasePresenter {
   constructor(
     private readonly replica: PrismaClientOrTransaction,
     private readonly clickhouse: ClickHouse
-  ) {}
+  ) {
+    super();
+  }
 
   public async call(
     organizationId: string,
@@ -242,10 +244,7 @@ export class LogsListPresenter {
       (search !== undefined && search !== "") ||
       !time.isDefault;
 
-    const possibleTasksAsync = getAllTaskIdentifiers(
-      this.replica,
-      environmentId
-    );
+    const possibleTasksAsync = getAllTaskIdentifiers(this.replica, environmentId);
 
     const bulkActionsAsync = this.replica.bulkActionGroup.findMany({
       select: {
@@ -264,31 +263,26 @@ export class LogsListPresenter {
       take: 20,
     });
 
-    const [possibleTasks, bulkActions, displayableEnvironment] =
-      await Promise.all([
-        possibleTasksAsync,
-        bulkActionsAsync,
-        findDisplayableEnvironment(environmentId, userId),
-      ]);
-
-    if (
-      bulkId &&
-      !bulkActions.some((bulkAction) => bulkAction.friendlyId === bulkId)
-    ) {
-      const selectedBulkAction =
-        await this.replica.bulkActionGroup.findFirst({
-          select: {
-            friendlyId: true,
-            type: true,
-            createdAt: true,
-            name: true,
-          },
-          where: {
-            friendlyId: bulkId,
-            projectId,
-            environmentId,
-          },
-        });
+    const [possibleTasks, bulkActions, displayableEnvironment] = await Promise.all([
+      possibleTasksAsync,
+      bulkActionsAsync,
+      findDisplayableEnvironment(environmentId, userId),
+    ]);
+
+    if (bulkId && !bulkActions.some((bulkAction) => bulkAction.friendlyId === bulkId)) {
+      const selectedBulkAction = await this.replica.bulkActionGroup.findFirst({
+        select: {
+          friendlyId: true,
+          type: true,
+          createdAt: true,
+          name: true,
+        },
+        where: {
+          friendlyId: bulkId,
+          projectId,
+          environmentId,
+        },
+      });
 
       if (selectedBulkAction) {
         bulkActions.push(selectedBulkAction);
@@ -371,7 +365,29 @@ export class LogsListPresenter {
       }
     }
 
-    const queryBuilder = this.clickhouse.taskEventsV2.logsListQueryBuilder();
+    // Determine which store to use based on organization configuration
+    const { store } = await getConfiguredEventRepository(organizationId);
+
+    // Throw error if postgres is detected
+    if (store === "postgres") {
+      throw new ServiceValidationError(
+        "Logs are not available for PostgreSQL event store. Please contact support."
+      );
+    }
+
+    // Throw error if clickhouse v1 is detected (not supported)
+    if (store === "postgres") {
+      throw new ServiceValidationError(
+        "Logs are not available for Postgres event store. Please contact support."
+      );
+    }
+
+    // Get the appropriate query builder based on store type
+    const isClickhouseV2 = store === "clickhouse_v2";
+
+    const queryBuilder = isClickhouseV2
+      ? this.clickhouse.taskEventsV2.logsListQueryBuilder()
+      : this.clickhouse.taskEvents.logsListQueryBuilder();
 
     queryBuilder.prewhere("environment_id = {environmentId: String}", {
       environmentId,
@@ -382,12 +398,17 @@ export class LogsListPresenter {
     });
     queryBuilder.where("project_id = {projectId: String}", { projectId });
 
-    // Time filters - inserted_at in PREWHERE for partition pruning, start_time in WHERE
+    // Time filters - inserted_at in PREWHERE only for v2, start_time in WHERE for both
     if (effectiveFrom) {
       const fromNs = convertDateToNanoseconds(effectiveFrom);
-      queryBuilder.prewhere("inserted_at >= {insertedAtStart: DateTime64(3)}", {
-        insertedAtStart: convertDateToClickhouseDateTime(effectiveFrom),
-      });
+
+      // Only use inserted_at for partition pruning if v2
+      if (isClickhouseV2) {
+        queryBuilder.prewhere("inserted_at >= {insertedAtStart: DateTime64(3)}", {
+          insertedAtStart: convertDateToClickhouseDateTime(effectiveFrom),
+        });
+      }
+
       queryBuilder.where("start_time >= {fromTime: String}", {
         fromTime: formatNanosecondsForClickhouse(fromNs),
       });
@@ -396,9 +417,14 @@ export class LogsListPresenter {
     if (effectiveTo) {
       const clampedTo = effectiveTo > new Date() ? new Date() : effectiveTo;
       const toNs = convertDateToNanoseconds(clampedTo);
-      queryBuilder.prewhere("inserted_at <= {insertedAtEnd: DateTime64(3)}", {
-        insertedAtEnd: convertDateToClickhouseDateTime(clampedTo),
-      });
+
+      // Only use inserted_at for partition pruning if v2
+      if (isClickhouseV2) {
+        queryBuilder.prewhere("inserted_at <= {insertedAtEnd: DateTime64(3)}", {
+          insertedAtEnd: convertDateToClickhouseDateTime(clampedTo),
+        });
+      }
+
       queryBuilder.where("start_time <= {toTime: String}", {
         toTime: formatNanosecondsForClickhouse(toNs),
       });
@@ -428,7 +454,6 @@ export class LogsListPresenter {
       );
     }
 
-
     if (levels && levels.length > 0) {
       const conditions: string[] = [];
       const params: Record<string, string[]> = {};
@@ -477,7 +502,6 @@ export class LogsListPresenter {
 
     queryBuilder.where("NOT (kind = 'SPAN' AND status = 'PARTIAL')");
 
-
     // Cursor pagination
     const decodedCursor = cursor ? decodeCursor(cursor) : null;
     if (decodedCursor) {
@@ -529,7 +553,7 @@ export class LogsListPresenter {
         try {
           let attributes = log.attributes as ErrorAttributes;
 
-          if (attributes?.error?.message && typeof attributes.error.message === 'string') {
+          if (attributes?.error?.message && typeof attributes.error.message === "string") {
             displayMessage = attributes.error.message;
           }
         } catch {

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

@@ -1,5 +1,6 @@
 import { type LoaderFunctionArgs , redirect} from "@remix-run/server-runtime";
 import { type MetaFunction, useFetcher, useNavigation, useLocation } from "@remix-run/react";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
 import {
   TypedAwait,
   typeddefer,
@@ -86,22 +87,28 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const showDebug = url.searchParams.get("showDebug") === "true";
 
   const presenter = new LogsListPresenter($replica, clickhouseClient);
-  const list = presenter.call(project.organizationId, environment.id, {
+
+  const listPromise = presenter.call(project.organizationId, environment.id, {
     userId,
     projectId: project.id,
     ...filters,
     search,
     levels,
     includeDebugLogs: isAdmin && showDebug,
     defaultPeriod: "1h",
+  }).catch((error) => {
+    if (error instanceof ServiceValidationError) {
+      return { error: error.message };
+    }
+    throw error;
   });
 
   const session = await setRootOnlyFilterPreference(filters.rootOnly, request);
   const cookieValue = await uiPreferencesStorage.commitSession(session);
 
   return typeddefer(
     {
-      data: list,
+      data: listPromise,
       rootOnlyDefault: filters.rootOnly,
       filters,
       isAdmin,
@@ -149,10 +156,20 @@ export default function Page() {
               </div>
             }
           >
-            {(list) => {
+            {(result) => {
+              // Check if result contains an error
+              if ("error" in result) {
+                return (
+                  <div className="flex items-center justify-center px-3 py-12">
+                    <Callout variant="error" className="max-w-fit">
+                      {result.error}
+                    </Callout>
+                  </div>
+                );
+              }
               return (
                 <LogsList
-                  list={list}
+                  list={result}
                   rootOnlyDefault={rootOnlyDefault}
                   isAdmin={isAdmin}
                   showDebug={showDebug}
@@ -307,7 +324,6 @@ function LogsList({
           {/* Table */}
           <LogsTable
             logs={accumulatedLogs}
-            hasFilters={list.hasFilters}
             searchTerm={list.searchTerm}
             isLoading={isLoading}
             isLoadingMore={fetcher.state === "loading"}