fix: Include prioritized jobs in queue depth metric (#45)

judoscale · Jun 6, 2024 · cdc26c5 · cdc26c5
1 parent 55b5c48
commit cdc26c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/bull/test/bull-metrics-collector.test.js b/packages/bull/test/bull-metrics-collector.test.js
@@ -21,14 +21,15 @@ describe('BullMetricsCollector', () => {
     queue = new Queue('foo')
 
     await queue.add('test-job')
+    await queue.add('prioritized-job', {}, { priority: 1 })
 
     const metrics = await collector.collect()
 
     expect(metrics.length).toEqual(2)
 
     expect(metrics[0].identifier).toEqual('qd')
     expect(metrics[0].queueName).toEqual('foo')
-    expect(metrics[0].value).toEqual(1)
+    expect(metrics[0].value).toEqual(2)
     expect(metrics[1].identifier).toEqual('busy')
     expect(metrics[1].queueName).toEqual('foo')
     expect(metrics[1].value).toEqual(0)

diff --git a/packages/bullmq/src/bull-mq-metrics-collector.js b/packages/bullmq/src/bull-mq-metrics-collector.js
@@ -16,9 +16,9 @@ class BullMQMetricsCollector extends WorkerMetricsCollector {
 
     for (const queueName of this.queueNames) {
       const queue = new Queue(queueName, { connection: this.redis })
-      const jobCounts = await queue.getJobCounts('waiting', 'active')
+      const jobCounts = await queue.getJobCounts('waiting', 'active', 'prioritized')
 
-      metrics.push(new Metric('qd', new Date(), jobCounts.waiting, queueName))
+      metrics.push(new Metric('qd', new Date(), jobCounts.waiting + jobCounts.prioritized, queueName))
       metrics.push(new Metric('busy', new Date(), jobCounts.active, queueName))
     }
 

diff --git a/packages/bullmq/test/bull-mq-metrics-collector.test.js b/packages/bullmq/test/bull-mq-metrics-collector.test.js
@@ -26,14 +26,15 @@ describe('BullMQMetricsCollector', () => {
 
     const queue = new Queue('foo', { connection: collector.redis })
     await queue.add('test-job')
+    await queue.add('prioritized-job', {}, { priority: 1 })
 
     const metrics = await collector.collect()
 
     expect(metrics.length).toEqual(2)
 
     expect(metrics[0].identifier).toEqual('qd')
     expect(metrics[0].queueName).toEqual('foo')
-    expect(metrics[0].value).toEqual(1)
+    expect(metrics[0].value).toEqual(2)
     expect(metrics[1].identifier).toEqual('busy')
     expect(metrics[1].queueName).toEqual('foo')
     expect(metrics[1].value).toEqual(0)