@adalo/metrics 0.0.0-staging.20 → 0.0.0-staging.22

package/README.md

@@ -31,7 +31,7 @@ new MetricsClient({
 
 ### HTTP metrics: `MetricsClient` vs Redis
 
-**`MetricsClient`** only registers **in-process** `app_requests_*` counters when `METRICS_HTTP_ENABLED` / `httpMetricsEnabled` is on. For **Redis-backed** HTTP aggregation (multi-web / cluster), use **`HttpMetricsRedisRecorder`** (writers) and **`HttpMetricsRedisCollector`** (drain + push) with an injected **`redisClient`** — same idea as `RedisMetricsClient`, not mixed into `MetricsClient`.
+**`MetricsClient`** only registers **in-process** `app_requests_*` counters when `METRICS_HTTP_ENABLED` / `httpMetricsEnabled` is on. For **Redis-backed** HTTP aggregation (multi-web / cluster), use **`HttpMetricsRedisRecorder`** (writers) and **`HttpMetricsRedisCollector`** (drain + push) with an injected **`redisClient`** — same idea as `RedisMetricsClient`, not mixed into `MetricsClient`. See **`docs/http-metrics-redis.md`** for key segments and what is stored in Redis.
 
 `DatabaseMetricsClient` / `QueueRedisMetricsClient` / `RedisMetricsClient` call **`process.exit(0)` with no logs** if `BUILD_DYNO_PROCESS_TYPE` (or `processType`) does not match `database-metrics` / `queue-metrics` / (`redis-metrics` or `queue-metrics`) respectively.
 ## Example Usage

package/__tests__/httpMetricsRedisCollector.test.js

@@ -0,0 +1,74 @@
+const { HttpMetricsRedisCollector } = require('../src/metrics/httpMetricsRedisCollector')
+const { buildFieldKey } = require('../src/metrics/httpMetricsRedisStore')
+
+function createRedisV3Mock() {
+  const multiChain = {
+    hincrby: jest.fn().mockReturnThis(),
+    expire: jest.fn().mockReturnThis(),
+    exec: jest.fn(cb => {
+      if (cb) {
+        setImmediate(() => cb(null))
+      }
+    }),
+  }
+  return {
+    multi: jest.fn(() => multiChain),
+    set: jest.fn(),
+    eval: jest.fn(),
+    del: jest.fn(),
+    _multiChain: multiChain,
+  }
+}
+
+describe('HttpMetricsRedisCollector', () => {
+  const originalEnv = process.env
+
+  beforeEach(() => {
+    process.env = { ...originalEnv, METRICS_DISABLE_PUSHGATEWAY: 'true' }
+  })
+
+  afterEach(() => {
+    process.env = originalEnv
+  })
+
+  it('throws without redisClient', () => {
+    expect(() => new HttpMetricsRedisCollector({ appName: 'a' })).toThrow('redisClient is required')
+  })
+
+  it('pushMetrics drains Redis then completes without network push', async () => {
+    const redis = createRedisV3Mock()
+    redis.set.mockImplementation((key, val, mode, ttl, nx, cb) => {
+      cb(null, 'OK')
+    })
+    const field = buildFieldKey('GET', '/health', 200, '', '')
+    redis.eval.mockImplementation((lua, numKeys, k1, k2, cb) => {
+      cb(null, [
+        [field, '1'],
+        [field, '10'],
+      ])
+    })
+    redis.del.mockImplementation((key, cb) => {
+      if (cb) {
+        cb()
+      }
+    })
+
+    const collector = new HttpMetricsRedisCollector({
+      redisClient: redis,
+      appName: 'test-app',
+      dynoId: 'dyno-1',
+      processType: 'http-metrics',
+      redisProcessTypeForKeys: 'web',
+      disablePushgateway: true,
+    })
+
+    await collector.pushMetrics()
+
+    expect(redis.eval).toHaveBeenCalled()
+    const metrics = await collector._registry.getMetricsAsJSON()
+    const total = metrics.find(m => m.name === 'app_requests_total')
+    expect(total).toBeDefined()
+    const totalDur = metrics.find(m => m.name === 'app_requests_total_duration')
+    expect(totalDur).toBeDefined()
+  })
+})

package/__tests__/httpMetricsRedisRecorder.test.js

@@ -0,0 +1,56 @@
+const { HttpMetricsRedisRecorder } = require('../src/metrics/httpMetricsRedisRecorder')
+const { buildFieldKey } = require('../src/metrics/httpMetricsRedisStore')
+
+const flushMicrotasks = () => new Promise(resolve => setImmediate(resolve))
+
+function createRedisV3Mock() {
+  const multiChain = {
+    hincrby: jest.fn().mockReturnThis(),
+    expire: jest.fn().mockReturnThis(),
+    exec: jest.fn(cb => {
+      if (cb) {
+        setImmediate(() => cb(null))
+      }
+    }),
+  }
+  return {
+    multi: jest.fn(() => multiChain),
+    set: jest.fn(),
+    eval: jest.fn(),
+    del: jest.fn(),
+    _multiChain: multiChain,
+  }
+}
+
+describe('HttpMetricsRedisRecorder', () => {
+  it('throws without redisClient', () => {
+    expect(() => new HttpMetricsRedisRecorder({ appName: 'a', processType: 'web' })).toThrow(
+      'redisClient is required'
+    )
+  })
+
+  it('trackHttpRequest forwards to Redis multi/hincrby', async () => {
+    const redis = createRedisV3Mock()
+    const rec = new HttpMetricsRedisRecorder({
+      redisClient: redis,
+      appName: 'app',
+      processType: 'web',
+    })
+    const countKey = rec._store.countKey
+    const durKey = rec._store.durKey
+    const field = buildFieldKey('GET', '/p', 404, 'x', 'y')
+
+    rec.trackHttpRequest({
+      method: 'GET',
+      route: '/p',
+      status_code: 404,
+      appId: 'x',
+      databaseId: 'y',
+      duration: 5,
+    })
+    await flushMicrotasks()
+
+    expect(redis._multiChain.hincrby).toHaveBeenCalledWith(countKey, field, 1)
+    expect(redis._multiChain.hincrby).toHaveBeenCalledWith(durKey, field, 5)
+  })
+})

package/__tests__/httpMetricsRedisStore.test.js

@@ -0,0 +1,182 @@
+const {
+  HttpMetricsRedisStore,
+  buildFieldKey,
+  FIELD_SEP,
+} = require('../src/metrics/httpMetricsRedisStore')
+
+const flushMicrotasks = () => new Promise(resolve => setImmediate(resolve))
+
+/**
+ * redis@3-style mock: multi().hincrby().expire().exec(cb)
+ */
+function createRedisV3Mock() {
+  const multiChain = {
+    hincrby: jest.fn().mockReturnThis(),
+    expire: jest.fn().mockReturnThis(),
+    exec: jest.fn(cb => {
+      if (cb) {
+        setImmediate(() => cb(null))
+      }
+    }),
+  }
+  return {
+    multi: jest.fn(() => multiChain),
+    set: jest.fn(),
+    eval: jest.fn(),
+    del: jest.fn(),
+    _multiChain: multiChain,
+  }
+}
+
+describe('HttpMetricsRedisStore', () => {
+  describe('buildFieldKey', () => {
+    it('joins parts with FIELD_SEP', () => {
+      expect(buildFieldKey('GET', '/api', 200, 'app1', 'db1')).toBe(
+        ['GET', '/api', '200', 'app1', 'db1'].join(FIELD_SEP)
+      )
+    })
+  })
+
+  describe('constructor', () => {
+    it('throws without redisClient', () => {
+      expect(() => new HttpMetricsRedisStore({ appName: 'a', processType: 'web' })).toThrow(
+        'redisClient is required'
+      )
+    })
+
+    it('builds encoded v2 keys', () => {
+      const redis = createRedisV3Mock()
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'my app',
+        processType: 'web',
+      })
+      const seg = `${encodeURIComponent('my app')}:${encodeURIComponent('web')}`
+      expect(store.countKey).toBe(`metrics:http:v2:${seg}:count`)
+      expect(store.durKey).toBe(`metrics:http:v2:${seg}:dur`)
+      expect(store.lockKey).toBe(`metrics:http:v2:${seg}:drain_lock`)
+    })
+  })
+
+  describe('record', () => {
+    it('increments count and duration hashes with TTL', async () => {
+      const redis = createRedisV3Mock()
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'app',
+        processType: 'web',
+        ttlSec: 90,
+      })
+      const field = buildFieldKey('GET', '/x', 200, '', '')
+
+      store.record('GET', '/x', 200, '', '', 12)
+      await flushMicrotasks()
+
+      expect(redis.multi).toHaveBeenCalled()
+      expect(redis._multiChain.hincrby).toHaveBeenCalledWith(store.countKey, field, 1)
+      expect(redis._multiChain.hincrby).toHaveBeenCalledWith(store.durKey, field, 12)
+      expect(redis._multiChain.expire).toHaveBeenCalledWith(store.countKey, 90)
+      expect(redis._multiChain.expire).toHaveBeenCalledWith(store.durKey, 90)
+      expect(redis._multiChain.exec).toHaveBeenCalled()
+    })
+  })
+
+  describe('flushToCounters', () => {
+    it('returns false when lock is not acquired', async () => {
+      const redis = createRedisV3Mock()
+      redis.set.mockImplementation((key, val, mode, ttl, nx, cb) => {
+        cb(null, null)
+      })
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'app',
+        processType: 'web',
+      })
+      const ok = await store.flushToCounters(jest.fn(), jest.fn())
+      expect(ok).toBe(false)
+      expect(redis.eval).not.toHaveBeenCalled()
+    })
+
+    it('drains hashes and applies count and duration', async () => {
+      const redis = createRedisV3Mock()
+      redis.set.mockImplementation((key, val, mode, ttl, nx, cb) => {
+        cb(null, 'OK')
+      })
+      const field = buildFieldKey('POST', '/r', 201, 'a1', 'd1')
+      redis.eval.mockImplementation((lua, numKeys, k1, k2, cb) => {
+        cb(null, [
+          [field, '2'],
+          [field, '50'],
+        ])
+      })
+      redis.del.mockImplementation((key, cb) => {
+        if (cb) {
+          cb()
+        }
+      })
+
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'app',
+        processType: 'web',
+      })
+      const applyCount = jest.fn()
+      const applyDuration = jest.fn()
+
+      const ok = await store.flushToCounters(applyCount, applyDuration)
+
+      expect(ok).toBe(true)
+      expect(redis.eval).toHaveBeenCalledWith(
+        expect.stringContaining('HGETALL'),
+        2,
+        store.countKey,
+        store.durKey,
+        expect.any(Function)
+      )
+      expect(applyCount).toHaveBeenCalledWith(
+        {
+          method: 'POST',
+          route: '/r',
+          status_code: '201',
+          appId: 'a1',
+          databaseId: 'd1',
+        },
+        2
+      )
+      expect(applyDuration).toHaveBeenCalledWith(
+        {
+          method: 'POST',
+          route: '/r',
+          status_code: '201',
+          appId: 'a1',
+          databaseId: 'd1',
+        },
+        50
+      )
+    })
+
+    it('resolves true with no applies when eval returns short array', async () => {
+      const redis = createRedisV3Mock()
+      redis.set.mockImplementation((key, val, mode, ttl, nx, cb) => {
+        cb(null, 'OK')
+      })
+      redis.eval.mockImplementation((lua, numKeys, k1, k2, cb) => {
+        cb(null, [])
+      })
+      redis.del.mockImplementation((key, cb) => {
+        if (cb) {
+          cb()
+        }
+      })
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'app',
+        processType: 'web',
+      })
+      const applyCount = jest.fn()
+      const ok = await store.flushToCounters(applyCount, jest.fn())
+      expect(ok).toBe(true)
+      expect(applyCount).not.toHaveBeenCalled()
+    })
+  })
+})

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;CAkEL"}
+{"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"}

