fix clickhouse knex connection

pezzolabs · Dec 31, 2023 · 7858612 · 7858612
1 parent 94430df
commit 7858612
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/apps/server/.eslintrc.json b/apps/server/.eslintrc.json
@@ -4,7 +4,9 @@
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
+      "rules": {
+        "no-case-declarations": "off"
+      }
     },
     {
       "files": ["*.ts", "*.tsx"],

diff --git a/apps/server/src/app/clickhouse/clickhouse.service.ts b/apps/server/src/app/clickhouse/clickhouse.service.ts
@@ -4,6 +4,7 @@ import { createLogger } from "../logger/create-logger";
 import { pino } from "pino";
 import { createClient, ClickHouseClient } from "@clickhouse/client"; // or '@clickhouse/client-web'
 import { knex, Knex } from "knex";
+import clickhouesDialect from "@pezzo/knex-clickhouse-dialect";
 
 @Injectable()
 export class ClickHouseService implements OnModuleInit {
@@ -36,17 +37,12 @@ export class ClickHouseService implements OnModuleInit {
     });
 
     this.logger.info("Creating Knex instance");
+    const connectionStr =
+      `${protocol}://${username}:${password}@${host}:${port}/${database}` as any;
 
     this.knex = knex({
-      client: "mysql2",
-      connection: {
-        host,
-        port: 9004,
-        user: username,
-        password,
-        database,
-        timezone: "Z",
-      },
+      client: clickhouesDialect as any,
+      connection: () => connectionStr,
     });
 
     await this.healthCheck();
@@ -59,7 +55,14 @@ export class ClickHouseService implements OnModuleInit {
         format: "JSONEachRow",
       });
     } catch (error) {
-      this.logger.error({ error }, "ClickHouse healthcheck failed");
+      this.logger.error({ error }, "ClickHouse client healthcheck failed");
+      throw error;
+    }
+
+    try {
+      await this.knex.raw("SELECT 1");
+    } catch (error) {
+      this.logger.error({ error }, "Knex healthcheck failed");
       throw error;
     }
   }

diff --git a/apps/server/src/app/metrics/project-metrics.service.ts b/apps/server/src/app/metrics/project-metrics.service.ts
@@ -67,9 +67,12 @@ export class ProjectMetricsService {
 
     switch (metric) {
       case DeltaMetricType.AverageRequestDuration:
+        const currentValue = /*sql*/ `avgIf(r.duration, r.isError = false AND r.requestTimestamp >= currentStartDate AND r.responseTimestamp <= currentEndDate)`;
+        const previousValue = /*sql*/ `avgIf(r.duration, r.isError = false AND r.requestTimestamp >= previousStartDate AND r.responseTimestamp <= previousEndDate)`;
+
         selectStatement = /*sql*/ `
-          avgIf(r.duration, r.isError = false AND r.requestTimestamp >= currentStartDate AND r.responseTimestamp <= currentEndDate) AS currentValue,
-          avgIf(r.duration, r.isError = false AND r.requestTimestamp >= previousStartDate AND r.responseTimestamp <= previousEndDate) AS previousValue
+          if(isNaN(${currentValue}), 0, ${currentValue}) AS currentValue,
+          if(isNaN(${previousValue}), 0, ${previousValue}) AS previousValue
         `;
         break;
       case DeltaMetricType.TotalRequests: