diff --git a/Pipfile b/Pipfile index 1ab13530f..0ef623783 100644 --- a/Pipfile +++ b/Pipfile @@ -11,15 +11,13 @@ flask = "~=2.3" flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" -gds-metrics = {version = "==0.2.4", ref = "6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72", git = "https://github.com/alphagov/gds_metrics_python.git"} govuk-bank-holidays = "==0.13" -govuk-frontend-jinja = {version = "==0.5.8-alpha", git = "https://github.com/alphagov/govuk-frontend-jinja.git"} +govuk-frontend-jinja = {version = "*", git = "https://github.com/alphagov/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} humanize = "~=4.8" itsdangerous = "~=2.1" jinja2 = "~=3.1" notifications-python-client = "==8.0.1" -prometheus-client = "==0.17.1" pyexcel = "==0.7.0" pyexcel-io = "==0.6.6" pyexcel-ods3 = "==0.6.1" diff --git a/app/__init__.py b/app/__init__.py index 5f244f630..d6c4257bc 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -20,7 +20,6 @@ from flask_login import LoginManager, current_user from flask_talisman import Talisman from flask_wtf import CSRFProtect from flask_wtf.csrf import CSRFError -from gds_metrics import GDSMetrics from govuk_frontend_jinja.flask_ext import init_govuk_frontend from itsdangerous import BadSignature from notifications_python_client.errors import HTTPError @@ -128,7 +127,6 @@ from app.url_converters import ( login_manager = LoginManager() csrf = CSRFProtect() talisman = Talisman() -metrics = GDSMetrics() basic_auth = CustomBasicAuth() @@ -194,11 +192,6 @@ def create_app(application): init_jinja(application) for client in ( - # Gubbins - # Note, metrics purposefully first so we start measuring response times as early as possible before any - # other `app.before_request` handlers (introduced by any of these clients) are processed (which would - # otherwise mean we aren't measuring the full response time) - metrics, csrf, login_manager, proxy_fix,