@adalo/metrics 0.0.0-staging.17 → 0.0.0-staging.18

package/lib/metrics/httpMetricsRedisCollector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisCollector.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisCollector.js"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;qBAfW,OAAO,OAAO,EAAE,WAAW;;;;;;;;;;;;;;mBAoErC;IAhCC,8BAKE;CAgDL"}
+{"version":3,"file":"httpMetricsRedisCollector.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisCollector.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;qBAfW,OAAO,OAAO,EAAE,WAAW;;;;;;;;;;;;;;mBAoErC;IAhCC,8BAKE;CA6DL"}

package/lib/metrics/httpMetricsRedisCollector.js

@@ -1,11 +1,22 @@
 "use strict";
 
+const cluster = require('cluster');
 const {
   BaseMetricsClient
 } = require('./baseMetricsClient');
 const {
   HttpMetricsRedisStore
 } = require('./httpMetricsRedisStore');
+function clusterWorkerTag() {
+  try {
+    if (cluster.isWorker && cluster.worker) {
+      return ` cluster_worker_id=${cluster.worker.id}`;
+    }
+  } catch (_) {
+    /* ignore */
+  }
+  return '';
+}
 
 /**
  * Drain worker: reads HTTP aggregates from Redis (written by {@link HttpMetricsRedisRecorder}),
@@ -74,10 +85,21 @@ class HttpMetricsRedisCollector extends BaseMetricsClient {
    * @returns {Promise<void>}
    */
   pushMetrics = async () => {
+    const {
+      pid
+    } = process;
+    const clusterTag = clusterWorkerTag();
+    // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
+    console.warn(`[TEMP_HTTP_METRICS_DIAG] http_metrics_publish_start pid=${pid}${clusterTag} dyno_id=${this.dynoId} process_type=${this.processType} app=${this.appName}`);
+    // --- end TEMP_HTTP_METRICS_DIAG ---
     if (this._store && this.countersFunctions?.app_requests_total && this.countersFunctions?.app_requests_total_duration) {
       await this._store.flushToCounters((labels, value) => this.countersFunctions.app_requests_total(labels, value), (labels, value) => this.countersFunctions.app_requests_total_duration(labels, value));
     }
-    return this._pushMetrics();
+    const out = await this._pushMetrics();
+    // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
+    console.warn(`[TEMP_HTTP_METRICS_DIAG] http_metrics_publish_finished pid=${pid}${clusterTag} dyno_id=${this.dynoId} (registry POST to VM-agent / import completed for this tick)`);
+    // --- end TEMP_HTTP_METRICS_DIAG ---
+    return out;
   };
 }
 module.exports = {

package/lib/metrics/httpMetricsRedisCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisCollector.js","names":["BaseMetricsClient","require","HttpMetricsRedisStore","HttpMetricsRedisCollector","constructor","config","redisClient","Error","blockNodeDefaultMetrics","keyProcessType","redisProcessTypeForKeys","process","env","METRICS_HTTP_REDIS_KEY_PROCESS_TYPE","defaultLabelsWithoutDynoId","app","appName","process_type","_store","processType","ttlSec","createCounter","name","help","labelNames","withDefaultLabelsWithoutDynoId","useLabelsWithoutDynoId","pushMetrics","countersFunctions","app_requests_total","app_requests_total_duration","flushToCounters","labels","value","_pushMetrics","module","exports"],"sources":["../../src/metrics/httpMetricsRedisCollector.js"],"sourcesContent":["const { BaseMetricsClient } = require('./baseMetricsClient')\nconst { HttpMetricsRedisStore } = require('./httpMetricsRedisStore')\n\n/**\n * Drain worker: reads HTTP aggregates from Redis (written by {@link HttpMetricsRedisRecorder}),\n * applies them to `app_requests_*` counters, then pushes the registry to the VM-agent (same as {@link BaseMetricsClient}).\n * Always passes `blockNodeDefaultMetrics: true` to the base client (HTTP-only registry; no default Node heap/event-loop metrics).\n * Redis key segment must match writers (`appName` + `processType` / {@link HttpMetricsRedisStore}).\n *\n * @extends BaseMetricsClient\n */\nclass HttpMetricsRedisCollector extends BaseMetricsClient {\n  /**\n   * @param {Object} [config]\n   * @param {import('redis').RedisClient} config.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).\n   * @param {string} [config.appName] Application name (defaults per {@link BaseMetricsClient})\n   * @param {string} [config.dynoId] Dyno/instance ID\n   * @param {string} [config.processType] Label `process_type` on push (default from env / base)\n   * @param {boolean} [config.enabled] Enable collection and push\n   * @param {boolean} [config.logValues] Log metric JSON to console\n   * @param {string} [config.pushgatewayUrl] VM-agent import URL\n   * @param {string} [config.pushgatewaySecret] Basic auth secret (Base64)\n   * @param {number} [config.intervalSec] Push interval (seconds)\n   * @param {boolean} [config.removeOldMetrics] Clear old series on shutdown where supported\n   * @param {function} [config.startupValidation] Run before first push\n   * @param {boolean} [config.disablePushgateway] Skip POST to VM-agent\n   * @param {string} [config.redisProcessTypeForKeys] Segment in Redis keys for HTTP hashes (default `web`; env `METRICS_HTTP_REDIS_KEY_PROCESS_TYPE` overrides)\n   * @param {number} [config.ttlSec] Passed to {@link HttpMetricsRedisStore} (should match writers)\n   */\n  constructor(config = {}) {\n    const { redisClient } = config\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisCollector: redisClient is required')\n    }\n\n    super({\n      ...config,\n      blockNodeDefaultMetrics: true,\n    })\n\n    const keyProcessType =\n      config.redisProcessTypeForKeys ||\n      process.env.METRICS_HTTP_REDIS_KEY_PROCESS_TYPE ||\n      'web'\n\n    this.defaultLabelsWithoutDynoId = {\n      app: this.appName,\n      process_type: keyProcessType,\n    }\n\n    this._store = new HttpMetricsRedisStore({\n      redisClient,\n      appName: this.appName,\n      processType: keyProcessType,\n      ttlSec: config.ttlSec,\n    })\n\n    this.createCounter({\n      name: 'app_requests_total',\n      help: 'Total number of HTTP requests',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n      useLabelsWithoutDynoId: true,\n    })\n\n    this.createCounter({\n      name: 'app_requests_total_duration',\n      help: 'Total duration of HTTP requests in milliseconds',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n      useLabelsWithoutDynoId: true,\n    })\n  }\n\n  /**\n   * Drains Redis into counters, then runs gauge updates and VM-agent push ({@link BaseMetricsClient#_pushMetrics}).\n   * @returns {Promise<void>}\n   */\n  pushMetrics = async () => {\n    if (\n      this._store &&\n      this.countersFunctions?.app_requests_total &&\n      this.countersFunctions?.app_requests_total_duration\n    ) {\n      await this._store.flushToCounters(\n        (labels, value) =>\n          this.countersFunctions.app_requests_total(labels, value),\n        (labels, value) =>\n          this.countersFunctions.app_requests_total_duration(labels, value)\n      )\n    }\n    return this._pushMetrics()\n  }\n}\n\nmodule.exports = { HttpMetricsRedisCollector }\n"],"mappings":";;AAAA,MAAM;EAAEA;AAAkB,CAAC,GAAGC,OAAO,CAAC,qBAAqB,CAAC;AAC5D,MAAM;EAAEC;AAAsB,CAAC,GAAGD,OAAO,CAAC,yBAAyB,CAAC;;AAEpE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAME,yBAAyB,SAASH,iBAAiB,CAAC;EACxD;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEI,WAAWA,CAACC,MAAM,GAAG,CAAC,CAAC,EAAE;IACvB,MAAM;MAAEC;IAAY,CAAC,GAAGD,MAAM;IAC9B,IAAIC,WAAW,IAAI,IAAI,EAAE;MACvB,MAAM,IAAIC,KAAK,CAAC,oDAAoD,CAAC;IACvE;IAEA,KAAK,CAAC;MACJ,GAAGF,MAAM;MACTG,uBAAuB,EAAE;IAC3B,CAAC,CAAC;IAEF,MAAMC,cAAc,GAClBJ,MAAM,CAACK,uBAAuB,IAC9BC,OAAO,CAACC,GAAG,CAACC,mCAAmC,IAC/C,KAAK;IAEP,IAAI,CAACC,0BAA0B,GAAG;MAChCC,GAAG,EAAE,IAAI,CAACC,OAAO;MACjBC,YAAY,EAAER;IAChB,CAAC;IAED,IAAI,CAACS,MAAM,GAAG,IAAIhB,qBAAqB,CAAC;MACtCI,WAAW;MACXU,OAAO,EAAE,IAAI,CAACA,OAAO;MACrBG,WAAW,EAAEV,cAAc;MAC3BW,MAAM,EAAEf,MAAM,CAACe;IACjB,CAAC,CAAC;IAEF,IAAI,CAACC,aAAa,CAAC;MACjBC,IAAI,EAAE,oBAAoB;MAC1BC,IAAI,EAAE,+BAA+B;MACrCC,UAAU,EAAE,IAAI,CAACC,8BAA8B,CAAC,CAC9C,QAAQ,EACR,OAAO,EACP,OAAO,EACP,YAAY,EACZ,aAAa,CACd,CAAC;MACFC,sBAAsB,EAAE;IAC1B,CAAC,CAAC;IAEF,IAAI,CAACL,aAAa,CAAC;MACjBC,IAAI,EAAE,6BAA6B;MACnCC,IAAI,EAAE,iDAAiD;MACvDC,UAAU,EAAE,IAAI,CAACC,8BAA8B,CAAC,CAC9C,QAAQ,EACR,OAAO,EACP,OAAO,EACP,YAAY,EACZ,aAAa,CACd,CAAC;MACFC,sBAAsB,EAAE;IAC1B,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;EACEC,WAAW,GAAG,MAAAA,CAAA,KAAY;IACxB,IACE,IAAI,CAACT,MAAM,IACX,IAAI,CAACU,iBAAiB,EAAEC,kBAAkB,IAC1C,IAAI,CAACD,iBAAiB,EAAEE,2BAA2B,EACnD;MACA,MAAM,IAAI,CAACZ,MAAM,CAACa,eAAe,CAC/B,CAACC,MAAM,EAAEC,KAAK,KACZ,IAAI,CAACL,iBAAiB,CAACC,kBAAkB,CAACG,MAAM,EAAEC,KAAK,CAAC,EAC1D,CAACD,MAAM,EAAEC,KAAK,KACZ,IAAI,CAACL,iBAAiB,CAACE,2BAA2B,CAACE,MAAM,EAAEC,KAAK,CACpE,CAAC;IACH;IACA,OAAO,IAAI,CAACC,YAAY,CAAC,CAAC;EAC5B,CAAC;AACH;AAEAC,MAAM,CAACC,OAAO,GAAG;EAAEjC;AAA0B,CAAC","ignoreList":[]}
+{"version":3,"file":"httpMetricsRedisCollector.js","names":["cluster","require","BaseMetricsClient","HttpMetricsRedisStore","clusterWorkerTag","isWorker","worker","id","_","HttpMetricsRedisCollector","constructor","config","redisClient","Error","blockNodeDefaultMetrics","keyProcessType","redisProcessTypeForKeys","process","env","METRICS_HTTP_REDIS_KEY_PROCESS_TYPE","defaultLabelsWithoutDynoId","app","appName","process_type","_store","processType","ttlSec","createCounter","name","help","labelNames","withDefaultLabelsWithoutDynoId","useLabelsWithoutDynoId","pushMetrics","pid","clusterTag","console","warn","dynoId","countersFunctions","app_requests_total","app_requests_total_duration","flushToCounters","labels","value","out","_pushMetrics","module","exports"],"sources":["../../src/metrics/httpMetricsRedisCollector.js"],"sourcesContent":["const cluster = require('cluster')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\nconst { HttpMetricsRedisStore } = require('./httpMetricsRedisStore')\n\nfunction clusterWorkerTag() {\n  try {\n    if (cluster.isWorker && cluster.worker) {\n      return ` cluster_worker_id=${cluster.worker.id}`\n    }\n  } catch (_) {\n    /* ignore */\n  }\n  return ''\n}\n\n/**\n * Drain worker: reads HTTP aggregates from Redis (written by {@link HttpMetricsRedisRecorder}),\n * applies them to `app_requests_*` counters, then pushes the registry to the VM-agent (same as {@link BaseMetricsClient}).\n * Always passes `blockNodeDefaultMetrics: true` to the base client (HTTP-only registry; no default Node heap/event-loop metrics).\n * Redis key segment must match writers (`appName` + `processType` / {@link HttpMetricsRedisStore}).\n *\n * @extends BaseMetricsClient\n */\nclass HttpMetricsRedisCollector extends BaseMetricsClient {\n  /**\n   * @param {Object} [config]\n   * @param {import('redis').RedisClient} config.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).\n   * @param {string} [config.appName] Application name (defaults per {@link BaseMetricsClient})\n   * @param {string} [config.dynoId] Dyno/instance ID\n   * @param {string} [config.processType] Label `process_type` on push (default from env / base)\n   * @param {boolean} [config.enabled] Enable collection and push\n   * @param {boolean} [config.logValues] Log metric JSON to console\n   * @param {string} [config.pushgatewayUrl] VM-agent import URL\n   * @param {string} [config.pushgatewaySecret] Basic auth secret (Base64)\n   * @param {number} [config.intervalSec] Push interval (seconds)\n   * @param {boolean} [config.removeOldMetrics] Clear old series on shutdown where supported\n   * @param {function} [config.startupValidation] Run before first push\n   * @param {boolean} [config.disablePushgateway] Skip POST to VM-agent\n   * @param {string} [config.redisProcessTypeForKeys] Segment in Redis keys for HTTP hashes (default `web`; env `METRICS_HTTP_REDIS_KEY_PROCESS_TYPE` overrides)\n   * @param {number} [config.ttlSec] Passed to {@link HttpMetricsRedisStore} (should match writers)\n   */\n  constructor(config = {}) {\n    const { redisClient } = config\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisCollector: redisClient is required')\n    }\n\n    super({\n      ...config,\n      blockNodeDefaultMetrics: true,\n    })\n\n    const keyProcessType =\n      config.redisProcessTypeForKeys ||\n      process.env.METRICS_HTTP_REDIS_KEY_PROCESS_TYPE ||\n      'web'\n\n    this.defaultLabelsWithoutDynoId = {\n      app: this.appName,\n      process_type: keyProcessType,\n    }\n\n    this._store = new HttpMetricsRedisStore({\n      redisClient,\n      appName: this.appName,\n      processType: keyProcessType,\n      ttlSec: config.ttlSec,\n    })\n\n    this.createCounter({\n      name: 'app_requests_total',\n      help: 'Total number of HTTP requests',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n      useLabelsWithoutDynoId: true,\n    })\n\n    this.createCounter({\n      name: 'app_requests_total_duration',\n      help: 'Total duration of HTTP requests in milliseconds',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n      useLabelsWithoutDynoId: true,\n    })\n  }\n\n  /**\n   * Drains Redis into counters, then runs gauge updates and VM-agent push ({@link BaseMetricsClient#_pushMetrics}).\n   * @returns {Promise<void>}\n   */\n  pushMetrics = async () => {\n    const { pid } = process\n    const clusterTag = clusterWorkerTag()\n    // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---\n    console.warn(\n      `[TEMP_HTTP_METRICS_DIAG] http_metrics_publish_start pid=${pid}${clusterTag} dyno_id=${this.dynoId} process_type=${this.processType} app=${this.appName}`\n    )\n    // --- end TEMP_HTTP_METRICS_DIAG ---\n    if (\n      this._store &&\n      this.countersFunctions?.app_requests_total &&\n      this.countersFunctions?.app_requests_total_duration\n    ) {\n      await this._store.flushToCounters(\n        (labels, value) =>\n          this.countersFunctions.app_requests_total(labels, value),\n        (labels, value) =>\n          this.countersFunctions.app_requests_total_duration(labels, value)\n      )\n    }\n    const out = await this._pushMetrics()\n    // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---\n    console.warn(\n      `[TEMP_HTTP_METRICS_DIAG] http_metrics_publish_finished pid=${pid}${clusterTag} dyno_id=${this.dynoId} (registry POST to VM-agent / import completed for this tick)`\n    )\n    // --- end TEMP_HTTP_METRICS_DIAG ---\n    return out\n  }\n}\n\nmodule.exports = { HttpMetricsRedisCollector }\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/httpMetricsRedisRecorder.d.ts

@@ -21,9 +21,6 @@ export class HttpMetricsRedisRecorder {
     processType: string;
     appName: string;
     _store: HttpMetricsRedisStore;
-    _diagWindowStart: number;
-    _diagWindowCount: number;
-    _diagIntervalMs: number;
     /**
      * @param {Object} params
      * @param {string} params.method

package/lib/metrics/httpMetricsRedisRecorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisRecorder.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisRecorder.js"],"names":[],"mappings":"AAcA;;;;;GAKG;AACH;IACE;;;;;;OAMG;IACH;QAL6C,WAAW,EAA7C,OAAO,OAAO,EAAE,WAAW;QACd,OAAO,EAApB,MAAM;QACO,WAAW,EAAxB,MAAM;QACQ,MAAM;OAoB9B;IAdC,oBAA8B;IAC9B,gBAAsB;IACtB,8BAKE;IAGF,yBAAyB;IACzB,yBAAyB;IACzB,wBAA2B;IAI7B;;;;;;;;OAQG;IACH;QAP0B,MAAM,EAArB,MAAM;QACS,KAAK,EAApB,MAAM;QACS,WAAW,EAA1B,MAAM;QACU,KAAK;QACL,UAAU;QACX,QAAQ,EAAvB,MAAM;aAmChB;IAED;;;;;;;OAOG;IACH,kCAJW,OAAO,MAAM,EAAE,eAAe,OAC9B,OAAO,MAAM,EAAE,cAAc,0BAkCvC;CACF"}
+{"version":3,"file":"httpMetricsRedisRecorder.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisRecorder.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH;IACE;;;;;;OAMG;IACH;QAL6C,WAAW,EAA7C,OAAO,OAAO,EAAE,WAAW;QACd,OAAO,EAApB,MAAM;QACO,WAAW,EAAxB,MAAM;QACQ,MAAM;OAc9B;IARC,oBAA8B;IAC9B,gBAAsB;IACtB,8BAKE;IAGJ;;;;;;;;OAQG;IACH;QAP0B,MAAM,EAArB,MAAM;QACS,KAAK,EAApB,MAAM;QACS,WAAW,EAA1B,MAAM;QACU,KAAK;QACL,UAAU;QACX,QAAQ,EAAvB,MAAM;aAWhB;IAED;;;;;;;OAOG;IACH,kCAJW,OAAO,MAAM,EAAE,eAAe,OAC9B,OAAO,MAAM,EAAE,cAAc,0BAkCvC;CACF"}

package/lib/metrics/httpMetricsRedisRecorder.js

@@ -1,19 +1,8 @@
 "use strict";
 
-const cluster = require('cluster');
 const {
   HttpMetricsRedisStore
 } = require('./httpMetricsRedisStore');
-function clusterWorkerTag() {
-  try {
-    if (cluster.isWorker && cluster.worker) {
-      return ` cluster_worker_id=${cluster.worker.id}`;
-    }
-  } catch (_) {
-    /* ignore */
-  }
-  return '';
-}
 
 /**
  * Records HTTP request aggregates only to Redis (no in-process Prometheus counters on this path).
@@ -46,12 +35,6 @@ class HttpMetricsRedisRecorder {
       processType,
       ttlSec
     });
-
-    // --- TEMP_HTTP_METRICS_DIAG: remove this block when cluster / multi-web coverage is verified ---
-    this._diagWindowStart = 0;
-    this._diagWindowCount = 0;
-    this._diagIntervalMs = 5000;
-    // --- end TEMP_HTTP_METRICS_DIAG ---
   }
 
   /**
@@ -71,21 +54,6 @@ class HttpMetricsRedisRecorder {
     databaseId = '',
     duration
   }) {
-    // --- TEMP_HTTP_METRICS_DIAG: remove this block when cluster / multi-web coverage is verified ---
-    this._diagWindowCount += 1;
-    const now = Date.now();
-    if (!this._diagWindowStart) {
-      this._diagWindowStart = now;
-    }
-    if (now - this._diagWindowStart >= this._diagIntervalMs) {
-      const pidTag = `pid=${process.pid}`;
-      const clusterTag = clusterWorkerTag();
-      console.warn(`[TEMP_HTTP_METRICS_DIAG] http_record_source ${pidTag}${clusterTag} process_type=${this.processType} app=${this.appName} batch_count=${this._diagWindowCount} (before Redis write)`);
-      this._diagWindowStart = now;
-      this._diagWindowCount = 0;
-    }
-    // --- end TEMP_HTTP_METRICS_DIAG ---
-
     this._store.record(method, route, status_code, appId, databaseId, duration);
   }
 

package/lib/metrics/httpMetricsRedisRecorder.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisRecorder.js","names":["cluster","require","HttpMetricsRedisStore","clusterWorkerTag","isWorker","worker","id","_","HttpMetricsRedisRecorder","constructor","redisClient","appName","processType","ttlSec","Error","_store","_diagWindowStart","_diagWindowCount","_diagIntervalMs","trackHttpRequest","method","route","status_code","appId","databaseId","duration","now","Date","pidTag","process","pid","clusterTag","console","warn","record","trackHttpRequestMiddleware","req","res","next","start","on","path","params","body","query","datasourceId","statusCode","module","exports"],"sources":["../../src/metrics/httpMetricsRedisRecorder.js"],"sourcesContent":["const cluster = require('cluster')\nconst { HttpMetricsRedisStore } = require('./httpMetricsRedisStore')\n\nfunction clusterWorkerTag() {\n  try {\n    if (cluster.isWorker && cluster.worker) {\n      return ` cluster_worker_id=${cluster.worker.id}`\n    }\n  } catch (_) {\n    /* ignore */\n  }\n  return ''\n}\n\n/**\n * Records HTTP request aggregates only to Redis (no in-process Prometheus counters on this path).\n * Pair with {@link HttpMetricsRedisCollector} on a drain process to flush into counters and push to the VM-agent.\n *\n * @see HttpMetricsRedisStore\n */\nclass HttpMetricsRedisRecorder {\n  /**\n   * @param {Object} opts\n   * @param {import('redis').RedisClient} opts.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).\n   * @param {string} opts.appName Application name (must match collector; typically `BUILD_APP_NAME`).\n   * @param {string} opts.processType Logical process segment in Redis keys (e.g. `web`; must match collector’s key segment).\n   * @param {number} [opts.ttlSec] Redis hash key TTL in seconds (sliding; default 120).\n   */\n  constructor({ redisClient, appName, processType, ttlSec }) {\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisRecorder: redisClient is required')\n    }\n    this.processType = processType\n    this.appName = appName\n    this._store = new HttpMetricsRedisStore({\n      redisClient,\n      appName,\n      processType,\n      ttlSec,\n    })\n\n    // --- TEMP_HTTP_METRICS_DIAG: remove this block when cluster / multi-web coverage is verified ---\n    this._diagWindowStart = 0\n    this._diagWindowCount = 0\n    this._diagIntervalMs = 5000\n    // --- end TEMP_HTTP_METRICS_DIAG ---\n  }\n\n  /**\n   * @param {Object} params\n   * @param {string} params.method\n   * @param {string} params.route\n   * @param {number} params.status_code\n   * @param {string} [params.appId]\n   * @param {string} [params.databaseId]\n   * @param {number} params.duration\n   */\n  trackHttpRequest({\n    method,\n    route,\n    status_code,\n    appId = '',\n    databaseId = '',\n    duration,\n  }) {\n    // --- TEMP_HTTP_METRICS_DIAG: remove this block when cluster / multi-web coverage is verified ---\n    this._diagWindowCount += 1\n    const now = Date.now()\n    if (!this._diagWindowStart) {\n      this._diagWindowStart = now\n    }\n    if (now - this._diagWindowStart >= this._diagIntervalMs) {\n      const pidTag = `pid=${process.pid}`\n      const clusterTag = clusterWorkerTag()\n      console.warn(\n        `[TEMP_HTTP_METRICS_DIAG] http_record_source ${pidTag}${clusterTag} process_type=${this.processType} app=${this.appName} batch_count=${this._diagWindowCount} (before Redis write)`\n      )\n      this._diagWindowStart = now\n      this._diagWindowCount = 0\n    }\n    // --- end TEMP_HTTP_METRICS_DIAG ---\n\n    this._store.record(\n      method,\n      route,\n      status_code,\n      appId,\n      databaseId,\n      duration\n    )\n  }\n\n  /**\n   * Express middleware: appends a `finish` listener and writes one aggregate row per request to Redis.\n   * Does not check `METRICS_ENABLED`; the app should only mount this when HTTP Redis metrics should run.\n   *\n   * @param {import('http').IncomingMessage} req\n   * @param {import('http').ServerResponse} res\n   * @param {function} next\n   */\n  trackHttpRequestMiddleware = (req, res, next) => {\n    if (req.method === 'OPTIONS') {\n      next()\n      return\n    }\n\n    const start = Date.now()\n    res.on('finish', () => {\n      const route = req.route?.path || req.path || 'unknown'\n      const appId =\n        req.params?.appId || req.body?.appId || req.query?.appId || ''\n      const databaseId =\n        req.params?.databaseId ||\n        req.body?.databaseId ||\n        req.query?.databaseId ||\n        req.params?.datasourceId ||\n        req.body?.datasourceId ||\n        req.query?.datasourceId ||\n        ''\n\n      this.trackHttpRequest({\n        method: req.method,\n        route,\n        status_code: res.statusCode,\n        appId,\n        databaseId,\n        duration: Date.now() - start,\n      })\n    })\n\n    next()\n  }\n}\n\nmodule.exports = { HttpMetricsRedisRecorder }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"httpMetricsRedisRecorder.js","names":["HttpMetricsRedisStore","require","HttpMetricsRedisRecorder","constructor","redisClient","appName","processType","ttlSec","Error","_store","trackHttpRequest","method","route","status_code","appId","databaseId","duration","record","trackHttpRequestMiddleware","req","res","next","start","Date","now","on","path","params","body","query","datasourceId","statusCode","module","exports"],"sources":["../../src/metrics/httpMetricsRedisRecorder.js"],"sourcesContent":["const { HttpMetricsRedisStore } = require('./httpMetricsRedisStore')\n\n/**\n * Records HTTP request aggregates only to Redis (no in-process Prometheus counters on this path).\n * Pair with {@link HttpMetricsRedisCollector} on a drain process to flush into counters and push to the VM-agent.\n *\n * @see HttpMetricsRedisStore\n */\nclass HttpMetricsRedisRecorder {\n  /**\n   * @param {Object} opts\n   * @param {import('redis').RedisClient} opts.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).\n   * @param {string} opts.appName Application name (must match collector; typically `BUILD_APP_NAME`).\n   * @param {string} opts.processType Logical process segment in Redis keys (e.g. `web`; must match collector’s key segment).\n   * @param {number} [opts.ttlSec] Redis hash key TTL in seconds (sliding; default 120).\n   */\n  constructor({ redisClient, appName, processType, ttlSec }) {\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisRecorder: redisClient is required')\n    }\n    this.processType = processType\n    this.appName = appName\n    this._store = new HttpMetricsRedisStore({\n      redisClient,\n      appName,\n      processType,\n      ttlSec,\n    })\n  }\n\n  /**\n   * @param {Object} params\n   * @param {string} params.method\n   * @param {string} params.route\n   * @param {number} params.status_code\n   * @param {string} [params.appId]\n   * @param {string} [params.databaseId]\n   * @param {number} params.duration\n   */\n  trackHttpRequest({\n    method,\n    route,\n    status_code,\n    appId = '',\n    databaseId = '',\n    duration,\n  }) {\n    this._store.record(method, route, status_code, appId, databaseId, duration)\n  }\n\n  /**\n   * Express middleware: appends a `finish` listener and writes one aggregate row per request to Redis.\n   * Does not check `METRICS_ENABLED`; the app should only mount this when HTTP Redis metrics should run.\n   *\n   * @param {import('http').IncomingMessage} req\n   * @param {import('http').ServerResponse} res\n   * @param {function} next\n   */\n  trackHttpRequestMiddleware = (req, res, next) => {\n    if (req.method === 'OPTIONS') {\n      next()\n      return\n    }\n\n    const start = Date.now()\n    res.on('finish', () => {\n      const route = req.route?.path || req.path || 'unknown'\n      const appId =\n        req.params?.appId || req.body?.appId || req.query?.appId || ''\n      const databaseId =\n        req.params?.databaseId ||\n        req.body?.databaseId ||\n        req.query?.databaseId ||\n        req.params?.datasourceId ||\n        req.body?.datasourceId ||\n        req.query?.datasourceId ||\n        ''\n\n      this.trackHttpRequest({\n        method: req.method,\n        route,\n        status_code: res.statusCode,\n        appId,\n        databaseId,\n        duration: Date.now() - start,\n      })\n    })\n\n    next()\n  }\n}\n\nmodule.exports = { HttpMetricsRedisRecorder }\n"],"mappings":";;AAAA,MAAM;EAAEA;AAAsB,CAAC,GAAGC,OAAO,CAAC,yBAAyB,CAAC;;AAEpE;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,wBAAwB,CAAC;EAC7B;AACF;AACA;AACA;AACA;AACA;AACA;EACEC,WAAWA,CAAC;IAAEC,WAAW;IAAEC,OAAO;IAAEC,WAAW;IAAEC;EAAO,CAAC,EAAE;IACzD,IAAIH,WAAW,IAAI,IAAI,EAAE;MACvB,MAAM,IAAII,KAAK,CAAC,mDAAmD,CAAC;IACtE;IACA,IAAI,CAACF,WAAW,GAAGA,WAAW;IAC9B,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACI,MAAM,GAAG,IAAIT,qBAAqB,CAAC;MACtCI,WAAW;MACXC,OAAO;MACPC,WAAW;MACXC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,gBAAgBA,CAAC;IACfC,MAAM;IACNC,KAAK;IACLC,WAAW;IACXC,KAAK,GAAG,EAAE;IACVC,UAAU,GAAG,EAAE;IACfC;EACF,CAAC,EAAE;IACD,IAAI,CAACP,MAAM,CAACQ,MAAM,CAACN,MAAM,EAAEC,KAAK,EAAEC,WAAW,EAAEC,KAAK,EAAEC,UAAU,EAAEC,QAAQ,CAAC;EAC7E;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,0BAA0B,GAAGA,CAACC,GAAG,EAAEC,GAAG,EAAEC,IAAI,KAAK;IAC/C,IAAIF,GAAG,CAACR,MAAM,KAAK,SAAS,EAAE;MAC5BU,IAAI,CAAC,CAAC;MACN;IACF;IAEA,MAAMC,KAAK,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IACxBJ,GAAG,CAACK,EAAE,CAAC,QAAQ,EAAE,MAAM;MACrB,MAAMb,KAAK,GAAGO,GAAG,CAACP,KAAK,EAAEc,IAAI,IAAIP,GAAG,CAACO,IAAI,IAAI,SAAS;MACtD,MAAMZ,KAAK,GACTK,GAAG,CAACQ,MAAM,EAAEb,KAAK,IAAIK,GAAG,CAACS,IAAI,EAAEd,KAAK,IAAIK,GAAG,CAACU,KAAK,EAAEf,KAAK,IAAI,EAAE;MAChE,MAAMC,UAAU,GACdI,GAAG,CAACQ,MAAM,EAAEZ,UAAU,IACtBI,GAAG,CAACS,IAAI,EAAEb,UAAU,IACpBI,GAAG,CAACU,KAAK,EAAEd,UAAU,IACrBI,GAAG,CAACQ,MAAM,EAAEG,YAAY,IACxBX,GAAG,CAACS,IAAI,EAAEE,YAAY,IACtBX,GAAG,CAACU,KAAK,EAAEC,YAAY,IACvB,EAAE;MAEJ,IAAI,CAACpB,gBAAgB,CAAC;QACpBC,MAAM,EAAEQ,GAAG,CAACR,MAAM;QAClBC,KAAK;QACLC,WAAW,EAAEO,GAAG,CAACW,UAAU;QAC3BjB,KAAK;QACLC,UAAU;QACVC,QAAQ,EAAEO,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGF;MACzB,CAAC,CAAC;IACJ,CAAC,CAAC;IAEFD,IAAI,CAAC,CAAC;EACR,CAAC;AACH;AAEAW,MAAM,CAACC,OAAO,GAAG;EAAE/B;AAAyB,CAAC","ignoreList":[]}

