kinto 19.3.2__py3-none-any.whl → 19.4.0__py3-none-any.whl

kinto/plugins/prometheus.py

@@ -28,7 +28,7 @@ def get_registry():
 
 
 def _fix_metric_name(s):
-    return s.replace("-", "_").replace(".", "_")
+    return s.replace("-", "_").replace(".", "_").replace(" ", "_")
 
 
 class Timer:
@@ -68,8 +68,20 @@ class Timer:
 
 @implementer(metrics.IMetricsService)
 class PrometheusService:
+    def __init__(self, prefix=""):
+        prefix_clean = ""
+        if prefix:
+            # In GCP Console, the metrics are grouped by the first
+            # word before the first underscore. Here we make sure the specified
+            # prefix is not mixed up with metrics names.
+            # (eg. `remote-settings` -> `remotesettings_`, `kinto_` -> `kinto_`)
+            prefix_clean = _fix_metric_name(prefix).replace("_", "") + "_"
+        self.prefix = prefix_clean.lower()
+
     def timer(self, key):
         global _METRICS
+        key = self.prefix + key
+
         if key not in _METRICS:
             _METRICS[key] = prometheus_module.Summary(
                 _fix_metric_name(key), f"Summary of {key}", registry=get_registry()
@@ -84,6 +96,7 @@ class PrometheusService:
 
     def observe(self, key, value, labels=[]):
         global _METRICS
+        key = self.prefix + key
 
         if key not in _METRICS:
             _METRICS[key] = prometheus_module.Summary(
@@ -106,6 +119,7 @@ class PrometheusService:
 
     def count(self, key, count=1, unique=None):
         global _METRICS
+        key = self.prefix + key
 
         labels = []
 
@@ -183,4 +197,7 @@ def includeme(config):
             pass
     _METRICS.clear()
 
-    config.registry.registerUtility(PrometheusService(), metrics.IMetricsService)
+    settings = config.get_settings()
+    prefix = settings.get("prometheus_prefix", settings["project_name"])
+
+    config.registry.registerUtility(PrometheusService(prefix=prefix), metrics.IMetricsService)

{kinto-19.3.2.dist-info → kinto-19.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kinto
-Version: 19.3.2
+Version: 19.4.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-19.3.2.dist-info → kinto-19.4.0.dist-info}/RECORD

@@ -78,7 +78,7 @@ kinto/core/views/openapi.py,sha256=YZ7akBoMqmiu0b4AOxlupHU01_kQEHtmzPxJq_iS79Y,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=mG3J6KI9xP2ICYaxQEscEhUfdkDky-qN0klYap9YPMM,809
-kinto/plugins/prometheus.py,sha256=tLxb1VZOzZS-8PJgqXDfjHz773wHtwZjcFZuE10-hbA,5486
+kinto/plugins/prometheus.py,sha256=oGpm1H4-CTVK4kd_GWDyn4nKBCSVq1fypdBoewDMRPk,6209
 kinto/plugins/statsd.py,sha256=-VasJZM1xkhTfFa6_0GgWwfPqKnYS2722bSMDLzZ3pI,2469
 kinto/plugins/accounts/__init__.py,sha256=KX3rTxHf520JNXfAa1RwCMZijSR6kPjOrMbTxMig8yk,4346
 kinto/plugins/accounts/authentication.py,sha256=h7l_KezC8os4sKN1bz3RKEwXwYTYAs21DRzzU9na_U0,3742
@@ -125,9 +125,9 @@ kinto/views/contribute.py,sha256=NEDr2g1HhVwcMBg0qHEZDmWVJ1V31WsM8cRs0Vm6hfc,118
 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-19.3.2.dist-info/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
-kinto-19.3.2.dist-info/METADATA,sha256=CnSTJCkQ75XHZgy7wSmXGswSlklTR5SZAj1HZipg1qI,8858
-kinto-19.3.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-kinto-19.3.2.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
-kinto-19.3.2.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
-kinto-19.3.2.dist-info/RECORD,,
+kinto-19.4.0.dist-info/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
+kinto-19.4.0.dist-info/METADATA,sha256=cUCZg_hSiek4uuNA6-syERFEIRgyXUAI5aUem_-5nxA,8858
+kinto-19.4.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+kinto-19.4.0.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
+kinto-19.4.0.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
+kinto-19.4.0.dist-info/RECORD,,