From 34538bcad8ca66f9b5419d43fb9737c0f199a528 Mon Sep 17 00:00:00 2001 From: David McDonald Date: Wed, 8 Jul 2020 16:51:41 +0100 Subject: [PATCH] Fix risk of uncaught exceptions due to gds metrics Similar to https://github.com/alphagov/notifications-admin/pull/3510 Because of https://github.com/alphagov/gds_metrics_python/pull/8 --- app/__init__.py | 4 +++- requirements-app.txt | 2 +- requirements.txt | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index d16e0cdbe..79c57e9ef 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -83,6 +83,9 @@ def create_app(application): application.config['NOTIFY_APP_NAME'] = application.name init_app(application) + + # Metrics intentionally high up to give the most accurate timing and reliability that the metric is recorded + metrics.init_app(application) request_helper.init_app(application) db.init_app(application) migrate.init_app(application, db=db) @@ -108,7 +111,6 @@ def create_app(application): redis_store.init_app(application) performance_platform_client.init_app(application) document_download_client.init_app(application) - metrics.init_app(application) register_blueprint(application) register_v2_blueprints(application) diff --git a/requirements-app.txt b/requirements-app.txt index ed4803a3a..92703f439 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -33,4 +33,4 @@ git+https://github.com/alphagov/notifications-utils.git@40.2.1#egg=notifications # gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains prometheus-client==0.7.1 -gds-metrics==0.2.0 +gds-metrics==0.2.2 diff --git a/requirements.txt b/requirements.txt index c96dd1dfe..2421420ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,21 +35,21 @@ git+https://github.com/alphagov/notifications-utils.git@40.2.1#egg=notifications # gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains prometheus-client==0.7.1 -gds-metrics==0.2.0 +gds-metrics==0.2.2 ## The following requirements were added by pip freeze: alembic==1.4.2 amqp==1.4.9 anyjson==0.3.3 attrs==19.3.0 -awscli==1.18.96 +awscli==1.18.97 bcrypt==3.1.7 billiard==3.3.0.23 bleach==3.1.4 blinker==1.4 boto==2.49.0 boto3==1.10.38 -botocore==1.17.19 +botocore==1.17.20 certifi==2020.6.20 chardet==3.0.4 click==7.1.2 @@ -82,7 +82,7 @@ pytz==2020.1 PyYAML==5.3.1 redis==3.5.3 requests==2.24.0 -rsa==3.4.2 +rsa==4.5 s3transfer==0.3.3 six==1.15.0 smartypants==2.0.1