Fix chaining labels in metrics (#38)

JIRA: RHELWF-6624
release-engineering · May 19, 2022 · 41440a0 · 41440a0
1 parent 29bd1ea
commit 41440a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/greenwave/monitor.py b/greenwave/monitor.py
@@ -44,7 +44,9 @@ def inc(self):
             client.incr(str(self))
 
     def labels(self, **labeldict):
-        return Counter(self.name, labeldict=labeldict)
+        new_labeldict = dict(self.labeldict)
+        new_labeldict.update(labeldict)
+        return Counter(self.name, labeldict=new_labeldict)
 
     def count_exceptions(self):
         """Returns function decorator to increase counter on exception."""

diff --git a/greenwave/tests/test_monitor.py b/greenwave/tests/test_monitor.py
@@ -13,6 +13,9 @@ def test_counter_to_str_with_labels():
     counter = Counter('total_decisions').labels(handler='test')
     assert str(counter) == 'total_decisions[handler=test]'
 
+    counter2 = counter.labels(decision_context='context')
+    assert str(counter2) == 'total_decisions[handler=test,decision_context=context]'
+
 
 def test_counter_no_host_set(monkeypatch):
     with patch('greenwave.monitor.StatsClient') as client: