fix metric type in desc header

Signed-off-by: hwassman <[email protected]>

Author: Helene

source/collector.py

@@ -109,12 +109,15 @@ def __init__(self, name: str, desc: str, type: Optional[str] = None):
         self.desc = desc
         self.timeseries: list[TimeSeries] = []
 
-    def str_descfmt(self) -> [str]:
+    def str_descfmt(self, original_counters=False) -> [str]:
         """Format MetricTimeSeries description rows
             Output format:
                 '''# HELP {name} {desc}'''
                 '''# TYPE {name} {mtype}'''
         """
+        metric_type = self.mtype
+        if not original_counters and metric_type == 'counter':
+            metric_type = 'gauge'
 
         myset = []
 
@@ -125,7 +128,7 @@ def str_descfmt(self) -> [str]:
         myset.append(expfmt)
         expfmt1 = '''# TYPE {name} {mtype}'''.format(
             name=self.mname,
-            mtype=self.mtype,
+            mtype=metric_type,
         )
         myset.append(expfmt1)
 

source/prometheus.py

@@ -59,13 +59,15 @@ def TOPO(self):
     def format_response(self, data) -> [str]:
         resp = []
         for name, metric in data.items():
-            header = metric.str_descfmt()
+            header = metric.str_descfmt(original_counters=self.raw_data)
             resp.extend(header)
             for sts in metric.timeseries:
                 if self.raw_data:
                     sts.reduce_dps_to_first_not_none(reverse_order=True)
                 for _key, _value in sts.dps.items():
-                    sts_resp = SingleTimeSeriesResponse(name, _key, _value, sts.tags, metric.mtype)
+                    sts_resp = SingleTimeSeriesResponse(name, _key,
+                                                        _value, sts.tags,
+                                                        metric.mtype)
                     self.logger.trace(f'sts_resp.str_expfmt output: {sts_resp.str_expfmt()}')
                     resp.extend(sts_resp.str_expfmt())
         return resp