diff --git a/apps/service/src/metrics.test.ts b/apps/service/src/metrics.test.ts index 6b5d208..8ff1ae4 100644 --- a/apps/service/src/metrics.test.ts +++ b/apps/service/src/metrics.test.ts @@ -68,7 +68,8 @@ describe('Metrics', () => { repository, pullNumber: 1, headSha: 'a'.repeat(40), - trigger: { kind: 'opened' } + trigger: { kind: 'opened' }, + strength: 'expert' }, attempts: 0, maxAttempts: 3 @@ -93,7 +94,7 @@ describe('Metrics', () => { const jobs = (await reader.points('hansi_jobs_total')).map((p) => [p.attributes, p.value]); expect(jobs).toEqual([ - [{ type: 'review', outcome: 'done', retry: 'false' }, 1], + [{ type: 'review', strength: 'expert', outcome: 'done', retry: 'false' }, 1], [{ type: 'chat', outcome: 'failed', retry: 'true' }, 1], [{ type: 'unknown', outcome: 'invalid', retry: 'false' }, 1] ]); diff --git a/apps/service/src/metrics.ts b/apps/service/src/metrics.ts index 60a97e3..e4e5f85 100644 --- a/apps/service/src/metrics.ts +++ b/apps/service/src/metrics.ts @@ -118,15 +118,18 @@ export class Metrics { this.jobsActive.add(1, { type }); } + /** A review carries the strength it ran at, so cost per review can be read per strength. */ jobFinished( type: string, outcome: 'done' | 'failed' | 'invalid', retry: boolean, - seconds?: number + seconds?: number, + strength?: Strength ): void { if (outcome !== 'invalid') this.jobsActive.add(-1, { type }); - this.jobs.add(1, { type, outcome, retry: String(retry) }); - if (seconds !== undefined) this.jobDuration.record(seconds, { type, outcome }); + const labels = { type, ...(strength && { strength }) }; + this.jobs.add(1, { ...labels, outcome, retry: String(retry) }); + if (seconds !== undefined) this.jobDuration.record(seconds, { ...labels, outcome }); } /** diff --git a/apps/service/src/worker.ts b/apps/service/src/worker.ts index aea4318..6aecd27 100644 --- a/apps/service/src/worker.ts +++ b/apps/service/src/worker.ts @@ -82,7 +82,8 @@ export class Worker { job.type, outcome?.outcome ?? 'failed', outcome === undefined || (outcome.outcome === 'failed' && outcome.retry), - (performance.now() - started) / 1000 + (performance.now() - started) / 1000, + job.type === 'review' ? job.strength : undefined ); this.running--; if (this.running === 0) this.idle.splice(0).forEach((resolve) => resolve());