fix: support timestamps in prometheus 0.19

prometheus/client_python#967 jiggers with
the format of multiprocess metrics in a way that broke our custom
aggregation.

Author: jvansanten

ampel/metrics/prometheus.py

@@ -142,12 +142,14 @@ def write_metrics(metrics: Collection[Metric], histogram_file: str, counter_file
                 continue
 
             for sample in metric.samples:
-                # prometheus_client 0.4+ adds extra fields
-                name, labels, value = sample[:3]
                 key = mmap_dict.mmap_key(
-                    metric.name, name, list(labels.keys()), list(labels.values()), metric.documentation,
+                    metric.name, sample.name, list(sample.labels.keys()), list(sample.labels.values()), metric.documentation,
                 )
-                sink.write_value(key, value)
+                # prometheus_client 0.19.0 adds timestamps, but only for MultiProcessValues
+                if hasattr(sample, "timestamp"):
+                    sink.write_value(key, sample.value, sample.timestamp or 0.0)
+                else:
+                    sink.write_value(key, sample.value)
     finally:
         histograms.close()
         counters.close()

ampel/test/test_concurrent.py

@@ -174,8 +174,8 @@ async def test_multiprocess_metrics(prometheus_multiproc_dir):
         if sample
     }
     read_mmap = lambda fname: {
-        k: v
-        for k, v, p in mmap_dict.MmapedDict.read_all_values_from_file(
+        item[0]: item[1]
+        for item in mmap_dict.MmapedDict.read_all_values_from_file(
             prometheus_multiproc_dir / fname
         )
     }