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

add metrics for redis timings

Browse Source
This commit is contained in:
Leo Hemsted
2020-05-13 11:06:27 +01:00
committed by David McDonald
parent d9b3b31a6a
commit 15ce9fe3f9
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/notifications/process_notifications.py
View File

@@ -34,6 +34,15 @@ from app.dao.notifications_dao import (
from app.v2.errors import BadRequestError from app.v2.errors import BadRequestError
from gds_metrics import Histogram
REDIS_GET_AND_INCR_DAILY_LIMIT_DURATION_SECONDS = Histogram(
'redis_get_and_incr_daily_limit_duration_seconds',
'Time taken to get and possibly incremement the daily limit cache key',
)
def create_content_for_notification(template, personalisation): def create_content_for_notification(template, personalisation):
template_object = template._as_utils_template_with_personalisation(personalisation) template_object = template._as_utils_template_with_personalisation(personalisation)
check_placeholders(template_object) check_placeholders(template_object)
@@ -115,8 +124,9 @@ def persist_notification(
if not simulated: if not simulated:
dao_create_notification(notification) dao_create_notification(notification)
if key_type != KEY_TYPE_TEST: if key_type != KEY_TYPE_TEST:
if redis_store.get(redis.daily_limit_cache_key(service.id)): with REDIS_GET_AND_INCR_DAILY_LIMIT_DURATION_SECONDS.time():
redis_store.incr(redis.daily_limit_cache_key(service.id)) if redis_store.get(redis.daily_limit_cache_key(service.id)):
redis_store.incr(redis.daily_limit_cache_key(service.id))
current_app.logger.info( current_app.logger.info(
"{} {} created at {}".format(notification_type, notification_id, notification_created_at) "{} {} created at {}".format(notification_type, notification_id, notification_created_at)

15
app/notifications/validators.py
View File

@@ -22,15 +22,24 @@ from app.utils import get_public_notify_type_text
from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
from app.dao.service_letter_contact_dao import dao_get_letter_contact_by_id from app.dao.service_letter_contact_dao import dao_get_letter_contact_by_id
from gds_metrics.metrics import Histogram
REDIS_EXCEEDED_RATE_LIMIT_DURATION_SECONDS = Histogram(
'redis_exceeded_rate_limit_duration_seconds',
'Time taken to check rate limit',
)
def check_service_over_api_rate_limit(service, api_key): def check_service_over_api_rate_limit(service, api_key):
if current_app.config['API_RATE_LIMIT_ENABLED'] and current_app.config['REDIS_ENABLED']: if current_app.config['API_RATE_LIMIT_ENABLED'] and current_app.config['REDIS_ENABLED']:
cache_key = rate_limit_cache_key(service.id, api_key.key_type) cache_key = rate_limit_cache_key(service.id, api_key.key_type)
rate_limit = service.rate_limit rate_limit = service.rate_limit
interval = 60 interval = 60
if redis_store.exceeded_rate_limit(cache_key, rate_limit, interval): with REDIS_EXCEEDED_RATE_LIMIT_DURATION_SECONDS.time():
current_app.logger.info("service {} has been rate limited for throughput".format(service.id)) if redis_store.exceeded_rate_limit(cache_key, rate_limit, interval):
raise RateLimitError(rate_limit, interval, api_key.key_type) current_app.logger.info("service {} has been rate limited for throughput".format(service.id))
raise RateLimitError(rate_limit, interval, api_key.key_type)
def check_service_over_daily_message_limit(key_type, service): def check_service_over_daily_message_limit(key_type, service):

2
gunicorn_config.py
View File

@@ -7,7 +7,7 @@ from gds_metrics.gunicorn import child_exit # noqa
workers = 4 workers = 4
worker_class = "eventlet" worker_class = "eventlet"
worker_connections = 256 worker_connections = 30
errorlog = "/home/vcap/logs/gunicorn_error.log" errorlog = "/home/vcap/logs/gunicorn_error.log"
bind = "0.0.0.0:{}".format(os.getenv("PORT")) bind = "0.0.0.0:{}".format(os.getenv("PORT"))
statsd_host = "{}:8125".format(os.getenv("STATSD_HOST")) statsd_host = "{}:8125".format(os.getenv("STATSD_HOST"))