From 93a50ab218021ac1d08304413ac53c44d25700ec Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Wed, 23 Apr 2025 11:10:35 +0100
Subject: [PATCH] Metrics working, better labelling structure

---
 trustgraph-base/trustgraph/base/metrics.py    | 19 ++++++++++---------
 .../trustgraph/base/request_response_spec.py  |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/trustgraph-base/trustgraph/base/metrics.py b/trustgraph-base/trustgraph/base/metrics.py
index 6e46e896..203ecc73 100644
--- a/trustgraph-base/trustgraph/base/metrics.py
+++ b/trustgraph-base/trustgraph/base/metrics.py
@@ -26,7 +26,7 @@ class ConsumerMetrics:
         if not hasattr(__class__, "processing_metric"):
             __class__.processing_metric = Counter(
                 'processing_count', 'Processing count',
-                ["processor", "flow", "name"],
+                ["processor", "flow", "name", "status"],
             )
 
         if not hasattr(__class__, "rate_limit_metric"):
@@ -37,22 +37,23 @@ class ConsumerMetrics:
 
     def process(self, status):
         __class__.processing_metric.labels(
-            processor = self.processor, flow=self.flow, status=status
+            processor = self.processor, flow = self.flow, name = self.name,
+            status=status
         ).inc()
 
     def rate_limit(self):
         __class__.rate_limit_metric.labels(
-            processor = self.processor, flow=self.flow
+            processor = self.processor, flow = self.flow, name = self.name,
         ).inc()
 
     def state(self, state):
         __class__.state_metric.labels(
-            processor = self.processor, flow=self.flow
+            processor = self.processor, flow = self.flow, name = self.name,
         ).state(state)
 
     def record_time(self):
         return __class__.request_metric.labels(
-            processor = self.processor, flow=self.flow
+            processor = self.processor, flow = self.flow, name = self.name,
         ).time()
 
 class ProducerMetrics:
@@ -63,14 +64,14 @@ class ProducerMetrics:
         self.flow = flow
         self.name = name
 
-        if not hasattr(__class__, "output_metric"):
-            __class__.output_metric = Counter(
-                'output_count', 'Output items created',
+        if not hasattr(__class__, "producer_metric"):
+            __class__.producer_metric = Counter(
+                'producer_count', 'Output items produced',
                 ["processor", "flow", "name"],
             )
 
     def inc(self):
-        __class__.output_metric.labels(
+        __class__.producer_metric.labels(
             processor = self.processor, flow = self.flow, name = self.name
         ).inc()
 
diff --git a/trustgraph-base/trustgraph/base/request_response_spec.py b/trustgraph-base/trustgraph/base/request_response_spec.py
index 7f82e163..5fcd92b3 100644
--- a/trustgraph-base/trustgraph/base/request_response_spec.py
+++ b/trustgraph-base/trustgraph/base/request_response_spec.py
@@ -117,7 +117,7 @@ class RequestResponseSpec(Spec):
     def add(self, flow, processor, definition):
 
         producer_metrics = ProducerMetrics(
-            process = flow.id, name = flow.name, name = self.response_name
+            processor = flow.id, flow = flow.name, name = self.response_name
         )
 
         rr = self.impl(