@koala42/redis-highway 0.2.10 → 0.2.11

package/dist/keys.d.ts

@@ -14,8 +14,9 @@ export declare class KeyManager {
     getDlqStreamKey(): string;
     /**
      * Metrics for storing throughput
+     * @param current - if true, takes throughput in the running minute, if false, takes -1 minute for closed throughput bucket
      */
-    getThroughputKey(groupName: string, timestamp: number): string;
+    getThroughputKey(groupName: string, timestamp: number, current?: boolean): string;
     /**
      * Metrics - retries key
      */

package/dist/keys.js

@@ -24,10 +24,11 @@ class KeyManager {
     }
     /**
      * Metrics for storing throughput
+     * @param current - if true, takes throughput in the running minute, if false, takes -1 minute for closed throughput bucket
      */
-    getThroughputKey(groupName, timestamp) {
+    getThroughputKey(groupName, timestamp, current = true) {
         const minute = Math.floor(timestamp / 60000) * 60000;
-        return `metrics:throughput:${this.streamName}:${groupName}:${minute}`;
+        return `metrics:throughput:${this.streamName}:${groupName}:${current ? minute : minute - 60000}`;
     }
     /**
      * Metrics - retries key

package/dist/metrics.d.ts

@@ -13,12 +13,12 @@ export declare class Metrics {
      * Get current metrics for the queue
      * @param groupNames - List of consumer groups to fetch throughput for
      */
-    getMetrics(groupNames: string[]): Promise<QueueMetrics>;
+    getMetrics(groupNames: string[], current?: boolean): Promise<QueueMetrics>;
     /**
      * Get prometheus compatible metrics
      * @param groupNames target group names for throughput metrics
      * @param prefix - export prefix
      * @returns metrics as string
      */
-    getPrometheusMetrics(groupNames: string[], prefix?: string): Promise<string>;
+    getPrometheusMetrics(groupNames: string[], prefix?: string, current?: boolean): Promise<string>;
 }

package/dist/metrics.js

@@ -12,13 +12,13 @@ class Metrics {
      * Get current metrics for the queue
      * @param groupNames - List of consumer groups to fetch throughput for
      */
-    async getMetrics(groupNames) {
+    async getMetrics(groupNames, current = false) {
         const pipeline = this.redis.pipeline();
         pipeline.xlen(this.streamName);
         pipeline.xlen(this.keys.getDlqStreamKey());
         const timestamp = Date.now();
         groupNames.forEach(group => {
-            pipeline.get(this.keys.getThroughputKey(group, timestamp));
+            pipeline.get(this.keys.getThroughputKey(group, timestamp, current));
         });
         const results = await pipeline.exec();
         if (!results) {
@@ -49,13 +49,13 @@ class Metrics {
      * @param prefix - export prefix
      * @returns metrics as string
      */
-    async getPrometheusMetrics(groupNames, prefix = 'redis_highway_queue') {
+    async getPrometheusMetrics(groupNames, prefix = 'redis_highway_queue', current = false) {
         const pipeline = this.redis.pipeline();
         pipeline.xlen(this.streamName);
         pipeline.xlen(this.keys.getDlqStreamKey());
         const timestamp = Date.now();
         groupNames.forEach(group => {
-            pipeline.get(this.keys.getThroughputKey(group, timestamp));
+            pipeline.get(this.keys.getThroughputKey(group, timestamp, current));
             pipeline.get(this.keys.getTotalKey(group));
             pipeline.get(this.keys.getRetriesKey(group, timestamp));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koala42/redis-highway",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "High performance redis queue",
   "license": "MIT",
   "author": {
@@ -40,4 +40,4 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
   }
-}
+}