kinto 20.4.0__tar.gz → 20.5.0__tar.gz

{kinto-20.4.0 → kinto-20.5.0}/Dockerfile

@@ -27,7 +27,8 @@ COPY --from=python-builder /opt/venv /opt/venv
 
 ENV KINTO_INI=/etc/kinto/kinto.ini \
     PORT=8888 \
-    PATH="/opt/venv/bin:$PATH"
+    PATH="/opt/venv/bin:$PATH" \
+    PROMETHEUS_MULTIPROC_DIR="/tmp/metrics"
 
 RUN kinto init --ini $KINTO_INI --host 0.0.0.0 --backend=memory --cache-backend=memory
 

{kinto-20.4.0 → kinto-20.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinto
-Version: 20.4.0
+Version: 20.5.0
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation

{kinto-20.4.0 → kinto-20.5.0}/kinto/plugins/prometheus.py

@@ -1,3 +1,6 @@
+import logging
+import os
+import shutil
 import warnings
 from time import perf_counter as time_now
 
@@ -15,15 +18,29 @@ except ImportError:  # pragma: no cover
     prometheus_module = None
 
 
+logger = logging.getLogger(__name__)
+
 _METRICS = {}
 _REGISTRY = None
 
 
+PROMETHEUS_MULTIPROC_DIR = os.getenv("PROMETHEUS_MULTIPROC_DIR")
+
+
 def get_registry():
     global _REGISTRY
 
     if _REGISTRY is None:
-        _REGISTRY = prometheus_module.CollectorRegistry()
+        if PROMETHEUS_MULTIPROC_DIR:  # pragma: no cover
+            from prometheus_client import multiprocess
+
+            _reset_multiproc_folder_content()
+            # Ref: https://prometheus.github.io/client_python/multiprocess/
+            _REGISTRY = prometheus_module.CollectorRegistry()
+            multiprocess.MultiProcessCollector(_REGISTRY)
+        else:
+            _REGISTRY = prometheus_module.REGISTRY
+            logger.warning("Prometheus metrics will run in single-process mode only.")
     return _REGISTRY
 
 
@@ -170,6 +187,12 @@ def metrics_view(request):
     return resp
 
 
+def _reset_multiproc_folder_content():  # pragma: no cover
+    if os.path.exists(PROMETHEUS_MULTIPROC_DIR):
+        shutil.rmtree(PROMETHEUS_MULTIPROC_DIR)
+    os.mkdir(PROMETHEUS_MULTIPROC_DIR)
+
+
 def includeme(config):
     if prometheus_module is None:
         error_msg = (
@@ -190,6 +213,7 @@ def includeme(config):
     # This is mainly useful in tests, where the plugin is included
     # several times with different settings.
     registry = get_registry()
+
     for collector in _METRICS.values():
         try:
             registry.unregister(collector)

{kinto-20.4.0 → kinto-20.5.0}/kinto.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinto
-Version: 20.4.0
+Version: 20.5.0
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation