@worker-manager/metrics 1.0.0 → 1.1.0

package/dist/RedisHistoryAdmin.js

@@ -0,0 +1,328 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisHistoryAdmin = void 0;
+exports.parseHistoryKey = parseHistoryKey;
+const connection_1 = require("./connection");
+const keys_1 = require("./keys");
+const SCAN_COUNT = 500;
+const BATCH = 256;
+/** Keys per pipelined `stats()` batch. Each key costs two commands. */
+const MEASURE_BATCH = 250;
+const METRICS = ['completed', 'failed', 'runtime', 'waittime', 'queueage'];
+/**
+ * Metrics whose global rollup is a plain summable counter, so one queue's share can be taken
+ * back out of it with HINCRBY. The latency metrics are deliberately absent: runtime and
+ * waittime pack a whole bucket vector into a single field and queueage holds a max gauge,
+ * and neither can be corrected by a scalar decrement. See `purge`.
+ */
+const SUMMABLE_METRICS = ['completed', 'failed'];
+/**
+ * Parses the three key shapes from the right, because queue names may themselves contain
+ * colons:
+ *
+ *   <ns>:<queue>:<metric>:<day>         minute buckets
+ *   <ns>:<queue>:<metric>:hour:<day>    hourly rollup
+ *   <ns>:<queue>:<metric>:totals        daily totals
+ *
+ * The metric segment is checked against the known set, so a queue named `hour` or one
+ * ending in `:completed` still resolves correctly. Anything that doesn't fit returns null
+ * and is then reported but never deleted, so a stray key can't be destroyed by accident.
+ */
+function parseHistoryKey(key, namespace) {
+    const prefix = `${namespace}:`;
+    if (!key.startsWith(prefix)) {
+        return null;
+    }
+    const parts = key.slice(prefix.length).split(':');
+    if (parts.length < 3) {
+        return null;
+    }
+    const last = parts[parts.length - 1];
+    if (last === 'totals' && METRICS.includes(parts[parts.length - 2])) {
+        const queue = parts.slice(0, -2).join(':');
+        return queue ? { queue, metric: parts[parts.length - 2], tier: 'day', day: null } : null;
+    }
+    if (!keys_1.DAY_PATTERN.test(last)) {
+        return null;
+    }
+    if (parts.length >= 4 && parts[parts.length - 2] === keys_1.HOUR_TIER) {
+        const metric = parts[parts.length - 3];
+        const queue = parts.slice(0, -3).join(':');
+        return queue && METRICS.includes(metric) ? { queue, metric, tier: 'hour', day: last } : null;
+    }
+    const metric = parts[parts.length - 2];
+    const queue = parts.slice(0, -2).join(':');
+    return queue && METRICS.includes(metric) ? { queue, metric, tier: 'minute', day: last } : null;
+}
+function emptyTiers() {
+    return {
+        minute: { keys: 0, bytes: 0 },
+        hour: { keys: 0, bytes: 0 },
+        day: { keys: 0, bytes: 0 },
+    };
+}
+/** The global rollup key mirroring a per-queue key, same tier and same day. */
+function globalKeyFor(keys, parsed) {
+    if (parsed.day === null) {
+        return keys.totals(keys_1.GLOBAL_QUEUE, parsed.metric);
+    }
+    return parsed.tier === 'hour'
+        ? keys.hour(keys_1.GLOBAL_QUEUE, parsed.metric, parsed.day)
+        : keys.day(keys_1.GLOBAL_QUEUE, parsed.metric, parsed.day);
+}
+/**
+ * Inspection and cleanup for the Redis keys written by `MetricsRecorder`.
+ *
+ * Every operation is confined to the recorder's namespace and driven by SCAN, so it never
+ * blocks Redis and never touches BullMQ's own keys. Deletes use UNLINK.
+ */
+class RedisHistoryAdmin {
+    constructor(opts) {
+        this.redis = opts.redis;
+        this.keys = opts.keys;
+    }
+    /**
+     * Per-queue footprint of the stored history.
+     *
+     * Every key has to be measured individually, since only `MEMORY USAGE` knows what a hash
+     * really costs. Issuing those one at a time would mean a round trip per key, which at a
+     * 90-day retention across a dozen queues runs into the thousands, so the measurements go
+     * out in pipelined batches instead. Still an ops-scale call rather than a hot path: it
+     * reads the whole namespace, so it belongs behind a debug endpoint, not a poll.
+     */
+    async stats() {
+        var _a;
+        const byQueue = new Map();
+        const tiers = emptyTiers();
+        let keys = 0;
+        let bytes = 0;
+        let minutes = 0;
+        let oldestDay = null;
+        let newestDay = null;
+        const found = [];
+        for await (const key of this.scan()) {
+            const parsed = parseHistoryKey(key, this.keys.namespace);
+            if (parsed) {
+                found.push({ key, parsed });
+            }
+        }
+        const measurements = await this.measure(found.map((item) => item.key));
+        for (const [index, { parsed }] of found.entries()) {
+            const { size, len } = measurements[index];
+            const entry = (_a = byQueue.get(parsed.queue)) !== null && _a !== void 0 ? _a : {
+                queue: parsed.queue,
+                keys: 0,
+                bytes: 0,
+                minutes: 0,
+                days: [],
+                tiers: emptyTiers(),
+            };
+            entry.keys += 1;
+            entry.bytes += size;
+            entry.tiers[parsed.tier].keys += 1;
+            entry.tiers[parsed.tier].bytes += size;
+            keys += 1;
+            bytes += size;
+            tiers[parsed.tier].keys += 1;
+            tiers[parsed.tier].bytes += size;
+            if (parsed.tier === 'minute') {
+                entry.minutes += len;
+                minutes += len;
+            }
+            if (parsed.day) {
+                entry.days.push(parsed.day);
+                if (oldestDay === null || parsed.day < oldestDay) {
+                    oldestDay = parsed.day;
+                }
+                if (newestDay === null || parsed.day > newestDay) {
+                    newestDay = parsed.day;
+                }
+            }
+            byQueue.set(parsed.queue, entry);
+        }
+        const queues = [...byQueue.values()].sort((a, b) => b.bytes - a.bytes);
+        for (const queue of queues) {
+            queue.days = [...new Set(queue.days)].sort();
+        }
+        return { keys, bytes, minutes, oldestDay, newestDay, tiers, queues };
+    }
+    /**
+     * Size and entry count for each key, in pipelined batches so the cost is a handful of
+     * round trips rather than one per key. A key that expires between the scan and the
+     * measurement simply reads as zero rather than failing the whole call.
+     */
+    async measure(keys) {
+        var _a, _b, _c, _d;
+        const out = [];
+        for (let i = 0; i < keys.length; i += MEASURE_BATCH) {
+            const chunk = keys.slice(i, i + MEASURE_BATCH);
+            const pipeline = this.redis.pipeline();
+            for (const key of chunk) {
+                pipeline.memory('USAGE', key);
+                pipeline.hlen(key);
+            }
+            const res = await pipeline.exec();
+            for (let j = 0; j < chunk.length; j++) {
+                out.push({
+                    size: Number((_b = (_a = res === null || res === void 0 ? void 0 : res[j * 2]) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 0) || 0,
+                    len: Number((_d = (_c = res === null || res === void 0 ? void 0 : res[j * 2 + 1]) === null || _c === void 0 ? void 0 : _c[1]) !== null && _d !== void 0 ? _d : 0) || 0,
+                });
+            }
+        }
+        return out;
+    }
+    /**
+     * Deletes recorded history. Purging a single queue also subtracts that queue's minutes
+     * from the global rollup, so the cross-queue chart stays correct instead of keeping the
+     * removed queue's throughput folded into it forever.
+     *
+     * That correction covers the counter metrics only. The global runtime, waittime and
+     * queueage rollups keep the purged queue's contribution until their own retention drops
+     * it: a packed bucket vector cannot be decremented field by field, and a max gauge has no
+     * record of which queue produced the maximum, so there is nothing to subtract. The
+     * per-queue keys are still deleted either way. See SUMMABLE_METRICS.
+     */
+    async purge(opts = {}) {
+        const before = opts.before === undefined ? null : (0, keys_1.toDay)(opts.before);
+        const result = { keysDeleted: 0, fieldsDeleted: 0 };
+        const dayKeys = [];
+        const totalsKeys = [];
+        for await (const key of this.scan()) {
+            const parsed = parseHistoryKey(key, this.keys.namespace);
+            if (!parsed) {
+                continue;
+            }
+            if (opts.queue !== undefined && parsed.queue !== opts.queue) {
+                continue;
+            }
+            if (parsed.day === null) {
+                totalsKeys.push({ key, parsed });
+            }
+            else if (before === null || parsed.day < before) {
+                dayKeys.push({ key, parsed });
+            }
+        }
+        // Rewriting the global rollup only makes sense when a single queue is being removed:
+        // a full purge drops the global keys outright, along with everything else.
+        const adjustGlobal = opts.queue !== undefined && opts.queue !== keys_1.GLOBAL_QUEUE;
+        for (const { key, parsed } of dayKeys) {
+            if (adjustGlobal) {
+                result.keysDeleted += await this.subtractDayFromGlobal(key, parsed);
+            }
+            result.keysDeleted += await this.redis.unlink(key);
+        }
+        for (const { key, parsed } of totalsKeys) {
+            const stale = (await this.redis.hkeys(key)).filter((day) => before === null || day < before);
+            if (adjustGlobal && stale.length > 0) {
+                const totals = await this.redis.hmget(key, ...stale);
+                result.fieldsDeleted += await this.subtractTotalsFromGlobal(parsed.metric, stale, totals);
+            }
+            if (before === null) {
+                result.keysDeleted += await this.redis.unlink(key);
+                continue;
+            }
+            for (let i = 0; i < stale.length; i += BATCH) {
+                result.fieldsDeleted += await this.redis.hdel(key, ...stale.slice(i, i + BATCH));
+            }
+            if ((await this.redis.hlen(key)) === 0) {
+                result.keysDeleted += await this.redis.unlink(key);
+            }
+        }
+        return result;
+    }
+    /**
+     * Removes one queue's buckets from the matching global key, so the cross-queue series
+     * reflects the queues that are left rather than keeping the removed queue folded in.
+     * Each tier is corrected from its own source key, because the tiers have independent
+     * retention and the minute hash may already be gone while the hourly one survives.
+     * Fields that drain to zero are dropped: the recorder never writes a zero bucket, so a
+     * leftover zero would read as recorded-but-idle instead of not recorded.
+     * Returns the number of global keys it deleted.
+     *
+     * Only the summable metrics are touched; the latency ones are skipped outright rather than
+     * silently producing a no-op subtraction of their packed values. See SUMMABLE_METRICS.
+     */
+    async subtractDayFromGlobal(key, parsed) {
+        if (parsed.day === null || !SUMMABLE_METRICS.includes(parsed.metric)) {
+            return 0;
+        }
+        const minutes = await this.redis.hgetall(key);
+        const globalDay = globalKeyFor(this.keys, parsed);
+        const pipeline = this.redis.multi();
+        const touched = [];
+        for (const field of Object.keys(minutes)) {
+            const value = Number(minutes[field]) || 0;
+            if (value === 0) {
+                continue;
+            }
+            touched.push(field);
+            pipeline.hincrby(globalDay, field, -value);
+        }
+        if (touched.length === 0) {
+            return 0;
+        }
+        const res = await pipeline.exec();
+        const drained = touched.filter((_, i) => { var _a, _b; return Number((_b = (_a = res === null || res === void 0 ? void 0 : res[i]) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 0) <= 0; });
+        for (let i = 0; i < drained.length; i += BATCH) {
+            await this.redis.hdel(globalDay, ...drained.slice(i, i + BATCH));
+        }
+        return (await this.redis.hlen(globalDay)) === 0 ? await this.redis.unlink(globalDay) : 0;
+    }
+    /**
+     * Same idea for the daily rollup: the global totals hash is the sum of the per-queue
+     * totals hashes, so it is corrected from those rather than re-derived from day hashes,
+     * which may already have expired. Returns the number of global fields it removed.
+     *
+     * Skips the latency metrics for the same reason as subtractDayFromGlobal.
+     */
+    async subtractTotalsFromGlobal(metric, days, values) {
+        if (!SUMMABLE_METRICS.includes(metric)) {
+            return 0;
+        }
+        const globalTotals = this.keys.totals(keys_1.GLOBAL_QUEUE, metric);
+        const pipeline = this.redis.multi();
+        const touched = [];
+        days.forEach((day, i) => {
+            const value = Number(values[i]) || 0;
+            if (value === 0) {
+                return;
+            }
+            touched.push(day);
+            pipeline.hincrby(globalTotals, day, -value);
+        });
+        if (touched.length === 0) {
+            return 0;
+        }
+        const res = await pipeline.exec();
+        const drained = touched.filter((_, i) => { var _a, _b; return Number((_b = (_a = res === null || res === void 0 ? void 0 : res[i]) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 0) <= 0; });
+        let removed = 0;
+        for (let i = 0; i < drained.length; i += BATCH) {
+            removed += await this.redis.hdel(globalTotals, ...drained.slice(i, i + BATCH));
+        }
+        return removed;
+    }
+    /**
+     * SCAN over the namespace, once per master: SCAN carries no key, so a cluster client has
+     * no slot to route by and would answer from one arbitrary node. SCAN may also hand back the
+     * same key on more than one cursor iteration, which would double-count in `stats()`, so
+     * emissions are de-duped here. The set is bounded by queues x metrics x retention days.
+     */
+    async *scan() {
+        const seen = new Set();
+        for (const target of (0, connection_1.scanTargets)(this.redis)) {
+            let cursor = '0';
+            do {
+                const [next, batch] = await target.scan(cursor, 'MATCH', this.keys.scanPattern, 'COUNT', SCAN_COUNT);
+                cursor = next;
+                for (const key of batch) {
+                    if (!seen.has(key)) {
+                        seen.add(key);
+                        yield key;
+                    }
+                }
+            } while (cursor !== '0');
+        }
+    }
+}
+exports.RedisHistoryAdmin = RedisHistoryAdmin;
+//# sourceMappingURL=RedisHistoryAdmin.js.map

package/dist/RedisHistoryAdmin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisHistoryAdmin.js","sourceRoot":"","sources":["../src/RedisHistoryAdmin.ts"],"names":[],"mappings":"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"}

package/dist/RedisMetricsHistoryProvider.d.ts

@@ -1,7 +1,6 @@
-import type { MetricsHistoryPoint, MetricsHistoryProvider, MetricsHistoryQuery, MetricsLatencyPoint, MetricsLatencyQuery } from '@worker-manager/api/typings/app';
-import { type MetricsConnection } from './connection';
-import { type HistoryStats, type PurgeOptions, type PurgeResult } from './HistoryAdmin';
-import { type Retention } from './HistoryStore';
+import type { MetricsConnection } from './connection';
+import type { Retention } from './store';
+import { StoreHistoryProvider } from './StoreHistoryProvider';
 export interface RedisMetricsHistoryProviderOptions {
     connection: MetricsConnection;
     /** Must match the recorder's. See `MetricsRecorderOptions.prefix`. */
@@ -10,19 +9,10 @@ export interface RedisMetricsHistoryProviderOptions {
     retention?: Partial<Retention>;
     retentionDays?: number;
 }
-export declare class RedisMetricsHistoryProvider implements MetricsHistoryProvider {
-    private readonly store;
-    private readonly latencyStore;
-    private readonly admin;
-    private readonly redis;
-    private readonly ownsRedis;
-    private readonly retentionDays;
+/** Serves the board's history charts and storage panel from the Redis store. */
+export declare class RedisMetricsHistoryProvider extends StoreHistoryProvider {
+    private readonly ownedStore;
     constructor(opts: RedisMetricsHistoryProviderOptions);
+    /** Closes the Redis connection this provider opened itself. A client handed in is left open. */
     disconnect(): void;
-    /** Backs the board's storage panel. See MetricsHistoryAdmin.stats. */
-    getUsage(): Promise<HistoryStats>;
-    /** Backs the board's "clear history" action. See MetricsHistoryAdmin.purge. */
-    purge(options?: PurgeOptions): Promise<PurgeResult>;
-    getHistory(query: MetricsHistoryQuery): Promise<MetricsHistoryPoint[]>;
-    getLatency(query: MetricsLatencyQuery): Promise<MetricsLatencyPoint[]>;
 }

package/dist/RedisMetricsHistoryProvider.js

@@ -1,147 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisMetricsHistoryProvider = void 0;
-const connection_1 = require("./connection");
-const histogram_1 = require("./histogram");
-const HistoryAdmin_1 = require("./HistoryAdmin");
-const HistoryStore_1 = require("./HistoryStore");
-const keys_1 = require("./keys");
-const LatencyStore_1 = require("./LatencyStore");
 const MetricsRecorder_1 = require("./MetricsRecorder");
-const MS_PER_HOUR = 3600000;
-class RedisMetricsHistoryProvider {
+const RedisMetricsStore_1 = require("./RedisMetricsStore");
+const StoreHistoryProvider_1 = require("./StoreHistoryProvider");
+/** Serves the board's history charts and storage panel from the Redis store. */
+class RedisMetricsHistoryProvider extends StoreHistoryProvider_1.StoreHistoryProvider {
     constructor(opts) {
-        const { client, owned } = (0, connection_1.resolveClient)(opts.connection);
-        this.redis = client;
-        this.ownsRedis = owned;
-        const keys = (0, keys_1.metricsKeys)((0, keys_1.resolveNamespace)(opts.prefix, (0, connection_1.isCluster)(client)));
-        const retention = (0, MetricsRecorder_1.resolveRetention)(opts);
-        this.retentionDays = retention.days;
-        this.store = new HistoryStore_1.HistoryStore({ redis: this.redis, keys, retention });
-        this.latencyStore = new LatencyStore_1.LatencyStore({ redis: this.redis, keys, retention });
-        this.admin = new HistoryAdmin_1.MetricsHistoryAdmin({ connection: this.redis, prefix: opts.prefix });
+        const store = new RedisMetricsStore_1.RedisMetricsStore({ connection: opts.connection, prefix: opts.prefix });
+        super(store, (0, MetricsRecorder_1.resolveRetention)(opts));
+        this.ownedStore = store;
     }
+    /** Closes the Redis connection this provider opened itself. A client handed in is left open. */
     disconnect() {
-        if (this.ownsRedis) {
-            this.redis.disconnect();
-        }
-    }
-    /** Backs the board's storage panel. See MetricsHistoryAdmin.stats. */
-    async getUsage() {
-        return this.admin.stats();
-    }
-    /** Backs the board's "clear history" action. See MetricsHistoryAdmin.purge. */
-    async purge(options = {}) {
-        return this.admin.purge(options);
-    }
-    async getHistory(query) {
-        var _a, _b;
-        const queue = (_a = query.queue) !== null && _a !== void 0 ? _a : keys_1.GLOBAL_QUEUE;
-        // Clamp the span to the retention window so an unbounded `from` (e.g. 0) can't make
-        // dayRange produce an unbounded number of day buckets -- older data doesn't exist anyway.
-        const maxSpanMs = (this.retentionDays + 1) * 86400000;
-        const from = Math.max(query.from, query.to - maxSpanMs);
-        const days = (0, keys_1.dayRange)(from, query.to);
-        if (query.metric === 'queueage') {
-            const ages = await this.latencyStore.readQueueAge(queue, query.granularity, days);
-            // Day points are stamped at the day's start, so an intraday `from` would drop the day
-            // it falls in. Floored, exactly as the counter path below does it.
-            const lowerBound = query.granularity === 'day' ? dayFloor(query.from) : query.from;
-            return Object.keys(ages)
-                .map((key) => ({
-                ts: query.granularity === 'day' ? (0, keys_1.dayToStartMs)(key) : Number(key) * MS_PER_HOUR,
-                value: ages[key],
-            }))
-                .filter((p) => p.ts >= lowerBound && p.ts <= query.to)
-                .sort((a, b) => a.ts - b.ts);
-        }
-        if (query.granularity === 'day') {
-            const rawTotals = await this.store.readDailyTotalsRaw(queue, query.metric, days);
-            // Empty history only when no day in range was ever recorded (all fields missing).
-            // A day with a stored '0' still counts as recorded -- otherwise the UI's empty
-            // state would be unreachable once any data exists.
-            if (rawTotals.every((value) => value == null)) {
-                return [];
-            }
-            const totals = {};
-            days.forEach((day, i) => {
-                totals[day] = Number(rawTotals[i]) || 0;
-            });
-            return days
-                .map((day) => { var _a; return ({ ts: (0, keys_1.dayToStartMs)(day), value: (_a = totals[day]) !== null && _a !== void 0 ? _a : 0 }); })
-                .filter((p) => p.ts >= dayFloor(query.from) && p.ts <= query.to);
-        }
-        const hourBuckets = new Map();
-        const dayHours = await Promise.all(days.map((day) => this.store.readDayHours(queue, query.metric, day)));
-        for (const hours of dayHours) {
-            for (const field of Object.keys(hours)) {
-                const ts = Number(field) * MS_PER_HOUR;
-                if (ts < query.from || ts > query.to) {
-                    continue;
-                }
-                hourBuckets.set(ts, ((_b = hourBuckets.get(ts)) !== null && _b !== void 0 ? _b : 0) + hours[field]);
-            }
-        }
-        return [...hourBuckets.entries()]
-            .map(([ts, value]) => ({ ts, value }))
-            .sort((a, b) => a.ts - b.ts);
-    }
-    async getLatency(query) {
-        var _a;
-        const queue = (_a = query.queue) !== null && _a !== void 0 ? _a : keys_1.GLOBAL_QUEUE;
-        const maxSpanMs = (this.retentionDays + 1) * 86400000;
-        const from = Math.max(query.from, query.to - maxSpanMs);
-        const days = (0, keys_1.dayRange)(from, query.to);
-        if (query.granularity === 'range') {
-            // Percentiles don't merge: averaging per-day p95s isn't the same number as the p95 of
-            // the whole range. Read the day tier's bucket vectors and merge them, then compute each
-            // requested percentile once from the summed vector.
-            const raw = await this.latencyStore.readRange(queue, query.metric, 'day', days);
-            let merged = (0, histogram_1.emptyVector)();
-            for (const day of days) {
-                const vector = raw[day];
-                if (vector) {
-                    merged = (0, histogram_1.mergeVectors)(merged, vector);
-                }
-            }
-            const count = (0, histogram_1.vectorTotal)(merged);
-            if (count === 0) {
-                return [];
-            }
-            const values = {};
-            for (const p of query.percentiles) {
-                values[String(p)] = (0, histogram_1.quantile)(merged, p);
-            }
-            return [{ ts: query.from, count: Math.round(count), values }];
-        }
-        const raw = await this.latencyStore.readRange(queue, query.metric, query.granularity, days);
-        // Same day-start alignment as getHistory: comparing a day bucket against a raw `from`
-        // would drop the oldest day and leave this chart one bucket shorter than the throughput
-        // chart drawn for the same range.
-        const lowerBound = query.granularity === 'day' ? dayFloor(query.from) : query.from;
-        const points = [];
-        for (const key of Object.keys(raw)) {
-            const ts = query.granularity === 'day' ? (0, keys_1.dayToStartMs)(key) : Number(key) * MS_PER_HOUR;
-            if (ts < lowerBound || ts > query.to) {
-                continue;
-            }
-            const vector = raw[key];
-            const count = (0, histogram_1.vectorTotal)(vector);
-            if (count === 0) {
-                continue;
-            }
-            const values = {};
-            for (const p of query.percentiles) {
-                values[String(p)] = (0, histogram_1.quantile)(vector, p);
-            }
-            points.push({ ts, count: Math.round(count), values });
-        }
-        return points.sort((a, b) => a.ts - b.ts);
+        void this.ownedStore.close();
     }
 }
 exports.RedisMetricsHistoryProvider = RedisMetricsHistoryProvider;
-function dayFloor(ms) {
-    const d = new Date(ms);
-    return Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
-}
 //# sourceMappingURL=RedisMetricsHistoryProvider.js.map

package/dist/RedisMetricsHistoryProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisMetricsHistoryProvider.js","sourceRoot":"","sources":["../src/RedisMetricsHistoryProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RedisMetricsHistoryProvider.js","sourceRoot":"","sources":["../src/RedisMetricsHistoryProvider.ts"],"names":[],"mappings":";;;AACA,uDAAqD;AACrD,2DAAwD;AAExD,iEAA8D;AAW9D,gFAAgF;AAChF,MAAa,2BAA4B,SAAQ,2CAAoB;IAGnE,YAAY,IAAwC;QAClD,MAAM,KAAK,GAAG,IAAI,qCAAiB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1F,KAAK,CAAC,KAAK,EAAE,IAAA,kCAAgB,EAAC,IAAI,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,gGAAgG;IAChG,UAAU;QACR,KAAK,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACF;AAbD,kEAaC"}

package/dist/RedisMetricsStore.d.ts

@@ -0,0 +1,27 @@
+import { type MetricsClient, type MetricsConnection } from './connection';
+import { type MetricsKeys } from './keys';
+import type { CounterStore, HistoryAdministration, LatencyStorage, MetricsStore, Retention } from './store';
+export interface RedisMetricsStoreOptions {
+    /** An ioredis client (or Cluster), or options to open one. */
+    connection: MetricsConnection;
+    /** Key namespace. See `MetricsRecorderOptions.prefix`. */
+    prefix?: string;
+}
+/**
+ * History in Redis: hashes under one key namespace, expired by TTL. The default store,
+ * which `connection` on the recorder, provider and admin is shorthand for.
+ */
+export declare class RedisMetricsStore implements MetricsStore {
+    readonly redis: MetricsClient;
+    readonly keys: MetricsKeys;
+    /** Whether `redis` was opened here from options, and so is closed by `close()`. */
+    readonly ownsClient: boolean;
+    private closed;
+    constructor(opts: RedisMetricsStoreOptions);
+    get jobClient(): MetricsClient;
+    counterStore(retention: Retention): CounterStore;
+    latencyStore(retention: Retention): LatencyStorage;
+    administration(): HistoryAdministration;
+    /** Disconnects a client this store opened; synchronous in effect, like `redis.disconnect()`. */
+    close(): Promise<void>;
+}

package/dist/RedisMetricsStore.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisMetricsStore = void 0;
+const connection_1 = require("./connection");
+const HistoryStore_1 = require("./HistoryStore");
+const keys_1 = require("./keys");
+const LatencyStore_1 = require("./LatencyStore");
+const RedisHistoryAdmin_1 = require("./RedisHistoryAdmin");
+/**
+ * History in Redis: hashes under one key namespace, expired by TTL. The default store,
+ * which `connection` on the recorder, provider and admin is shorthand for.
+ */
+class RedisMetricsStore {
+    constructor(opts) {
+        this.closed = false;
+        const { client, owned } = (0, connection_1.resolveClient)(opts.connection);
+        this.redis = client;
+        this.ownsClient = owned;
+        this.keys = (0, keys_1.metricsKeys)((0, keys_1.resolveNamespace)(opts.prefix, (0, connection_1.isCluster)(client)));
+    }
+    get jobClient() {
+        return this.redis;
+    }
+    counterStore(retention) {
+        return new HistoryStore_1.HistoryStore({ redis: this.redis, keys: this.keys, retention });
+    }
+    latencyStore(retention) {
+        return new LatencyStore_1.LatencyStore({ redis: this.redis, keys: this.keys, retention });
+    }
+    administration() {
+        return new RedisHistoryAdmin_1.RedisHistoryAdmin({ redis: this.redis, keys: this.keys });
+    }
+    /** Disconnects a client this store opened; synchronous in effect, like `redis.disconnect()`. */
+    async close() {
+        if (this.ownsClient && !this.closed) {
+            this.redis.disconnect();
+        }
+        this.closed = true;
+    }
+}
+exports.RedisMetricsStore = RedisMetricsStore;
+//# sourceMappingURL=RedisMetricsStore.js.map

package/dist/RedisMetricsStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisMetricsStore.js","sourceRoot":"","sources":["../src/RedisMetricsStore.ts"],"names":[],"mappings":";;;AAAA,6CAAoG;AACpG,iDAA8C;AAC9C,iCAAyE;AACzE,iDAA8C;AAC9C,2DAAwD;AAgBxD;;;GAGG;AACH,MAAa,iBAAiB;IAO5B,YAAY,IAA8B;QAFlC,WAAM,GAAG,KAAK,CAAC;QAGrB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,0BAAa,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,IAAA,kBAAW,EAAC,IAAA,uBAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAA,sBAAS,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,YAAY,CAAC,SAAoB;QAC/B,OAAO,IAAI,2BAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,YAAY,CAAC,SAAoB;QAC/B,OAAO,IAAI,2BAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,qCAAiB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,gGAAgG;IAChG,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF;AArCD,8CAqCC"}