kinto 21.0.0__py3-none-any.whl → 21.1.0__py3-none-any.whl

kinto/__init__.py

@@ -14,7 +14,7 @@ from kinto.core import utils
 __version__ = pkg_resources.get_distribution(__package__).version
 
 # Implemented HTTP API Version
-HTTP_API_VERSION = "1.22"
+HTTP_API_VERSION = "1.23"
 
 # Main kinto logger
 logger = logging.getLogger(__name__)

kinto/config/__init__.py

@@ -1,6 +1,9 @@
 import codecs
 import logging
 import os
+from datetime import datetime
+from functools import lru_cache
+from hashlib import sha256
 from time import strftime
 
 from kinto import __version__
@@ -69,3 +72,23 @@ def init(config_file, backend, cache_backend, host="127.0.0.1"):
     values.update(cache_backend_to_values[cache_backend])
 
     render_template("kinto.tpl", config_file, **values)
+
+
+@lru_cache(maxsize=1)
+def config_attributes():
+    """
+    Returns a hash of the config `.ini` file content.
+    The path is only known from `app.wsgi`, so we have to read
+    the environment variable again. Since tests are not run through
+    WSGI, then the variable is not set.
+    """
+    # WARNING: this default value should be the same as `app.wsgi`
+    ini_path = os.environ.get("KINTO_INI", os.path.join(".", "config", "kinto.ini"))
+    if not os.path.exists(ini_path):
+        logger.error(f"Could not find config file at {ini_path}")
+        return None
+    return {
+        "path": ini_path,
+        "hash": sha256(open(ini_path, "rb").read()).hexdigest(),
+        "modified": datetime.fromtimestamp(os.path.getmtime(ini_path)).isoformat(),
+    }

kinto/core/views/hello.py

@@ -2,6 +2,7 @@ import colander
 from pyramid.authorization import Authenticated
 from pyramid.security import NO_PERMISSION_REQUIRED
 
+from kinto.config import config_attributes
 from kinto.core import Service
 
 
