@rudderjs/pulse 6.0.0 → 6.1.0

package/dist/recorders/queue.d.ts

@@ -1,12 +1,19 @@
 import type { Recorder, PulseStorage } from '../types.js';
 /**
- * Tracks queue throughput, wait time, and failed jobs.
- * Wraps the QueueRegistry adapter's dispatch method.
+ * Tracks queue throughput, wait time, and failed jobs by subscribing to
+ * `@rudderjs/queue/observers`. Replaces the legacy `dispatch()`
+ * monkey-patch which only fired in the dispatching process — under
+ * BullMQ, worker-side completion and failure events were never recorded
+ * and `queue_wait_time` was actually the enqueue duration, not the
+ * queue-to-active wait.
  */
 export declare class QueueRecorder implements Recorder {
     private readonly storage;
     readonly name = "Queue Recorder";
+    private unsubscribe;
     constructor(storage: PulseStorage);
-    register(): Promise<void>;
+    register(): void;
+    /** @internal — used in tests + provider shutdown. */
+    unregister(): void;
 }
 //# sourceMappingURL=queue.d.ts.map

package/dist/recorders/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/recorders/queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAEzD;;;GAGG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAGhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAFpC,QAAQ,CAAC,IAAI,oBAAmB;gBAEH,OAAO,EAAE,YAAY;IAE5C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAiChC"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/recorders/queue.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAEzD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAIhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,QAAQ,CAAC,IAAI,oBAAmB;IAChC,OAAO,CAAC,WAAW,CAA4B;gBAElB,OAAO,EAAE,YAAY;IAElD,QAAQ,IAAI,IAAI;IA6BhB,qDAAqD;IACrD,UAAU,IAAI,IAAI;CAInB"}

package/dist/recorders/queue.js

