darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 07:46:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2876 from alphagov/more-histograms

Browse Source 
add more prometheus metrics
This commit is contained in:
Leo Hemsted
2020-06-15 17:28:59 +01:00
committed by GitHub
parent 4c230a7235 58ab99d74b
commit eec2c2859e
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/authentication/auth.py
View File

@@ -6,12 +6,18 @@ from notifications_python_client.errors import (
from notifications_utils import request_helper from notifications_utils import request_helper
from sqlalchemy.exc import DataError from sqlalchemy.exc import DataError
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound
from gds_metrics import Histogram
from app.dao.services_dao import dao_fetch_service_by_id_with_api_keys from app.dao.services_dao import dao_fetch_service_by_id_with_api_keys
GENERAL_TOKEN_ERROR_MESSAGE = 'Invalid token: make sure your API token matches the example at https://docs.notifications.service.gov.uk/rest-api.html#authorisation-header' # noqa GENERAL_TOKEN_ERROR_MESSAGE = 'Invalid token: make sure your API token matches the example at https://docs.notifications.service.gov.uk/rest-api.html#authorisation-header' # noqa
AUTH_DB_CONNECTION_DURATION_SECONDS = Histogram(
'auth_db_connection_duration_seconds',
'Time taken to get DB connection and fetch service from database',
)
class AuthError(Exception): class AuthError(Exception):
def __init__(self, message, code, service_id=None, api_key_id=None): def __init__(self, message, code, service_id=None, api_key_id=None):
@@ -87,7 +93,8 @@ def requires_auth():
issuer = __get_token_issuer(auth_token) # ie the `iss` claim which should be a service ID issuer = __get_token_issuer(auth_token) # ie the `iss` claim which should be a service ID
try: try:
service = dao_fetch_service_by_id_with_api_keys(issuer) with AUTH_DB_CONNECTION_DURATION_SECONDS.time():
service = dao_fetch_service_by_id_with_api_keys(issuer)
except DataError: except DataError:
raise AuthError("Invalid token: service id is not the right data type", 403) raise AuthError("Invalid token: service id is not the right data type", 403)
except NoResultFound: except NoResultFound:

26
app/v2/notifications/post_notifications.py
View File

@@ -7,6 +7,7 @@ from boto.exception import SQSError
from flask import request, jsonify, current_app, abort from flask import request, jsonify, current_app, abort
from notifications_utils.postal_address import PostalAddress from notifications_utils.postal_address import PostalAddress
from notifications_utils.recipients import try_validate_and_format_phone_number from notifications_utils.recipients import try_validate_and_format_phone_number
from gds_metrics import Histogram
from app import ( from app import (
api_user, api_user,
@@ -74,6 +75,12 @@ from app.v2.notifications.notification_schemas import (
from app.v2.utils import get_valid_json from app.v2.utils import get_valid_json
POST_NOTIFICATION_JSON_PARSE_DURATION_SECONDS = Histogram(
'post_notification_json_parse_duration_seconds',
'Time taken to parse and validate post request json',
)
@v2_notification_blueprint.route('/{}'.format(LETTER_TYPE), methods=['POST']) @v2_notification_blueprint.route('/{}'.format(LETTER_TYPE), methods=['POST'])
def post_precompiled_letter_notification(): def post_precompiled_letter_notification():
request_json = get_valid_json() request_json = get_valid_json()
@@ -116,16 +123,17 @@ def post_precompiled_letter_notification():
@v2_notification_blueprint.route('/<notification_type>', methods=['POST']) @v2_notification_blueprint.route('/<notification_type>', methods=['POST'])
def post_notification(notification_type): def post_notification(notification_type):
request_json = get_valid_json() with POST_NOTIFICATION_JSON_PARSE_DURATION_SECONDS.time():
request_json = get_valid_json()
if notification_type == EMAIL_TYPE: if notification_type == EMAIL_TYPE:
form = validate(request_json, post_email_request) form = validate(request_json, post_email_request)
elif notification_type == SMS_TYPE: elif notification_type == SMS_TYPE:
form = validate(request_json, post_sms_request) form = validate(request_json, post_sms_request)
elif notification_type == LETTER_TYPE: elif notification_type == LETTER_TYPE:
form = validate(request_json, post_letter_request) form = validate(request_json, post_letter_request)
else: else:
abort(404) abort(404)
check_service_has_permission(notification_type, authenticated_service.permissions) check_service_has_permission(notification_type, authenticated_service.permissions)