Merge branch 'prometheus:master' into master

HelloBroBro · web-flow · commit 7b7bc3d29a24 · 2024-03-09T06:02:04.000+01:00
diff --git a/prometheus_client/metrics.py b/prometheus_client/metrics.py
@@ -705,6 +705,8 @@ def info(self, val: Dict[str, str]) -> None:
         if self._labelname_set.intersection(val.keys()):
             raise ValueError('Overlapping labels for Info metric, metric: {} child: {}'.format(
                 self._labelnames, val))
+        if any(i is None for i in val.values()):
+            raise ValueError('Label value cannot be None')
         with self._lock:
             self._value = dict(val)
 
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -534,6 +534,7 @@ def test_info(self):
 
     def test_labels(self):
         self.assertRaises(ValueError, self.labels.labels('a').info, {'l': ''})
+        self.assertRaises(ValueError, self.labels.labels('a').info, {'il': None})
 
         self.labels.labels('a').info({'foo': 'bar'})
         self.assertEqual(1, self.registry.get_sample_value('il_info', {'l': 'a', 'foo': 'bar'}))
