ajustes

Signed-off-by: Felipe Monteiro Jácome <[email protected]>

Author: engFelipeMonteiro

README.md

@@ -621,3 +621,8 @@ for family in text_string_to_metric_families(u"my_gauge 1.0\n"):
 
 * [Releases](https://github.com/prometheus/client_python/releases): The releases page shows the history of the project and acts as a changelog.
 * [PyPI](https://pypi.python.org/pypi/prometheus_client)
+
+
+```
+python -m pytest -vv -s -k test_gauge_pandas .\tests\
+```

prometheus_client/exposition.py

@@ -168,6 +168,7 @@ def sample_line(line):
         return f'{line.name}{labelstr} {floatToGoString(line.value)}{timestamp}\n'
 
     output = []
+    output_string = ""
     for metric in registry.collect():
         try:
             mname = metric.name
@@ -186,7 +187,6 @@ def sample_line(line):
                 mtype = 'histogram'
             elif mtype == 'unknown':
                 mtype = 'untyped'
-            import pdb; pdb.set_trace()
             if 'encoder' not in vars(metric) or ('encoder' in vars(metric) and metric.encoder != 'pandas'):
                 # normal calls
                 output.append('# HELP {} {}\n'.format(
@@ -215,8 +215,6 @@ def sample_line(line):
         except Exception as exception:
             exception.args = (exception.args or ('',)) + (metric,)
             raise
-        import pdb; pdb.set_trace()
-        
 
         return ''.join(output).encode('utf-8')
 

prometheus_client/metrics.py

@@ -758,6 +758,24 @@ def __repr__(self):
         metric_type = type(self)
         return f"{metric_type.__module__}.{metric_type.__name__}({self._name})"
 
+    def generate_pandas_report(self, value='value', tag='report'):
+        def make_str(row):
+            return f"{self._name}({[ f'{col}={row[col]}, ' for col in self._metrics.columns  if col not in [value, tag]]})"
+ 
+        # generate another column with metric formated
+        # make_str = lambda x: "metric01(a={}, b={})".format(x['a'],x['b'])
+        # a = s.apply(make_str , axis=1)
+        # https://github.com/prometheus/client_python/discussions/772
+
+        self._metrics[value] = self._metrics.apply(make_str, axis=1) 
+        # self._metrics
+
+    def set_metric(self, df: pd.DataFrame):
+        with self._lock:
+            self._metrics = df
+        self.generate_pandas_report()
+        import pdb; pdb.set_trace()
+
     #def __init__(self: T,
     #             name: str,
     #             documentation: str,

prometheus_client/registry.py

@@ -71,7 +71,6 @@ def _get_names(self, collector):
 
     def collect(self):
         """Yields metrics from the collectors in the registry."""
-        import pdb; pdb.set_trace()
         collectors = None
         ti = None
         with self._lock:

tests/test_exposition.py

@@ -204,6 +204,7 @@ def test_gauge_pandas(self):
         df2.unit = ''
         g = PandasGauge(df, registry=self.registry)
         g = PandasGauge(df2, registry=self.registry)
+        g.generate_pandas_report()
         import pdb; pdb.set_trace()
         self.assertEqual(b'# HELP gg A gauge\n# TYPE gg gauge\ngg 17.0\n', generate_latest(self.registry))