Skip to content

Log delivered_at and delivery_latency for immediate email deliveries #2128

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

Merged
theseanything merged 2 commits into from
May 29, 2026
Merged

Log delivered_at and delivery_latency for immediate email deliveries #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e5e303
Rename delivery_time to delivered_at in receive deliveries job
theseanything May 28, 2026
7f3f7e2
Log delivered_at and delivery_duration_ms for immediate deliveries
theseanything May 28, 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
33 changes: 17 additions & 16 deletions app/jobs/receive_submission_deliveries_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,27 @@ def perform

raise "Unexpected event type:#{ses_event_type}" unless ses_event_type == "Delivery"

delivery_time = Time.zone.parse(ses_message["delivery"]["timestamp"])
process_delivery(delivery, submission, delivered_at: delivery_time)

if delivery.immediate?
submission_duration_ms = ((delivery_time - submission.created_at) * 1000).round
CloudWatchService.record_submission_delivery_latency_metric(submission_duration_ms, "Email")
end
delivered_at = Time.zone.parse(ses_message["delivery"]["timestamp"])
process_delivery(delivery, submission, delivered_at:)
end
end

private

def process_delivery(delivery, submission, **attributes)
set_submission_logging_attributes(submission:, delivery:) if delivery.immediate?
set_submission_batch_logging_attributes(form: submission.form, mode: submission.mode_object, delivery:) if delivery.daily? || delivery.weekly?

delivery.update! attributes

form_event_name = delivery.immediate? ? "submission_delivered" : "submission_batch_delivered"

EventLogger.log_form_event(form_event_name)
def process_delivery(delivery, submission, delivered_at:)
delivery.update!(delivered_at:)

if delivery.immediate?
delivery_latency = ((delivery.delivered_at - submission.created_at) * 1000).round
set_submission_logging_attributes(submission:, delivery:)
CloudWatchService.record_submission_delivery_latency_metric(delivery_latency, "Email")
EventLogger.log_form_event(
"submission_delivered",
{ delivered_at: delivery.delivered_at, delivery_latency: },
)
elsif delivery.daily? || delivery.weekly?
set_submission_batch_logging_attributes(form: submission.form, mode: submission.mode_object, delivery:)
EventLogger.log_form_event("submission_batch_delivered")
end
end
end
2 changes: 2 additions & 0 deletions spec/jobs/receive_submission_deliveries_job_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@
"form_id" => submission.form_id,
"submission_reference" => reference,
"preview" => "false",
"delivered_at" => Time.zone.parse(ses_delivery_timestamp),
"delivery_latency" => 6122,
"sns_message_timestamp" => sns_message_timestamp,
"job_id" => @job_id,
"job_class" => "ReceiveSubmissionDeliveriesJob",
Expand Down