kinto 20.4.0__py3-none-any.whl → 20.5.0__py3-none-any.whl

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.dist-info → kinto-20.5.0.dist-info}/METADATA

@@ -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.dist-info → kinto-20.5.0.dist-info}/RECORD

@@ -100,7 +100,7 @@ kinto/core/views/openapi.py,sha256=PgxplQX1D0zqzlvRxBvd5SzrNMJmsaLfDta_fh-Pr-A,9
 kinto/core/views/version.py,sha256=-m5G_o0oHTpCgrtfFrHFve6Zqw_gs_szT0Bd8jnNmD4,1419
 kinto/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kinto/plugins/flush.py,sha256=poiBOLGXjml0xXHjqDMRdbXJSd6N3SL0mfeGK2vxeHY,812
-kinto/plugins/prometheus.py,sha256=oGpm1H4-CTVK4kd_GWDyn4nKBCSVq1fypdBoewDMRPk,6209
+kinto/plugins/prometheus.py,sha256=qSXsNf9TqqMUIzseFtjAkvqjjYxoItoiVvtzwH2FMqc,7000
 kinto/plugins/statsd.py,sha256=-VasJZM1xkhTfFa6_0GgWwfPqKnYS2722bSMDLzZ3pI,2469
 kinto/plugins/accounts/__init__.py,sha256=2DeIaXJmMqRca3xVHeJ6xBWmeXAfrCdyg3EvK5jzIak,3670
 kinto/plugins/accounts/authentication.py,sha256=pCb269FquKGFd6DH8AVTjFnBFlfxcDEYVyxhQp5Y08o,2117
@@ -141,9 +141,9 @@ kinto/views/contribute.py,sha256=PJoIMLj9_IszSjgZkaCd_TUjekDgNqjpmVTmRN9ztaA,983
 kinto/views/groups.py,sha256=jOq5fX0-4lwZE8k1q5HME2tU7x9052rtBPF7YqcJ-Qg,3181
 kinto/views/permissions.py,sha256=F0_eKx201WyLonXJ5vLdGKa9RcFKjvAihrEEhU1JuLw,9069
 kinto/views/records.py,sha256=lYfACW2L8qcQoyYBD5IX-fTPjFWmGp7GjHq_U4InlyE,5037
-kinto-20.4.0.dist-info/licenses/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
-kinto-20.4.0.dist-info/METADATA,sha256=FJkC9Vuz90F7WOrCHXR68mhO8z59xIu5bkLBCe1Os2k,8731
-kinto-20.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-kinto-20.4.0.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
-kinto-20.4.0.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
-kinto-20.4.0.dist-info/RECORD,,
+kinto-20.5.0.dist-info/licenses/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
+kinto-20.5.0.dist-info/METADATA,sha256=8hgp9glzPTbNRIWX6r2RXIy5xX_-V72uFHyjo27XlxQ,8731
+kinto-20.5.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+kinto-20.5.0.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
+kinto-20.5.0.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
+kinto-20.5.0.dist-info/RECORD,,