Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions internal-packages/run-engine/src/run-queue/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import {
RunQueueKeyProducer,
RunQueueSelectionStrategy,
} from "./types.js";
import { WorkerQueueResolver } from "./workerQueueResolver.js";

const SemanticAttributes = {
QUEUE: "runqueue.queue",
Expand Down Expand Up @@ -169,6 +170,7 @@ export class RunQueue {
private shardCount: number;
private abortController: AbortController;
private worker: Worker<typeof workerCatalog>;
private workerQueueResolver: WorkerQueueResolver;
private _observableWorkerQueues: Set<string> = new Set();
private _meter: Meter;
private _queueCooloffStates: Map<string, QueueCooloffState> = new Map();
Expand All @@ -185,6 +187,8 @@ export class RunQueue {
},
});
this.logger = options.logger ?? new Logger("RunQueue", options.logLevel ?? "info");

this.workerQueueResolver = new WorkerQueueResolver({ logger: this.logger });
this._meter = options.meter ?? getMeter("run-queue");

const workerQueueObservableGauge = this._meter.createObservableGauge(
Expand Down Expand Up @@ -1845,19 +1849,8 @@ export class RunQueue {
);
}

#getWorkerQueueFromMessage(message: OutputPayload) {
if (message.version === "2") {
return message.workerQueue;
}

// In v2, if the environment is development, the worker queue is the environment id.
if (message.environmentType === "DEVELOPMENT") {
return message.environmentId;
}

// In v1, the master queue is something like us-nyc-3,
// which in v2 is the worker queue.
return message.masterQueues[0];
#getWorkerQueueFromMessage(message: OutputPayload): string {
return this.workerQueueResolver.getWorkerQueueFromMessage(message);
}

#createBlockingDequeueClient() {
Expand Down
Loading
Loading