From b0dc54b84d8ee1678a271e06f1e3898594cc9577 Mon Sep 17 00:00:00 2001
From: Sam Noel <noel.samuel.a@gmail.com>
Date: Fri, 20 Sep 2024 16:25:14 -0400
Subject: [PATCH] fix: bad metric usage

---
 src/Queue.ts   |  1 -
 src/Service.ts | 59 ++++++++++++++++++++++++++++----------------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/Queue.ts b/src/Queue.ts
index 18f0107..69988b1 100644
--- a/src/Queue.ts
+++ b/src/Queue.ts
@@ -154,7 +154,6 @@ export class Queue {
       // Clean up the resource and grab all existing jobs to run them before starting watch
       trace(`[QueueId ${this._id}] Adding existing jobs`);
       const jobs = stripResource(r.data as Record<string, unknown>);
-      this._service.metrics[`${this._service.name}_total_queued`].set(Object.keys(jobs).length);
 
       if (skipQueue) {
         info('Skipping existing jobs in the queue prior to startup.');
diff --git a/src/Service.ts b/src/Service.ts
index 454d9b3..7e87828 100644
--- a/src/Service.ts
+++ b/src/Service.ts
@@ -128,29 +128,9 @@ export class Service {
     this.domain = this.#oada.getDomain();
     this.token = this.#oada.getToken()[0]!;
     this.concurrency = object.concurrency ?? this.#oada.getConcurrency();
-    this.metrics = {
-      [`${this.name}_total_failure`]: new  Gauge({
-        name: `${this.name}_total_failure`,
-        help: `Number of ${this.name} jobs that failed`,
-        labelNames: ['service', this.name],
-      }),
-      [`${this.name}_total_queued`]: new Gauge({
-        name: `${this.name}_total_queued`,
-        help: `Number of ${this.name} jobs that were queued`,
-        labelNames: ['service', 'type'],
-      }),
-      [`${this.name}_total_success`]: new  Gauge({
-        name: `${this.name}_total_success`,
-        help: `Number of ${this.name} jobs that succeeded`,
-        labelNames: ['service', this.name],
-      }),
-      [`${this.name}_total_running`]: new  Gauge({
-        name: `${this.name}_total_running`,
-        help: `Number of ${this.name} jobs that are running`,
-        labelNames: ['service', this.name],
-      }),
+    this.metrics = {};
+    this.#ensureMetrics();
 
-    }
     if (object.opts) {
       this.opts = object.opts;
     }
@@ -184,7 +164,6 @@ export class Service {
   }
 
   public async start(): Promise<void> {
-    await this.#initTotalMetrics();
     await this.#doQueue();
     for (const r of this.#reports.values()) {
       r.start();
@@ -214,8 +193,7 @@ export class Service {
    * @param worker Worker function
    */
   public on(type: string, timeout: number, work: WorkerFunction): void {
-    this.#ensureMetrics(type);
-    this.#initTypedMetrics(type);
+    this.#ensureTypedMetrics(type);
     this.#workers.set(type, { work, timeout });
   }
 
@@ -280,6 +258,7 @@ export class Service {
     } catch (error_) {
       warn('Invalid queue');
       debug('Invalid queue: %O', error_);
+      error(error_);
     }
   }
 
@@ -295,7 +274,7 @@ export class Service {
   /**
    * Create the metrics
    */
-  #ensureMetrics(type: string): void {
+  async #ensureTypedMetrics(type: string): Promise<void> {
     const statuses = ['queued', 'running', 'success', 'failure'];
     for (const status of statuses) {
       let mtype = type.replaceAll('-', '_').replaceAll(' ', '_');
@@ -306,10 +285,12 @@ export class Service {
           help: `Number of ${this.name} jobs of type "${type}" that are of status "${status}"`,
           labelNames: ['service', mtype, status],
         });
+        this.metrics[name].set(0);
       }
     }
   }
 
+  /*
   async #initTotalMetrics(): Promise<void> {
     const date = new Date().toISOString().split('T')[0];
     for await (const status of ['success', 'failure']) {
@@ -344,4 +325,30 @@ export class Service {
       }
     }
   }
+  */
+
+  async #ensureMetrics(): Promise<void> {
+    /*
+    this.#oada.ensure({
+      path: `/bookmarks/services/${this.name}/metrics`,
+      data: {},
+    });
+    const { data: val } = this.#oada.get({
+      path: `/bookmarks/services/${this.name}/metrics`,
+    })
+    */
+
+    const statuses = ['queued', 'running', 'success', 'failure'];
+    for (const status of statuses) {
+      const name = `${this.name}_total_${status}`;
+      if (!this.metrics[name]) {
+        this.metrics[name] = new Gauge({
+          name: name,
+          help: `Total number of ${this.name} jobs that are of status "${status}"`,
+          labelNames: ['service', 'total', status],
+        });
+        this.metrics[name].set(0);
+      }
+    }
+  }
 }