Skip to content

WIP: Tidy up provider log messages #4782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
robinjam wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

WIP: Tidy up provider log messages #4782

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36fc986
SmsClient: Inline function record_outcome
robinjam Mar 18, 2026
de6274e
SmsClient: Merge succeeded/failed log messages into finished message
robinjam Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions app/clients/sms/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,48 +45,32 @@ def __init__(self, current_app, statsd_client):
**adapter.poolmanager.connection_pool_kw,
}

def record_outcome(self, success):
if success:
self.current_app.logger.info(
"Provider request for %s succeeded",
self.name,
extra={
"provider_name": self.name,
},
)
self.statsd_client.incr(f"clients.{self.name}.success")
else:
self.statsd_client.incr(f"clients.{self.name}.error")
self.current_app.logger.warning(
"Provider request for %s failed",
self.name,
extra={
"provider_name": self.name,
},
)

def send_sms(self, to, content, reference, international, sender):
start_time = monotonic()
status = "succeeded"

try:
response = self.try_send_sms(to, content, reference, international, sender)
self.record_outcome(True)
self.statsd_client.incr(f"clients.{self.name}.success")
except SmsClientResponseException as e:
self.record_outcome(False)
status = "failed"
self.statsd_client.incr(f"clients.{self.name}.error")
raise e
finally:
elapsed_time = monotonic() - start_time
self.statsd_client.timing(f"clients.{self.name}.request-time", elapsed_time)
self.current_app.logger.info(
"%s request for %s finished in %.4g",
"Provider %s request for %s %s in %.4g",
self.name,
reference,
status,
elapsed_time,
extra={
"provider_name": self.name,
# for SMS, we happen to use the notification id as the "reference" for the provider
"notification_id": reference,
"duration": elapsed_time,
"status": status,
},
)

Expand Down
Loading