package/lib/metrics/httpMetricsRedisStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisStore.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisStore.js"],"names":[],"mappings":"AAwDA;;;GAGG;AACH;IACE;;;;;;OAMG;IACH;QAL6C,WAAW,EAA7C,OAAO,OAAO,EAAE,WAAW;QACd,OAAO,EAApB,MAAM;QACO,WAAW,EAAxB,MAAM;QACQ,MAAM;OAe9B;IATC,qCAA0B;IAC1B,eAGwC;IAExC,iBAAiD;IACjD,eAA6C;IAC7C,gBAAqD;IAGvD;;;OAGG;IACH,sBAEC;IAED;;;;;;;OAOG;IACH,eAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,cACN,MAAM,QAqBhB;IAED;;;;OAIG;IACH,qCAJoB,MAAM,SAAS,MAAM,KAAK,IAAI,0BAC9B,MAAM,SAAS,MAAM,KAAK,IAAI,GACrC,QAAQ,OAAO,CAAC,CAsE5B;CACF;AAjKD;;;;;;;GAOG;AACH,sCAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,GACJ,MAAM,CAIlB;AA3CD;;;GAGG;AACH,wBAFU,MAAM,CAEQ;AAiBxB;;GAEG;AACH,wCAFa,OAAO,CASnB;AAzBD;;;GAGG;AACH,iDAFU,MAAM,CAE8B"}
+{"version":3,"file":"httpMetricsRedisStore.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisStore.js"],"names":[],"mappings":"AA6DA;;;GAGG;AACH;IACE;;;;;;OAMG;IACH;QAL6C,WAAW,EAA7C,OAAO,OAAO,EAAE,WAAW;QACd,OAAO,EAApB,MAAM;QACO,WAAW,EAAxB,MAAM;QACQ,MAAM;OAiB9B;IAXC,qCAA0B;IAC1B,eAGwC;IAIxC,iBAAiD;IACjD,eAA6C;IAC7C,gBAAqD;IAGvD;;;OAGG;IACH,sBAEC;IAED;;;;;;;OAOG;IACH,eAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,cACN,MAAM,QAyBhB;IAED;;;;OAIG;IACH,qCAJoB,MAAM,SAAS,MAAM,KAAK,IAAI,0BAC9B,MAAM,SAAS,MAAM,KAAK,IAAI,GACrC,QAAQ,OAAO,CAAC,CAkG5B;CACF;AAxMD;;;;;;;GAOG;AACH,sCAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,GACJ,MAAM,CAIlB;AA3CD;;;GAGG;AACH,wBAFU,MAAM,CAEQ;AAiBxB;;GAEG;AACH,wCAFa,OAAO,CASnB;AAzBD;;;GAGG;AACH,iDAFU,MAAM,CAE8B"}

