Create a basic package for BullMQ that we can import and use

It doesn't actually do anything yet other than start the reporter. No metrics collected. No singleton reporter (BullMQ and Express each start their own reporter).

bullmq/README.md

@@ -14,16 +14,16 @@ npm install judoscale-bullmq --save
 
 ```javascript
 // ESM
-import judoscale from 'judoscale-bullmq'
+import judoscaleBullMQ from 'judoscale-bullmq'
 
 // CommonJs
-const judoscale = require('judoscale-bullmq').default
+const judoscaleBullMQ = require('judoscale-bullmq').default
 
 // default configuration
-judoscale.reporter.start()
+judoscaleBullMQ()
 
 // custom configuration
-judoscale.reporter.start({
+judoscaleBullMQ({
   queues: ['default', 'urgent'],
   log_level: 'debug',
 })

bullmq/src/index.js

@@ -1,2 +1,12 @@
-const { mergeConfig, Reporter, MetricsStore, requestMetrics, WebMetricsCollector } = require('judoscale-node-core')
-const Adapter = require('./adapter')
+const { mergeConfig, Reporter } = require('judoscale-node-core')
+const Adapter = require('./Adapter')
+// const BullMQMetricsCollector = require('./BullMQMetricsCollector')
+
+module.exports = function initJudoscaleBullMQ(config = {}) {
+  const finalConfig = mergeConfig(config)
+  // const collectors = [new BullMQMetricsCollector()]
+  const collectors = []
+  const reporter = new Reporter()
+
+  reporter.start(finalConfig, collectors, Adapter)
+}

sample_apps/express_web/package.json

@@ -12,7 +12,8 @@
     "bullmq": "^5.7.9",
     "ejs": "^3.1.6",
     "express": "^4.17.2",
-    "judoscale-express": "*"
+    "judoscale-express": "*",
+    "judoscale-bullmq": "*"
   },
   "devDependencies": {
     "nodemon": "^3.1.0"

sample_apps/express_web/src/app.js

@@ -1,20 +1,36 @@
 import Redis from 'ioredis'
 import express from 'express'
 import { Queue, Worker, QueueEvents } from 'bullmq'
-import judoscale from 'judoscale-express'
+import judoscaleExpress from 'judoscale-express'
+import judoscaleBullMQ from 'judoscale-bullmq'
 
 const app = express()
 const port = process.env.PORT || 5000
 const redisConfig = { connection: { host: '127.0.0.1', port: 6379 } }
 const redis = new Redis(redisConfig.connection)
-const judoscaleConfig = {
-  api_base_url: process.env.JUDOSCALE_URL || 'https://judoscale-node-sample.requestcatcher.com',
-}
 
 app.set('views', './views')
 app.set('view engine', 'ejs')
 
-app.use(judoscale.default(judoscaleConfig))
+// TODO: Consider this approach which would mirror our Ruby adapter
+// Judoscale.config({
+//   ...
+// })
+
+// TODO: Why do we have to use default? Is this broken in our published packages?
+judoscaleBullMQ({
+  api_base_url: process.env.JUDOSCALE_URL || 'https://judoscale-node-sample.requestcatcher.com',
+})
+
+// TODO: Only pass the configuration to the first call that starts the reporter
+// app.use(judoscaleExpress())
+
+app.use(
+  judoscaleExpress.default({
+    api_base_url: process.env.JUDOSCALE_URL || 'https://judoscale-node-sample.requestcatcher.com',
+  })
+)
+
 app.use(express.json()) // parse JSON bodies
 app.use(express.urlencoded({ extended: true })) // parse HTML forms
 

sample_apps/express_web/src/worker.js

@@ -1,8 +1,13 @@
 import { Worker } from 'bullmq'
+import judoscaleBullMQ from 'judoscale-bullmq'
 
 const redisOpts = { url: process.env.REDIS_URL || 'redis://127.0.0.1:6379' }
 const queueNames = ['default', 'urgent']
 
+judoscaleBullMQ({
+  api_base_url: process.env.JUDOSCALE_URL || 'https://judoscale-node-sample.requestcatcher.com',
+})
+
 const workers = queueNames.map((queueName) => {
   console.log(`Starting worker for ${queueName} queue`)
   return new Worker(queueName, handlerForQueue(queueName), { connection: redisOpts })