Merge remote-tracking branch 'origin/main' into fix/misc

Author: nicktrn

.changeset/spotty-ducks-punch.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+fix: default machine config indexing now works

apps/webapp/app/components/runs/v3/RunFilters.tsx

@@ -841,8 +841,8 @@ function BatchIdDropdown({
   if (batchId) {
     if (!batchId.startsWith("batch_")) {
       error = "Batch IDs start with 'batch_'";
-    } else if (batchId.length !== 27) {
-      error = "Batch IDs are 27 characters long";
+    } else if (batchId.length !== 27 && batchId.length !== 31) {
+      error = "Batch IDs are 27 or 31 characters long";
     }
   }
 

apps/webapp/app/env.server.ts

@@ -384,6 +384,7 @@ const EnvironmentSchema = z.object({
     .int()
     .default(60 * 1000 * 15),
   MARQS_SHARED_QUEUE_LIMIT: z.coerce.number().int().default(1000),
+  MARQS_MAXIMUM_QUEUE_PER_ENV_COUNT: z.coerce.number().int().default(50),
   MARQS_DEV_QUEUE_LIMIT: z.coerce.number().int().default(1000),
   MARQS_MAXIMUM_NACK_COUNT: z.coerce.number().int().default(64),
   MARQS_CONCURRENCY_LIMIT_BIAS: z.coerce.number().default(0.75),

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx

@@ -285,7 +285,7 @@ export default function Page() {
           {success ? (
             <div
               className={cn(
-                "grid h-fit max-h-full min-h-full grid-rows-[1fr] overflow-x-auto",
+                "grid max-h-full min-h-full grid-rows-[1fr] overflow-x-auto",
                 pagination.totalPages > 1 && "grid-rows-[1fr_auto]"
               )}
             >

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules/route.tsx

@@ -229,7 +229,7 @@ export default function Page() {
 
                   <div
                     className={cn(
-                      "grid h-fit max-h-full min-h-full overflow-x-auto",
+                      "grid max-h-full min-h-full overflow-x-auto",
                       totalPages > 1 ? "grid-rows-[1fr_auto]" : "grid-rows-[1fr]"
                     )}
                   >

apps/webapp/app/v3/marqs/fairDequeuingStrategy.server.ts

@@ -43,6 +43,11 @@ export type FairDequeuingStrategyOptions = {
   biases?: FairDequeuingStrategyBiases;
   reuseSnapshotCount?: number;
   maximumEnvCount?: number;
+  /**
+   * Maximum number of queues to process per environment
+   * If not provided, all queues in an environment will be processed
+   */
+  maximumQueuePerEnvCount?: number;
 };
 
 type FairQueueConcurrency = {
@@ -216,8 +221,6 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
     return result;
   }
 
-  // Helper method to maintain DRY principle
-  // Update return type
   #orderQueuesByEnvs(envs: string[], snapshot: FairQueueSnapshot): Array<EnvQueues> {
     const queuesByEnv = snapshot.queues.reduce((acc, queue) => {
       if (!acc[queue.env]) {
@@ -231,11 +234,17 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
       if (queuesByEnv[envId]) {
         // Get ordered queues for this env
         const orderedQueues = this.#weightedRandomQueueOrder(queuesByEnv[envId]);
+
+        // Apply queue limit if maximumQueuePerEnvCount is set
+        const limitedQueues = this.options.maximumQueuePerEnvCount
+          ? orderedQueues.slice(0, this.options.maximumQueuePerEnvCount)
+          : orderedQueues;
+
         // Only add the env if it has queues
-        if (orderedQueues.length > 0) {
+        if (limitedQueues.length > 0) {
           acc.push({
             envId,
-            queues: orderedQueues.map((queue) => queue.id),
+            queues: limitedQueues.map((queue) => queue.id),
           });
         }
       }
@@ -512,6 +521,10 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
 
       span.setAttribute("queue_count", result.length);
 
+      if (result.length === this.options.parentQueueLimit) {
+        span.setAttribute("parent_queue_limit_reached", true);
+      }
+
       return result;
     });
   }

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

@@ -2189,6 +2189,7 @@ function getMarQSClient() {
       },
       reuseSnapshotCount: env.MARQS_REUSE_SNAPSHOT_COUNT,
       maximumEnvCount: env.MARQS_MAXIMUM_ENV_COUNT,
+      maximumQueuePerEnvCount: env.MARQS_MAXIMUM_QUEUE_PER_ENV_COUNT,
     }),
     envQueuePriorityStrategy: new FairDequeuingStrategy({
       tracer: tracer,