package/lib/metrics/httpMetricsRedisCollector.js

@@ -75,21 +75,7 @@ class HttpMetricsRedisCollector extends BaseMetricsClient {
    */
   pushMetrics = async () => {
     if (this._store && this.countersFunctions?.app_requests_total && this.countersFunctions?.app_requests_total_duration) {
-      const {
-        pid
-      } = process;
-      const t0 = Date.now();
-      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
-      console.warn(`[TEMP_HTTP_METRICS_DIAG] http_collector_flush_begin pid=${pid} dyno_id=${this.dynoId} process_type=${this.processType} app=${this.appName}`);
-      // --- end TEMP_HTTP_METRICS_DIAG ---
-      const drainedOk = await this._store.flushToCounters((labels, value) => this.countersFunctions.app_requests_total(labels, value), (labels, value) => this.countersFunctions.app_requests_total_duration(labels, value));
-      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
-      console.warn(`[TEMP_HTTP_METRICS_DIAG] http_collector_flush_end pid=${pid} lock_acquired_and_ran_drain=${drainedOk} elapsed_ms=${Date.now() - t0}`);
-      // --- end TEMP_HTTP_METRICS_DIAG ---
-    } else {
-      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
-      console.warn(`[TEMP_HTTP_METRICS_DIAG] http_collector_flush_skipped pid=${process.pid} reason=missing_store_or_http_counters`);
-      // --- end TEMP_HTTP_METRICS_DIAG ---
+      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();
   };

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","pid","t0","Date","now","console","warn","dynoId","drainedOk","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      const { pid } = process\n      const t0 = Date.now()\n      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---\n      console.warn(\n        `[TEMP_HTTP_METRICS_DIAG] http_collector_flush_begin pid=${pid} dyno_id=${this.dynoId} process_type=${this.processType} app=${this.appName}`\n      )\n      // --- end TEMP_HTTP_METRICS_DIAG ---\n      const drainedOk = 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      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---\n      console.warn(\n        `[TEMP_HTTP_METRICS_DIAG] http_collector_flush_end pid=${pid} lock_acquired_and_ran_drain=${drainedOk} elapsed_ms=${Date.now() - t0}`\n      )\n      // --- end TEMP_HTTP_METRICS_DIAG ---\n    } else {\n      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---\n      console.warn(\n        `[TEMP_HTTP_METRICS_DIAG] http_collector_flush_skipped pid=${process.pid} reason=missing_store_or_http_counters`\n      )\n      // --- end TEMP_HTTP_METRICS_DIAG ---\n    }\n    return this._pushMetrics()\n  }\n}\n\nmodule.exports = { HttpMetricsRedisCollector }\n"],"mappings":"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","ignoreList":[]}
+{"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":[]}

package/lib/metrics/httpMetricsRedisStore.d.ts

@@ -1,6 +1,9 @@
 /**
  * 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`.
+ *
+ * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`
+ * (sum of duration ms per same field). Hash field = `method\\x1eroute\\x1estatus\\x1eappId\\x1edatabaseId`.
  */
 export class HttpMetricsRedisStore {
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisStore.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisStore.js"],"names":[],"mappings":"AAkEA;;;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,QA4BhB;IAED;;;;OAIG;IACH,qCAJoB,MAAM,SAAS,MAAM,KAAK,IAAI,0BAC9B,MAAM,SAAS,MAAM,KAAK,IAAI,GACrC,QAAQ,OAAO,CAAC,CA2H5B;CACF;AAzOD;;;;;;;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":"AAwDA;;;;;;GAMG;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,QAqBhB;IAED;;;;OAIG;IACH,qCAJoB,MAAM,SAAS,MAAM,KAAK,IAAI,0BAC9B,MAAM,SAAS,MAAM,KAAK,IAAI,GACrC,QAAQ,OAAO,CAAC,CA6E5B;CACF;AA7KD;;;;;;;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,18 +54,12 @@ 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}`);
-}
-function truncateForDiag(s, maxLen = 220) {
-  const t = String(s);
-  return t.length > maxLen ? `${t.slice(0, maxLen - 3)}...` : t;
-}
-
 /**
  * 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`.
+ *
+ * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`
+ * (sum of duration ms per same field). Hash field = `method\\x1eroute\\x1estatus\\x1eappId\\x1edatabaseId`.
  */
 class HttpMetricsRedisStore {
   /**
@@ -113,7 +107,6 @@ class HttpMetricsRedisStore {
       const client = this._ensureClient();
       const field = buildFieldKey(method, route, statusCode, appId, databaseId);
       const dur = Math.max(0, Math.round(Number(durationMs) || 0));
-      tempHttpDiagLog(`http_redis_write_prepare pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} hincr_field=${truncateForDiag(field)} durationMs=${dur}`);
       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);
@@ -140,7 +133,6 @@ class HttpMetricsRedisStore {
     return new Promise(resolve => {
       client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {
         if (setErr || ok !== 'OK') {
-          tempHttpDiagLog(`http_redis_drain_skip pid=${process.pid} countKey=${this.countKey} reason=${setErr ? setErr.message : 'lock_not_held'}`);
           resolve(false);
           return;
         }
@@ -150,22 +142,17 @@ class HttpMetricsRedisStore {
           };
           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_collected pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_request_counts=0 (empty — keys deleted or no data)`);
               finish();
               return;
             }
             const counts = hgetallPairsToObject(raw[0]);
             const durs = hgetallPairsToObject(raw[1]);
             const fieldKeys = Object.keys(counts);
