From e0e3a72268102e6b721a3670f95bc9dfad46d49b Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 25 Mar 2017 21:17:12 +0100 Subject: [PATCH] Add metrics for request/task counting --- src/pretix/base/metrics.py | 6 +++-- src/pretix/base/services/async.py | 19 ++++++++++++++- src/pretix/helpers/metrics/__init__.py | 0 src/pretix/helpers/metrics/middleware.py | 30 ++++++++++++++++++++++++ src/pretix/settings.py | 5 ++++ 5 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 src/pretix/helpers/metrics/__init__.py create mode 100644 src/pretix/helpers/metrics/middleware.py diff --git a/src/pretix/base/metrics.py b/src/pretix/base/metrics.py index 4105fa30b2..cd6908cc32 100755 --- a/src/pretix/base/metrics.py +++ b/src/pretix/base/metrics.py @@ -146,5 +146,7 @@ def metric_values(): """ Provided metrics """ -http_requests_total = Counter("http_requests_total", "Total number of HTTP requests made.", ["code", "handler", "method"]) -# usage: http_requests_total.inc(code="200", handler="/foo", method="GET") +http_view_requests = Counter("http_view_requests", "Total number of HTTP requests made.", + ["status_code", "method", "url_name"]) +celery_task_runs = Counter("celery_task_runs", "Total calls to a celery task", + ["task_name", "status"]) diff --git a/src/pretix/base/services/async.py b/src/pretix/base/services/async.py index 25a96bf428..f48dbf4e6c 100644 --- a/src/pretix/base/services/async.py +++ b/src/pretix/base/services/async.py @@ -15,12 +15,12 @@ import time from django.conf import settings from django.db import transaction +from pretix.base.metrics import celery_task_runs from pretix.celery_app import app class ProfiledTask(app.Task): def __call__(self, *args, **kwargs): - if settings.PROFILING_RATE > 0 and random.random() < settings.PROFILING_RATE / 100: profiler = cProfile.Profile() profiler.enable() @@ -35,6 +35,23 @@ class ProfiledTask(app.Task): else: return super().__call__(*args, **kwargs) + def on_failure(self, exc, task_id, args, kwargs, einfo): + if settings.METRICS_ENABLED: + expected = False + for t in self.throws: + if isinstance(exc, t): + expected = True + break + celery_task_runs.inc(1, task_name=self.name, status="expected-error" if expected else "error") + + return super().on_failure(exc, task_id, args, kwargs, einfo) + + def on_success(self, retval, task_id, args, kwargs): + if settings.METRICS_ENABLED: + celery_task_runs.inc(1, task_name=self.name, status="success") + + return super().on_success(retval, task_id, args, kwargs) + class TransactionAwareTask(ProfiledTask): """ diff --git a/src/pretix/helpers/metrics/__init__.py b/src/pretix/helpers/metrics/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/pretix/helpers/metrics/middleware.py b/src/pretix/helpers/metrics/middleware.py new file mode 100644 index 0000000000..09d0a7bc3e --- /dev/null +++ b/src/pretix/helpers/metrics/middleware.py @@ -0,0 +1,30 @@ +from django.urls import resolve + +from pretix.base.metrics import http_view_requests + + +class MetricsMiddleware(object): + blacklist = ( + '/healthcheck/', + '/jsi18n/', + '/metrics', + ) + + def __init__(self, get_response): + self.get_response = get_response + # One-time configuration and initialization. + + def __call__(self, request): + # Code to be executed for each request before + # the view (and later middleware) are called. + for b in self.blacklist: + if b in request.path: + return self.get_response(request) + + url = resolve(request.path_info) + + resp = self.get_response(request) + http_view_requests.inc(1, status_code=resp.status_code, method=request.method, + url_name=url.namespace + ':' + url.url_name) + + return resp diff --git a/src/pretix/settings.py b/src/pretix/settings.py index ee08724c8e..7f783dd307 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -261,6 +261,11 @@ except ImportError: pass +if METRICS_ENABLED: + MIDDLEWARE.insert(MIDDLEWARE.index('pretix.multidomain.middlewares.MultiDomainMiddleware') + 1, + 'pretix.helpers.metrics.middleware.MetricsMiddleware') + + PROFILING_RATE = config.getfloat('django', 'profile', fallback=0) # Percentage of requests to profile if PROFILING_RATE > 0: if not os.path.exists(PROFILE_DIR):