f9ec66c562
* upgrade @opentelemetry packages to the latest versions * remove v2 only packages, will be moved to a dedicated repo * remove more v2 code and run pnpm install * use the npm yalt package in the webapp * convert @trigger.dev/core to tshy * Switch from jest to vitest in @trigger.dev/core * Fixed core test * move core-backend code into core subpath export * convert @trigger.dev/sdk to tshy * Removed hono * move core-apps to core/v3/apps, remove core-apps, start converting cli-v3 * Fix up some of the commands * cli now building and loadable * using package-json-from-dist to get package version now in core and cli * dev command WIP * cleaned up some repetition and structure of the entry point stuff * bringing back the background worker stuff * Indexing of the v3 catalog * getting closer to executing dev runs... * centralize dev logging using event emitter * Move indexing to it’s own entry point, simplify code * dev runs working * Get instrumentation to work with openai * debugging achieved internally * provide worker files as part of the worker creation on the server * support for cjs and esm javascript * Fixed timeout * worker manifest now has the config path * auto-upgrade config to non-deprecated alternatives * Adding package preview release * deployment WIP * improve the syncEnvVars output and adapt resolveEnvVars * WIP bun runtime * WIP bun support * seed tasks with the machine preset if listed in the config * deploy run executions WIP, extracted TaskRunProcess into 1 place * deployed tasks running and executing 🎉 * support for waits and better flushing & process cleanup * Fixed the heartbeating * Better warning messages * Improve and unify the indexing between dev and deploy * Support for external deps that need node-gyp to build * build extensions can now install custom packages and run instructions in the image. Also prisma extension now works and also works with multiple schema files * Add back in the main/types/module to sdk * dev no longer is Ink/React, grace period for disconnections in dev * Fix the changeset config * More changeset fixes * Remove config packages * More changeset fixes * Fixed typescript issues (needed to revert back to zod 3.22.3 * Fix pr_checks workflow * Remove the prepare script * Fixed tests and package versions * Remove cli test script * Remove packages from tailwind watch paths * Add repo to public packages * Just commit the generated files and do the building at dev time * Try and get pkg.pr.new working * Try again * Fix emitDecoratorMetadata importing named export from typescript * config file backwards compat with export const config * Fixed issue where import errors weren’t coming through * p-retry is a prod dep * typescript needs to be a prod dependency for emitDecoratorMetadata * Add better debug logging to help track down import-in-the-middle bug * An external is only considered resolvable if it resolves to the same path as the collected external * Fix runtime checks to allow >=18.20 * Move extensions to a new build package * Fixed building packages in dockerfile * Remove the e2e test from publish workflow for now * Don’t treat pkg.pr.new versions has needing upgrading * making sure config handleError works, and discovered path aliases don’t work in config files * Strip empty string env vars so they accidentally override real values * Couple of things * Update version to use preview instead of beta * Hopefully fix re-attempts with >30s delay * Match socket emit messages to current latest in main * Initial guide * Go back to beta * Go back to the preview, and update guide to use pr preview tags * Go back to beta --------- Co-authored-by: Matt Aitken <matt@mattaitken.com>
538 lines
16 KiB
TypeScript
538 lines
16 KiB
TypeScript
import { Context, ROOT_CONTEXT, Span, SpanKind, context, trace } from "@opentelemetry/api";
|
|
import {
|
|
TaskRunExecution,
|
|
TaskRunExecutionLazyAttemptPayload,
|
|
TaskRunExecutionResult,
|
|
TaskRunFailedExecutionResult,
|
|
serverWebsocketMessages,
|
|
} from "@trigger.dev/core/v3";
|
|
import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
|
|
import { BackgroundWorker, BackgroundWorkerTask } from "@trigger.dev/database";
|
|
import { z } from "zod";
|
|
import { prisma } from "~/db.server";
|
|
import { createNewSession, disconnectSession } from "~/models/runtimeEnvironment.server";
|
|
import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
|
|
import { logger } from "~/services/logger.server";
|
|
import { marqs, sanitizeQueueName } from "~/v3/marqs/index.server";
|
|
import { resolveVariablesForEnvironment } from "../environmentVariables/environmentVariablesRepository.server";
|
|
import { FailedTaskRunService } from "../failedTaskRun.server";
|
|
import { CancelDevSessionRunsService } from "../services/cancelDevSessionRuns.server";
|
|
import { CompleteAttemptService } from "../services/completeAttempt.server";
|
|
import {
|
|
SEMINTATTRS_FORCE_RECORDING,
|
|
attributesFromAuthenticatedEnv,
|
|
tracer,
|
|
} from "../tracer.server";
|
|
import { DevSubscriber, devPubSub } from "./devPubSub.server";
|
|
|
|
const MessageBody = z.discriminatedUnion("type", [
|
|
z.object({
|
|
type: z.literal("EXECUTE"),
|
|
taskIdentifier: z.string(),
|
|
}),
|
|
]);
|
|
|
|
type BackgroundWorkerWithTasks = BackgroundWorker & { tasks: BackgroundWorkerTask[] };
|
|
|
|
export type DevQueueConsumerOptions = {
|
|
maximumItemsPerTrace?: number;
|
|
traceTimeoutSeconds?: number;
|
|
ipAddress?: string;
|
|
};
|
|
|
|
export class DevQueueConsumer {
|
|
private _backgroundWorkers: Map<string, BackgroundWorkerWithTasks> = new Map();
|
|
private _backgroundWorkerSubscriber: Map<string, DevSubscriber> = new Map();
|
|
private _deprecatedWorkers: Map<string, BackgroundWorkerWithTasks> = new Map();
|
|
private _enabled = false;
|
|
private _maximumItemsPerTrace: number;
|
|
private _traceTimeoutSeconds: number;
|
|
private _perTraceCountdown: number | undefined;
|
|
private _lastNewTrace: Date | undefined;
|
|
private _currentSpanContext: Context | undefined;
|
|
private _taskFailures: number = 0;
|
|
private _taskSuccesses: number = 0;
|
|
private _currentSpan: Span | undefined;
|
|
private _endSpanInNextIteration = false;
|
|
private _inProgressRuns: Map<string, string> = new Map(); // Keys are task run friendly IDs, values are TaskRun internal ids/queue message ids
|
|
|
|
constructor(
|
|
public env: AuthenticatedEnvironment,
|
|
private _sender: ZodMessageSender<typeof serverWebsocketMessages>,
|
|
private _options: DevQueueConsumerOptions = {}
|
|
) {
|
|
this._traceTimeoutSeconds = _options.traceTimeoutSeconds ?? 60;
|
|
this._maximumItemsPerTrace = _options.maximumItemsPerTrace ?? 1_000;
|
|
}
|
|
|
|
// This method is called when a background worker is deprecated and will no longer be used unless a run is locked to it
|
|
public async deprecateBackgroundWorker(id: string) {
|
|
const backgroundWorker = this._backgroundWorkers.get(id);
|
|
|
|
if (!backgroundWorker) {
|
|
return;
|
|
}
|
|
|
|
this._deprecatedWorkers.set(id, backgroundWorker);
|
|
this._backgroundWorkers.delete(id);
|
|
}
|
|
|
|
public async registerBackgroundWorker(id: string, inProgressRuns: string[] = []) {
|
|
const backgroundWorker = await prisma.backgroundWorker.findUnique({
|
|
where: { friendlyId: id, runtimeEnvironmentId: this.env.id },
|
|
include: {
|
|
tasks: true,
|
|
},
|
|
});
|
|
|
|
if (!backgroundWorker) {
|
|
return;
|
|
}
|
|
|
|
if (this._backgroundWorkers.has(backgroundWorker.id)) {
|
|
return;
|
|
}
|
|
|
|
this._backgroundWorkers.set(backgroundWorker.id, backgroundWorker);
|
|
|
|
logger.debug("Registered background worker", {
|
|
backgroundWorker: backgroundWorker.id,
|
|
inProgressRuns,
|
|
});
|
|
|
|
const subscriber = await devPubSub.subscribe(`backgroundWorker:${backgroundWorker.id}:*`);
|
|
|
|
subscriber.on("CANCEL_ATTEMPT", async (message) => {
|
|
await this._sender.send("BACKGROUND_WORKER_MESSAGE", {
|
|
backgroundWorkerId: backgroundWorker.friendlyId,
|
|
data: {
|
|
type: "CANCEL_ATTEMPT",
|
|
taskAttemptId: message.attemptId,
|
|
taskRunId: message.taskRunId,
|
|
},
|
|
});
|
|
});
|
|
|
|
this._backgroundWorkerSubscriber.set(backgroundWorker.id, subscriber);
|
|
|
|
for (const runId of inProgressRuns) {
|
|
this._inProgressRuns.set(runId, runId);
|
|
}
|
|
|
|
// Start reading from the queue if we haven't already
|
|
await this.#enable();
|
|
}
|
|
|
|
public async taskAttemptCompleted(
|
|
workerId: string,
|
|
completion: TaskRunExecutionResult,
|
|
execution: TaskRunExecution
|
|
) {
|
|
if (completion.ok) {
|
|
this._taskSuccesses++;
|
|
} else {
|
|
this._taskFailures++;
|
|
}
|
|
|
|
logger.debug("[DevQueueConsumer] taskAttemptCompleted()", {
|
|
taskRunCompletion: completion,
|
|
execution,
|
|
});
|
|
|
|
const service = new CompleteAttemptService();
|
|
const result = await service.call({ completion, execution, env: this.env });
|
|
|
|
if (result === "COMPLETED") {
|
|
this._inProgressRuns.delete(execution.run.id);
|
|
}
|
|
}
|
|
|
|
public async taskRunFailed(workerId: string, completion: TaskRunFailedExecutionResult) {
|
|
this._taskFailures++;
|
|
|
|
logger.debug("[DevQueueConsumer] taskRunFailed()", { completion });
|
|
|
|
this._inProgressRuns.delete(completion.id);
|
|
|
|
const service = new FailedTaskRunService();
|
|
|
|
await service.call(completion.id, completion);
|
|
}
|
|
|
|
/**
|
|
* @deprecated Use `taskRunHeartbeat` instead
|
|
*/
|
|
public async taskHeartbeat(workerId: string, id: string, seconds: number = 60) {
|
|
logger.debug("[DevQueueConsumer] taskHeartbeat()", { id, seconds });
|
|
|
|
const taskRunAttempt = await prisma.taskRunAttempt.findUnique({
|
|
where: { friendlyId: id },
|
|
});
|
|
|
|
if (!taskRunAttempt) {
|
|
return;
|
|
}
|
|
|
|
await marqs?.heartbeatMessage(taskRunAttempt.taskRunId, seconds);
|
|
}
|
|
|
|
public async taskRunHeartbeat(workerId: string, id: string, seconds: number = 60) {
|
|
logger.debug("[DevQueueConsumer] taskRunHeartbeat()", { id, seconds });
|
|
|
|
await marqs?.heartbeatMessage(id, seconds);
|
|
}
|
|
|
|
public async stop(reason: string = "CLI disconnected") {
|
|
if (!this._enabled) {
|
|
return;
|
|
}
|
|
|
|
logger.debug("Stopping dev queue consumer", { env: this.env });
|
|
|
|
this._enabled = false;
|
|
|
|
// Create the session
|
|
const session = await disconnectSession(this.env.id);
|
|
|
|
const runIds = Array.from(this._inProgressRuns.values());
|
|
this._inProgressRuns.clear();
|
|
|
|
if (runIds.length > 0) {
|
|
await CancelDevSessionRunsService.enqueue(
|
|
{
|
|
runIds,
|
|
cancelledAt: new Date(),
|
|
reason,
|
|
cancelledSessionId: session?.id,
|
|
},
|
|
new Date(Date.now() + 1000 * 10) // 10 seconds from now
|
|
);
|
|
}
|
|
|
|
// We need to unsubscribe from the background worker channels
|
|
for (const [id, subscriber] of this._backgroundWorkerSubscriber) {
|
|
logger.debug("Unsubscribing from background worker channel", { id });
|
|
|
|
await subscriber.stopListening();
|
|
this._backgroundWorkerSubscriber.delete(id);
|
|
|
|
logger.debug("Unsubscribed from background worker channel", { id });
|
|
}
|
|
|
|
// We need to end the current span
|
|
if (this._currentSpan) {
|
|
this._currentSpan.end();
|
|
}
|
|
}
|
|
|
|
async #enable() {
|
|
if (this._enabled) {
|
|
return;
|
|
}
|
|
|
|
this._enabled = true;
|
|
// Create the session
|
|
await createNewSession(this.env, this._options.ipAddress ?? "unknown");
|
|
|
|
this._perTraceCountdown = this._options.maximumItemsPerTrace;
|
|
this._lastNewTrace = new Date();
|
|
this._taskFailures = 0;
|
|
this._taskSuccesses = 0;
|
|
|
|
this.#doWork().finally(() => {});
|
|
}
|
|
|
|
async #doWork() {
|
|
if (!this._enabled) {
|
|
return;
|
|
}
|
|
|
|
// Check if the trace has expired
|
|
if (
|
|
this._perTraceCountdown === 0 ||
|
|
Date.now() - this._lastNewTrace!.getTime() > this._traceTimeoutSeconds * 1000 ||
|
|
this._currentSpanContext === undefined ||
|
|
this._endSpanInNextIteration
|
|
) {
|
|
if (this._currentSpan) {
|
|
this._currentSpan.setAttribute("tasks.period.failures", this._taskFailures);
|
|
this._currentSpan.setAttribute("tasks.period.successes", this._taskSuccesses);
|
|
|
|
logger.debug("Ending DevQueueConsumer.doWork() trace", {
|
|
isRecording: this._currentSpan.isRecording(),
|
|
});
|
|
|
|
this._currentSpan.end();
|
|
}
|
|
|
|
// Create a new trace
|
|
this._currentSpan = tracer.startSpan(
|
|
"DevQueueConsumer.doWork()",
|
|
{
|
|
kind: SpanKind.CONSUMER,
|
|
attributes: {
|
|
...attributesFromAuthenticatedEnv(this.env),
|
|
[SEMINTATTRS_FORCE_RECORDING]: true,
|
|
},
|
|
},
|
|
ROOT_CONTEXT
|
|
);
|
|
|
|
// Get the span trace context
|
|
this._currentSpanContext = trace.setSpan(ROOT_CONTEXT, this._currentSpan);
|
|
|
|
this._perTraceCountdown = this._options.maximumItemsPerTrace;
|
|
this._lastNewTrace = new Date();
|
|
this._taskFailures = 0;
|
|
this._taskSuccesses = 0;
|
|
this._endSpanInNextIteration = false;
|
|
}
|
|
|
|
return context.with(this._currentSpanContext ?? ROOT_CONTEXT, async () => {
|
|
await this.#doWorkInternal();
|
|
this._perTraceCountdown = this._perTraceCountdown! - 1;
|
|
});
|
|
}
|
|
|
|
async #doWorkInternal() {
|
|
// Attempt to dequeue a message from the environment's queue
|
|
// If no message is available, reschedule the worker to run again in 1 second
|
|
// If a message is available, find the BackgroundWorkerTask that matches the message's taskIdentifier
|
|
// If no matching task is found, nack the message and reschedule the worker to run again in 1 second
|
|
// If the matching task is found, create the task attempt and lock the task run, then send the task run to the client
|
|
// Store the message as a processing message
|
|
// If the websocket connection disconnects before the task run is completed, nack the message
|
|
// When the task run completes, ack the message
|
|
// Using a heartbeat mechanism, if the client keeps responding with a heartbeat, we'll keep the message processing and increase the visibility timeout.
|
|
|
|
const message = await marqs?.dequeueMessageInEnv(this.env);
|
|
|
|
if (!message) {
|
|
setTimeout(() => this.#doWork(), 1000);
|
|
return;
|
|
}
|
|
|
|
const messageBody = MessageBody.safeParse(message.data);
|
|
|
|
if (!messageBody.success) {
|
|
logger.error("Failed to parse message", {
|
|
queueMessage: message.data,
|
|
error: messageBody.error,
|
|
env: this.env,
|
|
});
|
|
|
|
await marqs?.acknowledgeMessage(message.messageId);
|
|
|
|
setTimeout(() => this.#doWork(), 100);
|
|
return;
|
|
}
|
|
|
|
const existingTaskRun = await prisma.taskRun.findUnique({
|
|
where: {
|
|
id: message.messageId,
|
|
},
|
|
});
|
|
|
|
if (!existingTaskRun) {
|
|
await marqs?.acknowledgeMessage(message.messageId);
|
|
setTimeout(() => this.#doWork(), 100);
|
|
return;
|
|
}
|
|
|
|
const backgroundWorker = existingTaskRun.lockedToVersionId
|
|
? this._deprecatedWorkers.get(existingTaskRun.lockedToVersionId) ??
|
|
this._backgroundWorkers.get(existingTaskRun.lockedToVersionId)
|
|
: this.#getLatestBackgroundWorker();
|
|
|
|
if (!backgroundWorker) {
|
|
await marqs?.acknowledgeMessage(message.messageId);
|
|
setTimeout(() => this.#doWork(), 100);
|
|
return;
|
|
}
|
|
|
|
const backgroundTask = backgroundWorker.tasks.find(
|
|
(task) => task.slug === existingTaskRun.taskIdentifier
|
|
);
|
|
|
|
if (!backgroundTask) {
|
|
logger.warn("No matching background task found for task run", {
|
|
taskRun: existingTaskRun.id,
|
|
taskIdentifier: existingTaskRun.taskIdentifier,
|
|
backgroundWorker: backgroundWorker.id,
|
|
taskSlugs: backgroundWorker.tasks.map((task) => task.slug),
|
|
});
|
|
|
|
await marqs?.acknowledgeMessage(message.messageId);
|
|
|
|
setTimeout(() => this.#doWork(), 100);
|
|
return;
|
|
}
|
|
|
|
const lockedTaskRun = await prisma.taskRun.update({
|
|
where: {
|
|
id: message.messageId,
|
|
},
|
|
data: {
|
|
lockedAt: new Date(),
|
|
lockedById: backgroundTask.id,
|
|
status: "EXECUTING",
|
|
lockedToVersionId: backgroundWorker.id,
|
|
startedAt: existingTaskRun.startedAt ?? new Date(),
|
|
},
|
|
include: {
|
|
attempts: {
|
|
take: 1,
|
|
orderBy: { number: "desc" },
|
|
},
|
|
tags: true,
|
|
batchItems: {
|
|
include: {
|
|
batchTaskRun: true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
if (!lockedTaskRun) {
|
|
logger.warn("Failed to lock task run", {
|
|
taskRun: existingTaskRun.id,
|
|
taskIdentifier: existingTaskRun.taskIdentifier,
|
|
backgroundWorker: backgroundWorker.id,
|
|
messageId: message.messageId,
|
|
});
|
|
|
|
await marqs?.acknowledgeMessage(message.messageId);
|
|
|
|
setTimeout(() => this.#doWork(), 100);
|
|
return;
|
|
}
|
|
|
|
const queue = await prisma.taskQueue.findUnique({
|
|
where: {
|
|
runtimeEnvironmentId_name: {
|
|
runtimeEnvironmentId: this.env.id,
|
|
name: sanitizeQueueName(lockedTaskRun.queue),
|
|
},
|
|
},
|
|
});
|
|
|
|
if (!queue) {
|
|
logger.debug("[DevQueueConsumer] Failed to find queue", {
|
|
queueName: lockedTaskRun.queue,
|
|
sanitizedName: sanitizeQueueName(lockedTaskRun.queue),
|
|
taskRun: lockedTaskRun.id,
|
|
messageId: message.messageId,
|
|
});
|
|
|
|
await marqs?.nackMessage(message.messageId);
|
|
setTimeout(() => this.#doWork(), 1000);
|
|
return;
|
|
}
|
|
|
|
if (!this._enabled) {
|
|
logger.debug("Dev queue consumer is disabled", { env: this.env, queueMessage: message });
|
|
|
|
await marqs?.nackMessage(message.messageId);
|
|
return;
|
|
}
|
|
|
|
const variables = await resolveVariablesForEnvironment(this.env);
|
|
|
|
if (backgroundWorker.supportsLazyAttempts) {
|
|
const payload: TaskRunExecutionLazyAttemptPayload = {
|
|
traceContext: lockedTaskRun.traceContext as Record<string, unknown>,
|
|
environment: variables.reduce((acc: Record<string, string>, curr) => {
|
|
acc[curr.key] = curr.value;
|
|
return acc;
|
|
}, {}),
|
|
runId: lockedTaskRun.friendlyId,
|
|
messageId: lockedTaskRun.id,
|
|
isTest: lockedTaskRun.isTest,
|
|
};
|
|
|
|
try {
|
|
await this._sender.send("BACKGROUND_WORKER_MESSAGE", {
|
|
backgroundWorkerId: backgroundWorker.friendlyId,
|
|
data: {
|
|
type: "EXECUTE_RUN_LAZY_ATTEMPT",
|
|
payload,
|
|
},
|
|
});
|
|
|
|
logger.debug("Executing the run", {
|
|
messageId: message.messageId,
|
|
});
|
|
|
|
this._inProgressRuns.set(lockedTaskRun.friendlyId, message.messageId);
|
|
} catch (e) {
|
|
if (e instanceof Error) {
|
|
this._currentSpan?.recordException(e);
|
|
} else {
|
|
this._currentSpan?.recordException(new Error(String(e)));
|
|
}
|
|
|
|
this._endSpanInNextIteration = true;
|
|
|
|
// We now need to unlock the task run and delete the task run attempt
|
|
await prisma.$transaction([
|
|
prisma.taskRun.update({
|
|
where: {
|
|
id: lockedTaskRun.id,
|
|
},
|
|
data: {
|
|
lockedAt: null,
|
|
lockedById: null,
|
|
status: "PENDING",
|
|
startedAt: existingTaskRun.startedAt,
|
|
},
|
|
}),
|
|
]);
|
|
|
|
this._inProgressRuns.delete(lockedTaskRun.friendlyId);
|
|
|
|
// Finally we need to nack the message so it can be retried
|
|
await marqs?.nackMessage(message.messageId);
|
|
} finally {
|
|
setTimeout(() => this.#doWork(), 100);
|
|
}
|
|
} else {
|
|
logger.debug("We no longer support non-lazy attempts, aborting this run", {
|
|
messageId: message.messageId,
|
|
backgroundWorker,
|
|
});
|
|
await marqs?.acknowledgeMessage(message.messageId);
|
|
|
|
setTimeout(() => this.#doWork(), 100);
|
|
}
|
|
}
|
|
|
|
// Get the latest background worker based on the version.
|
|
// Versions are in the format of 20240101.1 and 20240101.2, or even 20240101.10, 20240101.11, etc.
|
|
#getLatestBackgroundWorker() {
|
|
const workers = Array.from(this._backgroundWorkers.values());
|
|
|
|
if (workers.length === 0) {
|
|
return;
|
|
}
|
|
|
|
return workers.reduce((acc, curr) => {
|
|
const accParts = acc.version.split(".").map(Number);
|
|
const currParts = curr.version.split(".").map(Number);
|
|
|
|
// Compare the major part
|
|
if (accParts[0] < currParts[0]) {
|
|
return curr;
|
|
} else if (accParts[0] > currParts[0]) {
|
|
return acc;
|
|
}
|
|
|
|
// Compare the minor part (assuming all versions have two parts)
|
|
if (accParts[1] < currParts[1]) {
|
|
return curr;
|
|
} else {
|
|
return acc;
|
|
}
|
|
});
|
|
}
|
|
}
|