db efficiency improvements (#1657)

- remove calls to findUnique, especially when including/selecting relations
- add some missing indexes
- add spans to $transaction calls to help track down long running txs

Author: ericallam

apps/webapp/app/db.server.ts

@@ -13,6 +13,8 @@ import { logger } from "./services/logger.server";
 import { isValidDatabaseUrl } from "./utils/db";
 import { singleton } from "./utils/singleton";
 import { $transaction as transac } from "@trigger.dev/database";
+import { startActiveSpan } from "./v3/tracer.server";
+import { Span } from "@opentelemetry/api";
 
 export type {
   PrismaTransactionClient,
@@ -21,25 +23,76 @@ export type {
   PrismaReplicaClient,
 };
 
+export async function $transaction<R>(
+  prisma: PrismaClientOrTransaction,
+  name: string,
+  fn: (prisma: PrismaTransactionClient, span?: Span) => Promise<R>,
+  options?: PrismaTransactionOptions
+): Promise<R | undefined>;
 export async function $transaction<R>(
   prisma: PrismaClientOrTransaction,
   fn: (prisma: PrismaTransactionClient) => Promise<R>,
   options?: PrismaTransactionOptions
+): Promise<R | undefined>;
+export async function $transaction<R>(
+  prisma: PrismaClientOrTransaction,
+  fnOrName: ((prisma: PrismaTransactionClient) => Promise<R>) | string,
+  fnOrOptions?: ((prisma: PrismaTransactionClient) => Promise<R>) | PrismaTransactionOptions,
+  options?: PrismaTransactionOptions
 ): Promise<R | undefined> {
-  return transac(
-    prisma,
-    fn,
-    (error) => {
-      logger.error("prisma.$transaction error", {
-        code: error.code,
-        meta: error.meta,
-        stack: error.stack,
-        message: error.message,
-        name: error.name,
-      });
-    },
-    options
-  );
+  if (typeof fnOrName === "string") {
+    return await startActiveSpan(fnOrName, async (span) => {
+      span.setAttribute("$transaction", true);
+
+      if (options?.isolationLevel) {
+        span.setAttribute("isolation_level", options.isolationLevel);
+      }
+
+      if (options?.timeout) {
+        span.setAttribute("timeout", options.timeout);
+      }
+
+      if (options?.maxWait) {
+        span.setAttribute("max_wait", options.maxWait);
+      }
+
+      if (options?.swallowPrismaErrors) {
+        span.setAttribute("swallow_prisma_errors", options.swallowPrismaErrors);
+      }
+
+      const fn = fnOrOptions as (prisma: PrismaTransactionClient, span: Span) => Promise<R>;
+
+      return transac(
+        prisma,
+        (client) => fn(client, span),
+        (error) => {
+          logger.error("prisma.$transaction error", {
+            code: error.code,
+            meta: error.meta,
+            stack: error.stack,
+            message: error.message,
+            name: error.name,
+          });
+        },
+        options
+      );
+    });
+  } else {
+    return transac(
+      prisma,
+      fnOrName,
+      (error) => {
+        logger.error("prisma.$transaction error", {
+          code: error.code,
+          meta: error.meta,
+          stack: error.stack,
+          message: error.message,
+          name: error.name,
+        });
+      },
+      typeof fnOrOptions === "function" ? undefined : fnOrOptions
+    );
+  }
 }
 
 export { Prisma };

apps/webapp/app/presenters/v3/ApiBatchResultsPresenter.server.ts

@@ -9,7 +9,7 @@ export class ApiBatchResultsPresenter extends BasePresenter {
     env: AuthenticatedEnvironment
   ): Promise<BatchTaskRunExecutionResult | undefined> {
     return this.traceWithEnv("call", env, async (span) => {
-      const batchRun = await this._prisma.batchTaskRun.findUnique({
+      const batchRun = await this._prisma.batchTaskRun.findFirst({
         where: {
           friendlyId,
           runtimeEnvironmentId: env.id,

apps/webapp/app/presenters/v3/ApiRunResultPresenter.server.ts

@@ -9,7 +9,7 @@ export class ApiRunResultPresenter extends BasePresenter {
     env: AuthenticatedEnvironment
   ): Promise<TaskRunExecutionResult | undefined> {
     return this.traceWithEnv("call", env, async (span) => {
-      const taskRun = await this._prisma.taskRun.findUnique({
+      const taskRun = await this._prisma.taskRun.findFirst({
         where: {
           friendlyId,
           runtimeEnvironmentId: env.id,

apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts

@@ -53,12 +53,10 @@ export class DeploymentPresenter {
       },
     });
 
-    const deployment = await this.#prismaClient.workerDeployment.findUniqueOrThrow({
+    const deployment = await this.#prismaClient.workerDeployment.findFirstOrThrow({
       where: {
-        projectId_shortCode: {
-          projectId: project.id,
-          shortCode: deploymentShortCode,
-        },
+        projectId: project.id,
+        shortCode: deploymentShortCode,
       },
       select: {
         id: true,

apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts

@@ -15,7 +15,7 @@ export class EnvironmentVariablesPresenter {
   }
 
   public async call({ userId, projectSlug }: { userId: User["id"]; projectSlug: Project["slug"] }) {
-    const project = await this.#prismaClient.project.findUnique({
+    const project = await this.#prismaClient.project.findFirst({
       select: {
         id: true,
       },

apps/webapp/app/presenters/v3/NewAlertChannelPresenter.server.ts

@@ -8,7 +8,7 @@ import { WebClient } from "@slack/web-api";
 
 export class NewAlertChannelPresenter extends BasePresenter {
   public async call(projectId: string) {
-    const project = await this._prisma.project.findUniqueOrThrow({
+    const project = await this._prisma.project.findFirstOrThrow({
       where: {
         id: projectId,
       },

apps/webapp/app/presenters/v3/RunListPresenter.server.ts

@@ -131,7 +131,7 @@ export class RunListPresenter extends BasePresenter {
 
     //bulk id
     if (bulkId) {
-      const bulkAction = await this._replica.bulkActionGroup.findUnique({
+      const bulkAction = await this._replica.bulkActionGroup.findFirst({
         select: {
           items: {
             select: {

apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts

@@ -21,7 +21,7 @@ export class RunStreamPresenter {
     request: Request;
     runFriendlyId: TaskRun["friendlyId"];
   }) {
-    const run = await this.#prismaClient.taskRun.findUnique({
+    const run = await this.#prismaClient.taskRun.findFirst({
       where: {
         friendlyId: runFriendlyId,
       },

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

@@ -29,7 +29,7 @@ export class SpanPresenter extends BasePresenter {
     spanId: string;
     runFriendlyId: string;
   }) {
-    const project = await this._replica.project.findUnique({
+    const project = await this._replica.project.findFirst({
       where: {
         slug: projectSlug,
       },

apps/webapp/app/presenters/v3/TasksStreamPresenter.server.ts

@@ -33,7 +33,7 @@ export class TasksStreamPresenter {
     projectSlug: string;
     userId: string;
   }) {
-    const project = await this.#prismaClient.project.findUnique({
+    const project = await this.#prismaClient.project.findFirst({
       where: {
         slug: projectSlug,
         organization: {