-            let totalUnits = 0;
-            let appliedGroups = 0;
-            const samples = [];
             for (const field of fieldKeys) {
               const count = parseInt(counts[field], 10);
               if (!count || count < 1) {
@@ -176,12 +163,7 @@ class HttpMetricsRedisStore {
               if (parts.length !== 5) {
                 continue;
               }
-              totalUnits += count;
-              appliedGroups += 1;
               const [m, route, statusStr, aid, did] = parts;
-              if (samples.length < 4) {
-                samples.push(`${m} ${route} ${statusStr} x${count}`);
-              }
               const labels = {
                 method: m,
                 route,
@@ -194,17 +176,8 @@ class HttpMetricsRedisStore {
                 applyDuration(labels, dur);
               }
             }
-            let emptyHint = 'ok';
-            if (fieldKeys.length === 0) {
-              emptyHint = 'no_hash_entries';
-            } else if (totalUnits === 0) {
-              emptyHint = 'entries_present_but_zero_counts';
-            }
-            const noTrafficHint = fieldKeys.length === 0 ? ' hint=web_must_use_HttpMetricsRedisRecorder_same_redis_APP_web_segment' : '';
-            tempHttpDiagLog(truncateForDiag(`http_redis_drain_collected pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} hash_fields_read=${fieldKeys.length} label_groups_applied=${appliedGroups} sum_request_counts=${totalUnits} state=${emptyHint} sample=${samples.join(' | ') || '—'}${noTrafficHint}`, 900));
           } 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","tempHttpDiagLog","message","console","warn","truncateForDiag","s","maxLen","t","slice","HttpMetricsRedisStore","constructor","redisClient","appName","processType","ttlSec","Error","_client","keySeg","encodeURIComponent","countKey","durKey","lockKey","_ensureClient","record","durationMs","client","field","dur","Math","max","round","Number","process","pid","multi","hincrby","expire","exec","err","error","e","flushToCounters","applyCount","applyDuration","Promise","set","setErr","ok","eval","evalErr","raw","finish","del","Array","isArray","counts","durs","fieldKeys","Object","keys","totalUnits","appliedGroups","samples","count","parseInt","parts","split","m","statusStr","aid","did","push","labels","status_code","emptyHint","noTrafficHint","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\nfunction truncateForDiag(s, maxLen = 220) {\n  const t = String(s)\n  return t.length > maxLen ? `${t.slice(0, maxLen - 3)}...` : t\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      tempHttpDiagLog(\n        `http_redis_write_prepare pid=${process.pid} countKey=${\n          this.countKey\n        } durKey=${this.durKey} hincr_field=${truncateForDiag(\n          field\n        )} durationMs=${dur}`\n      )\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          tempHttpDiagLog(\n            `http_redis_drain_skip pid=${process.pid} countKey=${\n              this.countKey\n            } reason=${setErr ? setErr.message : 'lock_not_held'}`\n          )\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(\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_collected pid=${process.pid} countKey=${\n                    this.countKey\n                  } hash_fields=0 sum_request_counts=0 (empty — keys deleted or no data)`\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              let appliedGroups = 0\n              const samples = []\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                appliedGroups += 1\n                const [m, route, statusStr, aid, did] = parts\n                if (samples.length < 4) {\n                  samples.push(`${m} ${route} ${statusStr} x${count}`)\n                }\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              let emptyHint = 'ok'\n              if (fieldKeys.length === 0) {\n                emptyHint = 'no_hash_entries'\n              } else if (totalUnits === 0) {\n                emptyHint = 'entries_present_but_zero_counts'\n              }\n              const noTrafficHint =\n                fieldKeys.length === 0\n                  ? ' hint=web_must_use_HttpMetricsRedisRecorder_same_redis_APP_web_segment'\n                  : ''\n              tempHttpDiagLog(\n                truncateForDiag(\n                  `http_redis_drain_collected pid=${process.pid} countKey=${\n                    this.countKey\n                  } durKey=${this.durKey} hash_fields_read=${\n                    fieldKeys.length\n                  } label_groups_applied=${appliedGroups} sum_request_counts=${totalUnits} state=${emptyHint} sample=${\n                    samples.join(' | ') || '—'\n                  }${noTrafficHint}`,\n                  900\n                )\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":[]}
+{"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","fieldKeys","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 *\n * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`\n * (sum of duration ms per same field). Hash field = `method\\\\x1eroute\\\\x1estatus\\\\x1eappId\\\\x1edatabaseId`.\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          }\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(\n                '[HttpMetricsRedisStore] drain failed:',\n                evalErr.message\n              )\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              const fieldKeys = Object.keys(counts)\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                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(\n                '[HttpMetricsRedisStore] flush apply failed:',\n                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/metricsProcessTypeUtils.d.ts

@@ -35,8 +35,9 @@ export function exitUnlessProcessTypeIn(metricsConfig: {
  *
  * **Canonical names** align with typical Procfile processes (e.g. backend: `web`, `worker`,
  * `queue-metrics`, `database-metrics`, `http-metrics`). The compile **worker** dyno serves queues/builds
- * — it does not run HTTP request metrics; HTTP Redis **writers** use `web` (or `METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`);
- * the HTTP **collector** dyno uses {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.
+ * — it does not run HTTP request metrics. HTTP Redis **key segment** is **`METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`**
+ * (default **`web`**), not `BUILD_DYNO_PROCESS_TYPE` (workers/collector differ). The HTTP **collector** dyno
+ * identity for logs is often {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.
  *
  * @module metrics/metricsProcessTypeUtils
  */

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

@@ -1 +1 @@
-{"version":3,"file":"metricsProcessTypeUtils.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsProcessTypeUtils.js"],"names":[],"mappings":"AAuCA;;;;;;GAMG;AACH,yDAJW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sBACxB,MAAM,GACJ,MAAM,CAQlB;AAED;;;;;;GAMG;AACH,uDAJW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,uBACxB,MAAM,GACJ,IAAI,CAUhB;AAED;;;;;;;GAOG;AACH,uDALW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,uBACxB,SAAS,MAAM,EAAE,0BACjB,MAAM,GACJ,IAAI,CAchB;AA3FD;;;;;;;;;;GAUG;AAEH,6DAA6D;AAC7D,+DAAwD;AAExD,gEAAgE;AAChE,yDAAkD;AAElD,yEAAyE;AACzE,yDAAkD;AAElD,kGAAkG;AAClG,6CAAsC;AAEtC,gGAAgG;AAChG,mDAA4C;AAE5C,wGAAwG;AACxG,yEAAkE;AAElE;;;GAGG;AACH,yDAFU,SAAS,MAAM,EAAE,CAKzB"}
+{"version":3,"file":"metricsProcessTypeUtils.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsProcessTypeUtils.js"],"names":[],"mappings":"AAwCA;;;;;;GAMG;AACH,yDAJW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sBACxB,MAAM,GACJ,MAAM,CAQlB;AAED;;;;;;GAMG;AACH,uDAJW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,uBACxB,MAAM,GACJ,IAAI,CAUhB;AAED;;;;;;;GAOG;AACH,uDALW;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,uBACxB,SAAS,MAAM,EAAE,0BACjB,MAAM,GACJ,IAAI,CAchB;AA5FD;;;;;;;;;;;GAWG;AAEH,6DAA6D;AAC7D,+DAAwD;AAExD,gEAAgE;AAChE,yDAAkD;AAElD,yEAAyE;AACzE,yDAAkD;AAElD,kGAAkG;AAClG,6CAAsC;AAEtC,gGAAgG;AAChG,mDAA4C;AAE5C,wGAAwG;AACxG,yEAAkE;AAElE;;;GAGG;AACH,yDAFU,SAAS,MAAM,EAAE,CAKzB"}

package/lib/metrics/metricsProcessTypeUtils.js

@@ -6,8 +6,9 @@
  *
  * **Canonical names** align with typical Procfile processes (e.g. backend: `web`, `worker`,
  * `queue-metrics`, `database-metrics`, `http-metrics`). The compile **worker** dyno serves queues/builds
- * — it does not run HTTP request metrics; HTTP Redis **writers** use `web` (or `METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`);
- * the HTTP **collector** dyno uses {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.
+ * — it does not run HTTP request metrics. HTTP Redis **key segment** is **`METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`**
+ * (default **`web`**), not `BUILD_DYNO_PROCESS_TYPE` (workers/collector differ). The HTTP **collector** dyno
+ * identity for logs is often {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.
  *
  * @module metrics/metricsProcessTypeUtils
  */

package/lib/metrics/metricsProcessTypeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsProcessTypeUtils.js","names":["METRICS_PROCESS_TYPE_DATABASE","METRICS_PROCESS_TYPE_QUEUE","METRICS_PROCESS_TYPE_REDIS","METRICS_PROCESS_TYPE_WEB","METRICS_PROCESS_TYPE_WORKER","METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR","REDIS_METRICS_CLIENT_ALLOWED_PROCESS_TYPES","Object","freeze","resolveMetricsProcessType","metricsConfig","defaultProcessType","processType","process","env","BUILD_DYNO_PROCESS_TYPE","exitUnlessProcessTypeIs","expectedProcessType","resolved","exit","exitUnlessProcessTypeIn","allowedProcessTypes","defaultWhenUnspecified","includes","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 * **Canonical names** align with typical Procfile processes (e.g. backend: `web`, `worker`,\n * `queue-metrics`, `database-metrics`, `http-metrics`). The compile **worker** dyno serves queues/builds\n * — it does not run HTTP request metrics; HTTP Redis **writers** use `web` (or `METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`);\n * the HTTP **collector** dyno uses {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.\n *\n * @module metrics/metricsProcessTypeUtils\n */\n\n/** DB-only metrics dyno (`database-metrics` in Procfile). */\nconst METRICS_PROCESS_TYPE_DATABASE = 'database-metrics'\n\n/** Queue + Redis metrics dyno (`queue-metrics` in Procfile). */\nconst METRICS_PROCESS_TYPE_QUEUE = 'queue-metrics'\n\n/** Redis-only metrics dyno (no Bee Queue; optional separate process). */\nconst METRICS_PROCESS_TYPE_REDIS = 'redis-metrics'\n\n/** Web servers — HTTP traffic, HTTP Redis **writers** typically use this in Redis key segment. */\nconst METRICS_PROCESS_TYPE_WEB = 'web'\n\n/** Build/compile workers and similar (e.g. backend `worker:`) — no HTTP server metrics here. */\nconst METRICS_PROCESS_TYPE_WORKER = 'worker'\n\n/** HTTP Redis **drain + push** process (e.g. backend `http-metrics:` / `http-metrics-collector.ts`). */\nconst METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR = 'http-metrics'\n\n/**\n * Parent {@link RedisMetricsClient} allows either redis-only or queue stack (`QueueRedisMetricsClient`).\n * @type {readonly string[]}\n */\nconst REDIS_METRICS_CLIENT_ALLOWED_PROCESS_TYPES = Object.freeze([\n  METRICS_PROCESS_TYPE_REDIS,\n  METRICS_PROCESS_TYPE_QUEUE,\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 `metricsConfig.processType` and `BUILD_DYNO_PROCESS_TYPE` 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 * Exit with no logs if the resolved process type is not exactly `expectedProcessType`.\n *\n * @param {{ processType?: string }} metricsConfig\n * @param {string} expectedProcessType - Single allowed value (use a module constant, e.g. {@link METRICS_PROCESS_TYPE_DATABASE})\n * @returns {void}\n */\nfunction exitUnlessProcessTypeIs(metricsConfig, expectedProcessType) {\n  const resolved = resolveMetricsProcessType(\n    metricsConfig,\n    expectedProcessType\n  )\n  if (resolved !== expectedProcessType) {\n    process.exit(0)\n  }\n}\n\n/**\n * Exit with no logs if the resolved process type is not in `allowedProcessTypes`.\n *\n * @param {{ processType?: string }} metricsConfig\n * @param {readonly string[]} allowedProcessTypes\n * @param {string} defaultWhenUnspecified - Used only to resolve when config/env omit `processType` (e.g. {@link METRICS_PROCESS_TYPE_QUEUE} for {@link RedisMetricsClient})\n * @returns {void}\n */\nfunction exitUnlessProcessTypeIn(\n  metricsConfig,\n  allowedProcessTypes,\n  defaultWhenUnspecified\n) {\n  const resolved = resolveMetricsProcessType(\n    metricsConfig,\n    defaultWhenUnspecified\n  )\n  if (!allowedProcessTypes.includes(resolved)) {\n    process.exit(0)\n  }\n}\n\nmodule.exports = {\n  resolveMetricsProcessType,\n  exitUnlessProcessTypeIs,\n  exitUnlessProcessTypeIn,\n  METRICS_PROCESS_TYPE_DATABASE,\n  METRICS_PROCESS_TYPE_QUEUE,\n  METRICS_PROCESS_TYPE_REDIS,\n  METRICS_PROCESS_TYPE_WEB,\n  METRICS_PROCESS_TYPE_WORKER,\n  METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR,\n  REDIS_METRICS_CLIENT_ALLOWED_PROCESS_TYPES,\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAMA,6BAA6B,GAAG,kBAAkB;;AAExD;AACA,MAAMC,0BAA0B,GAAG,eAAe;;AAElD;AACA,MAAMC,0BAA0B,GAAG,eAAe;;AAElD;AACA,MAAMC,wBAAwB,GAAG,KAAK;;AAEtC;AACA,MAAMC,2BAA2B,GAAG,QAAQ;;AAE5C;AACA,MAAMC,2CAA2C,GAAG,cAAc;;AAElE;AACA;AACA;AACA;AACA,MAAMC,0CAA0C,GAAGC,MAAM,CAACC,MAAM,CAAC,CAC/DN,0BAA0B,EAC1BD,0BAA0B,CAC3B,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASQ,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,SAASK,uBAAuBA,CAACN,aAAa,EAAEO,mBAAmB,EAAE;EACnE,MAAMC,QAAQ,GAAGT,yBAAyB,CACxCC,aAAa,EACbO,mBACF,CAAC;EACD,IAAIC,QAAQ,KAAKD,mBAAmB,EAAE;IACpCJ,OAAO,CAACM,IAAI,CAAC,CAAC,CAAC;EACjB;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,uBAAuBA,CAC9BV,aAAa,EACbW,mBAAmB,EACnBC,sBAAsB,EACtB;EACA,MAAMJ,QAAQ,GAAGT,yBAAyB,CACxCC,aAAa,EACbY,sBACF,CAAC;EACD,IAAI,CAACD,mBAAmB,CAACE,QAAQ,CAACL,QAAQ,CAAC,EAAE;IAC3CL,OAAO,CAACM,IAAI,CAAC,CAAC,CAAC;EACjB;AACF;AAEAK,MAAM,CAACC,OAAO,GAAG;EACfhB,yBAAyB;EACzBO,uBAAuB;EACvBI,uBAAuB;EACvBpB,6BAA6B;EAC7BC,0BAA0B;EAC1BC,0BAA0B;EAC1BC,wBAAwB;EACxBC,2BAA2B;EAC3BC,2CAA2C;EAC3CC;AACF,CAAC","ignoreList":[]}
+{"version":3,"file":"metricsProcessTypeUtils.js","names":["METRICS_PROCESS_TYPE_DATABASE","METRICS_PROCESS_TYPE_QUEUE","METRICS_PROCESS_TYPE_REDIS","METRICS_PROCESS_TYPE_WEB","METRICS_PROCESS_TYPE_WORKER","METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR","REDIS_METRICS_CLIENT_ALLOWED_PROCESS_TYPES","Object","freeze","resolveMetricsProcessType","metricsConfig","defaultProcessType","processType","process","env","BUILD_DYNO_PROCESS_TYPE","exitUnlessProcessTypeIs","expectedProcessType","resolved","exit","exitUnlessProcessTypeIn","allowedProcessTypes","defaultWhenUnspecified","includes","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 * **Canonical names** align with typical Procfile processes (e.g. backend: `web`, `worker`,\n * `queue-metrics`, `database-metrics`, `http-metrics`). The compile **worker** dyno serves queues/builds\n * — it does not run HTTP request metrics. HTTP Redis **key segment** is **`METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`**\n * (default **`web`**), not `BUILD_DYNO_PROCESS_TYPE` (workers/collector differ). The HTTP **collector** dyno\n * identity for logs is often {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.\n *\n * @module metrics/metricsProcessTypeUtils\n */\n\n/** DB-only metrics dyno (`database-metrics` in Procfile). */\nconst METRICS_PROCESS_TYPE_DATABASE = 'database-metrics'\n\n/** Queue + Redis metrics dyno (`queue-metrics` in Procfile). */\nconst METRICS_PROCESS_TYPE_QUEUE = 'queue-metrics'\n\n/** Redis-only metrics dyno (no Bee Queue; optional separate process). */\nconst METRICS_PROCESS_TYPE_REDIS = 'redis-metrics'\n\n/** Web servers — HTTP traffic, HTTP Redis **writers** typically use this in Redis key segment. */\nconst METRICS_PROCESS_TYPE_WEB = 'web'\n\n/** Build/compile workers and similar (e.g. backend `worker:`) — no HTTP server metrics here. */\nconst METRICS_PROCESS_TYPE_WORKER = 'worker'\n\n/** HTTP Redis **drain + push** process (e.g. backend `http-metrics:` / `http-metrics-collector.ts`). */\nconst METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR = 'http-metrics'\n\n/**\n * Parent {@link RedisMetricsClient} allows either redis-only or queue stack (`QueueRedisMetricsClient`).\n * @type {readonly string[]}\n */\nconst REDIS_METRICS_CLIENT_ALLOWED_PROCESS_TYPES = Object.freeze([\n  METRICS_PROCESS_TYPE_REDIS,\n  METRICS_PROCESS_TYPE_QUEUE,\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 `metricsConfig.processType` and `BUILD_DYNO_PROCESS_TYPE` 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 * Exit with no logs if the resolved process type is not exactly `expectedProcessType`.\n *\n * @param {{ processType?: string }} metricsConfig\n * @param {string} expectedProcessType - Single allowed value (use a module constant, e.g. {@link METRICS_PROCESS_TYPE_DATABASE})\n * @returns {void}\n */\nfunction exitUnlessProcessTypeIs(metricsConfig, expectedProcessType) {\n  const resolved = resolveMetricsProcessType(\n    metricsConfig,\n    expectedProcessType\n  )\n  if (resolved !== expectedProcessType) {\n    process.exit(0)\n  }\n}\n\n/**\n * Exit with no logs if the resolved process type is not in `allowedProcessTypes`.\n *\n * @param {{ processType?: string }} metricsConfig\n * @param {readonly string[]} allowedProcessTypes\n * @param {string} defaultWhenUnspecified - Used only to resolve when config/env omit `processType` (e.g. {@link METRICS_PROCESS_TYPE_QUEUE} for {@link RedisMetricsClient})\n * @returns {void}\n */\nfunction exitUnlessProcessTypeIn(\n  metricsConfig,\n  allowedProcessTypes,\n  defaultWhenUnspecified\n) {\n  const resolved = resolveMetricsProcessType(\n    metricsConfig,\n    defaultWhenUnspecified\n  )\n  if (!allowedProcessTypes.includes(resolved)) {\n    process.exit(0)\n  }\n}\n\nmodule.exports = {\n  resolveMetricsProcessType,\n  exitUnlessProcessTypeIs,\n  exitUnlessProcessTypeIn,\n  METRICS_PROCESS_TYPE_DATABASE,\n  METRICS_PROCESS_TYPE_QUEUE,\n  METRICS_PROCESS_TYPE_REDIS,\n  METRICS_PROCESS_TYPE_WEB,\n  METRICS_PROCESS_TYPE_WORKER,\n  METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR,\n  REDIS_METRICS_CLIENT_ALLOWED_PROCESS_TYPES,\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAMA,6BAA6B,GAAG,kBAAkB;;AAExD;AACA,MAAMC,0BAA0B,GAAG,eAAe;;AAElD;AACA,MAAMC,0BAA0B,GAAG,eAAe;;AAElD;AACA,MAAMC,wBAAwB,GAAG,KAAK;;AAEtC;AACA,MAAMC,2BAA2B,GAAG,QAAQ;;AAE5C;AACA,MAAMC,2CAA2C,GAAG,cAAc;;AAElE;AACA;AACA;AACA;AACA,MAAMC,0CAA0C,GAAGC,MAAM,CAACC,MAAM,CAAC,CAC/DN,0BAA0B,EAC1BD,0BAA0B,CAC3B,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASQ,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,SAASK,uBAAuBA,CAACN,aAAa,EAAEO,mBAAmB,EAAE;EACnE,MAAMC,QAAQ,GAAGT,yBAAyB,CACxCC,aAAa,EACbO,mBACF,CAAC;EACD,IAAIC,QAAQ,KAAKD,mBAAmB,EAAE;IACpCJ,OAAO,CAACM,IAAI,CAAC,CAAC,CAAC;EACjB;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,uBAAuBA,CAC9BV,aAAa,EACbW,mBAAmB,EACnBC,sBAAsB,EACtB;EACA,MAAMJ,QAAQ,GAAGT,yBAAyB,CACxCC,aAAa,EACbY,sBACF,CAAC;EACD,IAAI,CAACD,mBAAmB,CAACE,QAAQ,CAACL,QAAQ,CAAC,EAAE;IAC3CL,OAAO,CAACM,IAAI,CAAC,CAAC,CAAC;EACjB;AACF;AAEAK,MAAM,CAACC,OAAO,GAAG;EACfhB,yBAAyB;EACzBO,uBAAuB;EACvBI,uBAAuB;EACvBpB,6BAA6B;EAC7BC,0BAA0B;EAC1BC,0BAA0B;EAC1BC,wBAAwB;EACxBC,2BAA2B;EAC3BC,2CAA2C;EAC3CC;AACF,CAAC","ignoreList":[]}

package/package.json

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

package/src/metrics/httpMetricsRedisCollector.js

@@ -92,30 +92,12 @@ class HttpMetricsRedisCollector extends BaseMetricsClient {
       this.countersFunctions?.app_requests_total &&
       this.countersFunctions?.app_requests_total_duration
     ) {
-      const { pid } = process
-      const t0 = Date.now()
-      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
-      console.warn(
-        `[TEMP_HTTP_METRICS_DIAG] http_collector_flush_begin pid=${pid} dyno_id=${this.dynoId} process_type=${this.processType} app=${this.appName}`
-      )
-      // --- end TEMP_HTTP_METRICS_DIAG ---
-      const drainedOk = await this._store.flushToCounters(
+      await this._store.flushToCounters(
         (labels, value) =>
           this.countersFunctions.app_requests_total(labels, value),
         (labels, value) =>
           this.countersFunctions.app_requests_total_duration(labels, value)
       )
-      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
-      console.warn(
-        `[TEMP_HTTP_METRICS_DIAG] http_collector_flush_end pid=${pid} lock_acquired_and_ran_drain=${drainedOk} elapsed_ms=${Date.now() - t0}`
-      )
-      // --- end TEMP_HTTP_METRICS_DIAG ---
-    } else {
-      // --- TEMP_HTTP_METRICS_DIAG: remove when done debugging ---
-      console.warn(
-        `[TEMP_HTTP_METRICS_DIAG] http_collector_flush_skipped pid=${process.pid} reason=missing_store_or_http_counters`
-      )
-      // --- end TEMP_HTTP_METRICS_DIAG ---
     }
     return this._pushMetrics()
   }

package/src/metrics/httpMetricsRedisStore.js

@@ -54,19 +54,12 @@ 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}`)
-}
-
-function truncateForDiag(s, maxLen = 220) {
-  const t = String(s)
-  return t.length > maxLen ? `${t.slice(0, maxLen - 3)}...` : t
-}
-
 /**
  * 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`.
+ *
+ * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`
+ * (sum of duration ms per same field). Hash field = `method\\x1eroute\\x1estatus\\x1eappId\\x1edatabaseId`.
  */
 class HttpMetricsRedisStore {
   /**
@@ -114,13 +107,6 @@ class HttpMetricsRedisStore {
       const client = this._ensureClient()
       const field = buildFieldKey(method, route, statusCode, appId, databaseId)
       const dur = Math.max(0, Math.round(Number(durationMs) || 0))
-      tempHttpDiagLog(
-        `http_redis_write_prepare pid=${process.pid} countKey=${
-          this.countKey
-        } durKey=${this.durKey} hincr_field=${truncateForDiag(
-          field
-        )} durationMs=${dur}`
-      )
       client
         .multi()
         .hincrby(this.countKey, field, 1)
@@ -153,11 +139,6 @@ class HttpMetricsRedisStore {
     return new Promise(resolve => {
       client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {
         if (setErr || ok !== 'OK') {
-          tempHttpDiagLog(
-            `http_redis_drain_skip pid=${process.pid} countKey=${
-              this.countKey
-            } reason=${setErr ? setErr.message : 'lock_not_held'}`
-          )
           resolve(false)
           return
         }
@@ -176,29 +157,18 @@ class HttpMetricsRedisStore {
                 '[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_collected pid=${process.pid} countKey=${
-                    this.countKey
-                  } hash_fields=0 sum_request_counts=0 (empty — keys deleted or no data)`
-                )
                 finish()
                 return
               }
               const counts = hgetallPairsToObject(raw[0])
               const durs = hgetallPairsToObject(raw[1])
               const fieldKeys = Object.keys(counts)
-              let totalUnits = 0
-              let appliedGroups = 0
-              const samples = []
               for (const field of fieldKeys) {
                 const count = parseInt(counts[field], 10)
                 if (!count || count < 1) {
@@ -209,12 +179,7 @@ class HttpMetricsRedisStore {
                 if (parts.length !== 5) {
                   continue
                 }
-                totalUnits += count
-                appliedGroups += 1
                 const [m, route, statusStr, aid, did] = parts
-                if (samples.length < 4) {
-                  samples.push(`${m} ${route} ${statusStr} x${count}`)
-                }
                 const labels = {
                   method: m,
                   route,
@@ -227,36 +192,11 @@ class HttpMetricsRedisStore {
                   applyDuration(labels, dur)
                 }
               }
-              let emptyHint = 'ok'
-              if (fieldKeys.length === 0) {
-                emptyHint = 'no_hash_entries'
-              } else if (totalUnits === 0) {
-                emptyHint = 'entries_present_but_zero_counts'
-              }
-              const noTrafficHint =
-                fieldKeys.length === 0
-                  ? ' hint=web_must_use_HttpMetricsRedisRecorder_same_redis_APP_web_segment'
-                  : ''
-              tempHttpDiagLog(
-                truncateForDiag(
-                  `http_redis_drain_collected pid=${process.pid} countKey=${
-                    this.countKey
-                  } durKey=${this.durKey} hash_fields_read=${
-                    fieldKeys.length
-                  } label_groups_applied=${appliedGroups} sum_request_counts=${totalUnits} state=${emptyHint} sample=${
-                    samples.join(' | ') || '—'
-                  }${noTrafficHint}`,
-                  900
-                )
-              )
             } catch (e) {
               console.error(
                 '[HttpMetricsRedisStore] flush apply failed:',
                 e.message
               )
-              tempHttpDiagLog(
-                `http_redis_drain_apply_failed pid=${process.pid} ${e.message}`
-              )
             }
             finish()
           }

package/src/metrics/metricsProcessTypeUtils.js

@@ -4,8 +4,9 @@
  *
  * **Canonical names** align with typical Procfile processes (e.g. backend: `web`, `worker`,
  * `queue-metrics`, `database-metrics`, `http-metrics`). The compile **worker** dyno serves queues/builds
- * — it does not run HTTP request metrics; HTTP Redis **writers** use `web` (or `METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`);
- * the HTTP **collector** dyno uses {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.
+ * — it does not run HTTP request metrics. HTTP Redis **key segment** is **`METRICS_HTTP_REDIS_KEY_PROCESS_TYPE`**
+ * (default **`web`**), not `BUILD_DYNO_PROCESS_TYPE` (workers/collector differ). The HTTP **collector** dyno
+ * identity for logs is often {@link METRICS_PROCESS_TYPE_HTTP_METRICS_COLLECTOR}.
  *
  * @module metrics/metricsProcessTypeUtils
  */