package/lib/metrics/httpMetricsRedisStore.js

@@ -54,6 +54,11 @@ function hgetallPairsToObject(pairs) {
   return o;
 }
 
+/** --- TEMP_HTTP_METRICS_DIAG: delete this helper and all calls when done debugging --- */
+function tempHttpDiagLog(message) {
+  console.warn(`[TEMP_HTTP_METRICS_DIAG] ${message}`);
+}
+
 /**
  * Redis HTTP aggregate store. Uses an **injected** client (same pattern as {@link RedisMetricsClient}).
  * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`, `set`, `del`.
@@ -107,7 +112,9 @@ class HttpMetricsRedisStore {
       client.multi().hincrby(this.countKey, field, 1).hincrby(this.durKey, field, dur).expire(this.countKey, this.ttlSec).expire(this.durKey, this.ttlSec).exec(err => {
         if (err) {
           console.error('[HttpMetricsRedisStore] record failed:', err.message);
+          return;
         }
+        tempHttpDiagLog(`http_redis_write_sent pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} sample=${method} ${route} ${statusCode}`);
       });
     } catch (e) {
       console.error('[HttpMetricsRedisStore] record:', e.message);
@@ -130,26 +137,32 @@ class HttpMetricsRedisStore {
     return new Promise(resolve => {
       client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {
         if (setErr || ok !== 'OK') {
+          tempHttpDiagLog(`http_redis_drain_skipped pid=${process.pid} lockKey=${this.lockKey} reason=${setErr ? setErr.message : 'lock_not_acquired'}`);
           resolve(false);
           return;
         }
+        tempHttpDiagLog(`http_redis_drain_request pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} (EVAL HGETALL+DEL)`);
         client.eval(DRAIN_LUA, 2, this.countKey, this.durKey, (evalErr, raw) => {
           const finish = () => {
             client.del(this.lockKey, () => resolve(true));
           };
           if (evalErr) {
             console.error('[HttpMetricsRedisStore] drain failed:', evalErr.message);
+            tempHttpDiagLog(`http_redis_drain_got_error pid=${process.pid} message=${evalErr.message}`);
             finish();
             return;
           }
           try {
             if (!raw || !Array.isArray(raw) || raw.length < 2) {
+              tempHttpDiagLog(`http_redis_drain_got pid=${process.pid} distinct_fields=0 total_units=0 (empty raw)`);
               finish();
               return;
             }
             const counts = hgetallPairsToObject(raw[0]);
             const durs = hgetallPairsToObject(raw[1]);
-            for (const field of Object.keys(counts)) {
+            const fieldKeys = Object.keys(counts);
+            let totalUnits = 0;
+            for (const field of fieldKeys) {
               const count = parseInt(counts[field], 10);
               if (!count || count < 1) {
                 continue;
@@ -159,6 +172,7 @@ class HttpMetricsRedisStore {
               if (parts.length !== 5) {
                 continue;
               }
+              totalUnits += count;
               const [m, route, statusStr, aid, did] = parts;
               const labels = {
                 method: m,
@@ -172,8 +186,11 @@ class HttpMetricsRedisStore {
                 applyDuration(labels, dur);
               }
             }
+            const sampleFields = fieldKeys.slice(0, 3).join(' | ');
+            tempHttpDiagLog(`http_redis_drain_got pid=${process.pid} distinct_fields=${fieldKeys.length} total_request_units=${totalUnits} sample_fields=${sampleFields || '(none)'}`);
           } catch (e) {
             console.error('[HttpMetricsRedisStore] flush apply failed:', e.message);
+            tempHttpDiagLog(`http_redis_drain_apply_failed pid=${process.pid} ${e.message}`);
           }
           finish();
         });

package/lib/metrics/httpMetricsRedisStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisStore.js","names":["FIELD_SEP","DEFAULT_HTTP_METRICS_REDIS_TTL_SEC","DRAIN_LUA","isRedisPeerInstalled","require","resolve","buildFieldKey","method","route","statusCode","appId","databaseId","String","join","hgetallPairsToObject","pairs","o","length","i","HttpMetricsRedisStore","constructor","redisClient","appName","processType","ttlSec","Error","_client","keySeg","encodeURIComponent","countKey","durKey","lockKey","_ensureClient","record","durationMs","client","field","dur","Math","max","round","Number","multi","hincrby","expire","exec","err","console","error","message","e","flushToCounters","applyCount","applyDuration","Promise","set","setErr","ok","eval","evalErr","raw","finish","del","Array","isArray","counts","durs","Object","keys","count","parseInt","parts","split","m","statusStr","aid","did","labels","status_code","module","exports"],"sources":["../../src/metrics/httpMetricsRedisStore.js"],"sourcesContent":["/**\n * Record separator for hash fields (avoids collisions when route contains \"|\").\n * @type {string}\n */\nconst FIELD_SEP = '\\x1e'\n\n/**\n * Default Redis key TTL in seconds (sliding: refreshed on each `record` write).\n * @type {number}\n */\nconst DEFAULT_HTTP_METRICS_REDIS_TTL_SEC = 120\n\nconst DRAIN_LUA = `\nlocal function drain(key)\n  local v = redis.call('HGETALL', key)\n  redis.call('DEL', key)\n  return v\nend\nreturn {drain(KEYS[1]), drain(KEYS[2])}\n`\n\n/**\n * @returns {boolean} Whether the `redis` npm package is resolvable (optional peer).\n */\nfunction isRedisPeerInstalled() {\n  try {\n    require.resolve('redis')\n    return true\n  } catch {\n    return false\n  }\n}\n\n/**\n * @param {string} method\n * @param {string} route\n * @param {number} statusCode\n * @param {string} appId\n * @param {string} databaseId\n * @returns {string}\n */\nfunction buildFieldKey(method, route, statusCode, appId, databaseId) {\n  return [method, route, String(statusCode), appId, databaseId].join(FIELD_SEP)\n}\n\nfunction hgetallPairsToObject(pairs) {\n  const o = {}\n  if (!pairs || !pairs.length) {\n    return o\n  }\n  for (let i = 0; i < pairs.length; i += 2) {\n    o[pairs[i]] = pairs[i + 1]\n  }\n  return o\n}\n\n/**\n * Redis HTTP aggregate store. Uses an **injected** client (same pattern as {@link RedisMetricsClient}).\n * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`, `set`, `del`.\n */\nclass HttpMetricsRedisStore {\n  /**\n   * @param {Object} opts\n   * @param {import('redis').RedisClient} opts.redisClient\n   * @param {string} opts.appName BUILD_APP_NAME (key segment)\n   * @param {string} opts.processType logical process for key (e.g. web)\n   * @param {number} [opts.ttlSec] Expire keys after this many seconds (default 120)\n   */\n  constructor({ redisClient, appName, processType, ttlSec }) {\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisStore: redisClient is required')\n    }\n    this._client = redisClient\n    this.ttlSec =\n      typeof ttlSec === 'number' && ttlSec > 0\n        ? ttlSec\n        : DEFAULT_HTTP_METRICS_REDIS_TTL_SEC\n    const keySeg = `${encodeURIComponent(appName)}:${encodeURIComponent(processType)}`\n    this.countKey = `metrics:http:v2:${keySeg}:count`\n    this.durKey = `metrics:http:v2:${keySeg}:dur`\n    this.lockKey = `metrics:http:v2:${keySeg}:drain_lock`\n  }\n\n  /**\n   * @returns {import('redis').RedisClient}\n   * @private\n   */\n  _ensureClient() {\n    return this._client\n  }\n\n  /**\n   * @param {string} method\n   * @param {string} route\n   * @param {number} statusCode\n   * @param {string} appId\n   * @param {string} databaseId\n   * @param {number} durationMs\n   */\n  record(method, route, statusCode, appId, databaseId, durationMs) {\n    try {\n      const client = this._ensureClient()\n      const field = buildFieldKey(method, route, statusCode, appId, databaseId)\n      const dur = Math.max(0, Math.round(Number(durationMs) || 0))\n      client\n        .multi()\n        .hincrby(this.countKey, field, 1)\n        .hincrby(this.durKey, field, dur)\n        .expire(this.countKey, this.ttlSec)\n        .expire(this.durKey, this.ttlSec)\n        .exec(err => {\n          if (err) {\n            console.error('[HttpMetricsRedisStore] record failed:', err.message)\n          }\n        })\n    } catch (e) {\n      console.error('[HttpMetricsRedisStore] record:', e.message)\n    }\n  }\n\n  /**\n   * @param {(labels: Object, value: number) => void} applyCount\n   * @param {(labels: Object, value: number) => void} applyDuration\n   * @returns {Promise<boolean>}\n   */\n  flushToCounters(applyCount, applyDuration) {\n    let client\n    try {\n      client = this._ensureClient()\n    } catch (e) {\n      console.error('[HttpMetricsRedisStore] flush:', e.message)\n      return Promise.resolve(false)\n    }\n    return new Promise(resolve => {\n      client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {\n        if (setErr || ok !== 'OK') {\n          resolve(false)\n          return\n        }\n        client.eval(\n          DRAIN_LUA,\n          2,\n          this.countKey,\n          this.durKey,\n          (evalErr, raw) => {\n            const finish = () => {\n              client.del(this.lockKey, () => resolve(true))\n            }\n\n            if (evalErr) {\n              console.error('[HttpMetricsRedisStore] drain failed:', evalErr.message)\n              finish()\n              return\n            }\n\n            try {\n              if (!raw || !Array.isArray(raw) || raw.length < 2) {\n                finish()\n                return\n              }\n              const counts = hgetallPairsToObject(raw[0])\n              const durs = hgetallPairsToObject(raw[1])\n              for (const field of Object.keys(counts)) {\n                const count = parseInt(counts[field], 10)\n                if (!count || count < 1) {\n                  continue\n                }\n                const dur = parseInt(durs[field] || '0', 10) || 0\n                const parts = field.split(FIELD_SEP)\n                if (parts.length !== 5) {\n                  continue\n                }\n                const [m, route, statusStr, aid, did] = parts\n                const labels = {\n                  method: m,\n                  route,\n                  status_code: statusStr,\n                  appId: aid,\n                  databaseId: did,\n                }\n                applyCount(labels, count)\n                if (dur > 0) {\n                  applyDuration(labels, dur)\n                }\n              }\n            } catch (e) {\n              console.error('[HttpMetricsRedisStore] flush apply failed:', e.message)\n            }\n            finish()\n          }\n        )\n      })\n    })\n  }\n}\n\nmodule.exports = {\n  HttpMetricsRedisStore,\n  buildFieldKey,\n  FIELD_SEP,\n  isRedisPeerInstalled,\n  DEFAULT_HTTP_METRICS_REDIS_TTL_SEC,\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"httpMetricsRedisStore.js","names":["FIELD_SEP","DEFAULT_HTTP_METRICS_REDIS_TTL_SEC","DRAIN_LUA","isRedisPeerInstalled","require","resolve","buildFieldKey","method","route","statusCode","appId","databaseId","String","join","hgetallPairsToObject","pairs","o","length","i","tempHttpDiagLog","message","console","warn","HttpMetricsRedisStore","constructor","redisClient","appName","processType","ttlSec","Error","_client","keySeg","encodeURIComponent","countKey","durKey","lockKey","_ensureClient","record","durationMs","client","field","dur","Math","max","round","Number","multi","hincrby","expire","exec","err","error","process","pid","e","flushToCounters","applyCount","applyDuration","Promise","set","setErr","ok","eval","evalErr","raw","finish","del","Array","isArray","counts","durs","fieldKeys","Object","keys","totalUnits","count","parseInt","parts","split","m","statusStr","aid","did","labels","status_code","sampleFields","slice","module","exports"],"sources":["../../src/metrics/httpMetricsRedisStore.js"],"sourcesContent":["/**\n * Record separator for hash fields (avoids collisions when route contains \"|\").\n * @type {string}\n */\nconst FIELD_SEP = '\\x1e'\n\n/**\n * Default Redis key TTL in seconds (sliding: refreshed on each `record` write).\n * @type {number}\n */\nconst DEFAULT_HTTP_METRICS_REDIS_TTL_SEC = 120\n\nconst DRAIN_LUA = `\nlocal function drain(key)\n  local v = redis.call('HGETALL', key)\n  redis.call('DEL', key)\n  return v\nend\nreturn {drain(KEYS[1]), drain(KEYS[2])}\n`\n\n/**\n * @returns {boolean} Whether the `redis` npm package is resolvable (optional peer).\n */\nfunction isRedisPeerInstalled() {\n  try {\n    require.resolve('redis')\n    return true\n  } catch {\n    return false\n  }\n}\n\n/**\n * @param {string} method\n * @param {string} route\n * @param {number} statusCode\n * @param {string} appId\n * @param {string} databaseId\n * @returns {string}\n */\nfunction buildFieldKey(method, route, statusCode, appId, databaseId) {\n  return [method, route, String(statusCode), appId, databaseId].join(FIELD_SEP)\n}\n\nfunction hgetallPairsToObject(pairs) {\n  const o = {}\n  if (!pairs || !pairs.length) {\n    return o\n  }\n  for (let i = 0; i < pairs.length; i += 2) {\n    o[pairs[i]] = pairs[i + 1]\n  }\n  return o\n}\n\n/** --- TEMP_HTTP_METRICS_DIAG: delete this helper and all calls when done debugging --- */\nfunction tempHttpDiagLog(message) {\n  console.warn(`[TEMP_HTTP_METRICS_DIAG] ${message}`)\n}\n\n/**\n * Redis HTTP aggregate store. Uses an **injected** client (same pattern as {@link RedisMetricsClient}).\n * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`, `set`, `del`.\n */\nclass HttpMetricsRedisStore {\n  /**\n   * @param {Object} opts\n   * @param {import('redis').RedisClient} opts.redisClient\n   * @param {string} opts.appName BUILD_APP_NAME (key segment)\n   * @param {string} opts.processType logical process for key (e.g. web)\n   * @param {number} [opts.ttlSec] Expire keys after this many seconds (default 120)\n   */\n  constructor({ redisClient, appName, processType, ttlSec }) {\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisStore: redisClient is required')\n    }\n    this._client = redisClient\n    this.ttlSec =\n      typeof ttlSec === 'number' && ttlSec > 0\n        ? ttlSec\n        : DEFAULT_HTTP_METRICS_REDIS_TTL_SEC\n    const keySeg = `${encodeURIComponent(appName)}:${encodeURIComponent(\n      processType\n    )}`\n    this.countKey = `metrics:http:v2:${keySeg}:count`\n    this.durKey = `metrics:http:v2:${keySeg}:dur`\n    this.lockKey = `metrics:http:v2:${keySeg}:drain_lock`\n  }\n\n  /**\n   * @returns {import('redis').RedisClient}\n   * @private\n   */\n  _ensureClient() {\n    return this._client\n  }\n\n  /**\n   * @param {string} method\n   * @param {string} route\n   * @param {number} statusCode\n   * @param {string} appId\n   * @param {string} databaseId\n   * @param {number} durationMs\n   */\n  record(method, route, statusCode, appId, databaseId, durationMs) {\n    try {\n      const client = this._ensureClient()\n      const field = buildFieldKey(method, route, statusCode, appId, databaseId)\n      const dur = Math.max(0, Math.round(Number(durationMs) || 0))\n      client\n        .multi()\n        .hincrby(this.countKey, field, 1)\n        .hincrby(this.durKey, field, dur)\n        .expire(this.countKey, this.ttlSec)\n        .expire(this.durKey, this.ttlSec)\n        .exec(err => {\n          if (err) {\n            console.error('[HttpMetricsRedisStore] record failed:', err.message)\n            return\n          }\n          tempHttpDiagLog(\n            `http_redis_write_sent pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} sample=${method} ${route} ${statusCode}`\n          )\n        })\n    } catch (e) {\n      console.error('[HttpMetricsRedisStore] record:', e.message)\n    }\n  }\n\n  /**\n   * @param {(labels: Object, value: number) => void} applyCount\n   * @param {(labels: Object, value: number) => void} applyDuration\n   * @returns {Promise<boolean>}\n   */\n  flushToCounters(applyCount, applyDuration) {\n    let client\n    try {\n      client = this._ensureClient()\n    } catch (e) {\n      console.error('[HttpMetricsRedisStore] flush:', e.message)\n      return Promise.resolve(false)\n    }\n    return new Promise(resolve => {\n      client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {\n        if (setErr || ok !== 'OK') {\n          tempHttpDiagLog(\n            `http_redis_drain_skipped pid=${process.pid} lockKey=${this.lockKey} reason=${setErr ? setErr.message : 'lock_not_acquired'}`\n          )\n          resolve(false)\n          return\n        }\n        tempHttpDiagLog(\n          `http_redis_drain_request pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} (EVAL HGETALL+DEL)`\n        )\n        client.eval(\n          DRAIN_LUA,\n          2,\n          this.countKey,\n          this.durKey,\n          (evalErr, raw) => {\n            const finish = () => {\n              client.del(this.lockKey, () => resolve(true))\n            }\n\n            if (evalErr) {\n              console.error(\n                '[HttpMetricsRedisStore] drain failed:',\n                evalErr.message\n              )\n              tempHttpDiagLog(\n                `http_redis_drain_got_error pid=${process.pid} message=${evalErr.message}`\n              )\n              finish()\n              return\n            }\n\n            try {\n              if (!raw || !Array.isArray(raw) || raw.length < 2) {\n                tempHttpDiagLog(\n                  `http_redis_drain_got pid=${process.pid} distinct_fields=0 total_units=0 (empty raw)`\n                )\n                finish()\n                return\n              }\n              const counts = hgetallPairsToObject(raw[0])\n              const durs = hgetallPairsToObject(raw[1])\n              const fieldKeys = Object.keys(counts)\n              let totalUnits = 0\n              for (const field of fieldKeys) {\n                const count = parseInt(counts[field], 10)\n                if (!count || count < 1) {\n                  continue\n                }\n                const dur = parseInt(durs[field] || '0', 10) || 0\n                const parts = field.split(FIELD_SEP)\n                if (parts.length !== 5) {\n                  continue\n                }\n                totalUnits += count\n                const [m, route, statusStr, aid, did] = parts\n                const labels = {\n                  method: m,\n                  route,\n                  status_code: statusStr,\n                  appId: aid,\n                  databaseId: did,\n                }\n                applyCount(labels, count)\n                if (dur > 0) {\n                  applyDuration(labels, dur)\n                }\n              }\n              const sampleFields = fieldKeys.slice(0, 3).join(' | ')\n              tempHttpDiagLog(\n                `http_redis_drain_got pid=${process.pid} distinct_fields=${fieldKeys.length} total_request_units=${totalUnits} sample_fields=${sampleFields || '(none)'}`\n              )\n            } catch (e) {\n              console.error(\n                '[HttpMetricsRedisStore] flush apply failed:',\n                e.message\n              )\n              tempHttpDiagLog(\n                `http_redis_drain_apply_failed pid=${process.pid} ${e.message}`\n              )\n            }\n            finish()\n          }\n        )\n      })\n    })\n  }\n}\n\nmodule.exports = {\n  HttpMetricsRedisStore,\n  buildFieldKey,\n  FIELD_SEP,\n  isRedisPeerInstalled,\n  DEFAULT_HTTP_METRICS_REDIS_TTL_SEC,\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/metricsDatabaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsDatabaseClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;QAf2B,WAAW,EAA3B,MAAM;QACU,YAAY,EAA5B,MAAM;QAC2B,wBAAwB;;;QACxC,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAoF9C;IAtBC,qBAAuB;IAUvB,mDAAmD;IACnD,8DAQE;IAKJ,yCAKC;IAED;;;OAGG;IACH,gCAHW,IAAI,KACF,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CA4BrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}
+{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsDatabaseClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;QAf2B,WAAW,EAA3B,MAAM;QACU,YAAY,EAA5B,MAAM;QAC2B,wBAAwB;;;QACxC,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAwF9C;IAtBC,qBAAuB;IAUvB,mDAAmD;IACnD,8DAQE;IAKJ,yCAKC;IAED;;;OAGG;IACH,gCAHW,IAAI,KACF,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CA4BrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}

