@shipfox/api-runners 12.2.0 → 12.3.0

package/dist/db/runner-sessions.js

@@ -31,30 +31,37 @@ export async function getRunnerSessionById(runnerSessionId) {
 }
 export async function createRunnerSessionConsumingActivationToken(params) {
     return await db().transaction(async (tx)=>{
-        const [token] = await tx.select({
-            id: runnerActivationTokens.id,
-            runnerInstanceId: runnerActivationTokens.runnerInstanceId,
+        const [runner] = await tx.select({
+            activationTokenId: runnerActivationTokens.id,
+            runnerInstanceId: providerRunners.id,
             workspaceId: providerRunners.workspaceId,
             provisionerId: providerRunners.provisionerId,
-            providerRunnerId: providerRunners.providerRunnerId
-        }).from(runnerActivationTokens).innerJoin(providerRunners, eq(providerRunners.id, runnerActivationTokens.runnerInstanceId)).where(and(eq(runnerActivationTokens.id, params.activationTokenId), isNull(runnerActivationTokens.consumedAt), isNull(runnerActivationTokens.revokedAt), gt(runnerActivationTokens.expiresAt, sql`now()`), isNull(providerRunners.runnerSessionId))).limit(1).for('update');
-        if (!token?.workspaceId || !token.providerRunnerId) throw new Error('Runner activation token is invalid, expired, or has already been used');
+            providerRunnerId: providerRunners.providerRunnerId,
+            runnerSessionId: providerRunners.runnerSessionId
+        }).from(runnerActivationTokens).innerJoin(providerRunners, eq(providerRunners.id, runnerActivationTokens.runnerInstanceId)).where(eq(runnerActivationTokens.id, params.activationTokenId)).limit(1).for('update', {
+            of: providerRunners
+        });
+        if (!runner?.workspaceId || !runner.providerRunnerId || runner.runnerSessionId) throw new Error('Runner activation token is invalid, expired, or has already been used');
+        const [activationToken] = await tx.select({
+            id: runnerActivationTokens.id
+        }).from(runnerActivationTokens).where(and(eq(runnerActivationTokens.id, runner.activationTokenId), eq(runnerActivationTokens.runnerInstanceId, runner.runnerInstanceId), isNull(runnerActivationTokens.consumedAt), isNull(runnerActivationTokens.revokedAt), gt(runnerActivationTokens.expiresAt, sql`now()`))).limit(1).for('update');
+        if (!activationToken) throw new Error('Runner activation token is invalid, expired, or has already been used');
         const [provisioner] = await tx.select({
             scope: provisionerTokens.scope
-        }).from(provisionerTokens).where(eq(provisionerTokens.id, token.provisionerId)).limit(1);
+        }).from(provisionerTokens).where(eq(provisionerTokens.id, runner.provisionerId)).limit(1);
         const labels = sanitizeRunnerLabelsOrThrow(params.labels, {
             scope: provisioner?.scope ?? 'workspace',
             source: 'activation runner registration'
         });
         if (labels.length === 0) throw new EmptyRunnerLabelsError();
         const [session] = await tx.insert(runnerSessions).values({
-            workspaceId: token.workspaceId,
+            workspaceId: runner.workspaceId,
             scope: 'workspace',
-            registrationTokenId: token.id,
+            registrationTokenId: activationToken.id,
             registrationTokenKind: 'activation',
-            runnerInstanceId: token.runnerInstanceId,
-            provisionerId: token.provisionerId,
-            providerRunnerId: token.providerRunnerId,
+            runnerInstanceId: runner.runnerInstanceId,
+            provisionerId: runner.provisionerId,
+            providerRunnerId: runner.providerRunnerId,
             labels,
             toolCapabilities: params.toolCapabilities ?? null,
             toolCapabilitiesReportedAt: params.toolCapabilities ? sql`now()` : null,
@@ -65,15 +72,15 @@ export async function createRunnerSessionConsumingActivationToken(params) {
         await tx.update(runnerActivationTokens).set({
             consumedAt: sql`now()`,
             consumedSessionId: session.id
-        }).where(eq(runnerActivationTokens.id, token.id));
+        }).where(eq(runnerActivationTokens.id, activationToken.id));
         await tx.update(providerRunners).set({
             runnerSessionId: session.id,
             updatedAt: sql`now()`
-        }).where(and(eq(providerRunners.id, token.runnerInstanceId), isNull(providerRunners.runnerSessionId)));
+        }).where(and(eq(providerRunners.id, runner.runnerInstanceId), isNull(providerRunners.runnerSessionId)));
         await tx.update(runnerControlSessions).set({
             closedAt: sql`now()`,
             closeReason: 'activated'
-        }).where(and(eq(runnerControlSessions.runnerInstanceId, token.runnerInstanceId), isNull(runnerControlSessions.closedAt)));
+        }).where(and(eq(runnerControlSessions.runnerInstanceId, runner.runnerInstanceId), isNull(runnerControlSessions.closedAt)));
         return toRunnerSession(session);
     });
 }