@@ -26,14 +27,17 @@ hello_response_schemas = {
 def get_hello(request):
     """Return information regarding the current instance."""
     settings = request.registry.settings
+
     project_name = settings["project_name"]
     project_version = settings["project_version"]
+
     data = dict(
         project_name=project_name,
         project_version=project_version,
         http_api_version=settings["http_api_version"],
         project_docs=settings["project_docs"],
         url=request.route_url(hello.name),
+        config=config_attributes(),
     )
 
     eos = get_eos(request)

kinto/plugins/prometheus.py

@@ -6,6 +6,7 @@ from time import perf_counter as time_now
 
 from pyramid.exceptions import ConfigurationError
 from pyramid.response import Response
+from pyramid.settings import asbool, aslist
 from zope.interface import implementer
 
 from kinto.core import metrics
@@ -102,7 +103,7 @@ class Timer:
 
 @implementer(metrics.IMetricsService)
 class PrometheusService:
-    def __init__(self, prefix=""):
+    def __init__(self, prefix="", exclude_labels=None):
         prefix_clean = ""
         if prefix:
             # In GCP Console, the metrics are grouped by the first
@@ -111,10 +112,19 @@ class PrometheusService:
             # (eg. `remote-settings` -> `remotesettings_`, `kinto_` -> `kinto_`)
             prefix_clean = _fix_metric_name(prefix).replace("_", "") + "_"
         self.prefix = prefix_clean.lower()
+        self.exclude_labels = exclude_labels or []
+
+    def _exclude_labels(self, labels):
+        return [
+            (label_name, label_value)
+            for label_name, label_value in labels
+            if label_name not in self.exclude_labels
+        ]
 
     def timer(self, key, value=None, labels=[]):
         global _METRICS
         key = self.prefix + key
+        labels = self._exclude_labels(labels)
 
         if key not in _METRICS:
             _METRICS[key] = prometheus_module.Histogram(
@@ -144,6 +154,7 @@ class PrometheusService:
     def observe(self, key, value, labels=[]):
         global _METRICS
         key = self.prefix + key
+        labels = self._exclude_labels(labels)
 
         if key not in _METRICS:
             _METRICS[key] = prometheus_module.Summary(
@@ -184,6 +195,7 @@ class PrometheusService:
                 label_name, label_value = unique.rsplit(".", 1)
                 unique = [(label_name, label_value)]
 
+            unique = self._exclude_labels(unique)
             labels = [
                 (_fix_metric_name(label_name), label_value) for label_name, label_value in unique
             ]
@@ -229,6 +241,11 @@ def includeme(config):
         )
         raise ConfigurationError(error_msg)
 
+    settings = config.get_settings()
+
+    if not asbool(settings.get("prometheus_created_metrics_enabled", True)):
+        prometheus_module.disable_created_metrics()
+
     config.add_api_capability(
         "prometheus",
         description="Prometheus metrics.",
@@ -250,7 +267,13 @@ def includeme(config):
             pass
     _METRICS.clear()
 
-    settings = config.get_settings()
     prefix = settings.get("prometheus_prefix", settings["project_name"])
 
-    config.registry.registerUtility(PrometheusService(prefix=prefix), metrics.IMetricsService)
+    # If we want to reduce the metrics cardinality, we can exclude certain
+    # labels (eg. records_id). This way all metrics will be grouped by the
+    # remaining labels.
+    exclude_labels = aslist(settings.get("prometheus_exclude_labels", ""))
+
+    config.registry.registerUtility(
+        PrometheusService(prefix=prefix, exclude_labels=exclude_labels), metrics.IMetricsService
+    )

{kinto-21.0.0.dist-info → kinto-21.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinto
-Version: 21.0.0
+Version: 21.1.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-21.0.0.dist-info → kinto-21.1.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-kinto/__init__.py,sha256=XG7cOyHN0ipQeOSPMW-XFax7uFgAjnCd3Slq0jSFGC4,3299
+kinto/__init__.py,sha256=OLigXJoAE1frrLwNjfAnuuhgfRrk8yL_OrvZpguRzT8,3299
 kinto/__main__.py,sha256=6XDjWYGtJ36qepn9Of4xL9zc35TfdSeEvHh3s26Aw9c,7913
 kinto/authorization.py,sha256=i3ttdPTFGzE9CqUQmfC4rR_6dDZJu0jWJMLGl_jFzIE,4919
 kinto/contribute.json,sha256=HT9QVB8rA8jWIREQoqWfMibfJXMAzbRsixW8F6O6cQY,792
 kinto/events.py,sha256=NMPvKUdbi25aYHhu9svzQsrEZMa9nyO4mtuMZC5871Q,85
 kinto/schema_validation.py,sha256=mtAmnl5HwiUsjS2gU8MKH4lkZ1380A5wZht-w9s5X7M,5306
-kinto/config/__init__.py,sha256=av8W0utmjheueFqrjTYEDk_vbpm3XYdHcqv5lppNR4k,2131
+kinto/config/__init__.py,sha256=v3EySgWgyqLr2kV6sFkBVgnEgjHwyylbcgYIpdNveKQ,2979
 kinto/config/kinto.tpl,sha256=Pm9p_oRsBlVoEXPVA2X6Wvv49jMOVv-27jw4rahVlwE,8201
 kinto/core/__init__.py,sha256=s7PshdeKmpiqI5sW-zdC7p3Ig-e60w4kiUwlKi-impY,8655
 kinto/core/authentication.py,sha256=HLA0kREC3GMEsrIsHsQYjVNztYfAF01kb8-pLboByFs,1527
@@ -95,12 +95,12 @@ kinto/core/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 kinto/core/views/batch.py,sha256=sWNn67YqfTbiqwpbwbm1QyumcVGi8aNhlT5AtLToElI,5657
 kinto/core/views/errors.py,sha256=2uTy85UBQL1EDIMotzFBhVl14RmWwb3rupbsB0mycbs,6099
 kinto/core/views/heartbeat.py,sha256=qidZ7fTvuPoJMo7miDnclAm_WsbgqubzsARrv9aCo5U,3336
-kinto/core/views/hello.py,sha256=tTjJ2PHKPnmLL41cwF6e0AzPhm4WmojIc0VWHcZNOgI,1961
+kinto/core/views/hello.py,sha256=DipWK5EuuDOyUSHCGTGZKmNBbgyp_SHyPXUje6hc81E,2042
 kinto/core/views/openapi.py,sha256=PgxplQX1D0zqzlvRxBvd5SzrNMJmsaLfDta_fh-Pr-A,958
 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=Isr8mhDJHG5pcAC0_1RtFnbZHko1iCfw-cQicFkqVIU,8065
+kinto/plugins/prometheus.py,sha256=WyE3jULDSMe35S4SJiKbh05AVGDyU9Hc-UR3-7baaGs,8957
 kinto/plugins/statsd.py,sha256=k9sewYZUwm60k9Z799VxbShBP3uPwGVlImaGCPnIrkE,2801
 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-21.0.0.dist-info/licenses/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
-kinto-21.0.0.dist-info/METADATA,sha256=rn2hxy6jgnxDk8FMz_kKe_ammE_kfHpmJ5ieV5G2XtE,8731
-kinto-21.0.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-kinto-21.0.0.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
-kinto-21.0.0.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
-kinto-21.0.0.dist-info/RECORD,,
+kinto-21.1.0.dist-info/licenses/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
+kinto-21.1.0.dist-info/METADATA,sha256=rTspJQTHQ907FEjyjIM27a3XT_mxRQIILCnGfyZ3-S8,8731
+kinto-21.1.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+kinto-21.1.0.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
+kinto-21.1.0.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
+kinto-21.1.0.dist-info/RECORD,,