simplify

Author: ericallam

apps/webapp/app/services/runsReplicationService.server.ts

@@ -1,5 +1,4 @@
 import type { ClickHouse } from "@internal/clickhouse";
-import { TASK_RUN_COLUMNS, PAYLOAD_COLUMNS } from "@internal/clickhouse";
 import { type RedisOptions } from "@internal/redis";
 import {
   LogicalReplicationClient,
@@ -760,14 +759,14 @@ export class RunsReplicationService {
   #getClickhouseInsertSettings() {
     if (this._insertStrategy === "insert") {
       return {};
-    } else if (this._insertStrategy === "insert_async") {
-      return {
-        async_insert: 1 as const,
-        async_insert_max_data_size: "1000000",
-        async_insert_busy_timeout_ms: 1000,
-        wait_for_async_insert: this.options.waitForAsyncInsert ? (1 as const) : (0 as const),
-      };
     }
+
+    return {
+      async_insert: 1 as const,
+      async_insert_max_data_size: "1000000",
+      async_insert_busy_timeout_ms: 1000,
+      wait_for_async_insert: this.options.waitForAsyncInsert ? (1 as const) : (0 as const),
+    };
   }
 
   async #insertTaskRunInserts(taskRunInserts: any[][], attempt: number) {
@@ -825,18 +824,8 @@ export class RunsReplicationService {
 
     const { run, _version, event } = batchedRun;
 
-    if (!run.environmentType) {
-      return {
-        taskRunInsert: undefined,
-        payloadInsert: undefined,
-      };
-    }
-
-    if (!run.organizationId) {
-      return {
-        taskRunInsert: undefined,
-        payloadInsert: undefined,
-      };
+    if (!run.environmentType || !run.organizationId) {
+      return {};
     }
 
     if (event === "update" || event === "delete" || this._disablePayloadInsert) {
@@ -848,21 +837,15 @@ export class RunsReplicationService {
         _version
       );
 
-      return {
-        taskRunInsert,
-        payloadInsert: undefined,
-      };
+      return { taskRunInsert };
     }
 
     const [taskRunInsert, payloadInsert] = await Promise.all([
       this.#prepareTaskRunInsert(run, run.organizationId, run.environmentType, event, _version),
       this.#preparePayloadInsert(run, _version),
     ]);
 
-    return {
-      taskRunInsert,
-      payloadInsert,
-    };
+    return { taskRunInsert, payloadInsert };
   }
 
   async #prepareTaskRunInsert(

internal-packages/clickhouse/src/client/client.ts

@@ -900,24 +900,18 @@ export class ClickhouseClient implements ClickhouseReader, ClickhouseWriter {
   }
 }
 
-function recordClickhouseError(span: Span, error: Error) {
+function recordClickhouseError(span: Span, error: Error): void {
   if (error instanceof ClickHouseError) {
     span.setAttributes({
       "clickhouse.error.code": error.code,
       "clickhouse.error.message": error.message,
       "clickhouse.error.type": error.type,
     });
-    recordSpanError(span, error);
-  } else {
-    recordSpanError(span, error);
   }
+  recordSpanError(span, error);
 }
 
-function convertLogLevelToClickhouseLogLevel(logLevel?: LogLevel) {
-  if (!logLevel) {
-    return ClickHouseLogLevel.INFO;
-  }
-
+function convertLogLevelToClickhouseLogLevel(logLevel?: LogLevel): ClickHouseLogLevel {
   switch (logLevel) {
     case "debug":
       return ClickHouseLogLevel.DEBUG;