package/dist/db/runner-sessions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/db/runner-sessions.ts"],"sourcesContent":["import type {RunnerToolCapabilitiesDto} from '@shipfox/api-runners-dto';\nimport {and, asc, eq, gt, inArray, isNull, lt, notExists, or, sql} from 'drizzle-orm';\nimport type {RunnerSession} from '#core/entities/runner-session.js';\nimport {EmptyRunnerLabelsError} from '#core/errors.js';\nimport {sanitizeRunnerLabelsOrThrow} from '#core/runner-labels.js';\nimport {db} from './db.js';\nimport {provisionerTokens} from './schema/provisioner-tokens.js';\nimport {runnerActivationTokens} from './schema/runner-activation-tokens.js';\nimport {runnerControlSessions} from './schema/runner-control-sessions.js';\nimport {providerRunners} from './schema/runner-instances.js';\nimport {runnerSessions, toRunnerSession} from './schema/runner-sessions.js';\nimport {runningJobExecutions} from './schema/running-job-executions.js';\n\nexport interface CreateRunnerSessionParams {\n  workspaceId: string;\n  scope: 'workspace';\n  registrationTokenId: string;\n  labels: string[];\n  toolCapabilities?: RunnerToolCapabilitiesDto | null;\n}\n\nexport async function createRunnerSession(\n  params: CreateRunnerSessionParams,\n): Promise<RunnerSession> {\n  const rows = await db()\n    .insert(runnerSessions)\n    .values({\n      workspaceId: params.workspaceId,\n      scope: params.scope,\n      registrationTokenId: params.registrationTokenId,\n      registrationTokenKind: 'manual',\n      labels: params.labels,\n      toolCapabilities: params.toolCapabilities ?? null,\n      toolCapabilitiesReportedAt: params.toolCapabilities ? sql`now()` : null,\n      maxClaims: null,\n      claimsUsed: 0,\n    })\n    .returning();\n\n  const row = rows[0];\n  if (!row) throw new Error('Insert returned no rows');\n  return toRunnerSession(row);\n}\n\nexport async function getRunnerSessionById(runnerSessionId: string): Promise<RunnerSession | null> {\n  const rows = await db()\n    .select()\n    .from(runnerSessions)\n    .where(eq(runnerSessions.id, runnerSessionId))\n    .limit(1);\n\n  const row = rows[0];\n  return row ? toRunnerSession(row) : null;\n}\n\nexport async function createRunnerSessionConsumingActivationToken(params: {\n  activationTokenId: string;\n  labels: string[];\n  toolCapabilities?: RunnerToolCapabilitiesDto | null;\n}) {\n  return await db().transaction(async (tx) => {\n    const [token] = await tx\n      .select({\n        id: runnerActivationTokens.id,\n        runnerInstanceId: runnerActivationTokens.runnerInstanceId,\n        workspaceId: providerRunners.workspaceId,\n        provisionerId: providerRunners.provisionerId,\n        providerRunnerId: providerRunners.providerRunnerId,\n      })\n      .from(runnerActivationTokens)\n      .innerJoin(providerRunners, eq(providerRunners.id, runnerActivationTokens.runnerInstanceId))\n      .where(\n        and(\n          eq(runnerActivationTokens.id, params.activationTokenId),\n          isNull(runnerActivationTokens.consumedAt),\n          isNull(runnerActivationTokens.revokedAt),\n          gt(runnerActivationTokens.expiresAt, sql`now()`),\n          isNull(providerRunners.runnerSessionId),\n        ),\n      )\n      .limit(1)\n      .for('update');\n    if (!token?.workspaceId || !token.providerRunnerId)\n      throw new Error('Runner activation token is invalid, expired, or has already been used');\n    const [provisioner] = await tx\n      .select({scope: provisionerTokens.scope})\n      .from(provisionerTokens)\n      .where(eq(provisionerTokens.id, token.provisionerId))\n      .limit(1);\n    const labels = sanitizeRunnerLabelsOrThrow(params.labels, {\n      scope: provisioner?.scope ?? 'workspace',\n      source: 'activation runner registration',\n    });\n    if (labels.length === 0) throw new EmptyRunnerLabelsError();\n    const [session] = await tx\n      .insert(runnerSessions)\n      .values({\n        workspaceId: token.workspaceId,\n        scope: 'workspace',\n        registrationTokenId: token.id,\n        registrationTokenKind: 'activation',\n        runnerInstanceId: token.runnerInstanceId,\n        provisionerId: token.provisionerId,\n        providerRunnerId: token.providerRunnerId,\n        labels,\n        toolCapabilities: params.toolCapabilities ?? null,\n        toolCapabilitiesReportedAt: params.toolCapabilities ? sql`now()` : null,\n        maxClaims: 1,\n        claimsUsed: 0,\n      })\n      .returning();\n    if (!session) throw new Error('Runner activation session insert returned no row');\n    await tx\n      .update(runnerActivationTokens)\n      .set({consumedAt: sql`now()`, consumedSessionId: session.id})\n      .where(eq(runnerActivationTokens.id, token.id));\n    await tx\n      .update(providerRunners)\n      .set({runnerSessionId: session.id, updatedAt: sql`now()`})\n      .where(\n        and(\n          eq(providerRunners.id, token.runnerInstanceId),\n          isNull(providerRunners.runnerSessionId),\n        ),\n      );\n    await tx\n      .update(runnerControlSessions)\n      .set({closedAt: sql`now()`, closeReason: 'activated'})\n      .where(\n        and(\n          eq(runnerControlSessions.runnerInstanceId, token.runnerInstanceId),\n          isNull(runnerControlSessions.closedAt),\n        ),\n      );\n    return toRunnerSession(session);\n  });\n}\n\nexport interface DeleteExpiredRunnerSessionsParams {\n  manualRetentionDays: number;\n  ephemeralRetentionDays: number;\n  limit?: number;\n}\n\nexport async function deleteExpiredRunnerSessions(\n  params: DeleteExpiredRunnerSessionsParams,\n): Promise<number> {\n  const expiredIds = db()\n    .select({id: runnerSessions.id})\n    .from(runnerSessions)\n    .where(\n      and(\n        or(\n          and(\n            eq(runnerSessions.registrationTokenKind, 'manual'),\n            lt(\n              runnerSessions.createdAt,\n              sql`now() - (${params.manualRetentionDays} || ' days')::interval`,\n            ),\n          ),\n          and(\n            inArray(runnerSessions.registrationTokenKind, ['ephemeral', 'activation']),\n            lt(\n              runnerSessions.createdAt,\n              sql`now() - (${params.ephemeralRetentionDays} || ' days')::interval`,\n            ),\n          ),\n        ),\n        notExists(\n          db()\n            .select({id: runningJobExecutions.id})\n            .from(runningJobExecutions)\n            .where(eq(runningJobExecutions.runnerSessionId, runnerSessions.id)),\n        ),\n      ),\n    )\n    .orderBy(asc(runnerSessions.createdAt), asc(runnerSessions.id))\n    .limit(params.limit ?? 1000);\n\n  const deleted = await db()\n    .delete(runnerSessions)\n    .where(inArray(runnerSessions.id, expiredIds))\n    .returning({id: runnerSessions.id});\n\n  return deleted.length;\n}\n"],"names":["and","asc","eq","gt","inArray","isNull","lt","notExists","or","sql","EmptyRunnerLabelsError","sanitizeRunnerLabelsOrThrow","db","provisionerTokens","runnerActivationTokens","runnerControlSessions","providerRunners","runnerSessions","toRunnerSession","runningJobExecutions","createRunnerSession","params","rows","insert","values","workspaceId","scope","registrationTokenId","registrationTokenKind","labels","toolCapabilities","toolCapabilitiesReportedAt","maxClaims","claimsUsed","returning","row","Error","getRunnerSessionById","runnerSessionId","select","from","where","id","limit","createRunnerSessionConsumingActivationToken","transaction","tx","token","runnerInstanceId","provisionerId","providerRunnerId","innerJoin","activationTokenId","consumedAt","revokedAt","expiresAt","for","provisioner","source","length","session","update","set","consumedSessionId","updatedAt","closedAt","closeReason","deleteExpiredRunnerSessions","expiredIds","createdAt","manualRetentionDays","ephemeralRetentionDays","orderBy","deleted","delete"],"mappings":"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"}
+{"version":3,"sources":["../../src/db/runner-sessions.ts"],"sourcesContent":["import type {RunnerToolCapabilitiesDto} from '@shipfox/api-runners-dto';\nimport {and, asc, eq, gt, inArray, isNull, lt, notExists, or, sql} from 'drizzle-orm';\nimport type {RunnerSession} from '#core/entities/runner-session.js';\nimport {EmptyRunnerLabelsError} from '#core/errors.js';\nimport {sanitizeRunnerLabelsOrThrow} from '#core/runner-labels.js';\nimport {db} from './db.js';\nimport {provisionerTokens} from './schema/provisioner-tokens.js';\nimport {runnerActivationTokens} from './schema/runner-activation-tokens.js';\nimport {runnerControlSessions} from './schema/runner-control-sessions.js';\nimport {providerRunners} from './schema/runner-instances.js';\nimport {runnerSessions, toRunnerSession} from './schema/runner-sessions.js';\nimport {runningJobExecutions} from './schema/running-job-executions.js';\n\nexport interface CreateRunnerSessionParams {\n  workspaceId: string;\n  scope: 'workspace';\n  registrationTokenId: string;\n  labels: string[];\n  toolCapabilities?: RunnerToolCapabilitiesDto | null;\n}\n\nexport async function createRunnerSession(\n  params: CreateRunnerSessionParams,\n): Promise<RunnerSession> {\n  const rows = await db()\n    .insert(runnerSessions)\n    .values({\n      workspaceId: params.workspaceId,\n      scope: params.scope,\n      registrationTokenId: params.registrationTokenId,\n      registrationTokenKind: 'manual',\n      labels: params.labels,\n      toolCapabilities: params.toolCapabilities ?? null,\n      toolCapabilitiesReportedAt: params.toolCapabilities ? sql`now()` : null,\n      maxClaims: null,\n      claimsUsed: 0,\n    })\n    .returning();\n\n  const row = rows[0];\n  if (!row) throw new Error('Insert returned no rows');\n  return toRunnerSession(row);\n}\n\nexport async function getRunnerSessionById(runnerSessionId: string): Promise<RunnerSession | null> {\n  const rows = await db()\n    .select()\n    .from(runnerSessions)\n    .where(eq(runnerSessions.id, runnerSessionId))\n    .limit(1);\n\n  const row = rows[0];\n  return row ? toRunnerSession(row) : null;\n}\n\nexport async function createRunnerSessionConsumingActivationToken(params: {\n  activationTokenId: string;\n  labels: string[];\n  toolCapabilities?: RunnerToolCapabilitiesDto | null;\n}) {\n  return await db().transaction(async (tx) => {\n    const [runner] = await tx\n      .select({\n        activationTokenId: runnerActivationTokens.id,\n        runnerInstanceId: providerRunners.id,\n        workspaceId: providerRunners.workspaceId,\n        provisionerId: providerRunners.provisionerId,\n        providerRunnerId: providerRunners.providerRunnerId,\n        runnerSessionId: providerRunners.runnerSessionId,\n      })\n      .from(runnerActivationTokens)\n      .innerJoin(providerRunners, eq(providerRunners.id, runnerActivationTokens.runnerInstanceId))\n      .where(eq(runnerActivationTokens.id, params.activationTokenId))\n      .limit(1)\n      .for('update', {of: providerRunners});\n    if (!runner?.workspaceId || !runner.providerRunnerId || runner.runnerSessionId)\n      throw new Error('Runner activation token is invalid, expired, or has already been used');\n\n    const [activationToken] = await tx\n      .select({id: runnerActivationTokens.id})\n      .from(runnerActivationTokens)\n      .where(\n        and(\n          eq(runnerActivationTokens.id, runner.activationTokenId),\n          eq(runnerActivationTokens.runnerInstanceId, runner.runnerInstanceId),\n          isNull(runnerActivationTokens.consumedAt),\n          isNull(runnerActivationTokens.revokedAt),\n          gt(runnerActivationTokens.expiresAt, sql`now()`),\n        ),\n      )\n      .limit(1)\n      .for('update');\n    if (!activationToken)\n      throw new Error('Runner activation token is invalid, expired, or has already been used');\n\n    const [provisioner] = await tx\n      .select({scope: provisionerTokens.scope})\n      .from(provisionerTokens)\n      .where(eq(provisionerTokens.id, runner.provisionerId))\n      .limit(1);\n    const labels = sanitizeRunnerLabelsOrThrow(params.labels, {\n      scope: provisioner?.scope ?? 'workspace',\n      source: 'activation runner registration',\n    });\n    if (labels.length === 0) throw new EmptyRunnerLabelsError();\n    const [session] = await tx\n      .insert(runnerSessions)\n      .values({\n        workspaceId: runner.workspaceId,\n        scope: 'workspace',\n        registrationTokenId: activationToken.id,\n        registrationTokenKind: 'activation',\n        runnerInstanceId: runner.runnerInstanceId,\n        provisionerId: runner.provisionerId,\n        providerRunnerId: runner.providerRunnerId,\n        labels,\n        toolCapabilities: params.toolCapabilities ?? null,\n        toolCapabilitiesReportedAt: params.toolCapabilities ? sql`now()` : null,\n        maxClaims: 1,\n        claimsUsed: 0,\n      })\n      .returning();\n    if (!session) throw new Error('Runner activation session insert returned no row');\n    await tx\n      .update(runnerActivationTokens)\n      .set({consumedAt: sql`now()`, consumedSessionId: session.id})\n      .where(eq(runnerActivationTokens.id, activationToken.id));\n    await tx\n      .update(providerRunners)\n      .set({runnerSessionId: session.id, updatedAt: sql`now()`})\n      .where(\n        and(\n          eq(providerRunners.id, runner.runnerInstanceId),\n          isNull(providerRunners.runnerSessionId),\n        ),\n      );\n    await tx\n      .update(runnerControlSessions)\n      .set({closedAt: sql`now()`, closeReason: 'activated'})\n      .where(\n        and(\n          eq(runnerControlSessions.runnerInstanceId, runner.runnerInstanceId),\n          isNull(runnerControlSessions.closedAt),\n        ),\n      );\n    return toRunnerSession(session);\n  });\n}\n\nexport interface DeleteExpiredRunnerSessionsParams {\n  manualRetentionDays: number;\n  ephemeralRetentionDays: number;\n  limit?: number;\n}\n\nexport async function deleteExpiredRunnerSessions(\n  params: DeleteExpiredRunnerSessionsParams,\n): Promise<number> {\n  const expiredIds = db()\n    .select({id: runnerSessions.id})\n    .from(runnerSessions)\n    .where(\n      and(\n        or(\n          and(\n            eq(runnerSessions.registrationTokenKind, 'manual'),\n            lt(\n              runnerSessions.createdAt,\n              sql`now() - (${params.manualRetentionDays} || ' days')::interval`,\n            ),\n          ),\n          and(\n            inArray(runnerSessions.registrationTokenKind, ['ephemeral', 'activation']),\n            lt(\n              runnerSessions.createdAt,\n              sql`now() - (${params.ephemeralRetentionDays} || ' days')::interval`,\n            ),\n          ),\n        ),\n        notExists(\n          db()\n            .select({id: runningJobExecutions.id})\n            .from(runningJobExecutions)\n            .where(eq(runningJobExecutions.runnerSessionId, runnerSessions.id)),\n        ),\n      ),\n    )\n    .orderBy(asc(runnerSessions.createdAt), asc(runnerSessions.id))\n    .limit(params.limit ?? 1000);\n\n  const deleted = await db()\n    .delete(runnerSessions)\n    .where(inArray(runnerSessions.id, expiredIds))\n    .returning({id: runnerSessions.id});\n\n  return deleted.length;\n}\n"],"names":["and","asc","eq","gt","inArray","isNull","lt","notExists","or","sql","EmptyRunnerLabelsError","sanitizeRunnerLabelsOrThrow","db","provisionerTokens","runnerActivationTokens","runnerControlSessions","providerRunners","runnerSessions","toRunnerSession","runningJobExecutions","createRunnerSession","params","rows","insert","values","workspaceId","scope","registrationTokenId","registrationTokenKind","labels","toolCapabilities","toolCapabilitiesReportedAt","maxClaims","claimsUsed","returning","row","Error","getRunnerSessionById","runnerSessionId","select","from","where","id","limit","createRunnerSessionConsumingActivationToken","transaction","tx","runner","activationTokenId","runnerInstanceId","provisionerId","providerRunnerId","innerJoin","for","of","activationToken","consumedAt","revokedAt","expiresAt","provisioner","source","length","session","update","set","consumedSessionId","updatedAt","closedAt","closeReason","deleteExpiredRunnerSessions","expiredIds","createdAt","manualRetentionDays","ephemeralRetentionDays","orderBy","deleted","delete"],"mappings":"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"}

