Skip to content

Commit b90f3e2

Browse files
authored
fix(otel): remove clickhouse event repo feature flag support from v3, now v4 only (#2585)
1 parent b3b2553 commit b90f3e2

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

apps/webapp/app/v3/eventRepository/index.server.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,24 @@ export async function getEventRepository(
3838
return { repository: eventRepository, store: getTaskEventStore() };
3939
}
4040

41+
export async function getV3EventRepository(
42+
parentStore: string | undefined
43+
): Promise<{ repository: IEventRepository; store: string }> {
44+
if (typeof parentStore === "string") {
45+
if (parentStore === "clickhouse") {
46+
return { repository: clickhouseEventRepository, store: "clickhouse" };
47+
} else {
48+
return { repository: eventRepository, store: getTaskEventStore() };
49+
}
50+
}
51+
52+
if (env.EVENT_REPOSITORY_DEFAULT_STORE === "clickhouse") {
53+
return { repository: clickhouseEventRepository, store: "clickhouse" };
54+
} else {
55+
return { repository: eventRepository, store: getTaskEventStore() };
56+
}
57+
}
58+
4159
async function resolveTaskEventRepositoryFlag(
4260
featureFlags: Record<string, unknown> | undefined
4361
): Promise<"clickhouse" | "postgres"> {

apps/webapp/app/v3/services/triggerTaskV1.server.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { parseDelay } from "~/utils/delays";
2222
import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";
2323
import { handleMetadataPacket } from "~/utils/packets";
2424
import { marqs } from "~/v3/marqs/index.server";
25-
import { getEventRepository } from "../eventRepository/index.server";
25+
import { getV3EventRepository } from "../eventRepository/index.server";
2626
import { generateFriendlyId } from "../friendlyIdentifiers";
2727
import { findCurrentWorkerFromEnvironment } from "../models/workerDeployment.server";
2828
import { guardQueueSizeLimitsForEnv } from "../queueSizeLimits.server";
@@ -291,8 +291,7 @@ export class TriggerTaskServiceV1 extends BaseService {
291291
})
292292
: undefined;
293293

294-
const { repository, store } = await getEventRepository(
295-
environment.organization.featureFlags as Record<string, unknown>,
294+
const { repository, store } = await getV3EventRepository(
296295
dependentAttempt?.taskRun.taskEventStore ??
297296
parentAttempt?.taskRun.taskEventStore ??
298297
dependentBatchRun?.dependentTaskAttempt?.taskRun.taskEventStore

0 commit comments

Comments
 (0)