Only record the elapsed time at provider for notifications with a sent_at date,

could be that have a problem with state, misaligned tasks, we should just not record as edge case and this is aggregate.
This commit is contained in:
Martyn Inglis
2016-09-13 13:57:06 +01:00
parent 517cec173b
commit 1a4b303c43
4 changed files with 141 additions and 70 deletions

View File

@@ -24,3 +24,8 @@ class StatsdClient(StatsClient):
def timing(self, stat, delta, rate=1):
if self.active:
super(StatsClient, self).timing(self.format_stat_name(stat), delta, rate)
def timing_with_dates(self, stat, start, end, rate=1):
if self.active:
delta = (start - end).total_seconds() * 1000
super(StatsClient, self).timing(stat, delta, rate)

View File

@@ -71,9 +71,11 @@ def process_sms_client_response(status, reference, client_name):
notification_status_message))
statsd_client.incr('callback.{}.{}'.format(client_name.lower(), notification_status))
statsd_client.timing(
'callback.{}.elapsed-time'.format(client_name.lower()),
(datetime.utcnow() - notification.sent_at)
)
if notification.sent_at:
statsd_client.timing_with_dates(
'callback.{}.elapsed-time'.format(client_name.lower()),
datetime.utcnow(),
notification.sent_at
)
success = "{} callback succeeded. reference {} updated".format(client_name, reference)
return success, errors

View File

@@ -97,7 +97,12 @@ def process_ses_response():
)
statsd_client.incr('callback.ses.{}'.format(notification_status))
statsd_client.timing('callback.ses.elapsed-time', (datetime.utcnow() - notification.sent_at))
if notification.sent_at:
statsd_client.timing_with_dates(
'callback.ses.elapsed-time'.format(client_name.lower()),
datetime.utcnow(),
notification.sent_at
)
return jsonify(
result="success", message="SES callback succeeded"
), 200
@@ -233,8 +238,8 @@ def send_notification(notification_type):
raise InvalidRequest(errors, status_code=400)
if (
template_object.template_type == SMS_TYPE and
template_object.replaced_content_count > current_app.config.get('SMS_CHAR_COUNT_LIMIT')
template_object.template_type == SMS_TYPE and
template_object.replaced_content_count > current_app.config.get('SMS_CHAR_COUNT_LIMIT')
):
char_count = current_app.config.get('SMS_CHAR_COUNT_LIMIT')
message = 'Content has a character count greater than the limit of {}'.format(char_count)
@@ -242,14 +247,14 @@ def send_notification(notification_type):
raise InvalidRequest(errors, status_code=400)
if all((
api_user.key_type != KEY_TYPE_TEST,
service.restricted or api_user.key_type == KEY_TYPE_TEAM,
not allowed_to_send_to(
notification['to'],
itertools.chain.from_iterable(
[user.mobile_number, user.email_address] for user in service.users
)
)
api_user.key_type != KEY_TYPE_TEST,
service.restricted or api_user.key_type == KEY_TYPE_TEAM,
not allowed_to_send_to(
notification['to'],
itertools.chain.from_iterable(
[user.mobile_number, user.email_address] for user in service.users
)
)
)):
if (api_user.key_type == KEY_TYPE_TEAM):
message = 'Cant send to this recipient using a team-only API key'