Merge branch 'prometheus:master' into rlock

Author: btimby

.circleci/config.yml

@@ -75,8 +75,8 @@ workflows:
           matrix:
             parameters:
                python:
-                 - "3.8"
-                 - "3.9"
+                 - "3.8.18"
+                 - "3.9.18"
                  - "3.10"
                  - "3.11"
                  - "3.12"

docs/content/exporting/http/asgi.md

@@ -14,10 +14,10 @@ app = make_asgi_app()
 Such an application can be useful when integrating Prometheus metrics with ASGI
 apps.
 
-By default, the WSGI application will respect `Accept-Encoding:gzip` headers used by Prometheus
+By default, the ASGI application will respect `Accept-Encoding:gzip` headers used by Prometheus
 and compress the response if such a header is present. This behaviour can be disabled by passing 
 `disable_compression=True` when creating the app, like this:
 
 ```python
 app = make_asgi_app(disable_compression=True)
-```
+```

docs/content/exporting/http/fastapi-gunicorn.md

@@ -19,7 +19,7 @@ metrics_app = make_asgi_app()
 app.mount("/metrics", metrics_app)
 ```
 
-For Multiprocessing support, use this modified code snippet. Full multiprocessing instructions are provided [here](https://github.com/prometheus/client_python#multiprocess-mode-eg-gunicorn).
+For Multiprocessing support, use this modified code snippet. Full multiprocessing instructions are provided [here]({{< ref "/multiprocess" >}}).
 
 ```python
 from fastapi import FastAPI
@@ -47,4 +47,4 @@ pip install gunicorn
 gunicorn -b 127.0.0.1:8000 myapp:app -k uvicorn.workers.UvicornWorker
 ```
 
-Visit http://localhost:8000/metrics to see the metrics
+Visit http://localhost:8000/metrics to see the metrics

prometheus_client/metrics.py

@@ -704,6 +704,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)
 

prometheus_client/samples.py

@@ -28,10 +28,10 @@ def __ne__(self, other: object) -> bool:
         return not self == other
 
     def __gt__(self, other: "Timestamp") -> bool:
-        return self.sec > other.sec or self.nsec > other.nsec
+        return self.nsec > other.nsec if self.sec == other.sec else self.sec > other.sec
 
     def __lt__(self, other: "Timestamp") -> bool:
-        return self.sec < other.sec or self.nsec < other.nsec
+        return self.nsec < other.nsec if self.sec == other.sec else self.sec < other.sec
 
 
 # Timestamp and exemplar are optional.

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'}))

tests/test_samples.py

@@ -12,6 +12,8 @@ def test_gt(self):
         self.assertEqual(samples.Timestamp(1, 2) > samples.Timestamp(1, 1), True)
         self.assertEqual(samples.Timestamp(2, 1) > samples.Timestamp(1, 1), True)
         self.assertEqual(samples.Timestamp(2, 2) > samples.Timestamp(1, 1), True)
+        self.assertEqual(samples.Timestamp(0, 2) > samples.Timestamp(1, 1), False)
+        self.assertEqual(samples.Timestamp(2, 0) > samples.Timestamp(1, 1), True)
 
     def test_lt(self):
         self.assertEqual(samples.Timestamp(1, 1) < samples.Timestamp(1, 1), False)
@@ -21,6 +23,8 @@ def test_lt(self):
         self.assertEqual(samples.Timestamp(1, 2) < samples.Timestamp(1, 1), False)
         self.assertEqual(samples.Timestamp(2, 1) < samples.Timestamp(1, 1), False)
         self.assertEqual(samples.Timestamp(2, 2) < samples.Timestamp(1, 1), False)
+        self.assertEqual(samples.Timestamp(0, 2) < samples.Timestamp(1, 1), True)
+        self.assertEqual(samples.Timestamp(2, 0) < samples.Timestamp(1, 1), False)
 
 
 if __name__ == '__main__':