package/dist/metrics/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/metrics/service.ts"],"names":[],"mappings":"AAGA,wBAAgB,6BAA6B,IAAI,IAAI,CAkBpD"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/metrics/service.ts"],"names":[],"mappings":"AAKA,wBAAgB,6BAA6B,IAAI,IAAI,CAoCpD"}

package/dist/metrics/service.js

@@ -1,5 +1,7 @@
 import { getServiceMetricsProvider } from '@shipfox/node-opentelemetry';
+import { config } from '#config.js';
 import { getJobExecutionQueueDepth } from '#db/job-executions.js';
+import { countStaleEnrolledRunnerInstances } from '#db/runner-instances.js';
 export function registerRunnersServiceMetrics() {
     const meter = getServiceMetricsProvider().getMeter('runners');
     const pendingJobExecutions = meter.createObservableGauge('runners_pending_job_executions', {
@@ -8,13 +10,27 @@ export function registerRunnersServiceMetrics() {
     const runningJobExecutions = meter.createObservableGauge('runners_running_job_executions', {
         description: 'Job executions currently claimed by a runner and in progress'
     });
+    const enrolledRunnersWithoutRecentReport = meter.createObservableGauge('runners_enrolled_without_recent_report', {
+        description: 'Running enrolled runners with a live control session, no workspace or runner session, and no recent provisioner report after the stale-runner grace window'
+    });
     meter.addBatchObservableCallback(async (observer)=>{
-        const depth = await getJobExecutionQueueDepth();
-        observer.observe(pendingJobExecutions, depth.pendingJobExecutions);
-        observer.observe(runningJobExecutions, depth.runningJobExecutions);
+        const [depthResult, staleEnrolledRunnerCountResult] = await Promise.allSettled([
+            getJobExecutionQueueDepth(),
+            countStaleEnrolledRunnerInstances({
+                graceSeconds: config.RUNNER_STALE_PROVISIONED_RUNNER_THRESHOLD_SECONDS
+            })
+        ]);
+        if (depthResult.status === 'fulfilled') {
+            observer.observe(pendingJobExecutions, depthResult.value.pendingJobExecutions);
+            observer.observe(runningJobExecutions, depthResult.value.runningJobExecutions);
+        }
+        if (staleEnrolledRunnerCountResult.status === 'fulfilled') {
+            observer.observe(enrolledRunnersWithoutRecentReport, staleEnrolledRunnerCountResult.value);
+        }
     }, [
         pendingJobExecutions,
-        runningJobExecutions
+        runningJobExecutions,
+        enrolledRunnersWithoutRecentReport
     ]);
 }
 

package/dist/metrics/service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/metrics/service.ts"],"sourcesContent":["import {getServiceMetricsProvider} from '@shipfox/node-opentelemetry';\nimport {getJobExecutionQueueDepth} from '#db/job-executions.js';\n\nexport function registerRunnersServiceMetrics(): void {\n  const meter = getServiceMetricsProvider().getMeter('runners');\n\n  const pendingJobExecutions = meter.createObservableGauge('runners_pending_job_executions', {\n    description: 'Job executions currently waiting in the queue to be claimed',\n  });\n  const runningJobExecutions = meter.createObservableGauge('runners_running_job_executions', {\n    description: 'Job executions currently claimed by a runner and in progress',\n  });\n\n  meter.addBatchObservableCallback(\n    async (observer) => {\n      const depth = await getJobExecutionQueueDepth();\n      observer.observe(pendingJobExecutions, depth.pendingJobExecutions);\n      observer.observe(runningJobExecutions, depth.runningJobExecutions);\n    },\n    [pendingJobExecutions, runningJobExecutions],\n  );\n}\n"],"names":["getServiceMetricsProvider","getJobExecutionQueueDepth","registerRunnersServiceMetrics","meter","getMeter","pendingJobExecutions","createObservableGauge","description","runningJobExecutions","addBatchObservableCallback","observer","depth","observe"],"mappings":"AAAA,SAAQA,yBAAyB,QAAO,8BAA8B;AACtE,SAAQC,yBAAyB,QAAO,wBAAwB;AAEhE,OAAO,SAASC;IACd,MAAMC,QAAQH,4BAA4BI,QAAQ,CAAC;IAEnD,MAAMC,uBAAuBF,MAAMG,qBAAqB,CAAC,kCAAkC;QACzFC,aAAa;IACf;IACA,MAAMC,uBAAuBL,MAAMG,qBAAqB,CAAC,kCAAkC;QACzFC,aAAa;IACf;IAEAJ,MAAMM,0BAA0B,CAC9B,OAAOC;QACL,MAAMC,QAAQ,MAAMV;QACpBS,SAASE,OAAO,CAACP,sBAAsBM,MAAMN,oBAAoB;QACjEK,SAASE,OAAO,CAACJ,sBAAsBG,MAAMH,oBAAoB;IACnE,GACA;QAACH;QAAsBG;KAAqB;AAEhD"}
+{"version":3,"sources":["../../src/metrics/service.ts"],"sourcesContent":["import {getServiceMetricsProvider} from '@shipfox/node-opentelemetry';\nimport {config} from '#config.js';\nimport {getJobExecutionQueueDepth} from '#db/job-executions.js';\nimport {countStaleEnrolledRunnerInstances} from '#db/runner-instances.js';\n\nexport function registerRunnersServiceMetrics(): void {\n  const meter = getServiceMetricsProvider().getMeter('runners');\n\n  const pendingJobExecutions = meter.createObservableGauge('runners_pending_job_executions', {\n    description: 'Job executions currently waiting in the queue to be claimed',\n  });\n  const runningJobExecutions = meter.createObservableGauge('runners_running_job_executions', {\n    description: 'Job executions currently claimed by a runner and in progress',\n  });\n  const enrolledRunnersWithoutRecentReport = meter.createObservableGauge(\n    'runners_enrolled_without_recent_report',\n    {\n      description:\n        'Running enrolled runners with a live control session, no workspace or runner session, and no recent provisioner report after the stale-runner grace window',\n    },\n  );\n\n  meter.addBatchObservableCallback(\n    async (observer) => {\n      const [depthResult, staleEnrolledRunnerCountResult] = await Promise.allSettled([\n        getJobExecutionQueueDepth(),\n        countStaleEnrolledRunnerInstances({\n          graceSeconds: config.RUNNER_STALE_PROVISIONED_RUNNER_THRESHOLD_SECONDS,\n        }),\n      ]);\n\n      if (depthResult.status === 'fulfilled') {\n        observer.observe(pendingJobExecutions, depthResult.value.pendingJobExecutions);\n        observer.observe(runningJobExecutions, depthResult.value.runningJobExecutions);\n      }\n      if (staleEnrolledRunnerCountResult.status === 'fulfilled') {\n        observer.observe(enrolledRunnersWithoutRecentReport, staleEnrolledRunnerCountResult.value);\n      }\n    },\n    [pendingJobExecutions, runningJobExecutions, enrolledRunnersWithoutRecentReport],\n  );\n}\n"],"names":["getServiceMetricsProvider","config","getJobExecutionQueueDepth","countStaleEnrolledRunnerInstances","registerRunnersServiceMetrics","meter","getMeter","pendingJobExecutions","createObservableGauge","description","runningJobExecutions","enrolledRunnersWithoutRecentReport","addBatchObservableCallback","observer","depthResult","staleEnrolledRunnerCountResult","Promise","allSettled","graceSeconds","RUNNER_STALE_PROVISIONED_RUNNER_THRESHOLD_SECONDS","status","observe","value"],"mappings":"AAAA,SAAQA,yBAAyB,QAAO,8BAA8B;AACtE,SAAQC,MAAM,QAAO,aAAa;AAClC,SAAQC,yBAAyB,QAAO,wBAAwB;AAChE,SAAQC,iCAAiC,QAAO,0BAA0B;AAE1E,OAAO,SAASC;IACd,MAAMC,QAAQL,4BAA4BM,QAAQ,CAAC;IAEnD,MAAMC,uBAAuBF,MAAMG,qBAAqB,CAAC,kCAAkC;QACzFC,aAAa;IACf;IACA,MAAMC,uBAAuBL,MAAMG,qBAAqB,CAAC,kCAAkC;QACzFC,aAAa;IACf;IACA,MAAME,qCAAqCN,MAAMG,qBAAqB,CACpE,0CACA;QACEC,aACE;IACJ;IAGFJ,MAAMO,0BAA0B,CAC9B,OAAOC;QACL,MAAM,CAACC,aAAaC,+BAA+B,GAAG,MAAMC,QAAQC,UAAU,CAAC;YAC7Ef;YACAC,kCAAkC;gBAChCe,cAAcjB,OAAOkB,iDAAiD;YACxE;SACD;QAED,IAAIL,YAAYM,MAAM,KAAK,aAAa;YACtCP,SAASQ,OAAO,CAACd,sBAAsBO,YAAYQ,KAAK,CAACf,oBAAoB;YAC7EM,SAASQ,OAAO,CAACX,sBAAsBI,YAAYQ,KAAK,CAACZ,oBAAoB;QAC/E;QACA,IAAIK,+BAA+BK,MAAM,KAAK,aAAa;YACzDP,SAASQ,OAAO,CAACV,oCAAoCI,+BAA+BO,KAAK;QAC3F;IACF,GACA;QAACf;QAAsBG;QAAsBC;KAAmC;AAEpF"}