kinto 19.2.0__tar.gz → 19.3.1__tar.gz

{kinto-19.2.0 → kinto-19.3.1}/.github/workflows/test.yml

@@ -32,10 +32,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        pyenv: [py38, py39, py310, py311, py312, py312-raw]
+        pyenv: [py39, py310, py311, py312, py312-raw]
         include:
-          - pyenv: py38
-            python-version: "3.8"
           - pyenv: py39
             python-version: "3.9"
           - pyenv: py310

{kinto-19.2.0 → kinto-19.3.1}/Dockerfile

@@ -1,5 +1,5 @@
 # Mozilla Kinto server
-FROM python:3.10-bullseye as python-builder
+FROM python:3.10-bullseye AS python-builder
 RUN python -m venv /opt/venv
 ARG KINTO_VERSION=1
 ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_KINTO=${KINTO_VERSION} \
@@ -36,4 +36,4 @@ WORKDIR /app
 USER app
 
 # Run database migrations and start the kinto server
-CMD kinto migrate --ini $KINTO_INI && kinto start --ini $KINTO_INI --port $PORT
+CMD ["sh", "-c", "kinto migrate --ini $KINTO_INI && kinto start --ini $KINTO_INI --port $PORT"]

{kinto-19.2.0/kinto.egg-info → kinto-19.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kinto
-Version: 19.2.0
+Version: 19.3.1
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation
@@ -21,10 +21,10 @@ Project-URL: Repository, https://github.com/Kinto/kinto
 Keywords: web,sync,json,storage,services
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
@@ -114,7 +114,7 @@ Kinto is a minimalist JSON storage service with synchronisation and sharing abil
 Requirements
 ------------
 
-* **Python**: 3.8+
+* **Python**: 3.9+
 * **Backends**: In-memory (development), PostgreSQL 9.5+ (production)
 
 Contributors

{kinto-19.2.0 → kinto-19.3.1}/README.rst

@@ -38,5 +38,5 @@ Kinto is a minimalist JSON storage service with synchronisation and sharing abil
 Requirements
 ------------
 
-* **Python**: 3.8+
+* **Python**: 3.9+
 * **Backends**: In-memory (development), PostgreSQL 9.5+ (production)

{kinto-19.2.0 → kinto-19.3.1}/constraints.txt

@@ -10,7 +10,7 @@ attrs==23.2.0
     # via
     #   jsonschema
     #   referencing
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via -r constraints.in
 beautifulsoup4==4.12.3
     # via webtest
@@ -36,7 +36,7 @@ cornice==6.0.1
     #   cornice-swagger
 cornice-swagger==1.0.1
     # via -r constraints.in
-coverage==7.4.0
+coverage==7.6.4
     # via pytest-cov
 dockerflow==2024.4.2
     # via -r constraints.in
@@ -44,8 +44,10 @@ execnet==2.0.2
     # via pytest-cache
 fqdn==1.5.1
     # via jsonschema
-greenlet==3.0.3
-    # via playwright
+greenlet==3.1.1
+    # via
+    #   playwright
+    #   sqlalchemy
 hupper==1.12
     # via pyramid
 idna==3.7
@@ -79,7 +81,7 @@ markupsafe==2.1.4
     # via werkzeug
 msgpack==1.0.7
     # via bravado-core
-newrelic==10.1.0
+newrelic==10.3.1
     # via -r constraints.in
 packaging==23.2
     # via
@@ -94,13 +96,13 @@ plaster==1.1.2
     #   pyramid
 plaster-pastedeploy==1.0.1
     # via pyramid
-playwright==1.47.0
+playwright==1.49.0
     # via -r constraints.in
 pluggy==1.5.0
     # via pytest
-prometheus-client==0.21.0
+prometheus-client==0.21.1
     # via -r constraints.in
-psycopg2==2.9.9
+psycopg2==2.9.10
     # via -r constraints.in
 pyee==12.0.0
     # via playwright
@@ -117,16 +119,16 @@ pyramid-mailer==0.15.1
     # via -r constraints.in
 pyramid-multiauth==1.0.2
     # via -r constraints.in
-pyramid-tm==2.5
+pyramid-tm==2.6
     # via -r constraints.in
-pytest==8.3.3
+pytest==8.3.4
     # via
     #   -r constraints.in
     #   pytest-cache
     #   pytest-cov
 pytest-cache==1.0
     # via -r constraints.in
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r constraints.in
 python-dateutil==2.9.0.post0
     # via
@@ -161,7 +163,7 @@ rpds-py==0.17.1
     # via
     #   jsonschema
     #   referencing
-ruff==0.6.9
+ruff==0.8.2
     # via -r constraints.in
 sentry-sdk==2.8.0
     # via -r constraints.in
@@ -175,7 +177,7 @@ six==1.16.0
     #   rfc3339-validator
 soupsieve==2.5
     # via beautifulsoup4
-sqlalchemy==2.0.35
+sqlalchemy==2.0.36
     # via
     #   -r constraints.in
     #   sentry-sdk
@@ -212,7 +214,7 @@ venusian==3.1.0
     # via
     #   cornice
     #   pyramid
-waitress==3.0.0
+waitress==3.0.2
     # via
     #   -r constraints.in
     #   webtest
@@ -224,7 +226,7 @@ webob==1.8.8
     #   webtest
 webtest==3.0.0
     # via -r constraints.in
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via -r constraints.in
 zope-deprecation==5.0
     # via pyramid

{kinto-19.2.0 → kinto-19.3.1}/docs/conf.py

@@ -24,10 +24,7 @@ __HERE__ = os.path.dirname(os.path.abspath(__file__))
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-
     html_theme = "sphinx_rtd_theme"
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # otherwise, readthedocs.io uses their theme by default, so no need to specify
 # it

{kinto-19.2.0 → kinto-19.3.1}/docs/requirements.txt

@@ -1,12 +1,12 @@
-Sphinx==7.4.4
-sphinx_rtd_theme==2.0.0
+Sphinx==8.1.3
+sphinx_rtd_theme==3.0.2
 docutils==0.20.1
 sphinxcontrib-httpdomain==1.8.1
 sphinx-github-changelog==1.4.0
 kinto
 mock==5.1.0
-webtest==3.0.1
+webtest==3.0.2
 cornice==6.1.0
 pyramid==2.0.2
 python-rapidjson==1.20
-SQLAlchemy==2.0.35
+SQLAlchemy==2.0.36

{kinto-19.2.0 → kinto-19.3.1}/kinto/__init__.py

@@ -38,6 +38,7 @@ DEFAULT_SETTINGS = {
     "record_id_generator": "kinto.views.RelaxedUUID",
     "project_name": "kinto",
     "admin_assets_path": None,
+    "metrics_matchdict_fields": ["bucket_id", "collection_id", "group_id", "record_id"],
 }
 
 

{kinto-19.2.0 → kinto-19.3.1}/kinto/core/__init__.py

@@ -96,6 +96,7 @@ DEFAULT_SETTINGS = {
     "statsd_backend": "kinto.core.statsd",
     "statsd_prefix": "kinto.core",
     "statsd_url": None,
+    "metrics_matchdict_fields": [],
     "storage_backend": "",
     "storage_url": "",
     "storage_max_fetch_size": 10000,

{kinto-19.2.0 → kinto-19.3.1}/kinto/core/initialization.py

@@ -1,6 +1,7 @@
 import logging
 import random
 import re
+import urllib.parse
 import warnings
 from datetime import datetime
 from secrets import token_hex
@@ -431,6 +432,9 @@ def setup_logging(config):
 def setup_metrics(config):
     settings = config.get_settings()
 
+    # Register a no-op metrics service by default.
+    config.registry.registerUtility(metrics.NoOpMetricsService(), metrics.IMetricsService)
+
     # This does not fully respect the Pyramid/ZCA patterns, but the rest of Kinto uses
     # `registry.storage`, `registry.cache`, etc. Consistency seems more important.
     config.registry.__class__.metrics = property(
@@ -449,9 +453,6 @@ def setup_metrics(config):
     def on_app_created(event):
         config = event.app
         metrics_service = config.registry.metrics
-        if not metrics_service:
-            logger.warning("No metrics service registered.")
-            return
 
         metrics.watch_execution_time(metrics_service, config.registry.cache, prefix="backend")
         metrics.watch_execution_time(metrics_service, config.registry.storage, prefix="backend")
@@ -471,15 +472,66 @@ def setup_metrics(config):
     def on_new_response(event):
         request = event.request
         metrics_service = config.registry.metrics
-        if not metrics_service:
-            return
+
+        try:
+            endpoint = utils.strip_uri_prefix(request.path)
+            endpoint = urllib.parse.quote_plus(endpoint, safe="/?&=-_")
+        except UnicodeDecodeError as e:
+            # This `on_new_response` callback is also called when a HTTP 400
+            # is returned because of an invalid UTF-8 path. We still want metrics.
+            endpoint = str(e)
 
         # Count unique users.
         user_id = request.prefixed_userid
         if user_id:
             # Get rid of colons in metric packet (see #1282).
-            user_id = user_id.replace(":", ".")
-            metrics_service.count("users", unique=user_id)
+            auth, user_id = user_id.split(":")
+            metrics_service.count("users", unique=[("auth", auth), ("userid", user_id)])
+
+        # Add extra labels to metrics, based on fields extracted from the request matchdict.
+        metrics_matchdict_fields = aslist(settings["metrics_matchdict_fields"])
+        # Turn the `id` field of object endpoints into `{resource}_id` (eg. `mushroom_id`, `bucket_id`)
+        enhanced_matchdict = dict(request.matchdict or {})
+        try:
+            enhanced_matchdict[request.current_resource_name + "_id"] = enhanced_matchdict.get(
+                "id", ""
+            )
+        except AttributeError:
+            # Not on a resource.
+            pass
+        metrics_matchdict_labels = [
+            (field, enhanced_matchdict.get(field, "")) for field in metrics_matchdict_fields
+        ]
+
+        # Count served requests.
+        metrics_service.count(
+            "request_summary",
+            unique=[
+                ("method", request.method.lower()),
+                ("endpoint", endpoint),
+                ("status", str(event.response.status_code)),
+            ]
+            + metrics_matchdict_labels,
+        )
+
+        try:
+            current = utils.msec_time()
+            duration = current - request._received_at
+            metrics_service.observe(
+                "request_duration",
+                duration,
+                labels=[("endpoint", endpoint)] + metrics_matchdict_labels,
+            )
+        except AttributeError:  # pragma: no cover
+            # Logging was not setup in this Kinto app (unlikely but possible)
+            pass
+
+        # Observe response size.
+        metrics_service.observe(
+            "request_size",
+            len(event.response.body or b""),
+            labels=[("endpoint", endpoint)] + metrics_matchdict_labels,
+        )
 
         # Count authentication verifications.
         if hasattr(request, "authn_type"):

{kinto-19.2.0 → kinto-19.3.1}/kinto/core/metrics.py

@@ -1,6 +1,6 @@
 import types
 
-from zope.interface import Interface
+from zope.interface import Interface, implementer
 
 from kinto.core import utils
 
@@ -16,13 +16,47 @@ class IMetricsService(Interface):
         Watch execution time.
         """
 
+    def observe(self, key, value, labels=[]):
+        """
+        Observe a give `value` for the specified `key`.
+        """
+
     def count(key, count=1, unique=None):
         """
         Count occurrences. If `unique` is set, overwrites the counter value
         on each call.
+
+        `unique` should be of type ``list[tuple[str,str]]``.
         """
 
 
+class NoOpTimer:
+    def __call__(self, f):
+        @utils.safe_wraps(f)
+        def _wrapped(*args, **kwargs):
+            return f(*args, **kwargs)
+
+        return _wrapped
+
+    def __enter__(self):
+        pass
+
+    def __exit__(self, *args, **kwargs):
+        pass
+
+
+@implementer(IMetricsService)
+class NoOpMetricsService:
+    def timer(self, key):
+        return NoOpTimer()
+
+    def observe(self, key, value, labels=[]):
+        pass
+
+    def count(self, key, count=1, unique=None):
+        pass
+
+
 def watch_execution_time(metrics_service, obj, prefix="", classname=None):
     """
     Decorate all methods of an object in order to watch their execution time.
@@ -49,6 +83,8 @@ def listener_with_timer(config, key, func):
     def wrapped(*args, **kwargs):
         metrics_service = config.registry.metrics
         if not metrics_service:
+            # This only happens if `kinto.core.initialization.setup_metrics` is
+            # not listed in the `initialization_sequence` setting.
             return func(*args, **kwargs)
         # If metrics are enabled, monitor execution time of listeners.
         with metrics_service.timer(key):

{kinto-19.2.0 → kinto-19.3.1}/kinto/core/resource/__init__.py

@@ -665,7 +665,7 @@ class Resource:
         obj = self._get_object_or_404(self.object_id)
         self._raise_412_if_modified(obj)
 
-        # Retreive the last_modified information from a querystring if present.
+        # Retrieve the last_modified information from a querystring if present.
         last_modified = self.request.validated["querystring"].get("last_modified")
 
         # If less or equal than current object. Ignore it.
@@ -1060,7 +1060,8 @@ class Resource:
         """Extracts filters from QueryString parameters."""
 
         def is_valid_timestamp(value):
-            return isinstance(value, int) or re.match(r'^"?\d+"?$', str(value))
+            # Is either integer, or integer as string, or integer between 2 quotes.
+            return isinstance(value, int) or re.match(r'^(\d+)$|^("\d+")$', str(value))
 
         queryparams = self.request.validated["querystring"]
 

{kinto-19.2.0 → kinto-19.3.1}/kinto/core/utils.py

@@ -1,4 +1,5 @@
 import collections.abc as collections_abc
+import functools
 import hashlib
 import hmac
 import os
@@ -541,3 +542,10 @@ def apply_json_patch(obj, ops):
         raise ValueError(e)
 
     return result
+
+
+def safe_wraps(wrapper, *args, **kwargs):
+    """Safely wraps partial functions."""
+    while isinstance(wrapper, functools.partial):
+        wrapper = wrapper.func
+    return functools.wraps(wrapper, *args, **kwargs)

kinto-19.3.1/kinto/plugins/admin/VERSION

@@ -0,0 +1 @@
+3.4.1

kinto-19.3.1/kinto/plugins/admin/build/VERSION

@@ -0,0 +1 @@
+3.4.1