@adalo/metrics 0.0.0-staging.24 → 0.0.0-staging.27

package/__tests__/httpMetricsRedisCollector.test.js

@@ -13,9 +13,7 @@ function createRedisV3Mock() {
   }
   return {
     multi: jest.fn(() => multiChain),
-    set: jest.fn(),
     eval: jest.fn(),
-    del: jest.fn(),
     _multiChain: multiChain,
   }
 }
@@ -37,9 +35,6 @@ describe('HttpMetricsRedisCollector', () => {
 
   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, [
@@ -47,11 +42,6 @@ describe('HttpMetricsRedisCollector', () => {
         [field, '10'],
       ])
     })
-    redis.del.mockImplementation((key, cb) => {
-      if (cb) {
-        cb()
-      }
-    })
 
     const collector = new HttpMetricsRedisCollector({
       redisClient: redis,

package/__tests__/httpMetricsRedisRecorder.test.js

@@ -23,18 +23,24 @@ function createRedisV3Mock() {
 }
 
 describe('HttpMetricsRedisRecorder', () => {
+  const originalEnv = process.env
+
+  beforeEach(() => {
+    process.env = { ...originalEnv, BUILD_APP_NAME: 'app' }
+  })
+
+  afterEach(() => {
+    process.env = originalEnv
+  })
+
   it('throws without redisClient', () => {
-    expect(() => new HttpMetricsRedisRecorder({ appName: 'a', processType: 'web' })).toThrow(
-      'redisClient is required'
-    )
+    expect(() => new HttpMetricsRedisRecorder({})).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

package/__tests__/httpMetricsRedisStore.test.js

@@ -21,13 +21,70 @@ function createRedisV3Mock() {
   }
   return {
     multi: jest.fn(() => multiChain),
-    set: jest.fn(),
     eval: jest.fn(),
-    del: jest.fn(),
     _multiChain: multiChain,
   }
 }
 
+/**
+ * In-memory redis@3 mock: MULTI/EXEC applies HINCRBY to shared hashes; EVAL returns
+ * [HGETALL+DEL countKey, HGETALL+DEL durKey] like the real drain Lua. Use this to
+ * simulate many writers (same client) without Redis.
+ */
+function createRedisV3InMemoryMock() {
+  /** @type {Record<string, Record<string, string>>} */
+  const hashes = {}
+
+  function hgetallFlat(key) {
+    const h = hashes[key]
+    if (!h) return []
+    const flat = []
+    for (const [f, v] of Object.entries(h)) {
+      flat.push(f, v)
+    }
+    return flat
+  }
+
+  function drainKey(key) {
+    const flat = hgetallFlat(key)
+    delete hashes[key]
+    return flat
+  }
+
+  const client = {
+    multi: jest.fn(() => {
+      const ops = []
+      const chain = {}
+      chain.hincrby = jest.fn((key, field, inc) => {
+        ops.push({ key, field, inc: Number(inc) })
+        return chain
+      })
+      chain.expire = jest.fn().mockReturnValue(chain)
+      chain.exec = jest.fn(cb => {
+        for (const op of ops) {
+          if (!hashes[op.key]) hashes[op.key] = {}
+          const cur = parseInt(hashes[op.key][op.field] || '0', 10)
+          hashes[op.key][op.field] = String(cur + op.inc)
+        }
+        if (cb) cb(null)
+      })
+      return chain
+    }),
+    eval: jest.fn((lua, numKeys, k1, k2, cb) => {
+      const out = [drainKey(k1), drainKey(k2)]
+      if (cb) cb(null, out)
+    }),
+    /** @param {string} key */
+    _fieldCount(key) {
+      return Object.keys(hashes[key] || {}).length
+    },
+    _peek(key) {
+      return { ...(hashes[key] || {}) }
+    },
+  }
+  return client
+}
+
 describe('HttpMetricsRedisStore', () => {
   describe('buildFieldKey', () => {
     it('joins parts with FIELD_SEP', () => {
@@ -54,7 +111,6 @@ describe('HttpMetricsRedisStore', () => {
       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`)
     })
   })
 
@@ -82,26 +138,8 @@ describe('HttpMetricsRedisStore', () => {
   })
 
   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('applies aggregated count and summed duration for one route (many requests → one field)', async () => {
       const redis = createRedisV3Mock()
-      redis.set.mockImplementation((key, val, mode, ttl, nx, cb) => {
-        cb(null, 'OK')
-      })
       const field = buildFieldKey('GET', '/api/items', 200, '', '')
       redis.eval.mockImplementation((lua, numKeys, k1, k2, cb) => {
         cb(null, [
@@ -109,11 +147,6 @@ describe('HttpMetricsRedisStore', () => {
           [field, '4500'],
         ])
       })
-      redis.del.mockImplementation((key, cb) => {
-        if (cb) {
-          cb()
-        }
-      })
 
       const store = new HttpMetricsRedisStore({
         redisClient: redis,
@@ -150,9 +183,6 @@ describe('HttpMetricsRedisStore', () => {
 
     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, [
@@ -160,11 +190,6 @@ describe('HttpMetricsRedisStore', () => {
           [field, '50'],
         ])
       })
-      redis.del.mockImplementation((key, cb) => {
-        if (cb) {
-          cb()
-        }
-      })
 
       const store = new HttpMetricsRedisStore({
         redisClient: redis,
@@ -208,17 +233,9 @@ describe('HttpMetricsRedisStore', () => {
 
     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',
@@ -230,4 +247,159 @@ describe('HttpMetricsRedisStore', () => {
       expect(applyCount).not.toHaveBeenCalled()
     })
   })
+
+  describe('in-memory integration (many fields, shared writers)', () => {
+    it('flush applies many distinct hash fields (many routes / labels)', async () => {
+      const redis = createRedisV3InMemoryMock()
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'svc',
+        processType: 'web',
+      })
+      const routes = Array.from({ length: 24 }, (_, i) => `/api/v${i % 3}/item/${i}`)
+      for (let i = 0; i < routes.length; i++) {
+        const method = i % 2 === 0 ? 'GET' : 'POST'
+        const status = i % 5 === 0 ? 500 : 200
+        store.record(method, routes[i], status, `app-${i % 4}`, `db-${i % 3}`, 10 + i)
+      }
+      expect(redis._fieldCount(store.countKey)).toBe(routes.length)
+
+      const applyCount = jest.fn()
+      const applyDuration = jest.fn()
+      const ok = await store.flushToCounters(applyCount, applyDuration)
+
+      expect(ok).toBe(true)
+      expect(applyCount).toHaveBeenCalledTimes(routes.length)
+      let sumCount = 0
+      let sumDur = 0
+      applyCount.mock.calls.forEach(([, c]) => {
+        sumCount += c
+      })
+      applyDuration.mock.calls.forEach(([, d]) => {
+        sumDur += d
+      })
+      expect(sumCount).toBe(routes.length)
+      expect(sumDur).toBe(routes.reduce((acc, _, i) => acc + (10 + i), 0))
+      expect(redis._peek(store.countKey)).toEqual({})
+    })
+
+    it('many requests for the same field aggregate to one apply (like one dyno hot route)', async () => {
+      const redis = createRedisV3InMemoryMock()
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'app',
+        processType: 'web',
+      })
+      const n = 80
+      for (let i = 0; i < n; i++) {
+        store.record('GET', '/hot', 200, 'a1', 'd1', 5)
+      }
+      expect(redis._fieldCount(store.countKey)).toBe(1)
+
+      const applyCount = jest.fn()
+      const applyDuration = jest.fn()
+      await store.flushToCounters(applyCount, applyDuration)
+
+      expect(applyCount).toHaveBeenCalledTimes(1)
+      expect(applyCount).toHaveBeenCalledWith(
+        expect.objectContaining({
+          method: 'GET',
+          route: '/hot',
+          status_code: '200',
+          appId: 'a1',
+          databaseId: 'd1',
+        }),
+        n
+      )
+      expect(applyDuration).toHaveBeenCalledWith(
+        expect.objectContaining({ route: '/hot' }),
+        n * 5
+      )
+    })
+
+    it('multiple store instances on the same redis client combine like multiple dynos', async () => {
+      const redis = createRedisV3InMemoryMock()
+      const opts = { redisClient: redis, appName: 'prod', processType: 'web' }
+      const dynoA = new HttpMetricsRedisStore(opts)
+      const dynoB = new HttpMetricsRedisStore(opts)
+
+      dynoA.record('GET', '/a', 200, '', '', 3)
+      dynoB.record('GET', '/b', 304, '', '', 7)
+      dynoA.record('POST', '/c', 201, 'x', 'y', 11)
+
+      expect(redis._fieldCount(dynoA.countKey)).toBe(3)
+
+      const applyCount = jest.fn()
+      const applyDuration = jest.fn()
+      const ok = await dynoB.flushToCounters(applyCount, applyDuration)
+
+      expect(ok).toBe(true)
+      expect(applyCount).toHaveBeenCalledTimes(3)
+      expect(applyDuration).toHaveBeenCalledTimes(3)
+    })
+
+    it('interleaved record() calls from parallel async work combine correctly', async () => {
+      const redis = createRedisV3InMemoryMock()
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'app',
+        processType: 'web',
+      })
+
+      await Promise.all(
+        [0, 1, 2, 3, 4].map(worker =>
+          Promise.all(
+            Array.from({ length: 15 }, (_, j) => {
+              const route = `/w${worker}/r${j}`
+              store.record('GET', route, 200, `app${worker}`, 'db0', 2)
+              return Promise.resolve()
+            })
+          )
+        )
+      )
+
+      expect(redis._fieldCount(store.countKey)).toBe(5 * 15)
+
+      const applyCount = jest.fn()
+      const applyDuration = jest.fn()
+      await store.flushToCounters(applyCount, applyDuration)
+
+      expect(applyCount).toHaveBeenCalledTimes(75)
+      let total = 0
+      applyCount.mock.calls.forEach(([, c]) => {
+        total += c
+      })
+      expect(total).toBe(75)
+      expect(
+        applyDuration.mock.calls.reduce((acc, [, d]) => acc + d, 0)
+      ).toBe(75 * 2)
+    })
+
+    it('mixed methods, statuses, and apps in one drain', async () => {
+      const redis = createRedisV3InMemoryMock()
+      const store = new HttpMetricsRedisStore({
+        redisClient: redis,
+        appName: 'mixed',
+        processType: 'api',
+      })
+      const samples = [
+        ['GET', '/x', 200, 'a', 'd', 1],
+        ['GET', '/x', 404, 'a', 'd', 2],
+        ['DELETE', '/x|y', 204, 'b', 'd', 3],
+      ]
+      for (const [m, r, s, a, d, dur] of samples) {
+        store.record(m, r, s, a, d, dur)
+      }
+
+      const applyCount = jest.fn()
+      const applyDuration = jest.fn()
+      await store.flushToCounters(applyCount, applyDuration)
+
+      expect(applyCount).toHaveBeenCalledTimes(3)
+      expect(applyCount.mock.calls.map(([{ method, route, status_code }]) => `${method} ${route} ${status_code}`).sort()).toEqual(
+        ['DELETE /x|y 204', 'GET /x 200', 'GET /x 404'].sort()
+      )
+      expect(applyDuration.mock.calls.reduce((acc, [, v]) => acc + v, 0)).toBe(6)
+    })
+  })
 })

package/lib/metrics/httpMetricsRedisRecorder.d.ts

@@ -8,14 +8,14 @@ export class HttpMetricsRedisRecorder {
     /**
      * @param {Object} opts
      * @param {import('redis').RedisClient} opts.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).
-     * @param {string} opts.appName Application name (must match collector; typically `BUILD_APP_NAME`).
-     * @param {string} opts.processType Logical process segment in Redis keys (e.g. `web`; must match collector’s key segment).
+     * @param {string} [opts.appName] Optional override; default same as {@link BaseMetricsClient}: `BUILD_APP_NAME` or `unknown-app`.
+     * @param {string} [opts.processType] Redis key segment (default **`web`**, same as {@link HttpMetricsRedisCollector}).
      * @param {number} [opts.ttlSec] Redis hash key TTL in seconds (sliding; default 120).
      */
-    constructor({ redisClient, appName, processType, ttlSec }: {
+    constructor({ redisClient, appName, processType, ttlSec }?: {
         redisClient: import('redis').RedisClient;
-        appName: string;
-        processType: string;
+        appName?: string | undefined;
+        processType?: string | undefined;
         ttlSec?: number | undefined;
     });
     processType: string;

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

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisRecorder.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisRecorder.js"],"names":[],"mappings":"AAOA;;;;;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;aAgBhB;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":"AAOA;;;;;GAKG;AACH;IACE;;;;;;OAMG;IACH;QAL6C,WAAW,EAA7C,OAAO,OAAO,EAAE,WAAW;QACb,OAAO;QACP,WAAW;QACX,MAAM;OAe9B;IARC,oBAA8B;IAC9B,gBAA8B;IAC9B,8BAKE;IAGJ;;;;;;;;OAQG;IACH;QAP0B,MAAM,EAArB,MAAM;QACS,KAAK,EAApB,MAAM;QACS,WAAW,EAA1B,MAAM;QACU,KAAK;QACL,UAAU;QACX,QAAQ,EAAvB,MAAM;aAiBhB;IAED;;;;;;;OAOG;IACH,kCAJW,OAAO,MAAM,EAAE,eAAe,OAC9B,OAAO,MAAM,EAAE,cAAc,0BAkCvC;CACF"}

package/lib/metrics/httpMetricsRedisRecorder.js

@@ -19,24 +19,25 @@ class HttpMetricsRedisRecorder {
   /**
    * @param {Object} opts
    * @param {import('redis').RedisClient} opts.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).
-   * @param {string} opts.appName Application name (must match collector; typically `BUILD_APP_NAME`).
-   * @param {string} opts.processType Logical process segment in Redis keys (e.g. `web`; must match collector’s key segment).
+   * @param {string} [opts.appName] Optional override; default same as {@link BaseMetricsClient}: `BUILD_APP_NAME` or `unknown-app`.
+   * @param {string} [opts.processType] Redis key segment (default **`web`**, same as {@link HttpMetricsRedisCollector}).
    * @param {number} [opts.ttlSec] Redis hash key TTL in seconds (sliding; default 120).
    */
   constructor({
     redisClient,
     appName,
-    processType,
+    processType = 'web',
     ttlSec
-  }) {
+  } = {}) {
     if (redisClient == null) {
       throw new Error('HttpMetricsRedisRecorder: redisClient is required');
     }
+    const resolvedAppName = appName || process.env.BUILD_APP_NAME || 'unknown-app';
     this.processType = processType;
-    this.appName = appName;
+    this.appName = resolvedAppName;
     this._store = new HttpMetricsRedisStore({
       redisClient,
-      appName,
+      appName: resolvedAppName,
       processType,
       ttlSec
     });
@@ -59,7 +60,7 @@ class HttpMetricsRedisRecorder {
     databaseId = '',
     duration
   }) {
-    httpMetricsTraceLog(`1_track pid=${process.pid} app=${this.appName} segment=${this.processType} ` + `method=${method} route=${trunc(route)} status=${status_code} durationMs=${duration} ` + `appId=${trunc(appId || '—', 40)} databaseId=${trunc(databaseId || '—', 40)}`);
+    httpMetricsTraceLog(`track_request pid=${process.pid} app=${this.appName} segment=${this.processType} ` + `method=${method} route=${trunc(route)} status=${status_code} durationMs=${duration} ` + `appId=${trunc(appId || '—', 40)} databaseId=${trunc(databaseId || '—', 40)} ` + `(then save_to_redis lines from store)`);
     this._store.record(method, route, status_code, appId, databaseId, duration);
   }
 

package/lib/metrics/httpMetricsRedisRecorder.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisRecorder.js","names":["HttpMetricsRedisStore","httpMetricsTraceLog","require","trunc","s","max","t","String","length","slice","HttpMetricsRedisRecorder","constructor","redisClient","appName","processType","ttlSec","Error","_store","trackHttpRequest","method","route","status_code","appId","databaseId","duration","process","pid","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, httpMetricsTraceLog } = require('./httpMetricsRedisStore')\n\nfunction trunc(s, max = 120) {\n  const t = String(s)\n  return t.length > max ? `${t.slice(0, max - 3)}...` : t\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\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    httpMetricsTraceLog(\n      `1_track pid=${process.pid} app=${this.appName} segment=${this.processType} ` +\n        `method=${method} route=${trunc(route)} status=${status_code} durationMs=${duration} ` +\n        `appId=${trunc(appId || '—', 40)} databaseId=${trunc(databaseId || '—', 40)}`\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":"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","ignoreList":[]}
+{"version":3,"file":"httpMetricsRedisRecorder.js","names":["HttpMetricsRedisStore","httpMetricsTraceLog","require","trunc","s","max","t","String","length","slice","HttpMetricsRedisRecorder","constructor","redisClient","appName","processType","ttlSec","Error","resolvedAppName","process","env","BUILD_APP_NAME","_store","trackHttpRequest","method","route","status_code","appId","databaseId","duration","pid","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, httpMetricsTraceLog } = require('./httpMetricsRedisStore')\n\nfunction trunc(s, max = 120) {\n  const t = String(s)\n  return t.length > max ? `${t.slice(0, max - 3)}...` : t\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] Optional override; default same as {@link BaseMetricsClient}: `BUILD_APP_NAME` or `unknown-app`.\n   * @param {string} [opts.processType] Redis key segment (default **`web`**, same as {@link HttpMetricsRedisCollector}).\n   * @param {number} [opts.ttlSec] Redis hash key TTL in seconds (sliding; default 120).\n   */\n  constructor({ redisClient, appName, processType = 'web', ttlSec } = {}) {\n    if (redisClient == null) {\n      throw new Error('HttpMetricsRedisRecorder: redisClient is required')\n    }\n    const resolvedAppName = appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    this.processType = processType\n    this.appName = resolvedAppName\n    this._store = new HttpMetricsRedisStore({\n      redisClient,\n      appName: resolvedAppName,\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    httpMetricsTraceLog(\n      `track_request pid=${process.pid} app=${this.appName} segment=${this.processType} ` +\n        `method=${method} route=${trunc(route)} status=${status_code} durationMs=${duration} ` +\n        `appId=${trunc(appId || '—', 40)} databaseId=${trunc(databaseId || '—', 40)} ` +\n        `(then save_to_redis lines from store)`\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":"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","ignoreList":[]}

package/lib/metrics/httpMetricsRedisStore.d.ts

@@ -1,11 +1,12 @@
 /**
  * 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`.
+ * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`.
  *
- * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`
- * (sum of duration ms per same field). Same `(method, route, status, appId, databaseId)` → same hash field;
- * many requests in an interval **add** to count and **sum** durations (Redis `HINCRBY`). Drain applies those
- * totals to `app_requests_total` / `app_requests_total_duration`.
+ * **Structure:** `countKey` / `durKey` are each **one Redis hash**. The hash has **many fields** — not
+ * one bucket for all traffic. Each **field name** encodes one label group `(method, route, status_code,
+ * appId, databaseId)`. The **value** in `:count` is **HINCRBY 1** per request for that group; in `:dur`
+ * it is **HINCRBY** of that request’s **duration ms** (so many requests → summed ms per same field).
+ * Different routes → different hash fields. Drain runs atomic Lua (HGETALL + DEL) per tick.
  */
 export class HttpMetricsRedisStore {
     /**
@@ -25,7 +26,6 @@ export class HttpMetricsRedisStore {
     ttlSec: number;
     countKey: string;
     durKey: string;
-    lockKey: string;
     /**
      * @returns {import('redis').RedisClient}
      * @private
@@ -71,7 +71,9 @@ export function isRedisPeerInstalled(): boolean;
  */
 export const DEFAULT_HTTP_METRICS_REDIS_TTL_SEC: number;
 /**
- * Stdout trace (uses **console.log**, not warn — same as typical app request logs).
+ * Trace line for SAVE (web → Redis) and GET/drain (collector ← Redis).
+ * Single `console.log` only: many hosts (e.g. Heroku) merge stdout+stderr into one stream and would
+ * show duplicate lines if we also wrote the same text to stderr.
  * @param {string} body - Line body after `[http-metrics-redis]` prefix.
  */
 export function httpMetricsTraceLog(body: string): void;

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

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisStore.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisStore.js"],"names":[],"mappings":"AAmFA;;;;;;;;GAQG;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,CAgG5B;CACF;AAtMD;;;;;;;GAOG;AACH,sCAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,GACJ,MAAM,CAIlB;AAtED;;;GAGG;AACH,wBAFU,MAAM,CAEQ;AA4CxB;;GAEG;AACH,wCAFa,OAAO,CASnB;AApDD;;;GAGG;AACH,iDAFU,MAAM,CAE8B;AAqB9C;;;GAGG;AACH,0CAFW,MAAM,QAIhB"}
+{"version":3,"file":"httpMetricsRedisStore.d.ts","sourceRoot":"","sources":["../../src/metrics/httpMetricsRedisStore.js"],"names":[],"mappings":"AA2FA;;;;;;;;;GASG;AACH;IACE;;;;;;OAMG;IACH;QAL6C,WAAW,EAA7C,OAAO,OAAO,EAAE,WAAW;QACd,OAAO,EAApB,MAAM;QACO,WAAW,EAAxB,MAAM;QACQ,MAAM;OAgB9B;IAVC,qCAA0B;IAC1B,eAGwC;IAIxC,iBAAiD;IACjD,eAA6C;IAG/C;;;OAGG;IACH,sBAEC;IAED;;;;;;;OAOG;IACH,eAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,cACN,MAAM,QA6BhB;IAED;;;;OAIG;IACH,qCAJoB,MAAM,SAAS,MAAM,KAAK,IAAI,0BAC9B,MAAM,SAAS,MAAM,KAAK,IAAI,GACrC,QAAQ,OAAO,CAAC,CAqF5B;CACF;AA/LD;;;;;;;GAOG;AACH,sCAPW,MAAM,SACN,MAAM,cACN,MAAM,SACN,MAAM,cACN,MAAM,GACJ,MAAM,CAIlB;AA9ED;;;GAGG;AACH,wBAFU,MAAM,CAEQ;AAoDxB;;GAEG;AACH,wCAFa,OAAO,CASnB;AA5DD;;;GAGG;AACH,iDAFU,MAAM,CAE8B;AA0B9C;;;;;GAKG;AACH,0CAFW,MAAM,QAKhB"}

package/lib/metrics/httpMetricsRedisStore.js

@@ -29,13 +29,20 @@ function clusterHint() {
   }
   return '';
 }
+function truncField(s, max = 96) {
+  const t = String(s);
+  return t.length > max ? `${t.slice(0, max - 3)}...` : t;
+}
 
 /**
- * Stdout trace (uses **console.log**, not warn — same as typical app request logs).
+ * Trace line for SAVE (web → Redis) and GET/drain (collector ← Redis).
+ * Single `console.log` only: many hosts (e.g. Heroku) merge stdout+stderr into one stream and would
+ * show duplicate lines if we also wrote the same text to stderr.
  * @param {string} body - Line body after `[http-metrics-redis]` prefix.
  */
 function httpMetricsTraceLog(body) {
-  console.log(`${LOG} ${body}${clusterHint()}`);
+  const line = `${LOG} ${body}${clusterHint()}`;
+  console.log(line);
 }
 const DRAIN_LUA = `
 local function drain(key)
@@ -82,12 +89,13 @@ function hgetallPairsToObject(pairs) {
 
 /**
  * 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`.
+ * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`.
  *
- * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`
- * (sum of duration ms per same field). Same `(method, route, status, appId, databaseId)` → same hash field;
- * many requests in an interval **add** to count and **sum** durations (Redis `HINCRBY`). Drain applies those
- * totals to `app_requests_total` / `app_requests_total_duration`.
+ * **Structure:** `countKey` / `durKey` are each **one Redis hash**. The hash has **many fields** — not
+ * one bucket for all traffic. Each **field name** encodes one label group `(method, route, status_code,
+ * appId, databaseId)`. The **value** in `:count` is **HINCRBY 1** per request for that group; in `:dur`
+ * it is **HINCRBY** of that request’s **duration ms** (so many requests → summed ms per same field).
+ * Different routes → different hash fields. Drain runs atomic Lua (HGETALL + DEL) per tick.
  */
 class HttpMetricsRedisStore {
   /**
@@ -111,7 +119,6 @@ class HttpMetricsRedisStore {
     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`;
   }
 
   /**
@@ -135,12 +142,13 @@ class HttpMetricsRedisStore {
       const client = this._ensureClient();
       const field = buildFieldKey(method, route, statusCode, appId, databaseId);
       const dur = Math.max(0, Math.round(Number(durationMs) || 0));
+      httpMetricsTraceLog(`save_to_redis pid=${process.pid} countKey=${this.countKey} ` + `durKey=${this.durKey} field=${truncField(field)} durationMs=${dur} (before MULTI/EXEC)`);
       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;
         }
-        httpMetricsTraceLog(`2_redis_write pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} ok`);
+        httpMetricsTraceLog(`save_to_redis_ok pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} (after MULTI/EXEC)`);
       });
     } catch (e) {
       console.error('[HttpMetricsRedisStore] record:', e.message);
@@ -161,65 +169,57 @@ class HttpMetricsRedisStore {
       return Promise.resolve(false);
     }
     return new Promise(resolve => {
-      client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {
-        if (setErr || ok !== 'OK') {
-          httpMetricsTraceLog(`3_redis_drain_skip pid=${process.pid} countKey=${this.countKey} reason=${setErr ? `error:${setErr.message}` : 'lock_not_acquired'}`);
+      httpMetricsTraceLog(`get_from_redis_try pid=${process.pid} countKey=${this.countKey} (EVAL drain)`);
+      client.eval(DRAIN_LUA, 2, this.countKey, this.durKey, (evalErr, raw) => {
+        if (evalErr) {
+          console.error('[HttpMetricsRedisStore] drain failed:', evalErr.message);
           resolve(false);
           return;
         }
-        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);
-            finish();
+        try {
+          if (!raw || !Array.isArray(raw) || raw.length < 2) {
+            httpMetricsTraceLog(`get_from_redis_empty pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_requests=0 (lua returned no pairs)`);
+            resolve(true);
             return;
           }
-          try {
-            if (!raw || !Array.isArray(raw) || raw.length < 2) {
-              httpMetricsTraceLog(`3_redis_drain pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_requests=0 (empty_after_lua)`);
-              finish();
-              return;
+          const counts = hgetallPairsToObject(raw[0]);
+          const durs = hgetallPairsToObject(raw[1]);
+          const fieldKeys = Object.keys(counts);
+          let sumRequests = 0;
+          const samples = [];
+          for (const field of fieldKeys) {
+            const count = parseInt(counts[field], 10);
+            if (!count || count < 1) {
+              continue;
+            }
+            const dur = parseInt(durs[field] || '0', 10) || 0;
+            const parts = field.split(FIELD_SEP);
+            if (parts.length !== 5) {
+              continue;
+            }
+            const [m, route, statusStr, aid, did] = parts;
+            sumRequests += count;
+            if (samples.length < 3) {
+              samples.push(`${m} ${route} ${statusStr} x${count}`);
             }
-            const counts = hgetallPairsToObject(raw[0]);
-            const durs = hgetallPairsToObject(raw[1]);
-            const fieldKeys = Object.keys(counts);
-            let sumRequests = 0;
-            const samples = [];
-            for (const field of fieldKeys) {
-              const count = parseInt(counts[field], 10);
-              if (!count || count < 1) {
-                continue;
-              }
-              const dur = parseInt(durs[field] || '0', 10) || 0;
-              const parts = field.split(FIELD_SEP);
-              if (parts.length !== 5) {
-                continue;
-              }
-              const [m, route, statusStr, aid, did] = parts;
-              sumRequests += count;
-              if (samples.length < 3) {
-                samples.push(`${m} ${route} ${statusStr} x${count}`);
-              }
-              const labels = {
-                method: m,
-                route,
-                status_code: statusStr,
-                appId: aid,
-                databaseId: did
-              };
-              applyCount(labels, count);
-              if (dur > 0) {
-                applyDuration(labels, dur);
-              }
+            const labels = {
+              method: m,
+              route,
+              status_code: statusStr,
+              appId: aid,
+              databaseId: did
+            };
+            applyCount(labels, count);
+            if (dur > 0) {
+              applyDuration(labels, dur);
             }
-            httpMetricsTraceLog(`3_redis_drain pid=${process.pid} countKey=${this.countKey} hash_fields=${fieldKeys.length} sum_requests=${sumRequests} sample=${samples.join(' | ') || '—'}`);
-          } catch (e) {
-            console.error('[HttpMetricsRedisStore] flush apply failed:', e.message);
           }
-          finish();
-        });
+          httpMetricsTraceLog(`get_from_redis_ok pid=${process.pid} countKey=${this.countKey} hash_fields=${fieldKeys.length} sum_requests=${sumRequests} sample=${samples.join(' | ') || '—'}`);
+          resolve(true);
+        } catch (e) {
+          console.error('[HttpMetricsRedisStore] flush apply failed:', e.message);
+          resolve(false);
+        }
       });
     });
   }

package/lib/metrics/httpMetricsRedisStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpMetricsRedisStore.js","names":["FIELD_SEP","DEFAULT_HTTP_METRICS_REDIS_TTL_SEC","LOG","clusterHint","c","require","isWorker","worker","id","_","httpMetricsTraceLog","body","console","log","DRAIN_LUA","isRedisPeerInstalled","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","error","message","process","pid","e","flushToCounters","applyCount","applyDuration","Promise","set","setErr","ok","eval","evalErr","raw","finish","del","Array","isArray","counts","durs","fieldKeys","Object","keys","sumRequests","samples","count","parseInt","parts","split","m","statusStr","aid","did","push","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 LOG = '[http-metrics-redis]'\n\n/**\n * When Node runs behind `cluster`, HTTP is usually served from workers — include worker id in traces.\n * @returns {string}\n */\nfunction clusterHint() {\n  try {\n    // eslint-disable-next-line global-require\n    const c = require('cluster')\n    if (c.isWorker && c.worker != null) {\n      return ` cluster_worker=${c.worker.id}`\n    }\n  } catch (_) {\n    /* cluster not in use */\n  }\n  return ''\n}\n\n/**\n * Stdout trace (uses **console.log**, not warn — same as typical app request logs).\n * @param {string} body - Line body after `[http-metrics-redis]` prefix.\n */\nfunction httpMetricsTraceLog(body) {\n  console.log(`${LOG} ${body}${clusterHint()}`)\n}\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). Same `(method, route, status, appId, databaseId)` → same hash field;\n * many requests in an interval **add** to count and **sum** durations (Redis `HINCRBY`). Drain applies those\n * totals to `app_requests_total` / `app_requests_total_duration`.\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          httpMetricsTraceLog(\n            `2_redis_write pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} ok`\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          httpMetricsTraceLog(\n            `3_redis_drain_skip pid=${process.pid} countKey=${this.countKey} reason=${\n              setErr ? `error:${setErr.message}` : 'lock_not_acquired'\n            }`\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              finish()\n              return\n            }\n\n            try {\n              if (!raw || !Array.isArray(raw) || raw.length < 2) {\n                httpMetricsTraceLog(\n                  `3_redis_drain pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_requests=0 (empty_after_lua)`\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 sumRequests = 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                const [m, route, statusStr, aid, did] = parts\n                sumRequests += count\n                if (samples.length < 3) {\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              httpMetricsTraceLog(\n                `3_redis_drain pid=${process.pid} countKey=${this.countKey} hash_fields=${\n                  fieldKeys.length\n                } sum_requests=${sumRequests} sample=${samples.join(' | ') || '—'}`\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  httpMetricsTraceLog,\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"httpMetricsRedisStore.js","names":["FIELD_SEP","DEFAULT_HTTP_METRICS_REDIS_TTL_SEC","LOG","clusterHint","c","require","isWorker","worker","id","_","truncField","s","max","t","String","length","slice","httpMetricsTraceLog","body","line","console","log","DRAIN_LUA","isRedisPeerInstalled","resolve","buildFieldKey","method","route","statusCode","appId","databaseId","join","hgetallPairsToObject","pairs","o","i","HttpMetricsRedisStore","constructor","redisClient","appName","processType","ttlSec","Error","_client","keySeg","encodeURIComponent","countKey","durKey","_ensureClient","record","durationMs","client","field","dur","Math","round","Number","process","pid","multi","hincrby","expire","exec","err","error","message","e","flushToCounters","applyCount","applyDuration","Promise","eval","evalErr","raw","Array","isArray","counts","durs","fieldKeys","Object","keys","sumRequests","samples","count","parseInt","parts","split","m","statusStr","aid","did","push","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 LOG = '[http-metrics-redis]'\n\n/**\n * When Node runs behind `cluster`, HTTP is usually served from workers — include worker id in traces.\n * @returns {string}\n */\nfunction clusterHint() {\n  try {\n    // eslint-disable-next-line global-require\n    const c = require('cluster')\n    if (c.isWorker && c.worker != null) {\n      return ` cluster_worker=${c.worker.id}`\n    }\n  } catch (_) {\n    /* cluster not in use */\n  }\n  return ''\n}\n\nfunction truncField(s, max = 96) {\n  const t = String(s)\n  return t.length > max ? `${t.slice(0, max - 3)}...` : t\n}\n\n/**\n * Trace line for SAVE (web → Redis) and GET/drain (collector ← Redis).\n * Single `console.log` only: many hosts (e.g. Heroku) merge stdout+stderr into one stream and would\n * show duplicate lines if we also wrote the same text to stderr.\n * @param {string} body - Line body after `[http-metrics-redis]` prefix.\n */\nfunction httpMetricsTraceLog(body) {\n  const line = `${LOG} ${body}${clusterHint()}`\n  console.log(line)\n}\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`.\n *\n * **Structure:** `countKey` / `durKey` are each **one Redis hash**. The hash has **many fields** — not\n * one bucket for all traffic. Each **field name** encodes one label group `(method, route, status_code,\n * appId, databaseId)`. The **value** in `:count` is **HINCRBY 1** per request for that group; in `:dur`\n * it is **HINCRBY** of that request’s **duration ms** (so many requests → summed ms per same field).\n * Different routes → different hash fields. Drain runs atomic Lua (HGETALL + DEL) per tick.\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  }\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      httpMetricsTraceLog(\n        `save_to_redis pid=${process.pid} countKey=${this.countKey} ` +\n          `durKey=${this.durKey} field=${truncField(field)} durationMs=${dur} (before MULTI/EXEC)`\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            return\n          }\n          httpMetricsTraceLog(\n            `save_to_redis_ok pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} (after MULTI/EXEC)`\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      httpMetricsTraceLog(\n        `get_from_redis_try pid=${process.pid} countKey=${this.countKey} (EVAL drain)`\n      )\n      client.eval(\n        DRAIN_LUA,\n        2,\n        this.countKey,\n        this.durKey,\n        (evalErr, raw) => {\n          if (evalErr) {\n            console.error(\n              '[HttpMetricsRedisStore] drain failed:',\n              evalErr.message\n            )\n            resolve(false)\n            return\n          }\n\n          try {\n            if (!raw || !Array.isArray(raw) || raw.length < 2) {\n              httpMetricsTraceLog(\n                `get_from_redis_empty pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_requests=0 (lua returned no pairs)`\n              )\n              resolve(true)\n              return\n            }\n            const counts = hgetallPairsToObject(raw[0])\n            const durs = hgetallPairsToObject(raw[1])\n            const fieldKeys = Object.keys(counts)\n            let sumRequests = 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              const [m, route, statusStr, aid, did] = parts\n              sumRequests += count\n              if (samples.length < 3) {\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            httpMetricsTraceLog(\n              `get_from_redis_ok pid=${process.pid} countKey=${this.countKey} hash_fields=${\n                fieldKeys.length\n              } sum_requests=${sumRequests} sample=${samples.join(' | ') || '—'}`\n            )\n            resolve(true)\n          } catch (e) {\n            console.error(\n              '[HttpMetricsRedisStore] flush apply failed:',\n              e.message\n            )\n            resolve(false)\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  httpMetricsTraceLog,\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/metrics/httpMetricsRedisRecorder.js

@@ -15,19 +15,20 @@ class HttpMetricsRedisRecorder {
   /**
    * @param {Object} opts
    * @param {import('redis').RedisClient} opts.redisClient **Required.** Injected client (same pattern as {@link RedisMetricsClient}).
-   * @param {string} opts.appName Application name (must match collector; typically `BUILD_APP_NAME`).
-   * @param {string} opts.processType Logical process segment in Redis keys (e.g. `web`; must match collector’s key segment).
+   * @param {string} [opts.appName] Optional override; default same as {@link BaseMetricsClient}: `BUILD_APP_NAME` or `unknown-app`.
+   * @param {string} [opts.processType] Redis key segment (default **`web`**, same as {@link HttpMetricsRedisCollector}).
    * @param {number} [opts.ttlSec] Redis hash key TTL in seconds (sliding; default 120).
    */
-  constructor({ redisClient, appName, processType, ttlSec }) {
+  constructor({ redisClient, appName, processType = 'web', ttlSec } = {}) {
     if (redisClient == null) {
       throw new Error('HttpMetricsRedisRecorder: redisClient is required')
     }
+    const resolvedAppName = appName || process.env.BUILD_APP_NAME || 'unknown-app'
     this.processType = processType
-    this.appName = appName
+    this.appName = resolvedAppName
     this._store = new HttpMetricsRedisStore({
       redisClient,
-      appName,
+      appName: resolvedAppName,
       processType,
       ttlSec,
     })
@@ -51,9 +52,10 @@ class HttpMetricsRedisRecorder {
     duration,
   }) {
     httpMetricsTraceLog(
-      `1_track pid=${process.pid} app=${this.appName} segment=${this.processType} ` +
+      `track_request pid=${process.pid} app=${this.appName} segment=${this.processType} ` +
         `method=${method} route=${trunc(route)} status=${status_code} durationMs=${duration} ` +
-        `appId=${trunc(appId || '—', 40)} databaseId=${trunc(databaseId || '—', 40)}`
+        `appId=${trunc(appId || '—', 40)} databaseId=${trunc(databaseId || '—', 40)} ` +
+        `(then save_to_redis lines from store)`
     )
     this._store.record(method, route, status_code, appId, databaseId, duration)
   }

package/src/metrics/httpMetricsRedisStore.js

@@ -29,12 +29,20 @@ function clusterHint() {
   return ''
 }
 
+function truncField(s, max = 96) {
+  const t = String(s)
+  return t.length > max ? `${t.slice(0, max - 3)}...` : t
+}
+
 /**
- * Stdout trace (uses **console.log**, not warn — same as typical app request logs).
+ * Trace line for SAVE (web → Redis) and GET/drain (collector ← Redis).
+ * Single `console.log` only: many hosts (e.g. Heroku) merge stdout+stderr into one stream and would
+ * show duplicate lines if we also wrote the same text to stderr.
  * @param {string} body - Line body after `[http-metrics-redis]` prefix.
  */
 function httpMetricsTraceLog(body) {
-  console.log(`${LOG} ${body}${clusterHint()}`)
+  const line = `${LOG} ${body}${clusterHint()}`
+  console.log(line)
 }
 
 const DRAIN_LUA = `
@@ -83,12 +91,13 @@ function hgetallPairsToObject(pairs) {
 
 /**
  * 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`.
+ * Expects `redis` v3-style API: `multi().hincrby().expire().exec(cb)`, `eval`.
  *
- * **Stored metrics:** two hashes per app/segment — `:count` (HINCRBY per route group) and `:dur`
- * (sum of duration ms per same field). Same `(method, route, status, appId, databaseId)` → same hash field;
- * many requests in an interval **add** to count and **sum** durations (Redis `HINCRBY`). Drain applies those
- * totals to `app_requests_total` / `app_requests_total_duration`.
+ * **Structure:** `countKey` / `durKey` are each **one Redis hash**. The hash has **many fields** — not
+ * one bucket for all traffic. Each **field name** encodes one label group `(method, route, status_code,
+ * appId, databaseId)`. The **value** in `:count` is **HINCRBY 1** per request for that group; in `:dur`
+ * it is **HINCRBY** of that request’s **duration ms** (so many requests → summed ms per same field).
+ * Different routes → different hash fields. Drain runs atomic Lua (HGETALL + DEL) per tick.
  */
 class HttpMetricsRedisStore {
   /**
@@ -112,7 +121,6 @@ class HttpMetricsRedisStore {
     )}`
     this.countKey = `metrics:http:v2:${keySeg}:count`
     this.durKey = `metrics:http:v2:${keySeg}:dur`
-    this.lockKey = `metrics:http:v2:${keySeg}:drain_lock`
   }
 
   /**
@@ -136,6 +144,10 @@ class HttpMetricsRedisStore {
       const client = this._ensureClient()
       const field = buildFieldKey(method, route, statusCode, appId, databaseId)
       const dur = Math.max(0, Math.round(Number(durationMs) || 0))
+      httpMetricsTraceLog(
+        `save_to_redis pid=${process.pid} countKey=${this.countKey} ` +
+          `durKey=${this.durKey} field=${truncField(field)} durationMs=${dur} (before MULTI/EXEC)`
+      )
       client
         .multi()
         .hincrby(this.countKey, field, 1)
@@ -148,7 +160,7 @@ class HttpMetricsRedisStore {
             return
           }
           httpMetricsTraceLog(
-            `2_redis_write pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} ok`
+            `save_to_redis_ok pid=${process.pid} countKey=${this.countKey} durKey=${this.durKey} (after MULTI/EXEC)`
           )
         })
     } catch (e) {
@@ -170,90 +182,79 @@ class HttpMetricsRedisStore {
       return Promise.resolve(false)
     }
     return new Promise(resolve => {
-      client.set(this.lockKey, '1', 'EX', 25, 'NX', (setErr, ok) => {
-        if (setErr || ok !== 'OK') {
-          httpMetricsTraceLog(
-            `3_redis_drain_skip pid=${process.pid} countKey=${this.countKey} reason=${
-              setErr ? `error:${setErr.message}` : 'lock_not_acquired'
-            }`
-          )
-          resolve(false)
-          return
-        }
-        client.eval(
-          DRAIN_LUA,
-          2,
-          this.countKey,
-          this.durKey,
-          (evalErr, raw) => {
-            const finish = () => {
-              client.del(this.lockKey, () => resolve(true))
-            }
+      httpMetricsTraceLog(
+        `get_from_redis_try pid=${process.pid} countKey=${this.countKey} (EVAL drain)`
+      )
+      client.eval(
+        DRAIN_LUA,
+        2,
+        this.countKey,
+        this.durKey,
+        (evalErr, raw) => {
+          if (evalErr) {
+            console.error(
+              '[HttpMetricsRedisStore] drain failed:',
+              evalErr.message
+            )
+            resolve(false)
+            return
+          }
 
-            if (evalErr) {
-              console.error(
-                '[HttpMetricsRedisStore] drain failed:',
-                evalErr.message
+          try {
+            if (!raw || !Array.isArray(raw) || raw.length < 2) {
+              httpMetricsTraceLog(
+                `get_from_redis_empty pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_requests=0 (lua returned no pairs)`
               )
-              finish()
+              resolve(true)
               return
             }
-
-            try {
-              if (!raw || !Array.isArray(raw) || raw.length < 2) {
-                httpMetricsTraceLog(
-                  `3_redis_drain pid=${process.pid} countKey=${this.countKey} hash_fields=0 sum_requests=0 (empty_after_lua)`
-                )
-                finish()
-                return
+            const counts = hgetallPairsToObject(raw[0])
+            const durs = hgetallPairsToObject(raw[1])
+            const fieldKeys = Object.keys(counts)
+            let sumRequests = 0
+            const samples = []
+            for (const field of fieldKeys) {
+              const count = parseInt(counts[field], 10)
+              if (!count || count < 1) {
+                continue
               }
-              const counts = hgetallPairsToObject(raw[0])
-              const durs = hgetallPairsToObject(raw[1])
-              const fieldKeys = Object.keys(counts)
-              let sumRequests = 0
-              const samples = []
-              for (const field of fieldKeys) {
-                const count = parseInt(counts[field], 10)
-                if (!count || count < 1) {
-                  continue
-                }
-                const dur = parseInt(durs[field] || '0', 10) || 0
-                const parts = field.split(FIELD_SEP)
-                if (parts.length !== 5) {
-                  continue
-                }
-                const [m, route, statusStr, aid, did] = parts
-                sumRequests += count
-                if (samples.length < 3) {
-                  samples.push(`${m} ${route} ${statusStr} x${count}`)
-                }
-                const labels = {
-                  method: m,
-                  route,
-                  status_code: statusStr,
-                  appId: aid,
-                  databaseId: did,
-                }
-                applyCount(labels, count)
-                if (dur > 0) {
-                  applyDuration(labels, dur)
-                }
+              const dur = parseInt(durs[field] || '0', 10) || 0
+              const parts = field.split(FIELD_SEP)
+              if (parts.length !== 5) {
+                continue
+              }
+              const [m, route, statusStr, aid, did] = parts
+              sumRequests += count
+              if (samples.length < 3) {
+                samples.push(`${m} ${route} ${statusStr} x${count}`)
+              }
+              const labels = {
+                method: m,
+                route,
+                status_code: statusStr,
+                appId: aid,
+                databaseId: did,
+              }
+              applyCount(labels, count)
+              if (dur > 0) {
+                applyDuration(labels, dur)
               }
-              httpMetricsTraceLog(
-                `3_redis_drain pid=${process.pid} countKey=${this.countKey} hash_fields=${
-                  fieldKeys.length
-                } sum_requests=${sumRequests} sample=${samples.join(' | ') || '—'}`
-              )
-            } catch (e) {
-              console.error(
-                '[HttpMetricsRedisStore] flush apply failed:',
-                e.message
-              )
             }
-            finish()
+            httpMetricsTraceLog(
+              `get_from_redis_ok pid=${process.pid} countKey=${this.countKey} hash_fields=${
+                fieldKeys.length
+              } sum_requests=${sumRequests} sample=${samples.join(' | ') || '—'}`
+            )
+            resolve(true)
+          } catch (e) {
+            console.error(
+              '[HttpMetricsRedisStore] flush apply failed:',
+              e.message
+            )
+            resolve(false)
           }
-        )
-      })
+        }
+      )
     })
   }
 }