Merge branch 'main' into TRI-4372

Author: Pratik-Mahajan257

.changeset/funny-emus-pay.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Auto-fix /trigger or /src/trigger config.dirs to relative paths to prevent misconfiguration from preventing dev CLI from working

.changeset/lazy-carpets-reply.md

@@ -28,34 +28,3 @@ jobs:
     with:
       package: cli-v3
     secrets: inherit
-
-  preview-release:
-    name: Preview Release
-    needs: [typecheck, units, e2e]
-    if: github.repository == 'triggerdotdev/trigger.dev'
-    runs-on: ubuntu-latest
-    steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: ⎔ Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 8.15.5
-
-      - name: ⎔ Setup node
-        uses: buildjet/setup-node@v4
-        with:
-          node-version: 20.11.1
-          cache: "pnpm"
-
-      - name: 📥 Download deps
-        run: pnpm install --frozen-lockfile
-
-      - name: 🏗️ Build
-        run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
-
-      - name: ⚡ Publish preview release
-        run: npx pkg-pr-new publish --no-template $(ls -d ./packages/*)

.changeset/lovely-toys-obey.md

@@ -46,6 +46,14 @@
       "cwd": "${workspaceFolder}/references/init-shell",
       "sourceMaps": true
     },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "Debug V3 init dev CLI",
+      "command": "pnpm exec trigger dev",
+      "cwd": "${workspaceFolder}/references/init-shell",
+      "sourceMaps": true
+    },
     {
       "type": "node-terminal",
       "request": "launch",

.github/workflows/pr_checks.yml

@@ -37,6 +37,8 @@ const UPTIME_MAX_PENDING_ERRORS = Number(process.env.UPTIME_MAX_PENDING_ERRORS |
 const POD_EPHEMERAL_STORAGE_SIZE_LIMIT = process.env.POD_EPHEMERAL_STORAGE_SIZE_LIMIT || "10Gi";
 const POD_EPHEMERAL_STORAGE_SIZE_REQUEST = process.env.POD_EPHEMERAL_STORAGE_SIZE_REQUEST || "2Gi";
 
+const PRE_PULL_DISABLED = process.env.PRE_PULL_DISABLED === "true";
+
 const logger = new SimpleLogger(`[${NODE_NAME}]`);
 logger.log(`running in ${RUNTIME_ENV} mode`);
 
@@ -301,6 +303,11 @@ class KubernetesTaskOperations implements TaskOperations {
   }
 
   async prePullDeployment(opts: TaskOperationsPrePullDeploymentOptions) {
+    if (PRE_PULL_DISABLED) {
+      logger.debug("Pre-pull is disabled, skipping.", { opts });
+      return;
+    }
+
     const metaName = this.#getPrePullContainerName(opts.shortCode);
 
     const metaLabels = {
@@ -332,6 +339,22 @@ class KubernetesTaskOperations implements TaskOperations {
             spec: {
               ...this.#defaultPodSpec,
               restartPolicy: "Always",
+              affinity: {
+                nodeAffinity: {
+                  requiredDuringSchedulingIgnoredDuringExecution: {
+                    nodeSelectorTerms: [
+                      {
+                        matchExpressions: [
+                          {
+                            key: "trigger.dev/pre-pull-disabled",
+                            operator: "DoesNotExist",
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                },
+              },
               initContainers: [
                 {
                   name: "prepull",

.vscode/launch.json

@@ -6,7 +6,6 @@ import {
   ChartBarIcon,
   ClockIcon,
   CreditCardIcon,
-  CursorArrowRaysIcon,
   IdentificationIcon,
   KeyIcon,
   RectangleStackIcon,
@@ -38,7 +37,6 @@ import {
   organizationTeamPath,
   personalAccessTokensPath,
   projectEnvironmentsPath,
-  projectEventsPath,
   projectHttpEndpointsPath,
   projectPath,
   projectRunsPath,
@@ -451,12 +449,6 @@ function V2ProjectSideMenu({
         to={projectTriggersPath(organization, project)}
         data-action="triggers"
       />
-      <SideMenuItem
-        name="Events"
-        icon={CursorArrowRaysIcon}
-        activeIconColor="text-sky-500"
-        to={projectEventsPath(organization, project)}
-      />
       <SideMenuItem
         name="HTTP endpoints"
         icon="http-endpoint"

apps/kubernetes-provider/src/index.ts

@@ -444,7 +444,7 @@ function TasksDropdown({
         <SelectList>
           {filtered.map((item, index) => (
             <SelectItem
-              key={item.slug}
+              key={`${item.triggerSource}-${item.slug}`}
               value={item.slug}
               icon={
                 <TaskTriggerSourceIcon source={item.triggerSource} className="size-4 flex-none" />

apps/webapp/app/components/navigation/SideMenu.tsx

@@ -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 };
@@ -58,6 +111,7 @@ function getClient() {
   const databaseUrl = extendQueryParams(DATABASE_URL, {
     connection_limit: env.DATABASE_CONNECTION_LIMIT.toString(),
     pool_timeout: env.DATABASE_POOL_TIMEOUT.toString(),
+    connection_timeout: env.DATABASE_CONNECTION_TIMEOUT.toString(),
   });
 
   console.log(`🔌 setting up prisma client to ${redactUrlSecrets(databaseUrl)}`);
@@ -109,6 +163,7 @@ function getReplicaClient() {
   const replicaUrl = extendQueryParams(env.DATABASE_READ_REPLICA_URL, {
     connection_limit: env.DATABASE_CONNECTION_LIMIT.toString(),
     pool_timeout: env.DATABASE_POOL_TIMEOUT.toString(),
+    connection_timeout: env.DATABASE_CONNECTION_TIMEOUT.toString(),
   });
 
   console.log(`🔌 setting up read replica connection to ${redactUrlSecrets(replicaUrl)}`);