From 8132ec4bb09711c8700b6da0b318774e57cc78a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Tue, 4 Feb 2025 13:39:42 +0100
Subject: [PATCH] improve(clickhouse): better logger

---
 packages/db/src/clickhouse-client.ts | 41 +++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/packages/db/src/clickhouse-client.ts b/packages/db/src/clickhouse-client.ts
index 58c27e1a..3871dbb7 100644
--- a/packages/db/src/clickhouse-client.ts
+++ b/packages/db/src/clickhouse-client.ts
@@ -1,5 +1,5 @@
 import type { ResponseJSON } from '@clickhouse/client';
-import { createClient } from '@clickhouse/client';
+import { ClickHouseLogLevel, createClient } from '@clickhouse/client';
 import { escape } from 'sqlstring';
 
 import type { NodeClickHouseClientConfigOptions } from '@clickhouse/client/dist/config';
@@ -10,6 +10,41 @@ export { createClient };
 
 const logger = createLogger({ name: 'clickhouse' });
 
+import type { Logger } from '@clickhouse/client';
+
+// All three LogParams types are exported by the client
+interface LogParams {
+  module: string;
+  message: string;
+  args?: Record<string, unknown>;
+}
+type ErrorLogParams = LogParams & { err: Error };
+type WarnLogParams = LogParams & { err?: Error };
+
+class CustomLogger implements Logger {
+  trace({ message, args }: LogParams) {
+    logger.debug(message, args);
+  }
+  debug({ message, args }: LogParams) {
+    if (message.includes('Query:') && args?.response_status === 200) {
+      return;
+    }
+    logger.debug(message, args);
+  }
+  info({ message, args }: LogParams) {
+    logger.info(message, args);
+  }
+  warn({ message, args }: WarnLogParams) {
+    logger.warn(message, args);
+  }
+  error({ message, args, err }: ErrorLogParams) {
+    logger.error(message, {
+      ...args,
+      error: err,
+    });
+  }
+}
+
 export const TABLE_NAMES = {
   events: 'events',
   profiles: 'profiles',
@@ -35,6 +70,10 @@ export const CLICKHOUSE_OPTIONS: NodeClickHouseClientConfigOptions = {
   clickhouse_settings: {
     date_time_input_format: 'best_effort',
   },
+  log: {
+    LoggerClass: CustomLogger,
+    level: ClickHouseLogLevel.DEBUG,
+  },
 };
 
 export const originalCh = createClient({