@adalo/metrics 0.1.151 → 0.1.153

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,17 +12,37 @@ export class QueueRedisMetricsClient extends RedisMetricsClient {
12
12
  /** Gauge for queue jobs by status */
13
13
  queueJobsGauge: import("prom-client").Gauge<string>;
14
14
  /**
15
- * Get the correct Redis configuration for a queue depending on the client type
15
+ * Execute a Redis command in a client-type safe way.
16
16
  *
17
- * For ioredis, returns { host, port, db, password } because BeeQueue
18
- * cannot accept the full client instance.
19
- * For other Redis clients (v3/v4), returns the client instance directly.
20
- *
21
- * @returns {object|any} Redis config object for BeeQueue or Redis client instance
17
+ * @param {string[]} args Command args array, e.g. ['LLEN', 'key']
18
+ * @returns {Promise<any>}
22
19
  */
23
- getConfigForDifferentRedis: () => object | any;
20
+ _send: (args: string[]) => Promise<any>;
21
+ _toNumber: (v: any) => number;
22
+ _getQueueType: (queueName: any) => Promise<"bull" | "bee">;
23
+ _getBullHealth: (queueName: any) => Promise<{
24
+ waiting: number;
25
+ active: number;
26
+ succeeded: number;
27
+ failed: number;
28
+ delayed: number;
29
+ }>;
30
+ _getBeeQueueHealth: (queueName: any) => Promise<{
31
+ waiting: number;
32
+ active: number;
33
+ succeeded: number;
34
+ failed: number;
35
+ delayed: number;
36
+ }>;
24
37
  /**
25
- * Collect metrics for a single Bee Queue and set gauges
38
+ * Collect metrics for a single queue and set gauges.
39
+ *
40
+ * Supports:
41
+ * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`
42
+ * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`
43
+ *
44
+ * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.
45
+ *
26
46
  * @param {string} queueName - Name of the queue
27
47
  * @returns {Promise<void>}
28
48
  */
@@ -1 +1 @@
1
- {"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAC5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;;;;OAQG;IACH,kCAFa,MAAM,GAAC,GAAG,CAStB;IAED;;;;OAIG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAkDzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}
1
+ {"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;OAKG;IACH,cAHW,MAAM,EAAE,KACN,QAAQ,GAAG,CAAC,CA6BxB;IAED,8BAGC;IAED,2DA6BC;IAED;;;;;;OAmBC;IAED;;;;;;OAwBC;IAED;;;;;;;;;;;OAWG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAyCzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}
@@ -1,11 +1,12 @@
1
1
  "use strict";
2
2
 
3
- const Queue = require('bee-queue');
4
3
  const {
5
4
  RedisMetricsClient
6
5
  } = require('./metricsRedisClient');
7
6
  const {
8
- IOREDIS
7
+ IOREDIS,
8
+ REDIS_V3,
9
+ REDIS_V4
9
10
  } = require('../redisUtils');
10
11
 
11
12
  /**
@@ -66,6 +67,18 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
66
67
  this.startupValidation = startupValidation;
67
68
 
68
69
  /** Cache for queue objects to avoid multiple connections */
70
+ // NOTE:
71
+ // Historically we used `bee-queue`'s `Queue#checkHealth()` here.
72
+ // But bee-queue depends on `redis@3`, which is not compatible with Node 22
73
+ // in some environments and can crash with errors like:
74
+ // - "this._ready.then is not a function"
75
+ // - "TypeError: this.stream.once is not a function"
76
+ //
77
+ // To avoid pulling in node-redis v3 at runtime, we read queue counters
78
+ // directly from Redis using the *provided* redis client (ioredis or node-redis).
79
+ //
80
+ // Keep this map reserved for possible future caching (e.g. key schema detection),
81
+ // but we no longer store Queue instances.
69
82
  this.queueCache = new Map();
70
83
 
71
84
  /** Gauge for queue jobs by status */
@@ -78,49 +91,100 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
78
91
  }
79
92
 
80
93
  /**
81
- * Get the correct Redis configuration for a queue depending on the client type
94
+ * Execute a Redis command in a client-type safe way.
82
95
  *
83
- * For ioredis, returns { host, port, db, password } because BeeQueue
84
- * cannot accept the full client instance.
85
- * For other Redis clients (v3/v4), returns the client instance directly.
86
- *
87
- * @returns {object|any} Redis config object for BeeQueue or Redis client instance
96
+ * @param {string[]} args Command args array, e.g. ['LLEN', 'key']
97
+ * @returns {Promise<any>}
88
98
  */
89
- getConfigForDifferentRedis = () => {
99
+ _send = args => {
100
+ if (!this.redisClient) {
101
+ return Promise.reject(new Error('Redis client not provided'));
102
+ }
103
+
104
+ // node-redis v3 (callback API)
105
+ if (this.redisClientType === REDIS_V3) {
106
+ return new Promise((resolve, reject) => {
107
+ this.redisClient.send_command(args[0], args.slice(1), (err, result) => {
108
+ if (err) reject(err);else resolve(result);
109
+ });
110
+ });
111
+ }
112
+
113
+ // node-redis v4 (Promise API)
114
+ if (this.redisClientType === REDIS_V4) {
115
+ return this.redisClient.sendCommand(args);
116
+ }
117
+
118
+ // ioredis (Promise API)
90
119
  if (this.redisClientType === IOREDIS) {
91
- const {
92
- host,
93
- port,
94
- db,
95
- password
96
- } = this.redisClient.options;
97
- return {
98
- host,
99
- port,
100
- db,
101
- password
102
- };
120
+ // ioredis supports `.call(command, ...args)`
121
+ return this.redisClient.call(args[0], ...args.slice(1));
122
+ }
123
+ return Promise.reject(new Error('Unsupported Redis client type'));
124
+ };
125
+ _toNumber = v => {
126
+ const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10);
127
+ return Number.isFinite(n) ? n : 0;
128
+ };
129
+ _getQueueType = async queueName => {
130
+ const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase();
131
+ if (forced === 'bull' || forced === 'bee') return forced;
132
+ const bullPrefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull';
133
+ const beePrefix = (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() || 'bq';
134
+
135
+ // Detect by checking the canonical "waiting" key names.
136
+ const bullWaitKey = `${bullPrefix}:${queueName}:wait`;
137
+ const beeWaitKey = `${beePrefix}:${queueName}:waiting`;
138
+ try {
139
+ const [bullExists, beeExists] = await Promise.all([this._send(['EXISTS', bullWaitKey]), this._send(['EXISTS', beeWaitKey])]);
140
+ if (this._toNumber(bullExists) > 0) return 'bull';
141
+ if (this._toNumber(beeExists) > 0) return 'bee';
142
+ } catch {
143
+ // If EXISTS is blocked/unavailable, fall back to trying bull first.
103
144
  }
104
- return this.redisClient;
145
+ return 'bull';
146
+ };
147
+ _getBullHealth = async queueName => {
148
+ const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull';
149
+ const base = `${prefix}:${queueName}:`;
150
+ const [waiting, active, succeeded, failed, delayed] = await Promise.all([this._send(['LLEN', `${base}wait`]), this._send(['LLEN', `${base}active`]), this._send(['ZCARD', `${base}completed`]), this._send(['ZCARD', `${base}failed`]), this._send(['ZCARD', `${base}delayed`])]);
151
+ return {
152
+ waiting: this._toNumber(waiting),
153
+ active: this._toNumber(active),
154
+ succeeded: this._toNumber(succeeded),
155
+ failed: this._toNumber(failed),
156
+ delayed: this._toNumber(delayed)
157
+ };
158
+ };
159
+ _getBeeQueueHealth = async queueName => {
160
+ const prefix = (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() || 'bq';
161
+ const base = `${prefix}:${queueName}:`;
162
+ const [waiting, active, succeeded, failed, delayed] = await Promise.all([this._send(['LLEN', `${base}waiting`]), this._send(['LLEN', `${base}active`]), this._send(['SCARD', `${base}succeeded`]), this._send(['SCARD', `${base}failed`]), this._send(['ZCARD', `${base}delayed`])]);
163
+ return {
164
+ waiting: this._toNumber(waiting),
165
+ active: this._toNumber(active),
166
+ succeeded: this._toNumber(succeeded),
167
+ failed: this._toNumber(failed),
168
+ delayed: this._toNumber(delayed)
169
+ };
105
170
  };
106
171
 
107
172
  /**
108
- * Collect metrics for a single Bee Queue and set gauges
173
+ * Collect metrics for a single queue and set gauges.
174
+ *
175
+ * Supports:
176
+ * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`
177
+ * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`
178
+ *
179
+ * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.
180
+ *
109
181
  * @param {string} queueName - Name of the queue
110
182
  * @returns {Promise<void>}
111
183
  */
112
184
  collectSingleQueueMetrics = async queueName => {
113
185
  try {
114
- if (!this.queueCache.has(queueName)) {
115
- this.queueCache.set(queueName, new Queue(queueName, {
116
- redis: this.getConfigForDifferentRedis(),
117
- isWorker: false,
118
- getEvents: false,
119
- sendEvents: false
120
- }));
121
- }
122
- const queue = this.queueCache.get(queueName);
123
- const health = await queue.checkHealth();
186
+ const queueType = await this._getQueueType(queueName);
187
+ const health = queueType === 'bee' ? await this._getBeeQueueHealth(queueName) : await this._getBullHealth(queueName);
124
188
  const labels = {
125
189
  ...this.getDefaultLabels(),
126
190
  queue_name: queueName
@@ -1 +1 @@
1
- {"version":3,"file":"metricsQueueRedisClient.js","names":["Queue","require","RedisMetricsClient","IOREDIS","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","getConfigForDifferentRedis","redisClientType","host","port","db","password","options","collectSingleQueueMetrics","queueName","has","set","redis","isWorker","getEvents","sendEvents","queue","get","health","checkHealth","labels","getDefaultLabels","queue_name","status","waiting","active","succeeded","failed","delayed","warn","collectQueueMetrics","collectRedisMetrics","Promise","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","err","on","cleanup","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n */\n constructor({ redisClient, metricsConfig = {} } = {}) {\n const getConfiguredQueueNames = () => {\n if (!process.env.METRICS_APP_REDIS_BQ) {\n throw new Error(\n 'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n )\n }\n\n const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n .map(q => q.trim())\n .filter(Boolean)\n\n if (allQueues.length === 0) {\n throw new Error(\n 'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n 'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n )\n }\n\n return [...new Set(allQueues)]\n }\n\n const startupValidation = () => {\n try {\n const queueNames = getConfiguredQueueNames()\n console.info(\n `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n )\n return true\n } catch (error) {\n console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n console.error(\n `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n )\n console.error(\n `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n )\n console.error(`[queue-metrics] Skipping queue metrics collection`)\n return false\n }\n }\n\n super({\n ...metricsConfig,\n redisClient,\n startupValidation,\n })\n\n this.getConfiguredQueueNames = getConfiguredQueueNames\n this.startupValidation = startupValidation\n\n /** Cache for queue objects to avoid multiple connections */\n this.queueCache = new Map()\n\n /** Gauge for queue jobs by status */\n this.queueJobsGauge = this.createGauge({\n name: 'app_queue_jobs_count',\n help: 'Number of app jobs in the queue by status',\n labelNames: this.withDefaultLabels(['queue_name', 'status']),\n })\n\n this._setCleanupHandlers()\n }\n\n /**\n * Get the correct Redis configuration for a queue depending on the client type\n *\n * For ioredis, returns { host, port, db, password } because BeeQueue\n * cannot accept the full client instance.\n * For other Redis clients (v3/v4), returns the client instance directly.\n *\n * @returns {object|any} Redis config object for BeeQueue or Redis client instance\n */\n getConfigForDifferentRedis = () => {\n if (this.redisClientType === IOREDIS) {\n const { host, port, db, password } = this.redisClient.options\n return { host, port, db, password }\n }\n\n return this.redisClient\n }\n\n /**\n * Collect metrics for a single Bee Queue and set gauges\n * @param {string} queueName - Name of the queue\n * @returns {Promise<void>}\n */\n collectSingleQueueMetrics = async queueName => {\n try {\n if (!this.queueCache.has(queueName)) {\n this.queueCache.set(\n queueName,\n new Queue(queueName, {\n redis: this.getConfigForDifferentRedis(),\n isWorker: false,\n getEvents: false,\n sendEvents: false,\n })\n )\n }\n\n const queue = this.queueCache.get(queueName)\n const health = await queue.checkHealth()\n\n const labels = {\n ...this.getDefaultLabels(),\n queue_name: queueName,\n }\n\n this.queueJobsGauge.set(\n { ...labels, status: 'waiting' },\n health.waiting || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'active' },\n health.active || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'succeeded' },\n health.succeeded || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'failed' },\n health.failed || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'delayed' },\n health.delayed || 0\n )\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all queues and Redis, then push to Pushgateway\n * @returns {Promise<void>}\n */\n collectQueueMetrics = async () => {\n try {\n const queueNames = this.getConfiguredQueueNames()\n\n await this.collectRedisMetrics()\n await Promise.allSettled(\n queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n )\n\n await this.gatewayPush()\n this.clearAllCounters()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n if (\n error.message?.includes('No queues configured') ||\n error.message?.includes('METRICS_APP_REDIS_BQ')\n ) {\n console.error(\n `[queue-metrics] ❌ Configuration error: ${error.message}`\n )\n console.error(\n `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n )\n } else {\n console.error(\n `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n )\n }\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.collectQueueMetrics().catch(err => {\n console.error(\n `[queue-metrics] Failed to collect queue & Redis metrics:`,\n err\n )\n })\n })\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n\n /**\n * Cleanup queues and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n for (const [queueName, queue] of this.queueCache) {\n try {\n await queue.close()\n } catch (err) {\n console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n }\n }\n process.exit(0)\n }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","_send","args","Promise","reject","redisClientType","resolve","send_command","slice","err","result","sendCommand","call","_toNumber","v","n","parseInt","String","Number","isFinite","_getQueueType","queueName","forced","METRICS_QUEUE_TYPE","toLowerCase","bullPrefix","BULL_QUEUE_PREFIX","beePrefix","BEE_QUEUE_PREFIX","METRICS_BEE_QUEUE_PREFIX","bullWaitKey","beeWaitKey","bullExists","beeExists","all","_getBullHealth","prefix","base","waiting","active","succeeded","failed","delayed","_getBeeQueueHealth","collectSingleQueueMetrics","queueType","health","labels","getDefaultLabels","queue_name","set","status","warn","collectQueueMetrics","collectRedisMetrics","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","on","cleanup","queue","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n */\n constructor({ redisClient, metricsConfig = {} } = {}) {\n const getConfiguredQueueNames = () => {\n if (!process.env.METRICS_APP_REDIS_BQ) {\n throw new Error(\n 'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n )\n }\n\n const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n .map(q => q.trim())\n .filter(Boolean)\n\n if (allQueues.length === 0) {\n throw new Error(\n 'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n 'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n )\n }\n\n return [...new Set(allQueues)]\n }\n\n const startupValidation = () => {\n try {\n const queueNames = getConfiguredQueueNames()\n console.info(\n `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n )\n return true\n } catch (error) {\n console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n console.error(\n `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n )\n console.error(\n `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n )\n console.error(`[queue-metrics] Skipping queue metrics collection`)\n return false\n }\n }\n\n super({\n ...metricsConfig,\n redisClient,\n startupValidation,\n })\n\n this.getConfiguredQueueNames = getConfiguredQueueNames\n this.startupValidation = startupValidation\n\n /** Cache for queue objects to avoid multiple connections */\n // NOTE:\n // Historically we used `bee-queue`'s `Queue#checkHealth()` here.\n // But bee-queue depends on `redis@3`, which is not compatible with Node 22\n // in some environments and can crash with errors like:\n // - \"this._ready.then is not a function\"\n // - \"TypeError: this.stream.once is not a function\"\n //\n // To avoid pulling in node-redis v3 at runtime, we read queue counters\n // directly from Redis using the *provided* redis client (ioredis or node-redis).\n //\n // Keep this map reserved for possible future caching (e.g. key schema detection),\n // but we no longer store Queue instances.\n this.queueCache = new Map()\n\n /** Gauge for queue jobs by status */\n this.queueJobsGauge = this.createGauge({\n name: 'app_queue_jobs_count',\n help: 'Number of app jobs in the queue by status',\n labelNames: this.withDefaultLabels(['queue_name', 'status']),\n })\n\n this._setCleanupHandlers()\n }\n\n /**\n * Execute a Redis command in a client-type safe way.\n *\n * @param {string[]} args Command args array, e.g. ['LLEN', 'key']\n * @returns {Promise<any>}\n */\n _send = args => {\n if (!this.redisClient) {\n return Promise.reject(new Error('Redis client not provided'))\n }\n\n // node-redis v3 (callback API)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command(args[0], args.slice(1), (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 (Promise API)\n if (this.redisClientType === REDIS_V4) {\n return this.redisClient.sendCommand(args)\n }\n\n // ioredis (Promise API)\n if (this.redisClientType === IOREDIS) {\n // ioredis supports `.call(command, ...args)`\n return this.redisClient.call(args[0], ...args.slice(1))\n }\n\n return Promise.reject(new Error('Unsupported Redis client type'))\n }\n\n _toNumber = v => {\n const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)\n return Number.isFinite(n) ? n : 0\n }\n\n _getQueueType = async queueName => {\n const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()\n if (forced === 'bull' || forced === 'bee') return forced\n\n const bullPrefix =\n (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n const beePrefix =\n (\n process.env.BEE_QUEUE_PREFIX ||\n process.env.METRICS_BEE_QUEUE_PREFIX ||\n 'bq'\n ).trim() || 'bq'\n\n // Detect by checking the canonical \"waiting\" key names.\n const bullWaitKey = `${bullPrefix}:${queueName}:wait`\n const beeWaitKey = `${beePrefix}:${queueName}:waiting`\n\n try {\n const [bullExists, beeExists] = await Promise.all([\n this._send(['EXISTS', bullWaitKey]),\n this._send(['EXISTS', beeWaitKey]),\n ])\n if (this._toNumber(bullExists) > 0) return 'bull'\n if (this._toNumber(beeExists) > 0) return 'bee'\n } catch {\n // If EXISTS is blocked/unavailable, fall back to trying bull first.\n }\n\n return 'bull'\n }\n\n _getBullHealth = async queueName => {\n const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n const base = `${prefix}:${queueName}:`\n\n const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n this._send(['LLEN', `${base}wait`]),\n this._send(['LLEN', `${base}active`]),\n this._send(['ZCARD', `${base}completed`]),\n this._send(['ZCARD', `${base}failed`]),\n this._send(['ZCARD', `${base}delayed`]),\n ])\n\n return {\n waiting: this._toNumber(waiting),\n active: this._toNumber(active),\n succeeded: this._toNumber(succeeded),\n failed: this._toNumber(failed),\n delayed: this._toNumber(delayed),\n }\n }\n\n _getBeeQueueHealth = async queueName => {\n const prefix =\n (\n process.env.BEE_QUEUE_PREFIX ||\n process.env.METRICS_BEE_QUEUE_PREFIX ||\n 'bq'\n ).trim() || 'bq'\n const base = `${prefix}:${queueName}:`\n\n const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n this._send(['LLEN', `${base}waiting`]),\n this._send(['LLEN', `${base}active`]),\n this._send(['SCARD', `${base}succeeded`]),\n this._send(['SCARD', `${base}failed`]),\n this._send(['ZCARD', `${base}delayed`]),\n ])\n\n return {\n waiting: this._toNumber(waiting),\n active: this._toNumber(active),\n succeeded: this._toNumber(succeeded),\n failed: this._toNumber(failed),\n delayed: this._toNumber(delayed),\n }\n }\n\n /**\n * Collect metrics for a single queue and set gauges.\n *\n * Supports:\n * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`\n * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`\n *\n * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.\n *\n * @param {string} queueName - Name of the queue\n * @returns {Promise<void>}\n */\n collectSingleQueueMetrics = async queueName => {\n try {\n const queueType = await this._getQueueType(queueName)\n const health =\n queueType === 'bee'\n ? await this._getBeeQueueHealth(queueName)\n : await this._getBullHealth(queueName)\n\n const labels = {\n ...this.getDefaultLabels(),\n queue_name: queueName,\n }\n\n this.queueJobsGauge.set(\n { ...labels, status: 'waiting' },\n health.waiting || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'active' },\n health.active || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'succeeded' },\n health.succeeded || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'failed' },\n health.failed || 0\n )\n this.queueJobsGauge.set(\n { ...labels, status: 'delayed' },\n health.delayed || 0\n )\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all queues and Redis, then push to Pushgateway\n * @returns {Promise<void>}\n */\n collectQueueMetrics = async () => {\n try {\n const queueNames = this.getConfiguredQueueNames()\n\n await this.collectRedisMetrics()\n await Promise.allSettled(\n queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n )\n\n await this.gatewayPush()\n this.clearAllCounters()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n if (\n error.message?.includes('No queues configured') ||\n error.message?.includes('METRICS_APP_REDIS_BQ')\n ) {\n console.error(\n `[queue-metrics] ❌ Configuration error: ${error.message}`\n )\n console.error(\n `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n )\n } else {\n console.error(\n `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n )\n }\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.collectQueueMetrics().catch(err => {\n console.error(\n `[queue-metrics] Failed to collect queue & Redis metrics:`,\n err\n )\n })\n })\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n\n /**\n * Cleanup queues and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n for (const [queueName, queue] of this.queueCache) {\n try {\n await queue.close()\n } catch (err) {\n console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n }\n }\n process.exit(0)\n }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":";;AAAA,MAAM;EAAEA;AAAmB,CAAC,GAAGC,OAAO,CAAC,sBAAsB,CAAC;AAC9D,MAAM;EAAEC,OAAO;EAAEC,QAAQ;EAAEC;AAAS,CAAC,GAAGH,OAAO,CAAC,eAAe,CAAC;;AAEhE;AACA;AACA;AACA;AACA;AACA;AACA,MAAMI,uBAAuB,SAASL,kBAAkB,CAAC;EACvD;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEM,WAAWA,CAAC;IAAEC,WAAW;IAAEC,aAAa,GAAG,CAAC;EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;IACpD,MAAMC,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAACC,OAAO,CAACC,GAAG,CAACC,oBAAoB,EAAE;QACrC,MAAM,IAAIC,KAAK,CACb,gGACF,CAAC;MACH;MAEA,MAAMC,SAAS,GAAGJ,OAAO,CAACC,GAAG,CAACC,oBAAoB,CAACG,KAAK,CAAC,GAAG,CAAC,CAC1DC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,IAAI,CAAC,CAAC,CAAC,CAClBC,MAAM,CAACC,OAAO,CAAC;MAElB,IAAIN,SAAS,CAACO,MAAM,KAAK,CAAC,EAAE;QAC1B,MAAM,IAAIR,KAAK,CACb,6DAA6D,GAC3D,gEACJ,CAAC;MACH;MAEA,OAAO,CAAC,GAAG,IAAIS,GAAG,CAACR,SAAS,CAAC,CAAC;IAChC,CAAC;IAED,MAAMS,iBAAiB,GAAGA,CAAA,KAAM;MAC9B,IAAI;QACF,MAAMC,UAAU,GAAGf,uBAAuB,CAAC,CAAC;QAC5CgB,OAAO,CAACC,IAAI,CACV,iEAAiEF,UAAU,CAACH,MAAM,SACpF,CAAC;QACD,OAAO,IAAI;MACb,CAAC,CAAC,OAAOM,KAAK,EAAE;QACdF,OAAO,CAACE,KAAK,CAAC,mCAAmCA,KAAK,CAACC,OAAO,EAAE,CAAC;QACjEH,OAAO,CAACE,KAAK,CACX,mFACF,CAAC;QACDF,OAAO,CAACE,KAAK,CACX,8DACF,CAAC;QACDF,OAAO,CAACE,KAAK,CAAC,mDAAmD,CAAC;QAClE,OAAO,KAAK;MACd;IACF,CAAC;IAED,KAAK,CAAC;MACJ,GAAGnB,aAAa;MAChBD,WAAW;MACXgB;IACF,CAAC,CAAC;IAEF,IAAI,CAACd,uBAAuB,GAAGA,uBAAuB;IACtD,IAAI,CAACc,iBAAiB,GAAGA,iBAAiB;;IAE1C;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,IAAI,CAACM,UAAU,GAAG,IAAIC,GAAG,CAAC,CAAC;;IAE3B;IACA,IAAI,CAACC,cAAc,GAAG,IAAI,CAACC,WAAW,CAAC;MACrCC,IAAI,EAAE,sBAAsB;MAC5BC,IAAI,EAAE,2CAA2C;MACjDC,UAAU,EAAE,IAAI,CAACC,iBAAiB,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC7D,CAAC,CAAC;IAEF,IAAI,CAACC,mBAAmB,CAAC,CAAC;EAC5B;;EAEA;AACF;AACA;AACA;AACA;AACA;EACEC,KAAK,GAAGC,IAAI,IAAI;IACd,IAAI,CAAC,IAAI,CAAChC,WAAW,EAAE;MACrB,OAAOiC,OAAO,CAACC,MAAM,CAAC,IAAI5B,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/D;;IAEA;IACA,IAAI,IAAI,CAAC6B,eAAe,KAAKvC,QAAQ,EAAE;MACrC,OAAO,IAAIqC,OAAO,CAAC,CAACG,OAAO,EAAEF,MAAM,KAAK;QACtC,IAAI,CAAClC,WAAW,CAACqC,YAAY,CAACL,IAAI,CAAC,CAAC,CAAC,EAAEA,IAAI,CAACM,KAAK,CAAC,CAAC,CAAC,EAAE,CAACC,GAAG,EAAEC,MAAM,KAAK;UACrE,IAAID,GAAG,EAAEL,MAAM,CAACK,GAAG,CAAC,MACfH,OAAO,CAACI,MAAM,CAAC;QACtB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ;;IAEA;IACA,IAAI,IAAI,CAACL,eAAe,KAAKtC,QAAQ,EAAE;MACrC,OAAO,IAAI,CAACG,WAAW,CAACyC,WAAW,CAACT,IAAI,CAAC;IAC3C;;IAEA;IACA,IAAI,IAAI,CAACG,eAAe,KAAKxC,OAAO,EAAE;MACpC;MACA,OAAO,IAAI,CAACK,WAAW,CAAC0C,IAAI,CAACV,IAAI,CAAC,CAAC,CAAC,EAAE,GAAGA,IAAI,CAACM,KAAK,CAAC,CAAC,CAAC,CAAC;IACzD;IAEA,OAAOL,OAAO,CAACC,MAAM,CAAC,IAAI5B,KAAK,CAAC,+BAA+B,CAAC,CAAC;EACnE,CAAC;EAEDqC,SAAS,GAAGC,CAAC,IAAI;IACf,MAAMC,CAAC,GAAG,OAAOD,CAAC,KAAK,QAAQ,GAAGA,CAAC,GAAGE,QAAQ,CAACC,MAAM,CAACH,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;IACpE,OAAOI,MAAM,CAACC,QAAQ,CAACJ,CAAC,CAAC,GAAGA,CAAC,GAAG,CAAC;EACnC,CAAC;EAEDK,aAAa,GAAG,MAAMC,SAAS,IAAI;IACjC,MAAMC,MAAM,GAAG,CAACjD,OAAO,CAACC,GAAG,CAACiD,kBAAkB,IAAI,EAAE,EAAE1C,IAAI,CAAC,CAAC,CAAC2C,WAAW,CAAC,CAAC;IAC1E,IAAIF,MAAM,KAAK,MAAM,IAAIA,MAAM,KAAK,KAAK,EAAE,OAAOA,MAAM;IAExD,MAAMG,UAAU,GACd,CAACpD,OAAO,CAACC,GAAG,CAACoD,iBAAiB,IAAI,MAAM,EAAE7C,IAAI,CAAC,CAAC,IAAI,MAAM;IAC5D,MAAM8C,SAAS,GACb,CACEtD,OAAO,CAACC,GAAG,CAACsD,gBAAgB,IAC5BvD,OAAO,CAACC,GAAG,CAACuD,wBAAwB,IACpC,IAAI,EACJhD,IAAI,CAAC,CAAC,IAAI,IAAI;;IAElB;IACA,MAAMiD,WAAW,GAAG,GAAGL,UAAU,IAAIJ,SAAS,OAAO;IACrD,MAAMU,UAAU,GAAG,GAAGJ,SAAS,IAAIN,SAAS,UAAU;IAEtD,IAAI;MACF,MAAM,CAACW,UAAU,EAAEC,SAAS,CAAC,GAAG,MAAM9B,OAAO,CAAC+B,GAAG,CAAC,CAChD,IAAI,CAACjC,KAAK,CAAC,CAAC,QAAQ,EAAE6B,WAAW,CAAC,CAAC,EACnC,IAAI,CAAC7B,KAAK,CAAC,CAAC,QAAQ,EAAE8B,UAAU,CAAC,CAAC,CACnC,CAAC;MACF,IAAI,IAAI,CAAClB,SAAS,CAACmB,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,MAAM;MACjD,IAAI,IAAI,CAACnB,SAAS,CAACoB,SAAS,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK;IACjD,CAAC,CAAC,MAAM;MACN;IAAA;IAGF,OAAO,MAAM;EACf,CAAC;EAEDE,cAAc,GAAG,MAAMd,SAAS,IAAI;IAClC,MAAMe,MAAM,GAAG,CAAC/D,OAAO,CAACC,GAAG,CAACoD,iBAAiB,IAAI,MAAM,EAAE7C,IAAI,CAAC,CAAC,IAAI,MAAM;IACzE,MAAMwD,IAAI,GAAG,GAAGD,MAAM,IAAIf,SAAS,GAAG;IAEtC,MAAM,CAACiB,OAAO,EAAEC,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,OAAO,CAAC,GAAG,MAAMvC,OAAO,CAAC+B,GAAG,CAAC,CACtE,IAAI,CAACjC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAGoC,IAAI,MAAM,CAAC,CAAC,EACnC,IAAI,CAACpC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAGoC,IAAI,QAAQ,CAAC,CAAC,EACrC,IAAI,CAACpC,KAAK,CAAC,CAAC,OAAO,EAAE,GAAGoC,IAAI,WAAW,CAAC,CAAC,EACzC,IAAI,CAACpC,KAAK,CAAC,CAAC,OAAO,EAAE,GAAGoC,IAAI,QAAQ,CAAC,CAAC,EACtC,IAAI,CAACpC,KAAK,CAAC,CAAC,OAAO,EAAE,GAAGoC,IAAI,SAAS,CAAC,CAAC,CACxC,CAAC;IAEF,OAAO;MACLC,OAAO,EAAE,IAAI,CAACzB,SAAS,CAACyB,OAAO,CAAC;MAChCC,MAAM,EAAE,IAAI,CAAC1B,SAAS,CAAC0B,MAAM,CAAC;MAC9BC,SAAS,EAAE,IAAI,CAAC3B,SAAS,CAAC2B,SAAS,CAAC;MACpCC,MAAM,EAAE,IAAI,CAAC5B,SAAS,CAAC4B,MAAM,CAAC;MAC9BC,OAAO,EAAE,IAAI,CAAC7B,SAAS,CAAC6B,OAAO;IACjC,CAAC;EACH,CAAC;EAEDC,kBAAkB,GAAG,MAAMtB,SAAS,IAAI;IACtC,MAAMe,MAAM,GACV,CACE/D,OAAO,CAACC,GAAG,CAACsD,gBAAgB,IAC5BvD,OAAO,CAACC,GAAG,CAACuD,wBAAwB,IACpC,IAAI,EACJhD,IAAI,CAAC,CAAC,IAAI,IAAI;IAClB,MAAMwD,IAAI,GAAG,GAAGD,MAAM,IAAIf,SAAS,GAAG;IAEtC,MAAM,CAACiB,OAAO,EAAEC,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,OAAO,CAAC,GAAG,MAAMvC,OAAO,CAAC+B,GAAG,CAAC,CACtE,IAAI,CAACjC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAGoC,IAAI,SAAS,CAAC,CAAC,EACtC,IAAI,CAACpC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAGoC,IAAI,QAAQ,CAAC,CAAC,EACrC,IAAI,CAACpC,KAAK,CAAC,CAAC,OAAO,EAAE,GAAGoC,IAAI,WAAW,CAAC,CAAC,EACzC,IAAI,CAACpC,KAAK,CAAC,CAAC,OAAO,EAAE,GAAGoC,IAAI,QAAQ,CAAC,CAAC,EACtC,IAAI,CAACpC,KAAK,CAAC,CAAC,OAAO,EAAE,GAAGoC,IAAI,SAAS,CAAC,CAAC,CACxC,CAAC;IAEF,OAAO;MACLC,OAAO,EAAE,IAAI,CAACzB,SAAS,CAACyB,OAAO,CAAC;MAChCC,MAAM,EAAE,IAAI,CAAC1B,SAAS,CAAC0B,MAAM,CAAC;MAC9BC,SAAS,EAAE,IAAI,CAAC3B,SAAS,CAAC2B,SAAS,CAAC;MACpCC,MAAM,EAAE,IAAI,CAAC5B,SAAS,CAAC4B,MAAM,CAAC;MAC9BC,OAAO,EAAE,IAAI,CAAC7B,SAAS,CAAC6B,OAAO;IACjC,CAAC;EACH,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,yBAAyB,GAAG,MAAMvB,SAAS,IAAI;IAC7C,IAAI;MACF,MAAMwB,SAAS,GAAG,MAAM,IAAI,CAACzB,aAAa,CAACC,SAAS,CAAC;MACrD,MAAMyB,MAAM,GACVD,SAAS,KAAK,KAAK,GACf,MAAM,IAAI,CAACF,kBAAkB,CAACtB,SAAS,CAAC,GACxC,MAAM,IAAI,CAACc,cAAc,CAACd,SAAS,CAAC;MAE1C,MAAM0B,MAAM,GAAG;QACb,GAAG,IAAI,CAACC,gBAAgB,CAAC,CAAC;QAC1BC,UAAU,EAAE5B;MACd,CAAC;MAED,IAAI,CAAC3B,cAAc,CAACwD,GAAG,CACrB;QAAE,GAAGH,MAAM;QAAEI,MAAM,EAAE;MAAU,CAAC,EAChCL,MAAM,CAACR,OAAO,IAAI,CACpB,CAAC;MACD,IAAI,CAAC5C,cAAc,CAACwD,GAAG,CACrB;QAAE,GAAGH,MAAM;QAAEI,MAAM,EAAE;MAAS,CAAC,EAC/BL,MAAM,CAACP,MAAM,IAAI,CACnB,CAAC;MACD,IAAI,CAAC7C,cAAc,CAACwD,GAAG,CACrB;QAAE,GAAGH,MAAM;QAAEI,MAAM,EAAE;MAAY,CAAC,EAClCL,MAAM,CAACN,SAAS,IAAI,CACtB,CAAC;MACD,IAAI,CAAC9C,cAAc,CAACwD,GAAG,CACrB;QAAE,GAAGH,MAAM;QAAEI,MAAM,EAAE;MAAS,CAAC,EAC/BL,MAAM,CAACL,MAAM,IAAI,CACnB,CAAC;MACD,IAAI,CAAC/C,cAAc,CAACwD,GAAG,CACrB;QAAE,GAAGH,MAAM;QAAEI,MAAM,EAAE;MAAU,CAAC,EAChCL,MAAM,CAACJ,OAAO,IAAI,CACpB,CAAC;IACH,CAAC,CAAC,OAAOpD,KAAK,EAAE;MACdF,OAAO,CAACgE,IAAI,CACV,uDAAuD/B,SAAS,GAAG,EACnE/B,KAAK,CAACC,OACR,CAAC;IACH;EACF,CAAC;;EAED;AACF;AACA;AACA;EACE8D,mBAAmB,GAAG,MAAAA,CAAA,KAAY;IAChC,IAAI;MACF,MAAMlE,UAAU,GAAG,IAAI,CAACf,uBAAuB,CAAC,CAAC;MAEjD,MAAM,IAAI,CAACkF,mBAAmB,CAAC,CAAC;MAChC,MAAMnD,OAAO,CAACoD,UAAU,CACtBpE,UAAU,CAACR,GAAG,CAAC0C,SAAS,IAAI,IAAI,CAACuB,yBAAyB,CAACvB,SAAS,CAAC,CACvE,CAAC;MAED,MAAM,IAAI,CAACmC,WAAW,CAAC,CAAC;MACxB,IAAI,CAACC,gBAAgB,CAAC,CAAC;MAEvB,IAAI,IAAI,CAACC,gBAAgB,EAAE;QACzB,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACC,QAAQ,CAACC,gBAAgB,CAAC,CAAC;QAC5DzE,OAAO,CAACC,IAAI,CACV,yCAAyCF,UAAU,CAACH,MAAM,UAAU,EACpE8E,IAAI,CAACC,SAAS,CAACJ,aAAa,EAAE,IAAI,EAAE,CAAC,CACvC,CAAC;MACH;IACF,CAAC,CAAC,OAAOrE,KAAK,EAAE;MACd,IACEA,KAAK,CAACC,OAAO,EAAEyE,QAAQ,CAAC,sBAAsB,CAAC,IAC/C1E,KAAK,CAACC,OAAO,EAAEyE,QAAQ,CAAC,sBAAsB,CAAC,EAC/C;QACA5E,OAAO,CAACE,KAAK,CACX,0CAA0CA,KAAK,CAACC,OAAO,EACzD,CAAC;QACDH,OAAO,CAACE,KAAK,CACX,0FACF,CAAC;MACH,CAAC,MAAM;QACLF,OAAO,CAACE,KAAK,CACX,oDAAoDA,KAAK,CAACC,OAAO,EACnE,CAAC;MACH;MACA,MAAMD,KAAK;IACb;EACF,CAAC;;EAED;AACF;AACA;AACA;EACE2E,SAAS,GAAGA,CAACC,WAAW,GAAG,IAAI,CAACA,WAAW,KAAK;IAC9C,IAAI,CAACC,UAAU,CAACD,WAAW,EAAE,MAAM;MACjC,IAAI,CAACb,mBAAmB,CAAC,CAAC,CAACe,KAAK,CAAC3D,GAAG,IAAI;QACtCrB,OAAO,CAACE,KAAK,CACX,0DAA0D,EAC1DmB,GACF,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC;EAEDT,mBAAmB,GAAGA,CAAA,KAAM;IAC1B3B,OAAO,CAACgG,EAAE,CAAC,QAAQ,EAAE,IAAI,CAACC,OAAO,CAAC;IAClCjG,OAAO,CAACgG,EAAE,CAAC,SAAS,EAAE,IAAI,CAACC,OAAO,CAAC;EACrC,CAAC;;EAED;AACF;AACA;AACA;EACEA,OAAO,GAAG,MAAAA,CAAA,KAAY;IACpB,KAAK,MAAM,CAACjD,SAAS,EAAEkD,KAAK,CAAC,IAAI,IAAI,CAAC/E,UAAU,EAAE;MAChD,IAAI;QACF,MAAM+E,KAAK,CAACC,KAAK,CAAC,CAAC;MACrB,CAAC,CAAC,OAAO/D,GAAG,EAAE;QACZrB,OAAO,CAACE,KAAK,CAAC,uCAAuC+B,SAAS,GAAG,EAAEZ,GAAG,CAAC;MACzE;IACF;IACApC,OAAO,CAACoG,IAAI,CAAC,CAAC,CAAC;EACjB,CAAC;AACH;AAEAC,MAAM,CAACC,OAAO,GAAG;EAAE3G;AAAwB,CAAC","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAuD9C;IAzCC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAQF,6BAAmC;IACnC,+BAAqC;IAKvC,wCAgCC;IAED,6CAuBC;IAED,gDAkBC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAkKzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
1
+ {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAuD9C;IAzCC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAQF,6BAAmC;IACnC,+BAAqC;IAKvC,wCAgCC;IAED,6CAuBC;IAED,gDAkBC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CA6KzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
@@ -223,7 +223,9 @@ class RedisMetricsClient extends BaseMetricsClient {
223
223
  const currentKeys = new Set(Object.keys(grouped));
224
224
  for (const k of currentKeys) {
225
225
  this._redisConnSeenKeys.add(k);
226
- if (this._redisConnZeroedKeys.has(k)) this._redisConnZeroedKeys.delete(k);
226
+ if (this._redisConnZeroedKeys.has(k)) {
227
+ this._redisConnZeroedKeys.delete(k);
228
+ }
227
229
  }
228
230
 
229
231
  // Reset gauges each scrape so we only export:
@@ -1 +1 @@
1
- {"version":3,"file":"metricsRedisClient.js","names":["BaseMetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_redisConnSeenKeys","Set","_redisConnZeroedKeys","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","eqIdx","indexOf","k","slice","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","JSON","stringify","missing","flags","cmd","c","grouped","conn","totMem","key","count","memory","mem","Number","isFinite","currentKeys","Object","keys","add","has","delete","reset","valueLabels","parse","set","groups","values","groupedTotal","reduce","sum","g","size","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../../src/metrics/metricsRedisClient.js"],"sourcesContent":["const { BaseMetricsClient } = require('./baseMetricsClient')\nconst {\n getRedisClientType,\n REDIS_V4,\n IOREDIS,\n REDIS_V3,\n} = require('../redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends BaseMetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass RedisMetricsClient extends BaseMetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n */\n constructor({ redisClient, ...metricsConfig } = {}) {\n const intervalSec =\n metricsConfig.intervalSec ||\n parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n 5\n\n super({\n ...metricsConfig,\n processType: metricsConfig.processType || 'queue-metrics',\n intervalSec,\n })\n\n /** Redis client used for metrics */\n this.redisClient = redisClient\n this.redisClientType = getRedisClientType(redisClient)\n\n /** Counter for Redis client connections */\n this.redisConnectionsGauge = this.createGauge({\n name: 'app_redis_connections_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n this.redisConnectionsMemoryGauge = this.createGauge({\n name: 'app_redis_connections_memory_usage_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n /** Gauge for Redis memory usage */\n this.redisMemoryGauge = this.createGauge({\n name: 'app_redis_memory_bytes',\n help: 'Redis memory usage in bytes',\n labelNames: this.withDefaultLabels(['memory_type']),\n })\n\n /** Gauge for Redis operation stats */\n this.redisStatsGauge = this.createGauge({\n name: 'app_redis_stats_total',\n help: 'Redis operation statistics',\n labelNames: this.withDefaultLabels(['operation']),\n })\n\n // Track emitted connection label combinations so we can:\n // - emit a one-shot 0 for series that disappear (overwrite last non-zero sample)\n // - then stop emitting them on subsequent scrapes\n //\n // This is mainly needed because we label connections by `cmd`,\n // and Redis `CLIENT LIST` `cmd` is volatile.\n this._redisConnSeenKeys = new Set()\n this._redisConnZeroedKeys = new Set()\n\n this._setCleanupHandlers()\n }\n\n getRedisConnections = async () => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n if (err) {\n reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n } else resolve(result)\n })\n })\n }\n\n // node-redis v4\n if (this.redisClientType === REDIS_V4) {\n try {\n return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n if (this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.client('LIST')\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n getRedisInfo = async section => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.info(section, (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 or ioredis (info returns Promise)\n if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.info(section)\n } catch (err) {\n throw new Error(`Failed to get Redis INFO: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n parseRedisConnections = clientsStr => {\n return clientsStr\n .split('\\n')\n .filter(line => line.trim() !== '')\n .map(line => {\n const parts = line.split(' ')\n const client = {}\n parts.forEach(p => {\n const eqIdx = p.indexOf('=')\n if (eqIdx === -1) return\n const k = p.slice(0, eqIdx)\n const v = p.slice(eqIdx + 1)\n if (redisConnectionFields.includes(k)) {\n client[k] = v\n }\n })\n return client\n })\n }\n\n /**\n * Collect basic Redis INFO metrics: clients, memory, stats\n * @returns {Promise<void>}\n */\n collectRedisMetrics = async () => {\n try {\n const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n await Promise.all([\n this.getRedisInfo('memory'),\n this.getRedisInfo('stats'),\n this.getRedisConnections(),\n ])\n\n const labels = this.getDefaultLabels()\n\n const connections = this.parseRedisConnections(connectionsInfoStr)\n\n if (this.logValues) {\n // \"IN\" data: raw client list from Redis\n console.log('[queue-metrics] Redis CLIENT LIST (raw):\\n', connectionsInfoStr)\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw) length:',\n connectionsInfoStr.length\n )\n\n // \"OUT\" data: parsed fields used for metrics\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) count:',\n connections.length\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed sample, first 10):',\n JSON.stringify(connections.slice(0, 10), null, 2)\n )\n\n const missing = { name: 0, flags: 0, cmd: 0, 'tot-mem': 0 }\n connections.forEach(c => {\n if (!c.name) missing.name += 1\n if (!c.flags) missing.flags += 1\n if (!c.cmd) missing.cmd += 1\n if (!c['tot-mem']) missing['tot-mem'] += 1\n })\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) missing fields:',\n missing\n )\n }\n\n const grouped = {}\n connections.forEach(conn => {\n const { name, flags, 'tot-mem': totMem, cmd } = conn\n\n // build grouping key (includes default gauge labels later)\n const key = JSON.stringify({ name, flags, cmd })\n\n if (!grouped[key]) {\n grouped[key] = {\n labels: { name, flags, cmd },\n count: 0,\n memory: 0,\n }\n }\n\n grouped[key].count += 1\n const mem = parseInt(totMem, 10)\n grouped[key].memory += Number.isFinite(mem) ? mem : 0\n })\n\n // Ensure sets exist even if older instance is hot-reloaded.\n if (!this._redisConnSeenKeys) this._redisConnSeenKeys = new Set()\n if (!this._redisConnZeroedKeys) this._redisConnZeroedKeys = new Set()\n\n const currentKeys = new Set(Object.keys(grouped))\n for (const k of currentKeys) {\n this._redisConnSeenKeys.add(k)\n if (this._redisConnZeroedKeys.has(k)) this._redisConnZeroedKeys.delete(k)\n }\n\n // Reset gauges each scrape so we only export:\n // - current snapshot series\n // - one-shot zeros for recently disappeared series\n this.redisConnectionsGauge.reset()\n this.redisConnectionsMemoryGauge.reset()\n\n // Emit one-shot zeros for series that disappeared since last seen.\n for (const k of this._redisConnSeenKeys) {\n if (currentKeys.has(k)) continue\n if (this._redisConnZeroedKeys.has(k)) continue\n try {\n const valueLabels = JSON.parse(k)\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, 0)\n this.redisConnectionsMemoryGauge.set({ ...labels, ...valueLabels }, 0)\n this._redisConnZeroedKeys.add(k)\n } catch {\n // ignore malformed key\n }\n }\n\n if (this.logValues) {\n const groups = Object.values(grouped)\n const groupedTotal = groups.reduce((sum, g) => sum + (g.count || 0), 0)\n console.log('[queue-metrics] Redis connections grouped buckets:', groups.length)\n console.log('[queue-metrics] Redis connections grouped total:', groupedTotal)\n console.log(\n '[queue-metrics] Redis connections seen keys:',\n this._redisConnSeenKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections zeroed keys:',\n this._redisConnZeroedKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections grouped sample (first 10):',\n JSON.stringify(groups.slice(0, 10), null, 2)\n )\n }\n\n Object.values(grouped).forEach(\n ({ labels: valueLabels, count, memory }) => {\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n this.redisConnectionsMemoryGauge.set(\n { ...labels, ...valueLabels },\n memory\n )\n }\n )\n\n const parseRedisInfo = infoStr =>\n Object.fromEntries(\n infoStr\n .split('\\r\\n')\n .filter(line => line && !line.startsWith('#'))\n .map(line => line.split(':', 2))\n .filter(parts => parts.length === 2 && parts[0] && parts[1])\n )\n\n const memory = parseRedisInfo(memoryInfoStr)\n const stats = parseRedisInfo(statsInfoStr)\n\n if (memory.used_memory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'used' },\n parseInt(memory.used_memory, 10) || 0\n )\n }\n if (memory.maxmemory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'max' },\n parseInt(memory.maxmemory, 10) || 0\n )\n }\n\n if (stats.instantaneous_ops_per_sec) {\n this.redisStatsGauge.set(\n { ...labels, operation: 'ops_per_sec' },\n parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n )\n }\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect Redis metrics:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all Redis and push to Prometheus Pushgateway\n * @returns {Promise<void>}\n */\n pushRedisMetrics = async () => {\n try {\n await this.collectRedisMetrics()\n await this.gatewayPush()\n this.clearAllCounters()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for Redis`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n console.error(\n `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n )\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.pushRedisMetrics().catch(err => {\n console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n })\n })\n }\n\n /**\n * Cleanup Redis client and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n try {\n if (!this.redisClient) return\n\n if (\n this.redisClientType === REDIS_V3 ||\n this.redisClientType === REDIS_V4\n ) {\n await this.redisClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n await this.redisClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing Redis client:', err)\n }\n process.exit(0)\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"metricsRedisClient.js","names":["BaseMetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_redisConnSeenKeys","Set","_redisConnZeroedKeys","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","eqIdx","indexOf","k","slice","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","JSON","stringify","missing","flags","cmd","c","grouped","conn","totMem","key","count","memory","mem","Number","isFinite","currentKeys","Object","keys","add","has","delete","reset","valueLabels","parse","set","groups","values","groupedTotal","reduce","sum","g","size","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../../src/metrics/metricsRedisClient.js"],"sourcesContent":["const { BaseMetricsClient } = require('./baseMetricsClient')\nconst {\n getRedisClientType,\n REDIS_V4,\n IOREDIS,\n REDIS_V3,\n} = require('../redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends BaseMetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass RedisMetricsClient extends BaseMetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n */\n constructor({ redisClient, ...metricsConfig } = {}) {\n const intervalSec =\n metricsConfig.intervalSec ||\n parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n 5\n\n super({\n ...metricsConfig,\n processType: metricsConfig.processType || 'queue-metrics',\n intervalSec,\n })\n\n /** Redis client used for metrics */\n this.redisClient = redisClient\n this.redisClientType = getRedisClientType(redisClient)\n\n /** Counter for Redis client connections */\n this.redisConnectionsGauge = this.createGauge({\n name: 'app_redis_connections_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n this.redisConnectionsMemoryGauge = this.createGauge({\n name: 'app_redis_connections_memory_usage_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n /** Gauge for Redis memory usage */\n this.redisMemoryGauge = this.createGauge({\n name: 'app_redis_memory_bytes',\n help: 'Redis memory usage in bytes',\n labelNames: this.withDefaultLabels(['memory_type']),\n })\n\n /** Gauge for Redis operation stats */\n this.redisStatsGauge = this.createGauge({\n name: 'app_redis_stats_total',\n help: 'Redis operation statistics',\n labelNames: this.withDefaultLabels(['operation']),\n })\n\n // Track emitted connection label combinations so we can:\n // - emit a one-shot 0 for series that disappear (overwrite last non-zero sample)\n // - then stop emitting them on subsequent scrapes\n //\n // This is mainly needed because we label connections by `cmd`,\n // and Redis `CLIENT LIST` `cmd` is volatile.\n this._redisConnSeenKeys = new Set()\n this._redisConnZeroedKeys = new Set()\n\n this._setCleanupHandlers()\n }\n\n getRedisConnections = async () => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n if (err) {\n reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n } else resolve(result)\n })\n })\n }\n\n // node-redis v4\n if (this.redisClientType === REDIS_V4) {\n try {\n return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n if (this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.client('LIST')\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n getRedisInfo = async section => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.info(section, (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 or ioredis (info returns Promise)\n if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.info(section)\n } catch (err) {\n throw new Error(`Failed to get Redis INFO: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n parseRedisConnections = clientsStr => {\n return clientsStr\n .split('\\n')\n .filter(line => line.trim() !== '')\n .map(line => {\n const parts = line.split(' ')\n const client = {}\n parts.forEach(p => {\n const eqIdx = p.indexOf('=')\n if (eqIdx === -1) return\n const k = p.slice(0, eqIdx)\n const v = p.slice(eqIdx + 1)\n if (redisConnectionFields.includes(k)) {\n client[k] = v\n }\n })\n return client\n })\n }\n\n /**\n * Collect basic Redis INFO metrics: clients, memory, stats\n * @returns {Promise<void>}\n */\n collectRedisMetrics = async () => {\n try {\n const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n await Promise.all([\n this.getRedisInfo('memory'),\n this.getRedisInfo('stats'),\n this.getRedisConnections(),\n ])\n\n const labels = this.getDefaultLabels()\n\n const connections = this.parseRedisConnections(connectionsInfoStr)\n\n if (this.logValues) {\n // \"IN\" data: raw client list from Redis\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw):\\n',\n connectionsInfoStr\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw) length:',\n connectionsInfoStr.length\n )\n\n // \"OUT\" data: parsed fields used for metrics\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) count:',\n connections.length\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed sample, first 10):',\n JSON.stringify(connections.slice(0, 10), null, 2)\n )\n\n const missing = { name: 0, flags: 0, cmd: 0, 'tot-mem': 0 }\n connections.forEach(c => {\n if (!c.name) missing.name += 1\n if (!c.flags) missing.flags += 1\n if (!c.cmd) missing.cmd += 1\n if (!c['tot-mem']) missing['tot-mem'] += 1\n })\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) missing fields:',\n missing\n )\n }\n\n const grouped = {}\n connections.forEach(conn => {\n const { name, flags, 'tot-mem': totMem, cmd } = conn\n\n // build grouping key (includes default gauge labels later)\n const key = JSON.stringify({ name, flags, cmd })\n\n if (!grouped[key]) {\n grouped[key] = {\n labels: { name, flags, cmd },\n count: 0,\n memory: 0,\n }\n }\n\n grouped[key].count += 1\n const mem = parseInt(totMem, 10)\n grouped[key].memory += Number.isFinite(mem) ? mem : 0\n })\n\n // Ensure sets exist even if older instance is hot-reloaded.\n if (!this._redisConnSeenKeys) this._redisConnSeenKeys = new Set()\n if (!this._redisConnZeroedKeys) this._redisConnZeroedKeys = new Set()\n\n const currentKeys = new Set(Object.keys(grouped))\n for (const k of currentKeys) {\n this._redisConnSeenKeys.add(k)\n if (this._redisConnZeroedKeys.has(k)) {\n this._redisConnZeroedKeys.delete(k)\n }\n }\n\n // Reset gauges each scrape so we only export:\n // - current snapshot series\n // - one-shot zeros for recently disappeared series\n this.redisConnectionsGauge.reset()\n this.redisConnectionsMemoryGauge.reset()\n\n // Emit one-shot zeros for series that disappeared since last seen.\n for (const k of this._redisConnSeenKeys) {\n if (currentKeys.has(k)) continue\n if (this._redisConnZeroedKeys.has(k)) continue\n try {\n const valueLabels = JSON.parse(k)\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, 0)\n this.redisConnectionsMemoryGauge.set({ ...labels, ...valueLabels }, 0)\n this._redisConnZeroedKeys.add(k)\n } catch {\n // ignore malformed key\n }\n }\n\n if (this.logValues) {\n const groups = Object.values(grouped)\n const groupedTotal = groups.reduce((sum, g) => sum + (g.count || 0), 0)\n console.log(\n '[queue-metrics] Redis connections grouped buckets:',\n groups.length\n )\n console.log(\n '[queue-metrics] Redis connections grouped total:',\n groupedTotal\n )\n console.log(\n '[queue-metrics] Redis connections seen keys:',\n this._redisConnSeenKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections zeroed keys:',\n this._redisConnZeroedKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections grouped sample (first 10):',\n JSON.stringify(groups.slice(0, 10), null, 2)\n )\n }\n\n Object.values(grouped).forEach(\n ({ labels: valueLabels, count, memory }) => {\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n this.redisConnectionsMemoryGauge.set(\n { ...labels, ...valueLabels },\n memory\n )\n }\n )\n\n const parseRedisInfo = infoStr =>\n Object.fromEntries(\n infoStr\n .split('\\r\\n')\n .filter(line => line && !line.startsWith('#'))\n .map(line => line.split(':', 2))\n .filter(parts => parts.length === 2 && parts[0] && parts[1])\n )\n\n const memory = parseRedisInfo(memoryInfoStr)\n const stats = parseRedisInfo(statsInfoStr)\n\n if (memory.used_memory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'used' },\n parseInt(memory.used_memory, 10) || 0\n )\n }\n if (memory.maxmemory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'max' },\n parseInt(memory.maxmemory, 10) || 0\n )\n }\n\n if (stats.instantaneous_ops_per_sec) {\n this.redisStatsGauge.set(\n { ...labels, operation: 'ops_per_sec' },\n parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n )\n }\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect Redis metrics:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all Redis and push to Prometheus Pushgateway\n * @returns {Promise<void>}\n */\n pushRedisMetrics = async () => {\n try {\n await this.collectRedisMetrics()\n await this.gatewayPush()\n this.clearAllCounters()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for Redis`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n console.error(\n `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n )\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.pushRedisMetrics().catch(err => {\n console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n })\n })\n }\n\n /**\n * Cleanup Redis client and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n try {\n if (!this.redisClient) return\n\n if (\n this.redisClientType === REDIS_V3 ||\n this.redisClientType === REDIS_V4\n ) {\n await this.redisClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n await this.redisClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing Redis client:', err)\n }\n process.exit(0)\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adalo/metrics",
3
- "version": "0.1.151",
3
+ "version": "0.1.153",
4
4
  "description": "Reusable metrics utilities for Node.js and Laravel apps",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -1,6 +1,5 @@
1
- const Queue = require('bee-queue')
2
1
  const { RedisMetricsClient } = require('./metricsRedisClient')
3
- const { IOREDIS } = require('../redisUtils')
2
+ const { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')
4
3
 
5
4
  /**
6
5
  * QueueRedisMetricsClient extends RedisMetricsClient to collect
@@ -76,6 +75,18 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
76
75
  this.startupValidation = startupValidation
77
76
 
78
77
  /** Cache for queue objects to avoid multiple connections */
78
+ // NOTE:
79
+ // Historically we used `bee-queue`'s `Queue#checkHealth()` here.
80
+ // But bee-queue depends on `redis@3`, which is not compatible with Node 22
81
+ // in some environments and can crash with errors like:
82
+ // - "this._ready.then is not a function"
83
+ // - "TypeError: this.stream.once is not a function"
84
+ //
85
+ // To avoid pulling in node-redis v3 at runtime, we read queue counters
86
+ // directly from Redis using the *provided* redis client (ioredis or node-redis).
87
+ //
88
+ // Keep this map reserved for possible future caching (e.g. key schema detection),
89
+ // but we no longer store Queue instances.
79
90
  this.queueCache = new Map()
80
91
 
81
92
  /** Gauge for queue jobs by status */
@@ -89,44 +100,142 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
89
100
  }
90
101
 
91
102
  /**
92
- * Get the correct Redis configuration for a queue depending on the client type
103
+ * Execute a Redis command in a client-type safe way.
93
104
  *
94
- * For ioredis, returns { host, port, db, password } because BeeQueue
95
- * cannot accept the full client instance.
96
- * For other Redis clients (v3/v4), returns the client instance directly.
97
- *
98
- * @returns {object|any} Redis config object for BeeQueue or Redis client instance
105
+ * @param {string[]} args Command args array, e.g. ['LLEN', 'key']
106
+ * @returns {Promise<any>}
99
107
  */
100
- getConfigForDifferentRedis = () => {
108
+ _send = args => {
109
+ if (!this.redisClient) {
110
+ return Promise.reject(new Error('Redis client not provided'))
111
+ }
112
+
113
+ // node-redis v3 (callback API)
114
+ if (this.redisClientType === REDIS_V3) {
115
+ return new Promise((resolve, reject) => {
116
+ this.redisClient.send_command(args[0], args.slice(1), (err, result) => {
117
+ if (err) reject(err)
118
+ else resolve(result)
119
+ })
120
+ })
121
+ }
122
+
123
+ // node-redis v4 (Promise API)
124
+ if (this.redisClientType === REDIS_V4) {
125
+ return this.redisClient.sendCommand(args)
126
+ }
127
+
128
+ // ioredis (Promise API)
101
129
  if (this.redisClientType === IOREDIS) {
102
- const { host, port, db, password } = this.redisClient.options
103
- return { host, port, db, password }
130
+ // ioredis supports `.call(command, ...args)`
131
+ return this.redisClient.call(args[0], ...args.slice(1))
132
+ }
133
+
134
+ return Promise.reject(new Error('Unsupported Redis client type'))
135
+ }
136
+
137
+ _toNumber = v => {
138
+ const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)
139
+ return Number.isFinite(n) ? n : 0
140
+ }
141
+
142
+ _getQueueType = async queueName => {
143
+ const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()
144
+ if (forced === 'bull' || forced === 'bee') return forced
145
+
146
+ const bullPrefix =
147
+ (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'
148
+ const beePrefix =
149
+ (
150
+ process.env.BEE_QUEUE_PREFIX ||
151
+ process.env.METRICS_BEE_QUEUE_PREFIX ||
152
+ 'bq'
153
+ ).trim() || 'bq'
154
+
155
+ // Detect by checking the canonical "waiting" key names.
156
+ const bullWaitKey = `${bullPrefix}:${queueName}:wait`
157
+ const beeWaitKey = `${beePrefix}:${queueName}:waiting`
158
+
159
+ try {
160
+ const [bullExists, beeExists] = await Promise.all([
161
+ this._send(['EXISTS', bullWaitKey]),
162
+ this._send(['EXISTS', beeWaitKey]),
163
+ ])
164
+ if (this._toNumber(bullExists) > 0) return 'bull'
165
+ if (this._toNumber(beeExists) > 0) return 'bee'
166
+ } catch {
167
+ // If EXISTS is blocked/unavailable, fall back to trying bull first.
104
168
  }
105
169
 
106
- return this.redisClient
170
+ return 'bull'
171
+ }
172
+
173
+ _getBullHealth = async queueName => {
174
+ const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'
175
+ const base = `${prefix}:${queueName}:`
176
+
177
+ const [waiting, active, succeeded, failed, delayed] = await Promise.all([
178
+ this._send(['LLEN', `${base}wait`]),
179
+ this._send(['LLEN', `${base}active`]),
180
+ this._send(['ZCARD', `${base}completed`]),
181
+ this._send(['ZCARD', `${base}failed`]),
182
+ this._send(['ZCARD', `${base}delayed`]),
183
+ ])
184
+
185
+ return {
186
+ waiting: this._toNumber(waiting),
187
+ active: this._toNumber(active),
188
+ succeeded: this._toNumber(succeeded),
189
+ failed: this._toNumber(failed),
190
+ delayed: this._toNumber(delayed),
191
+ }
192
+ }
193
+
194
+ _getBeeQueueHealth = async queueName => {
195
+ const prefix =
196
+ (
197
+ process.env.BEE_QUEUE_PREFIX ||
198
+ process.env.METRICS_BEE_QUEUE_PREFIX ||
199
+ 'bq'
200
+ ).trim() || 'bq'
201
+ const base = `${prefix}:${queueName}:`
202
+
203
+ const [waiting, active, succeeded, failed, delayed] = await Promise.all([
204
+ this._send(['LLEN', `${base}waiting`]),
205
+ this._send(['LLEN', `${base}active`]),
206
+ this._send(['SCARD', `${base}succeeded`]),
207
+ this._send(['SCARD', `${base}failed`]),
208
+ this._send(['ZCARD', `${base}delayed`]),
209
+ ])
210
+
211
+ return {
212
+ waiting: this._toNumber(waiting),
213
+ active: this._toNumber(active),
214
+ succeeded: this._toNumber(succeeded),
215
+ failed: this._toNumber(failed),
216
+ delayed: this._toNumber(delayed),
217
+ }
107
218
  }
108
219
 
109
220
  /**
110
- * Collect metrics for a single Bee Queue and set gauges
221
+ * Collect metrics for a single queue and set gauges.
222
+ *
223
+ * Supports:
224
+ * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`
225
+ * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`
226
+ *
227
+ * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.
228
+ *
111
229
  * @param {string} queueName - Name of the queue
112
230
  * @returns {Promise<void>}
113
231
  */
114
232
  collectSingleQueueMetrics = async queueName => {
115
233
  try {
116
- if (!this.queueCache.has(queueName)) {
117
- this.queueCache.set(
118
- queueName,
119
- new Queue(queueName, {
120
- redis: this.getConfigForDifferentRedis(),
121
- isWorker: false,
122
- getEvents: false,
123
- sendEvents: false,
124
- })
125
- )
126
- }
127
-
128
- const queue = this.queueCache.get(queueName)
129
- const health = await queue.checkHealth()
234
+ const queueType = await this._getQueueType(queueName)
235
+ const health =
236
+ queueType === 'bee'
237
+ ? await this._getBeeQueueHealth(queueName)
238
+ : await this._getBullHealth(queueName)
130
239
 
131
240
  const labels = {
132
241
  ...this.getDefaultLabels(),
@@ -184,7 +184,10 @@ class RedisMetricsClient extends BaseMetricsClient {
184
184
 
185
185
  if (this.logValues) {
186
186
  // "IN" data: raw client list from Redis
187
- console.log('[queue-metrics] Redis CLIENT LIST (raw):\n', connectionsInfoStr)
187
+ console.log(
188
+ '[queue-metrics] Redis CLIENT LIST (raw):\n',
189
+ connectionsInfoStr
190
+ )
188
191
  console.log(
189
192
  '[queue-metrics] Redis CLIENT LIST (raw) length:',
190
193
  connectionsInfoStr.length
@@ -240,7 +243,9 @@ class RedisMetricsClient extends BaseMetricsClient {
240
243
  const currentKeys = new Set(Object.keys(grouped))
241
244
  for (const k of currentKeys) {
242
245
  this._redisConnSeenKeys.add(k)
243
- if (this._redisConnZeroedKeys.has(k)) this._redisConnZeroedKeys.delete(k)
246
+ if (this._redisConnZeroedKeys.has(k)) {
247
+ this._redisConnZeroedKeys.delete(k)
248
+ }
244
249
  }
245
250
 
246
251
  // Reset gauges each scrape so we only export:
@@ -266,8 +271,14 @@ class RedisMetricsClient extends BaseMetricsClient {
266
271
  if (this.logValues) {
267
272
  const groups = Object.values(grouped)
268
273
  const groupedTotal = groups.reduce((sum, g) => sum + (g.count || 0), 0)
269
- console.log('[queue-metrics] Redis connections grouped buckets:', groups.length)
270
- console.log('[queue-metrics] Redis connections grouped total:', groupedTotal)
274
+ console.log(
275
+ '[queue-metrics] Redis connections grouped buckets:',
276
+ groups.length
277
+ )
278
+ console.log(
279
+ '[queue-metrics] Redis connections grouped total:',
280
+ groupedTotal
281
+ )
271
282
  console.log(
272
283
  '[queue-metrics] Redis connections seen keys:',
273
284
  this._redisConnSeenKeys.size