ajust '"' in metric

lint

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

Author: engFelipeMonteiro

prometheus_client/__init__.py

@@ -11,7 +11,7 @@
     write_to_textfile,
 )
 from .gc_collector import GC_COLLECTOR, GCCollector
-from .metrics import Counter, Enum, Gauge, Histogram, Info, Summary, PandasGauge
+from .metrics import Counter, Enum, Gauge, Histogram, Info, PandasGauge, Summary
 from .metrics_core import Metric
 from .platform_collector import PLATFORM_COLLECTOR, PlatformCollector
 from .process_collector import PROCESS_COLLECTOR, ProcessCollector

prometheus_client/metrics.py

@@ -1,6 +1,7 @@
 from threading import Lock
 import time
 import types
+import pandas as pd
 from typing import (
     Any, Callable, Dict, Iterable, Optional, Sequence, Type, TypeVar, Union,
 )
@@ -15,7 +16,7 @@
 from .samples import Exemplar, Sample
 from .utils import floatToGoString, INF
 
-import pandas as pd
+
 
 T = TypeVar('T', bound='MetricWrapperBase')
 F = TypeVar("F", bound=Callable[..., Any])
@@ -271,7 +272,7 @@ def _metric_init(self) -> None:
                                         self._labelvalues)
         self._created = time.time()
 
-    def inc(self, amount: float = 1, exemplar: Optional[Dict[str, str]] = None) -> None:
+    def inc(self, amount: float=1, exemplar: Optional[Dict[str, str]] = None) -> None:
         """Increment counter by the given amount."""
         self._raise_if_not_observable()
         if amount < 0:
@@ -755,7 +756,7 @@ def __repr__(self):
 
     def generate_pandas_report(self):
         def make_str(row):
-            return  f"""{self._name}({','.join([ f'{col}={row[col]} ' for col in self._labelnames  if col not in [self._value, self._tag]])}) {row[self._value]} {chr(10)}"""
+            return  f"""{self._name}({','.join([ f'{col}="{row[col]}" ' for col in self._labelnames  if col not in [self._value, self._tag]])}) {row[self._value]} {chr(10)}"""
         with self._lock:
             self._metrics[self._tag] = self._metrics.apply(make_str, axis=1) 
         # self._metrics

tests/test_exposition.py

@@ -4,19 +4,19 @@
 import unittest
 
 import pytest
+import pandas as pd
 
 from prometheus_client import (
     CollectorRegistry, CONTENT_TYPE_LATEST, core, Counter, delete_from_gateway,
     Enum, Gauge, generate_latest, Histogram, Info, instance_ip_grouping_key,
-    Metric, push_to_gateway, pushadd_to_gateway, Summary, PandasGauge
+    Metric, PandasGauge, push_to_gateway, pushadd_to_gateway, Summary
 )
 from prometheus_client.core import GaugeHistogramMetricFamily, Timestamp
 from prometheus_client.exposition import (
     basic_auth_handler, default_handler, MetricsHandler,
     passthrough_redirect_handler,
 )
 
-import pandas as pd
 
 class TestGenerateText(unittest.TestCase):
     def setUp(self):
@@ -204,8 +204,8 @@ def test_gauge_pandas(self):
         ou
         PandasGauge('report_pandas', 'metric description', df=df, columns=['columnn01', 'column02'], registry=self.registry)
         """
-        df = pd.DataFrame({'a': [1.1,2.2,3.3,4.4], 'b':[5.1,6.2,7.3,8.4], 'value': [1,2,3,4]})
-        df2 = pd.DataFrame({'c': [1.1,2.2,3.3,4.4], 'd':[5.1,6.2,7.3,8.4], 'value': [5,6,7,8]})
+        df = pd.DataFrame({'a': [1.1, 2.2, 3.3, 4.4], 'b':[5.1, 6.2, 7.3, 8.4], 'value': [1, 2, 3, 4]})
+        df2 = pd.DataFrame({'c': [1.1, 2.2, 3.3, 4.4], 'd':[5.1, 6.2, 7.3, 8.4], 'value': [5, 6, 7, 8]})
         PandasGauge('report_pandas', 'metric description', df=df, columns= ['a', 'b', 'value'], registry=self.registry)
         g2 = PandasGauge('report_panda2s', 'metric description2', df=df2, registry=self.registry)
 
@@ -223,7 +223,7 @@ def test_gauge_pandas(self):
             b'report_panda2s(c=3.3 ,d=7.3 ) 7.0 \n'
             b'report_panda2s(c=4.4 ,d=8.4 ) 8.0 \n',
             generate_latest(self.registry)
-            )
+        )
 
         g2.set_metric(df2)
         self.assertEqual(
@@ -240,7 +240,7 @@ def test_gauge_pandas(self):
             b'report_panda2s(c=3.3 ,d=7.3 ) 7 \n'
             b'report_panda2s(c=4.4 ,d=8.4 ) 8 \n',
             generate_latest(self.registry)
-            )
+        )
 
     def test_gauge_pandas_columns(self):
         """
@@ -253,8 +253,8 @@ def test_gauge_pandas_columns(self):
         ou
         PandasGauge('report_pandas', 'metric description', df=df, columns=['columnn01', 'column02'], registry=self.registry)
         """
-        df = pd.DataFrame({'a': [1.1,2.2,3.3,4.4], 'b':[5.1,6.2,7.3,8.4], 'value': [1,2,3,4]})
-        df2 = pd.DataFrame({'c': [1.1,2.2,3.3,4.4], 'd':[5.1,6.2,7.3,8.4], 'result': [5,6,7,8]})
+        df = pd.DataFrame({'a': [1.1, 2.2, 3.3, 4.4], 'b':[5.1, 6.2, 7.3, 8.4], 'value': [1, 2, 3, 4]})
+        df2 = pd.DataFrame({'c': [1.1, 2.2, 3.3, 4.4], 'd':[5.1, 6.2, 7.3, 8.4], 'result': [5, 6, 7, 8]})
         PandasGauge('report_pandas', 'metric description', df=df, columns= ['a', 'value'], registry=self.registry)
         g2 = PandasGauge('report_panda2s', 'metric description2', df=df2, columns=['d', 'result'],value='result' ,registry=self.registry)
 
@@ -272,7 +272,7 @@ def test_gauge_pandas_columns(self):
             b'report_panda2s(d=7.3 ) 7.0 \n'
             b'report_panda2s(d=8.4 ) 8.0 \n',
             generate_latest(self.registry)
-            )
+        )
 
 class TestPushGateway(unittest.TestCase):
     def setUp(self):

tests/test_registry.py

@@ -1,6 +1,7 @@
+import pytest
+import pandas as pd
 from prometheus_client.registry import CollectorRegistry
 from prometheus_client.metrics import Gauge, PandasGauge, PandasGauge
-import pandas as pd
 
 def test_collector_registry_init():
     registry = CollectorRegistry()
@@ -10,7 +11,7 @@ def test_collector_registry_init():
     assert str(type(registry._lock)) == "<class '_thread.lock'>"
     assert registry._target_info == None
 
-import pytest
+
 @pytest.mark.skip('wip')    
 def test_collector_registry_gauge():
     registry = CollectorRegistry()