From a37cb7013dd0418f9146e537841ce885087f079c Mon Sep 17 00:00:00 2001
From: Bennet Gallein <bg@esyoil.com>
Date: Mon, 9 Sep 2024 15:23:18 +0200
Subject: [PATCH] feat: add zone to other metrics

---
 lib/queue-server.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/queue-server.js b/lib/queue-server.js
index f4412973..b1f26610 100644
--- a/lib/queue-server.js
+++ b/lib/queue-server.js
@@ -18,15 +18,17 @@ const deliveryStatusCounter = new promClient.Counter({
 const messagePushCounter = new promClient.Counter({
     name: 'zonemta_message_push',
     help: 'Messages pushed to queue',
-    labelNames: ['result']
+    labelNames: ['result', 'zone']
 });
 const bounceCounter = new promClient.Counter({
     name: 'zonemta_bounce_generation',
-    help: 'Bounce generation'
+    help: 'Bounce generation',
+    labelNames: ['zone']
 });
 const dropCounter = new promClient.Counter({
     name: 'zonemta_message_drop',
-    help: 'Messages dropped'
+    help: 'Messages dropped',
+    labelNames: ['zone']
 });
 
 const promMetrics = {
@@ -213,7 +215,9 @@ class QueueServer {
 
                     case 'BOUNCE':
                         {
-                            bounceCounter.inc();
+                            bounceCounter.inc({
+                                zone: client.zone.name
+                            });
                             const bounce = data;
                             bounce.headers = new Headers(bounce.headers || []);
                             plugins.handler.runHooks(
@@ -230,7 +234,9 @@ class QueueServer {
                         break;
 
                     case 'REMOVE':
-                        dropCounter.inc();
+                        dropCounter.inc({
+                            zone: client.zone.name
+                        });
                         this.queue.removeMessage(data.id, err => {
                             if (!client) {
                                 // client already errored or closed
@@ -290,7 +296,8 @@ class QueueServer {
                     case 'PUSH':
                         this.queue.push(data.id, data.envelope, err => {
                             messagePushCounter.inc({
-                                result: err ? 'fail' : 'success'
+                                result: err ? 'fail' : 'success',
+                                zone: client.zone.name
                             });
                             if (!client) {
                                 // client already errored or closed