Errors switched to using org-specific clickhouses

Author: matt-aitken

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

@@ -27,12 +27,10 @@ import {
 import { type NextRunList } from "~/presenters/v3/NextRunListPresenter.server";
 import { $replica } from "~/db.server";
 import {
+  clickhouseFactory,
   getDefaultClickhouseClient,
   getDefaultLogsClickhouseClient,
 } from "~/services/clickhouse/clickhouseFactory.server";
-
-const clickhouseClient = getDefaultClickhouseClient();
-const logsClickhouseClient = getDefaultLogsClickhouseClient();
 import { NavBar, PageTitle } from "~/components/primitives/PageHeader";
 import { PageBody } from "~/components/layout/AppLayout";
 import {
@@ -169,6 +167,11 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
       let occurrenceCountAtIgnoreTime: number | undefined;
 
       if (submission.value.totalOccurrences) {
+        const clickhouseClient = await clickhouseFactory.getClickhouseForOrganization(
+          environment.organizationId,
+          "query"
+        );
+
         const qb = clickhouseClient.errors.listQueryBuilder();
         qb.where("organization_id = {organizationId: String}", {
           organizationId: project.organizationId,
@@ -242,7 +245,12 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const directionRaw = url.searchParams.get("direction") ?? undefined;
   const direction = directionRaw ? DirectionSchema.parse(directionRaw) : undefined;
 
-  const presenter = new ErrorGroupPresenter($replica, logsClickhouseClient, clickhouseClient);
+  const clickhouseClient = await clickhouseFactory.getClickhouseForOrganization(
+    environment.organizationId,
+    "query"
+  );
+
+  const presenter = new ErrorGroupPresenter($replica, clickhouseClient, clickhouseClient);
 
   const detailPromise = presenter
     .call(project.organizationId, environment.id, {

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

@@ -123,8 +123,11 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const plan = await getCurrentPlan(project.organizationId);
   const retentionLimitDays = plan?.v3Subscription?.plan?.limits.logRetentionDays.number ?? 30;
 
-  const logsClickhouse = await clickhouseFactory.getClickhouseForOrganization(project.organizationId, "logs");
-  const presenter = new ErrorsListPresenter($replica, logsClickhouse);
+  const queryClickhouse = await clickhouseFactory.getClickhouseForOrganization(
+    project.organizationId,
+    "query"
+  );
+  const presenter = new ErrorsListPresenter($replica, queryClickhouse);
 
   const listPromise = presenter
     .call(project.organizationId, environment.id, {

apps/webapp/app/v3/services/alerts/errorAlertEvaluator.server.ts

@@ -7,9 +7,7 @@ import {
 } from "@trigger.dev/database";
 import { $replica, prisma } from "~/db.server";
 import { ErrorAlertConfig } from "~/models/projectAlert.server";
-import { getDefaultClickhouseClient } from "~/services/clickhouse/clickhouseFactory.server";
-
-const clickhouseClient = getDefaultClickhouseClient();
+import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactory.server";
 import { logger } from "~/services/logger.server";
 import { alertsWorker } from "~/v3/alertsWorker.server";
 
@@ -47,8 +45,7 @@ const DEFAULT_INTERVAL_MS = 300_000;
 export class ErrorAlertEvaluator {
   constructor(
     protected readonly _prisma: PrismaClientOrTransaction = prisma,
-    protected readonly _replica: PrismaClientOrTransaction = $replica,
-    protected readonly _clickhouse: ClickHouse = clickhouseClient
+    protected readonly _replica: PrismaClientOrTransaction = $replica
   ) {}
 
   async evaluate(projectId: string, scheduledAt: number): Promise<void> {
@@ -247,10 +244,7 @@ export class ErrorAlertEvaluator {
       }
     }
 
-    if (
-      state.ignoredUntilTotalOccurrences != null &&
-      state.ignoredAtOccurrenceCount != null
-    ) {
+    if (state.ignoredUntilTotalOccurrences != null && state.ignoredAtOccurrenceCount != null) {
       const occurrencesSinceIgnored =
         context.totalOccurrenceCount - Number(state.ignoredAtOccurrenceCount);
       if (occurrencesSinceIgnored >= state.ignoredUntilTotalOccurrences) {
@@ -337,7 +331,11 @@ export class ErrorAlertEvaluator {
     envIds: string[],
     scheduledAt: number
   ): Promise<ActiveErrorsSinceQueryResult[]> {
-    const qb = this._clickhouse.errors.activeErrorsSinceQueryBuilder();
+    const queryClickhouse = await clickhouseFactory.getClickhouseForOrganization(
+      organizationId,
+      "query"
+    );
+    const qb = queryClickhouse.errors.activeErrorsSinceQueryBuilder();
     qb.where("organization_id = {organizationId: String}", { organizationId });
     qb.where("project_id = {projectId: String}", { projectId });
     qb.where("environment_id IN {envIds: Array(String)}", { envIds });
@@ -391,7 +389,11 @@ export class ErrorAlertEvaluator {
       occurrences_since: number;
     }>
   > {
-    const qb = this._clickhouse.errors.occurrenceCountsSinceQueryBuilder();
+    const queryClickhouse = await clickhouseFactory.getClickhouseForOrganization(
+      organizationId,
+      "query"
+    );
+    const qb = queryClickhouse.errors.occurrenceCountsSinceQueryBuilder();
     qb.where("organization_id = {organizationId: String}", { organizationId });
     qb.where("project_id = {projectId: String}", { projectId });
     qb.where("environment_id IN {envIds: Array(String)}", { envIds });