@@ -1,43 +1,52 @@
+import { queueObservers } from '@rudderjs/queue/observers';
 /**
- * Tracks queue throughput, wait time, and failed jobs.
- * Wraps the QueueRegistry adapter's dispatch method.
+ * Tracks queue throughput, wait time, and failed jobs by subscribing to
+ * `@rudderjs/queue/observers`. Replaces the legacy `dispatch()`
+ * monkey-patch which only fired in the dispatching process — under
+ * BullMQ, worker-side completion and failure events were never recorded
+ * and `queue_wait_time` was actually the enqueue duration, not the
+ * queue-to-active wait.
  */
 export class QueueRecorder {
     storage;
     name = 'Queue Recorder';
+    unsubscribe = null;
     constructor(storage) {
         this.storage = storage;
     }
-    async register() {
-        try {
-            const { QueueRegistry } = await import('@rudderjs/queue');
-            const adapter = QueueRegistry.get();
-            if (!adapter)
-                return;
-            const storage = this.storage;
-            const originalDispatch = adapter.dispatch.bind(adapter);
-            adapter['dispatch'] = async (job, options) => {
-                const dispatchedAt = Date.now();
-                try {
-                    await originalDispatch(job, options);
-                    const duration = Date.now() - dispatchedAt;
-                    storage.record('queue_throughput', 1);
-                    storage.record('queue_wait_time', duration);
+    register() {
+        this.unsubscribe = queueObservers.subscribe((event) => {
+            try {
+                switch (event.kind) {
+                    case 'job.active': {
+                        const wait = event.startedAt.getTime() - event.dispatchedAt.getTime();
+                        void this.storage.record('queue_wait_time', wait);
+                        break;
+                    }
+                    case 'job.completed':
+                        void this.storage.record('queue_throughput', 1);
+                        break;
+                    case 'job.failed':
+                        void this.storage.record('queue_throughput', 1);
+                        void this.storage.storeEntry('failed_job', {
+                            class: event.name,
+                            queue: event.queue,
+                            jobId: event.jobId,
+                            attempts: event.attempts,
+                            exception: event.error,
+                        });
+                        break;
                 }
-                catch (err) {
-                    storage.record('queue_throughput', 1);
-                    const j = job;
-                    storage.storeEntry('failed_job', {
-                        class: j.constructor.name,
-                        exception: err instanceof Error ? err.message : String(err),
-                    });
-                    throw err;
-                }
-            };
-        }
-        catch {
-            // @rudderjs/queue not installed — skip
-        }
+            }
+            catch {
+                // observer errors must not break the queue layer
+            }
+        });
+    }
+    /** @internal — used in tests + provider shutdown. */
+    unregister() {
+        this.unsubscribe?.();
+        this.unsubscribe = null;
     }
 }
 //# sourceMappingURL=queue.js.map

package/dist/recorders/queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/recorders/queue.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,OAAO,aAAa;IAGK;IAFpB,IAAI,GAAG,gBAAgB,CAAA;IAEhC,YAA6B,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAEtD,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC;YACH,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;YACzD,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,CAAA;YACnC,IAAI,CAAC,OAAO;gBAAE,OAAM;YAEpB,MAAM,OAAO,GAAY,IAAI,CAAC,OAAO,CAAA;YACrC,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAEtD;YAAC,OAA8C,CAAC,UAAU,CAAC,GAAG,KAAK,EAClE,GAAY,EACZ,OAAiB,EACF,EAAE;gBACjB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBAC/B,IAAI,CAAC;oBACH,MAAO,gBAA0D,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;oBAC/E,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAA;oBAC1C,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;oBACrC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;gBAC7C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;oBACrC,MAAM,CAAC,GAAG,GAAwC,CAAA;oBAClD,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE;wBAC/B,KAAK,EAAM,CAAC,CAAC,WAAW,CAAC,IAAI;wBAC7B,SAAS,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;qBAC5D,CAAC,CAAA;oBACF,MAAM,GAAG,CAAA;gBACX,CAAC;YACH,CAAC,CAAA;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/recorders/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG1D;;;;;;;GAOG;AACH,MAAM,OAAO,aAAa;IAIK;IAHpB,IAAI,GAAG,gBAAgB,CAAA;IACxB,WAAW,GAAwB,IAAI,CAAA;IAE/C,YAA6B,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAEtD,QAAQ;QACN,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;YACpD,IAAI,CAAC;gBACH,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,CAAA;wBACrE,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;wBACjD,MAAK;oBACP,CAAC;oBACD,KAAK,eAAe;wBAClB,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;wBAC/C,MAAK;oBACP,KAAK,YAAY;wBACf,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;wBAC/C,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE;4BACzC,KAAK,EAAM,KAAK,CAAC,IAAI;4BACrB,KAAK,EAAM,KAAK,CAAC,KAAK;4BACtB,KAAK,EAAM,KAAK,CAAC,KAAK;4BACtB,QAAQ,EAAG,KAAK,CAAC,QAAQ;4BACzB,SAAS,EAAE,KAAK,CAAC,KAAK;yBACvB,CAAC,CAAA;wBACF,MAAK;gBACT,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,iDAAiD;YACnD,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,qDAAqD;IACrD,UAAU;QACR,IAAI,CAAC,WAAW,EAAE,EAAE,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rudderjs/pulse",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "rudderjs": {
     "provider": "PulseProvider",
     "stage": "monitoring"
@@ -25,16 +25,16 @@
     }
   },
   "dependencies": {
-    "@rudderjs/core": "^1.0.0",
-    "@rudderjs/contracts": "^1.1.0"
+    "@rudderjs/contracts": "^1.1.0",
+    "@rudderjs/core": "^1.0.0"
   },
   "peerDependencies": {
-    "@rudderjs/router": "^1.0.0",
     "@rudderjs/middleware": "^1.0.0",
-    "@rudderjs/log": "^1.0.0",
+    "@rudderjs/router": "^1.0.0",
     "@rudderjs/orm": "^1.3.0",
     "@rudderjs/cache": "^1.0.0",
-    "@rudderjs/queue": "^4.0.0"
+    "@rudderjs/log": "^1.0.0",
+    "@rudderjs/queue": "^4.1.0"
   },
   "peerDependenciesMeta": {
     "@rudderjs/log": {
@@ -56,7 +56,8 @@
   "devDependencies": {
     "@types/node": "^20.0.0",
     "@types/better-sqlite3": "^7.6.0",
-    "typescript": "^5.4.0"
+    "typescript": "^5.4.0",
+    "@rudderjs/queue": "^4.1.0"
   },
   "author": "Suleiman Shahbari",
   "scripts": {