Added spans

Author: matt-aitken

apps/webapp/app/services/runsRepository/clickhouseRunsRepository.server.ts

@@ -1,19 +1,21 @@
-import { timeFilters } from "~/components/runs/v3/SharedFilters";
+import { type ClickhouseQueryBuilder } from "@internal/clickhouse";
+import { RunId } from "@trigger.dev/core/v3/isomorphic";
 import {
   type FilterRunsOptions,
-  type RunListInputOptions,
   type IRunsRepository,
   type ListRunsOptions,
+  type RunListInputOptions,
   type RunsRepositoryOptions,
   convertRunListInputOptionsToFilterRunsOptions,
 } from "./runsRepository.server";
-import parseDuration from "parse-duration";
-import { BulkActionId, RunId } from "@trigger.dev/core/v3/isomorphic";
-import { type ClickhouseQueryBuilder } from "@internal/clickhouse";
 
 export class ClickHouseRunsRepository implements IRunsRepository {
   constructor(private readonly options: RunsRepositoryOptions) {}
 
+  get name() {
+    return "clickhouse";
+  }
+
   async listRunIds(options: ListRunsOptions) {
     const queryBuilder = this.options.clickhouse.taskRuns.queryBuilder();
     applyRunFiltersToQueryBuilder(

apps/webapp/app/services/runsRepository/postgresRunsRepository.server.ts

@@ -1,22 +1,23 @@
-import { Prisma, type TaskRunStatus } from "@trigger.dev/database";
-import parseDuration from "parse-duration";
-import { MachinePresetName } from "@trigger.dev/core/v3";
-import { BulkActionId, RunId } from "@trigger.dev/core/v3/isomorphic";
-import { timeFilters } from "~/components/runs/v3/SharedFilters";
+import { RunId } from "@trigger.dev/core/v3/isomorphic";
+import { Prisma } from "@trigger.dev/database";
 import { sqlDatabaseSchema } from "~/db.server";
 import {
   type FilterRunsOptions,
-  type RunListInputOptions,
   type IRunsRepository,
   type ListRunsOptions,
-  type RunsRepositoryOptions,
   type ListedRun,
+  type RunListInputOptions,
+  type RunsRepositoryOptions,
   convertRunListInputOptionsToFilterRunsOptions,
 } from "./runsRepository.server";
 
 export class PostgresRunsRepository implements IRunsRepository {
   constructor(private readonly options: RunsRepositoryOptions) {}
 
+  get name() {
+    return "postgres";
+  }
+
   async listRunIds(options: ListRunsOptions) {
     const filterOptions = await convertRunListInputOptionsToFilterRunsOptions(
       options,

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

@@ -11,6 +11,7 @@ import { type PrismaClient } from "~/db.server";
 import { ClickHouseRunsRepository } from "./clickhouseRunsRepository.server";
 import { PostgresRunsRepository } from "./postgresRunsRepository.server";
 import { FEATURE_FLAG, makeFlags } from "~/v3/featureFlags.server";
+import { startActiveSpan } from "~/v3/tracer.server";
 
 export type RunsRepositoryOptions = {
   clickhouse: ClickHouse;
@@ -103,6 +104,7 @@ export type ListedRun = Prisma.TaskRunGetPayload<{
 export type ListRunsOptions = RunListInputOptions & Pagination;
 
 export interface IRunsRepository {
+  name: string;
   listRunIds(options: ListRunsOptions): Promise<string[]>;
   listRuns(options: ListRunsOptions): Promise<{
     runs: ListedRun[];
@@ -123,25 +125,43 @@ export class RunsRepository implements IRunsRepository {
     this.postgresRunsRepository = new PostgresRunsRepository(options);
   }
 
-  async #getRepository() {
-    const getFlag = makeFlags(this.options.prisma);
-    const runsListRepository = await getFlag({
-      key: FEATURE_FLAG.runsListRepository,
-      defaultValue: "clickhouse",
-    });
+  get name() {
+    return "runsRepository";
+  }
 
-    switch (runsListRepository) {
-      case "postgres":
-        return this.postgresRunsRepository;
-      case "clickhouse":
-      default:
-        return this.clickHouseRunsRepository;
-    }
+  async #getRepository(): Promise<IRunsRepository> {
+    return startActiveSpan("runsRepository.getRepository", async (span) => {
+      const getFlag = makeFlags(this.options.prisma);
+      const runsListRepository = await getFlag({
+        key: FEATURE_FLAG.runsListRepository,
+        defaultValue: "clickhouse",
+      });
+
+      span.setAttribute("repository.name", runsListRepository);
+
+      switch (runsListRepository) {
+        case "postgres":
+          return this.postgresRunsRepository;
+        case "clickhouse":
+        default:
+          return this.clickHouseRunsRepository;
+      }
+    });
   }
 
   async listRunIds(options: ListRunsOptions): Promise<string[]> {
     const repository = await this.#getRepository();
-    return repository.listRunIds(options);
+    return startActiveSpan(
+      "runsRepository.listRunIds",
+      async () => {
+        return repository.listRunIds(options);
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+        },
+      }
+    );
   }
 
   async listRuns(options: ListRunsOptions): Promise<{
@@ -152,12 +172,32 @@ export class RunsRepository implements IRunsRepository {
     };
   }> {
     const repository = await this.#getRepository();
-    return repository.listRuns(options);
+    return startActiveSpan(
+      "runsRepository.listRuns",
+      async () => {
+        return repository.listRuns(options);
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+        },
+      }
+    );
   }
 
   async countRuns(options: RunListInputOptions): Promise<number> {
     const repository = await this.#getRepository();
-    return repository.countRuns(options);
+    return startActiveSpan(
+      "runsRepository.countRuns",
+      async () => {
+        return repository.countRuns(options);
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+        },
+      }
+    );
   }
 }