Check for invalid info/stateset values.

brian-brazil · brian-brazil · commit addb28cbd895 · 2018-10-03T14:14:13.000+01:00
Signed-off-by: Brian Brazil &lt;brian.brazil@robustperception.io&gt;
diff --git a/prometheus_client/openmetrics/parser.py b/prometheus_client/openmetrics/parser.py
@@ -257,7 +257,6 @@ def build_metric(name, documentation, typ, unit, samples):
         metric = core.Metric(name, documentation, typ, unit)
         # TODO: check labelvalues are valid utf8
         # TODO: check samples are appropriately grouped and ordered
-        # TODO: check info/stateset values are 1/0
         # TODO: Check histogram bucket rules being followed
         # TODO: Check for dupliate samples
         # TODO: Check for decresing timestamps
@@ -329,6 +328,10 @@ def build_metric(name, documentation, typ, unit, samples):
                 allowed_names = [sample.name]
             else:
                 samples.append(sample)
+            if typ == 'stateset' and sample.value not in [0, 1]:
+                raise ValueError("Stateset samples can only have values zero and one: " + line)
+            if typ == 'info' and sample.value != 1:
+                raise ValueError("Info samples can only have value one: " + line)
             if sample.exemplar and not (
                     typ in ['histogram', 'gaugehistogram']
                     and sample.name.endswith('_bucket')):
diff --git a/tests/openmetrics/test_parser.py b/tests/openmetrics/test_parser.py
@@ -160,7 +160,7 @@ def test_simple_stateset(self):
         families = text_string_to_metric_families("""# TYPE a stateset
 # HELP a help
 a{a="bar"} 0
-a{a="foo"} 1
+a{a="foo"} 1.0
 # EOF
 """)
         self.assertEqual([StateSetMetricFamily("a", "help", {'foo': True, 'bar': False})], list(families))
@@ -464,6 +464,11 @@ def test_invalid_input(self):
                 ('# TYPE a histogram\na_sum 1 # {a="b"} 0.5\n# EOF\n'),
                 ('# TYPE a gaugehistogram\na_sum 1 # {a="b"} 0.5\n# EOF\n'),
                 ('# TYPE a_bucket gauge\na_bucket 1 # {a="b"} 0.5\n# EOF\n'),
+                # Bad stateset/info values.
+                ('# TYPE a stateset\na 2\n# EOF\n'),
+                ('# TYPE a info\na 2\n# EOF\n'),
+                ('# TYPE a stateset\na 2.0\n# EOF\n'),
+                ('# TYPE a info\na 2.0\n# EOF\n'),
                 ]:
             with self.assertRaises(ValueError):
                 list(text_string_to_metric_families(case))