package/lib/metrics/metricsDatabaseClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","BaseMetricsClient","exitUnlessMetricsProcessType","DatabaseMetricsClient","constructor","databaseUrl","databaseName","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","tmpAppName","appName","BUILD_APP_NAME","mainDbName","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","dbKey","url","Object","entries","p","processType","databasePools","_addPool","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabelsWithoutDynoId","_setCleanupHandlers","pool","push","getDBConnectionsAndName","currentRes","current","rows","maxRes","max","dbName","options","database","URL","pathname","replace","collectDatabaseMetrics","set","defaultLabelsWithoutDynoId","database_name","max_connections","String","db_key","warn","pushDatabaseMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../../src/metrics/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\nconst { exitUnlessMetricsProcessType } = require('./metricsProcessTypeUtils')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass DatabaseMetricsClient extends BaseMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string} options.databaseName - Main database name for metrics\n   * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value\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\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {function} [options.startupValidation] - Function to validate startup\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({\n    databaseUrl,\n    databaseName,\n    additional_database_urls = {},\n    ...metricsConfig\n  } = {}) {\n    exitUnlessMetricsProcessType(metricsConfig, 'database-metrics', 'database-metrics')\n\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const tmpAppName =\n      metricsConfig.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    const mainDbName = databaseName || `${tmpAppName}_db`\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK: ${mainDbName}`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${dbKey}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${dbKey}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this._addPool(databaseUrl, mainDbName)\n    }\n\n    for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n      this._addPool(url, dbKey)\n    }\n\n    /** Gauge for Database connections (no dyno_id). */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'max_connections',\n        'database_name',\n        'db_key',\n      ]),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  _addPool = (url, dbKey) => {\n    const pool = new Pool({ connectionString: url })\n    pool.dbKey = dbKey\n    this.databasePools.push(pool)\n    return pool\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      let dbName = pool.options?.database\n      if (!dbName && pool.options?.connectionString) {\n        try {\n          const url = new URL(pool.options.connectionString)\n          dbName = url.pathname.replace(/^\\//, '')\n        } catch {\n          dbName = pool.options.connectionString\n        }\n      }\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.defaultLabelsWithoutDynoId,\n            database_name: pool.dbKey,\n            max_connections: String(max),\n            db_key: dbName,\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB 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.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\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 = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","BaseMetricsClient","exitUnlessMetricsProcessType","DatabaseMetricsClient","constructor","databaseUrl","databaseName","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","tmpAppName","appName","BUILD_APP_NAME","mainDbName","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","dbKey","url","Object","entries","p","processType","databasePools","_addPool","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabelsWithoutDynoId","_setCleanupHandlers","pool","push","getDBConnectionsAndName","currentRes","current","rows","maxRes","max","dbName","options","database","URL","pathname","replace","collectDatabaseMetrics","set","defaultLabelsWithoutDynoId","database_name","max_connections","String","db_key","warn","pushDatabaseMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../../src/metrics/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\nconst { exitUnlessMetricsProcessType } = require('./metricsProcessTypeUtils')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass DatabaseMetricsClient extends BaseMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string} options.databaseName - Main database name for metrics\n   * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value\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\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {function} [options.startupValidation] - Function to validate startup\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({\n    databaseUrl,\n    databaseName,\n    additional_database_urls = {},\n    ...metricsConfig\n  } = {}) {\n    exitUnlessMetricsProcessType(\n      metricsConfig,\n      'database-metrics',\n      'database-metrics'\n    )\n\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const tmpAppName =\n      metricsConfig.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    const mainDbName = databaseName || `${tmpAppName}_db`\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK: ${mainDbName}`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${dbKey}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${dbKey}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this._addPool(databaseUrl, mainDbName)\n    }\n\n    for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n      this._addPool(url, dbKey)\n    }\n\n    /** Gauge for Database connections (no dyno_id). */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'max_connections',\n        'database_name',\n        'db_key',\n      ]),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  _addPool = (url, dbKey) => {\n    const pool = new Pool({ connectionString: url })\n    pool.dbKey = dbKey\n    this.databasePools.push(pool)\n    return pool\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      let dbName = pool.options?.database\n      if (!dbName && pool.options?.connectionString) {\n        try {\n          const url = new URL(pool.options.connectionString)\n          dbName = url.pathname.replace(/^\\//, '')\n        } catch {\n          dbName = pool.options.connectionString\n        }\n      }\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.defaultLabelsWithoutDynoId,\n            database_name: pool.dbKey,\n            max_connections: String(max),\n            db_key: dbName,\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB 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.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\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 = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/metricsProcessTypeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsProcessTypeUtils.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsProcessTypeUtils.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,yDAJW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sBACxB,MAAM,GACJ,MAAM,CAQlB;AAED;;;;;;;;GAQG;AACH,4DALW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sBACxB,MAAM,WACN,MAAM,GAAG,MAAM,EAAE,GACf,IAAI,CAQhB"}
+{"version":3,"file":"metricsProcessTypeUtils.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsProcessTypeUtils.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,yDAJW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sBACxB,MAAM,GACJ,MAAM,CAQlB;AAED;;;;;;;;GAQG;AACH,4DALW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sBACxB,MAAM,WACN,MAAM,GAAG,MAAM,EAAE,GACf,IAAI,CAYhB"}

package/lib/metrics/metricsProcessTypeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsProcessTypeUtils.js","names":["resolveMetricsProcessType","metricsConfig","defaultProcessType","processType","process","env","BUILD_DYNO_PROCESS_TYPE","exitUnlessMetricsProcessType","allowed","resolved","list","Array","isArray","includes","exit","module","exports"],"sources":["../../src/metrics/metricsProcessTypeUtils.js"],"sourcesContent":["/**\n * Helpers for resolving `processType` and silently exiting when a specialized metrics client\n * is constructed on the wrong dyno / process (no log output).\n *\n * @module metrics/metricsProcessTypeUtils\n */\n\n/**\n * Resolve logical process type the same way specialized metrics clients do.\n *\n * @param {{ processType?: string }} metricsConfig - Remainder of constructor options (e.g. after destructuring `redisClient`, `databaseUrl`, …)\n * @param {string} defaultProcessType - Fallback when config and env are unset\n * @returns {string}\n */\nfunction resolveMetricsProcessType(metricsConfig, defaultProcessType) {\n  return (\n    metricsConfig.processType ||\n    process.env.BUILD_DYNO_PROCESS_TYPE ||\n    defaultProcessType\n  )\n}\n\n/**\n * If the resolved process type is not in the allowlist, exit immediately with no logs (`process.exit(0)`).\n * Used so the wrong dyno type does not run a specialized metrics client.\n *\n * @param {{ processType?: string }} metricsConfig\n * @param {string} defaultProcessType - Fallback for resolution only (when `processType` and env are unset)\n * @param {string | string[]} allowed - Single type or allowlist (e.g. `['redis-metrics','queue-metrics']`)\n * @returns {void}\n */\nfunction exitUnlessMetricsProcessType(metricsConfig, defaultProcessType, allowed) {\n  const resolved = resolveMetricsProcessType(metricsConfig, defaultProcessType)\n  const list = Array.isArray(allowed) ? allowed : [allowed]\n  if (!list.includes(resolved)) {\n    process.exit(0)\n  }\n}\n\nmodule.exports = {\n  resolveMetricsProcessType,\n  exitUnlessMetricsProcessType,\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,yBAAyBA,CAACC,aAAa,EAAEC,kBAAkB,EAAE;EACpE,OACED,aAAa,CAACE,WAAW,IACzBC,OAAO,CAACC,GAAG,CAACC,uBAAuB,IACnCJ,kBAAkB;AAEtB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASK,4BAA4BA,CAACN,aAAa,EAAEC,kBAAkB,EAAEM,OAAO,EAAE;EAChF,MAAMC,QAAQ,GAAGT,yBAAyB,CAACC,aAAa,EAAEC,kBAAkB,CAAC;EAC7E,MAAMQ,IAAI,GAAGC,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC;EACzD,IAAI,CAACE,IAAI,CAACG,QAAQ,CAACJ,QAAQ,CAAC,EAAE;IAC5BL,OAAO,CAACU,IAAI,CAAC,CAAC,CAAC;EACjB;AACF;AAEAC,MAAM,CAACC,OAAO,GAAG;EACfhB,yBAAyB;EACzBO;AACF,CAAC","ignoreList":[]}
+{"version":3,"file":"metricsProcessTypeUtils.js","names":["resolveMetricsProcessType","metricsConfig","defaultProcessType","processType","process","env","BUILD_DYNO_PROCESS_TYPE","exitUnlessMetricsProcessType","allowed","resolved","list","Array","isArray","includes","exit","module","exports"],"sources":["../../src/metrics/metricsProcessTypeUtils.js"],"sourcesContent":["/**\n * Helpers for resolving `processType` and silently exiting when a specialized metrics client\n * is constructed on the wrong dyno / process (no log output).\n *\n * @module metrics/metricsProcessTypeUtils\n */\n\n/**\n * Resolve logical process type the same way specialized metrics clients do.\n *\n * @param {{ processType?: string }} metricsConfig - Remainder of constructor options (e.g. after destructuring `redisClient`, `databaseUrl`, …)\n * @param {string} defaultProcessType - Fallback when config and env are unset\n * @returns {string}\n */\nfunction resolveMetricsProcessType(metricsConfig, defaultProcessType) {\n  return (\n    metricsConfig.processType ||\n    process.env.BUILD_DYNO_PROCESS_TYPE ||\n    defaultProcessType\n  )\n}\n\n/**\n * If the resolved process type is not in the allowlist, exit immediately with no logs (`process.exit(0)`).\n * Used so the wrong dyno type does not run a specialized metrics client.\n *\n * @param {{ processType?: string }} metricsConfig\n * @param {string} defaultProcessType - Fallback for resolution only (when `processType` and env are unset)\n * @param {string | string[]} allowed - Single type or allowlist (e.g. `['redis-metrics','queue-metrics']`)\n * @returns {void}\n */\nfunction exitUnlessMetricsProcessType(\n  metricsConfig,\n  defaultProcessType,\n  allowed\n) {\n  const resolved = resolveMetricsProcessType(metricsConfig, defaultProcessType)\n  const list = Array.isArray(allowed) ? allowed : [allowed]\n  if (!list.includes(resolved)) {\n    process.exit(0)\n  }\n}\n\nmodule.exports = {\n  resolveMetricsProcessType,\n  exitUnlessMetricsProcessType,\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,yBAAyBA,CAACC,aAAa,EAAEC,kBAAkB,EAAE;EACpE,OACED,aAAa,CAACE,WAAW,IACzBC,OAAO,CAACC,GAAG,CAACC,uBAAuB,IACnCJ,kBAAkB;AAEtB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASK,4BAA4BA,CACnCN,aAAa,EACbC,kBAAkB,EAClBM,OAAO,EACP;EACA,MAAMC,QAAQ,GAAGT,yBAAyB,CAACC,aAAa,EAAEC,kBAAkB,CAAC;EAC7E,MAAMQ,IAAI,GAAGC,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC;EACzD,IAAI,CAACE,IAAI,CAACG,QAAQ,CAACJ,QAAQ,CAAC,EAAE;IAC5BL,OAAO,CAACU,IAAI,CAAC,CAAC,CAAC;EACjB;AACF;AAEAC,MAAM,CAACC,OAAO,GAAG;EACfhB,yBAAyB;EACzBO;AACF,CAAC","ignoreList":[]}

package/lib/metrics/metricsQueueRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IAkEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,mDAAmD;IACnD,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"}
+{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IAsEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,mDAAmD;IACnD,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"}

package/lib/metrics/metricsQueueRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","exitUnlessMetricsProcessType","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","withDefaultLabelsWithoutDynoId","_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","defaultLabelsWithoutDynoId","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')\nconst { exitUnlessMetricsProcessType } = require('./metricsProcessTypeUtils')\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    exitUnlessMetricsProcessType(metricsConfig, 'queue-metrics', 'queue-metrics')\n\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 (no dyno_id). */\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.withDefaultLabelsWithoutDynoId(['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.defaultLabelsWithoutDynoId,\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":[]}
+{"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","exitUnlessMetricsProcessType","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","withDefaultLabelsWithoutDynoId","_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","defaultLabelsWithoutDynoId","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')\nconst { exitUnlessMetricsProcessType } = require('./metricsProcessTypeUtils')\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    exitUnlessMetricsProcessType(\n      metricsConfig,\n      'queue-metrics',\n      'queue-metrics'\n    )\n\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 (no dyno_id). */\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.withDefaultLabelsWithoutDynoId(['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.defaultLabelsWithoutDynoId,\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":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adalo/metrics",
-  "version": "0.0.0-staging.17",
+  "version": "0.0.0-staging.18",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/metrics/httpMetricsRedisCollector.js

@@ -1,6 +1,18 @@
+const cluster = require('cluster')
 const { BaseMetricsClient } = require('./baseMetricsClient')
 const { HttpMetricsRedisStore } = require('./httpMetricsRedisStore')
 
+function clusterWorkerTag() {
+  try {
+    if (cluster.isWorker && cluster.worker) {
+      return ` cluster_worker_id=${cluster.worker.id}`
+    }
+  } catch (_) {
+    /* ignore */
+  }
+  return ''
+}
+
 /**
  * Drain worker: reads HTTP aggregates from Redis (written by {@link HttpMetricsRedisRecorder}),
  * applies them to `app_requests_*` counters, then pushes the registry to the VM-agent (same as {@link BaseMetricsClient}).
@@ -87,6 +99,13 @@ class HttpMetricsRedisCollector extends BaseMetricsClient {
    * @returns {Promise<void>}
    */
   pushMetrics = async () => {
+    const { pid } = process
+    const clusterTag = clusterWorkerTag()
+    // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
+    console.warn(
+      `[TEMP_HTTP_METRICS_DIAG] http_metrics_publish_start pid=${pid}${clusterTag} dyno_id=${this.dynoId} process_type=${this.processType} app=${this.appName}`
+    )
+    // --- end TEMP_HTTP_METRICS_DIAG ---
     if (
       this._store &&
       this.countersFunctions?.app_requests_total &&
@@ -99,7 +118,13 @@ class HttpMetricsRedisCollector extends BaseMetricsClient {
           this.countersFunctions.app_requests_total_duration(labels, value)
       )
     }
-    return this._pushMetrics()
+    const out = await this._pushMetrics()
+    // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
+    console.warn(
+      `[TEMP_HTTP_METRICS_DIAG] http_metrics_publish_finished pid=${pid}${clusterTag} dyno_id=${this.dynoId} (registry POST to VM-agent / import completed for this tick)`
+    )
+    // --- end TEMP_HTTP_METRICS_DIAG ---
+    return out
   }
 }
 

package/src/metrics/httpMetricsRedisRecorder.js

@@ -1,17 +1,5 @@
-const cluster = require('cluster')
 const { HttpMetricsRedisStore } = require('./httpMetricsRedisStore')
 
-function clusterWorkerTag() {
-  try {
-    if (cluster.isWorker && cluster.worker) {
-      return ` cluster_worker_id=${cluster.worker.id}`
-    }
-  } catch (_) {
-    /* ignore */
-  }
-  return ''
-}
-
 /**
  * Records HTTP request aggregates only to Redis (no in-process Prometheus counters on this path).
  * Pair with {@link HttpMetricsRedisCollector} on a drain process to flush into counters and push to the VM-agent.
@@ -38,12 +26,6 @@ class HttpMetricsRedisRecorder {
       processType,
       ttlSec,
     })
-
-    // --- TEMP_HTTP_METRICS_DIAG: remove this block when cluster / multi-web coverage is verified ---
-    this._diagWindowStart = 0
-    this._diagWindowCount = 0
-    this._diagIntervalMs = 5000
-    // --- end TEMP_HTTP_METRICS_DIAG ---
   }
 
   /**
@@ -63,31 +45,7 @@ class HttpMetricsRedisRecorder {
     databaseId = '',
     duration,
   }) {
-    // --- TEMP_HTTP_METRICS_DIAG: remove this block when cluster / multi-web coverage is verified ---
-    this._diagWindowCount += 1
-    const now = Date.now()
-    if (!this._diagWindowStart) {
-      this._diagWindowStart = now
-    }
-    if (now - this._diagWindowStart >= this._diagIntervalMs) {
-      const pidTag = `pid=${process.pid}`
-      const clusterTag = clusterWorkerTag()
-      console.warn(
-        `[TEMP_HTTP_METRICS_DIAG] http_record_source ${pidTag}${clusterTag} process_type=${this.processType} app=${this.appName} batch_count=${this._diagWindowCount} (before Redis write)`
-      )
-      this._diagWindowStart = now
-      this._diagWindowCount = 0
-    }
-    // --- end TEMP_HTTP_METRICS_DIAG ---
-
-    this._store.record(
-      method,
-      route,
-      status_code,
-      appId,
-      databaseId,
-      duration
-    )
+    this._store.record(method, route, status_code, appId, databaseId, duration)
   }
 
   /**

package/src/metrics/httpMetricsRedisStore.js

@@ -54,6 +54,11 @@ function hgetallPairsToObject(pairs) {
   return o
 }
 
+/** --- TEMP_HTTP_METRICS_DIAG: delete this helper and all calls when done debugging --- */
+function tempHttpDiagLog(message) {
+  console.warn(`[TEMP_HTTP_METRICS_DIAG] ${message}`)
+}
+
 /**
  * Redis HTTP aggregate store. Uses an **injected** client (same pattern as {@link RedisMetricsClient}).
  * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`, `set`, `del`.
@@ -75,7 +80,9 @@ class HttpMetricsRedisStore {
       typeof ttlSec === 'number' && ttlSec > 0
         ? ttlSec
         : DEFAULT_HTTP_METRICS_REDIS_TTL_SEC
-    const keySeg = `${encodeURIComponent(appName)}:${encodeURIComponent(processType)}`
+    const keySeg = `${encodeURIComponent(appName)}:${encodeURIComponent(
+      processType
+    )}`
     this.countKey = `metrics:http:v2:${keySeg}:count`
     this.durKey = `metrics:http:v2:${keySeg}:dur`
     this.lockKey = `metrics:http:v2:${keySeg}:drain_lock`
@@ -111,7 +118,11 @@ class HttpMetricsRedisStore {
         .exec(err => {
           if (err) {
             console.error('[HttpMetricsRedisStore] record failed:', err.message)
+            return
           }
+          tempHttpDiagLog(
+            `http_redis_write_sent pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} sample=${method} ${route} ${statusCode}`
+          )
         })
     } catch (e) {
       console.error('[HttpMetricsRedisStore] record:', e.message)
@@ -134,9 +145,15 @@ class HttpMetricsRedisStore {
     return new Promise(resolve => {
       client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {
         if (setErr || ok !== 'OK') {
+          tempHttpDiagLog(
+            `http_redis_drain_skipped pid=${process.pid} lockKey=${this.lockKey} reason=${setErr ? setErr.message : 'lock_not_acquired'}`
+          )
           resolve(false)
           return
         }
+        tempHttpDiagLog(
+          `http_redis_drain_request pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} (EVAL HGETALL+DEL)`
+        )
         client.eval(
           DRAIN_LUA,
           2,
@@ -148,19 +165,30 @@ class HttpMetricsRedisStore {
             }
 
             if (evalErr) {
-              console.error('[HttpMetricsRedisStore] drain failed:', evalErr.message)
+              console.error(
+                '[HttpMetricsRedisStore] drain failed:',
+                evalErr.message
+              )
+              tempHttpDiagLog(
+                `http_redis_drain_got_error pid=${process.pid} message=${evalErr.message}`
+              )
               finish()
               return
             }
 
             try {
               if (!raw || !Array.isArray(raw) || raw.length < 2) {
+                tempHttpDiagLog(
+                  `http_redis_drain_got pid=${process.pid} distinct_fields=0 total_units=0 (empty raw)`
+                )
                 finish()
                 return
               }
               const counts = hgetallPairsToObject(raw[0])
               const durs = hgetallPairsToObject(raw[1])
-              for (const field of Object.keys(counts)) {
+              const fieldKeys = Object.keys(counts)
+              let totalUnits = 0
+              for (const field of fieldKeys) {
                 const count = parseInt(counts[field], 10)
                 if (!count || count < 1) {
                   continue
@@ -170,6 +198,7 @@ class HttpMetricsRedisStore {
                 if (parts.length !== 5) {
                   continue
                 }
+                totalUnits += count
                 const [m, route, statusStr, aid, did] = parts
                 const labels = {
                   method: m,
@@ -183,8 +212,18 @@ class HttpMetricsRedisStore {
                   applyDuration(labels, dur)
                 }
               }
+              const sampleFields = fieldKeys.slice(0, 3).join(' | ')
+              tempHttpDiagLog(
+                `http_redis_drain_got pid=${process.pid} distinct_fields=${fieldKeys.length} total_request_units=${totalUnits} sample_fields=${sampleFields || '(none)'}`
+              )
             } catch (e) {
-              console.error('[HttpMetricsRedisStore] flush apply failed:', e.message)
+              console.error(
+                '[HttpMetricsRedisStore] flush apply failed:',
+                e.message
+              )
+              tempHttpDiagLog(
+                `http_redis_drain_apply_failed pid=${process.pid} ${e.message}`
+              )
             }
             finish()
           }

package/src/metrics/metricsDatabaseClient.js

@@ -32,7 +32,11 @@ class DatabaseMetricsClient extends BaseMetricsClient {
     additional_database_urls = {},
     ...metricsConfig
   } = {}) {
-    exitUnlessMetricsProcessType(metricsConfig, 'database-metrics', 'database-metrics')
+    exitUnlessMetricsProcessType(
+      metricsConfig,
+      'database-metrics',
+      'database-metrics'
+    )
 
     const intervalSec =
       metricsConfig.intervalSec ||

package/src/metrics/metricsProcessTypeUtils.js

@@ -29,7 +29,11 @@ function resolveMetricsProcessType(metricsConfig, defaultProcessType) {
  * @param {string | string[]} allowed - Single type or allowlist (e.g. `['redis-metrics','queue-metrics']`)
  * @returns {void}
  */
-function exitUnlessMetricsProcessType(metricsConfig, defaultProcessType, allowed) {
+function exitUnlessMetricsProcessType(
+  metricsConfig,
+  defaultProcessType,
+  allowed
+) {
   const resolved = resolveMetricsProcessType(metricsConfig, defaultProcessType)
   const list = Array.isArray(allowed) ? allowed : [allowed]
   if (!list.includes(resolved)) {

package/src/metrics/metricsQueueRedisClient.js

@@ -25,7 +25,11 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
    * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
    */
   constructor({ redisClient, ...metricsConfig } = {}) {
-    exitUnlessMetricsProcessType(metricsConfig, 'queue-metrics', 'queue-metrics')
+    exitUnlessMetricsProcessType(
+      metricsConfig,
+      'queue-metrics',
+      'queue-metrics'
+    )
 
     const getConfiguredQueueNames = () => {
       if (!process.env.METRICS_APP_REDIS_BQ) {