re-add utf8 where needed

Signed-off-by: Owen Williams <[email protected]>

Author: ywwg

tests/openmetrics/test_exposition.py

@@ -10,7 +10,7 @@
     Exemplar, GaugeHistogramMetricFamily, Timestamp,
 )
 from prometheus_client.openmetrics.exposition import (
-    DOTS, escape_label_name, escape_metric_name, generate_latest,
+    ALLOWUTF8, DOTS, escape_label_name, escape_metric_name, generate_latest,
     UNDERSCORES, VALUES,
 )
 
@@ -43,7 +43,7 @@ def test_counter_utf8(self):
         c = Counter('cc.with.dots', 'A counter', registry=self.registry)
         c.inc()
         self.assertEqual(b'# HELP "cc.with.dots" A counter\n# TYPE "cc.with.dots" counter\n{"cc.with.dots_total"} 1.0\n{"cc.with.dots_created"} 123.456\n# EOF\n',
-                         generate_latest(self.registry))
+                         generate_latest(self.registry, ALLOWUTF8))
 
     def test_counter_utf8_escaped_underscores(self):
         c = Counter('utf8.cc', 'A counter', registry=self.registry)

tests/test_exposition.py

@@ -47,7 +47,7 @@ def test_counter(self):
 # HELP cc_created A counter
 # TYPE cc_created gauge
 cc_created 123.456
-""", generate_latest(self.registry))
+""", generate_latest(self.registry, openmetrics.ALLOWUTF8))
 
     def test_counter_utf8(self):
         c = Counter('utf8.cc', 'A counter', registry=self.registry)
@@ -58,7 +58,7 @@ def test_counter_utf8(self):
 # HELP "utf8.cc_created" A counter
 # TYPE "utf8.cc_created" gauge
 {"utf8.cc_created"} 123.456
-""", generate_latest(self.registry))
+""", generate_latest(self.registry, openmetrics.ALLOWUTF8))
 
     def test_counter_utf8_escaped_underscores(self):
         c = Counter('utf8.cc', 'A counter', registry=self.registry)

tests/test_parser.py

@@ -6,6 +6,7 @@
     HistogramMetricFamily, Metric, Sample, SummaryMetricFamily,
 )
 from prometheus_client.exposition import generate_latest
+from prometheus_client.openmetrics.exposition import ALLOWUTF8
 from prometheus_client.parser import text_string_to_metric_families
 
 
@@ -367,7 +368,7 @@ def collect(self):
 
         registry = CollectorRegistry()
         registry.register(TextCollector())
-        self.assertEqual(text.encode('utf-8'), generate_latest(registry))
+        self.assertEqual(text.encode('utf-8'), generate_latest(registry, ALLOWUTF8))
 
 
 if __name__ == '__main__':