Add reason to MarQS acknowledgeMessage to track why it's called

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

@@ -329,13 +329,16 @@ export class DevQueueConsumer {
         env: this.env,
       });
 
-      await marqs?.acknowledgeMessage(message.messageId);
+      await marqs?.acknowledgeMessage(
+        message.messageId,
+        "Failed to parse message.data with MessageBody schema in DevQueueConsumer"
+      );
 
       setTimeout(() => this.#doWork(), 100);
       return;
     }
 
-    const existingTaskRun = await prisma.taskRun.findUnique({
+    const existingTaskRun = await prisma.taskRun.findFirst({
       where: {
         id: message.messageId,
       },
@@ -346,7 +349,10 @@ export class DevQueueConsumer {
         messageId: message.messageId,
       });
 
-      await marqs?.acknowledgeMessage(message.messageId);
+      await marqs?.acknowledgeMessage(
+        message.messageId,
+        "Failed to find task run in DevQueueConsumer"
+      );
       setTimeout(() => this.#doWork(), 100);
       return;
     }
@@ -365,7 +371,10 @@ export class DevQueueConsumer {
         latestWorker: this.#getLatestBackgroundWorker(),
       });
 
-      await marqs?.acknowledgeMessage(message.messageId);
+      await marqs?.acknowledgeMessage(
+        message.messageId,
+        "Failed to find background worker in DevQueueConsumer"
+      );
       setTimeout(() => this.#doWork(), 100);
       return;
     }
@@ -382,7 +391,10 @@ export class DevQueueConsumer {
         taskSlugs: backgroundWorker.tasks.map((task) => task.slug),
       });
 
-      await marqs?.acknowledgeMessage(message.messageId);
+      await marqs?.acknowledgeMessage(
+        message.messageId,
+        "No matching background task found in DevQueueConsumer"
+      );
 
       setTimeout(() => this.#doWork(), 100);
       return;
@@ -416,7 +428,10 @@ export class DevQueueConsumer {
         messageId: message.messageId,
       });
 
-      await marqs?.acknowledgeMessage(message.messageId);
+      await marqs?.acknowledgeMessage(
+        message.messageId,
+        "Failed to lock task run in DevQueueConsumer"
+      );
 
       setTimeout(() => this.#doWork(), 100);
       return;
@@ -515,7 +530,10 @@ export class DevQueueConsumer {
         messageId: message.messageId,
         backgroundWorker,
       });
-      await marqs?.acknowledgeMessage(message.messageId);
+      await marqs?.acknowledgeMessage(
+        message.messageId,
+        "Non-lazy attempts are no longer supported in DevQueueConsumer"
+      );
 
       setTimeout(() => this.#doWork(), 100);
     }

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

@@ -291,6 +291,8 @@ export class MarQS {
             orgConcurrencyKey: this.keys.orgCurrentConcurrencyKeyFromQueue(messageQueue),
             messageId: messageData.messageId,
           });
+
+          return;
         }
 
         await this.options.visibilityTimeoutStrategy.heartbeat(
@@ -411,7 +413,7 @@ export class MarQS {
     );
   }
 
-  public async acknowledgeMessage(messageId: string) {
+  public async acknowledgeMessage(messageId: string, reason: string = "unknown") {
     return this.#trace(
       "acknowledgeMessage",
       async (span) => {
@@ -421,6 +423,7 @@ export class MarQS {
           logger.log(`[${this.name}].acknowledgeMessage() message not found`, {
             messageId,
             service: this.name,
+            reason,
           });
           return;
         }
@@ -430,6 +433,7 @@ export class MarQS {
           [SemanticAttributes.MESSAGE_ID]: message.messageId,
           [SemanticAttributes.CONCURRENCY_KEY]: message.concurrencyKey,
           [SemanticAttributes.PARENT_QUEUE]: message.parentQueue,
+          ["marqs.reason"]: reason,
         });
 
         await this.options.visibilityTimeoutStrategy.cancelHeartbeat(messageId);

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

@@ -975,7 +975,7 @@ export class SharedQueueConsumer {
   }
 
   async #ackAndDoMoreWork(messageId: string, intervalInMs?: number) {
-    await marqs?.acknowledgeMessage(messageId);
+    await marqs?.acknowledgeMessage(messageId, "Acking and doing more work in SharedQueueConsumer");
     this.#doMoreWork(intervalInMs);
   }
 

apps/webapp/app/v3/requeueTaskRun.server.ts

@@ -71,7 +71,10 @@ export class RequeueTaskRunService extends BaseService {
       case "WAITING_FOR_DEPLOY": {
         logger.debug("[RequeueTaskRunService] Removing task run from queue", { taskRun });
 
-        await marqs?.acknowledgeMessage(taskRun.id);
+        await marqs?.acknowledgeMessage(
+          taskRun.id,
+          "Run is either DELAYED or WAITING_FOR_DEPLOY so we cannot requeue it in RequeueTaskRunService"
+        );
 
         break;
       }
@@ -93,7 +96,10 @@ export class RequeueTaskRunService extends BaseService {
       case "CANCELED": {
         logger.debug("[RequeueTaskRunService] Task run is completed", { taskRun });
 
-        await marqs?.acknowledgeMessage(taskRun.id);
+        await marqs?.acknowledgeMessage(
+          taskRun.id,
+          "Task run is already completed in RequeueTaskRunService"
+        );
 
         try {
           if (taskRun.runtimeEnvironment.type === "DEVELOPMENT") {

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

@@ -307,7 +307,10 @@ export class CreateCheckpointService extends BaseService {
         checkpointId: checkpoint.id,
         params,
       });
-      await marqs?.acknowledgeMessage(attempt.taskRunId);
+      await marqs?.acknowledgeMessage(
+        attempt.taskRunId,
+        "No checkpoint event in CreateCheckpointService"
+      );
 
       return {
         success: false,

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

@@ -61,7 +61,7 @@ export class FinalizeTaskRunService extends BaseService {
       expiredAt,
       completedAt,
     });
-    await marqs?.acknowledgeMessage(id);
+    await marqs?.acknowledgeMessage(id, "FinalTaskRunService call");
 
     logger.debug("Finalizing run updating run status", {
       id,

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

@@ -172,7 +172,10 @@ export class ResumeAttemptService extends BaseService {
 
       if (!completedAttempt) {
         this._logger.error("Completed attempt not found", { completedAttemptId });
-        await marqs?.acknowledgeMessage(attempt.taskRunId);
+        await marqs?.acknowledgeMessage(
+          attempt.taskRunId,
+          "Cannot find completed attempt in ResumeAttemptService"
+        );
         return;
       }
 
@@ -186,7 +189,10 @@ export class ResumeAttemptService extends BaseService {
 
       if (!resumePayload) {
         logger.error("Failed to get resume payload");
-        await marqs?.acknowledgeMessage(attempt.taskRunId);
+        await marqs?.acknowledgeMessage(
+          attempt.taskRunId,
+          "Failed to get resume payload in ResumeAttemptService"
+        );
         return;
       }