Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Do not report hard bounce e-mail errors to Sentry (#2361)
Vinicius Brasil9a61a102732a
diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.exindex ad0762ee97..70a1e05933 100644--- a/lib/plausible/billing/billing.ex+++ b/lib/plausible/billing/billing.ex@@ -69,7 +69,7 @@ defmodule Plausible.Billing docase Repo.update(changeset) do{:ok, updated} ->PlausibleWeb.Email.cancellation_email(subscription.user)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send(){:ok, updated}diff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.exindex ee5755f2b1..d8c2cff420 100644--- a/lib/plausible/billing/site_locker.ex+++ b/lib/plausible/billing/site_locker.ex@@ -50,6 +50,6 @@ defmodule Plausible.Billing.SiteLocker dosuggested_plan)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)endenddiff --git a/lib/plausible/mailer.ex b/lib/plausible/mailer.exindex 8768e542a3..5e82e30b46 100644--- a/lib/plausible/mailer.ex+++ b/lib/plausible/mailer.ex@@ -1,29 +1,32 @@defmodule Plausible.Mailer douse Bamboo.Mailer, otp_app: :plausible- def send_email(email) do- try do- Plausible.Mailer.deliver_now!(email)- rescue- error ->- Sentry.capture_exception(error,- stacktrace: __STACKTRACE__,- extra: %{extra: "Error while sending email"}- )-- reraise error, __STACKTRACE__+ @spec send(Bamboo.Email.t()) :: :ok | {:error, :hard_bounce} | {:error, :unknown_error}+ def send(email) do+ case deliver_now(email) do+ {:ok, _email} -> :ok+ {:ok, _email, _response} -> :ok+ {:error, error} -> handle_error(error)endend- def send_email_safe(email) do- try do- Plausible.Mailer.deliver_now!(email)- rescue- error ->- Sentry.capture_exception(error,- stacktrace: __STACKTRACE__,- extra: %{extra: "Error while sending email"}- )+ defp handle_error(%{response: response}) when is_binary(response) do+ case Jason.decode(response) do+ {:ok, %{"ErrorCode" => 406}} ->+ {:error, :hard_bounce}++ {:ok, response} ->+ Sentry.capture_message("Failed to send e-mail", extra: %{response: response})+ {:error, :unknown_error}++ {:error, _any} ->+ Sentry.capture_message("Failed to send e-mail", extra: %{response: response})+ {:error, :unknown_error}endend++ defp handle_error(error) do+ Sentry.capture_message("Failed to send e-mail", extra: %{response: error})+ {:error, :unknown_error}+ endenddiff --git a/lib/plausible/mailer_test.exs b/lib/plausible/mailer_test.exsnew file mode 100644index 0000000000..f870835862--- /dev/null+++ b/lib/plausible/mailer_test.exs@@ -0,0 +1,12 @@+defmodule Plausible.MailerTest do+ use Plausible.DataCase+ use Bamboo.Test++ test "send/1 sends an email" do+ user = build(:user)+ email = PlausibleWeb.Email.welcome_email(user)++ assert :ok == Plausible.Mailer.send(email)+ assert_delivered_email(email)+ end+enddiff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex f8f58dc1ac..adde571fe5 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -146,7 +146,7 @@ defmodule PlausibleWeb.AuthController dodefp send_email_verification(user) docode = Auth.issue_email_verification(user)email_template = PlausibleWeb.Email.activation_email(user, code)- result = Plausible.Mailer.send_email(email_template)+ result = Plausible.Mailer.send(email_template)Logger.debug("E-mail verification e-mail sent. In dev environment GET /sent-emails for details."@@ -228,7 +228,7 @@ defmodule PlausibleWeb.AuthController docode = Auth.issue_email_verification(user)email_template = PlausibleWeb.Email.activation_email(user, code)- Plausible.Mailer.send_email(email_template)+ Plausible.Mailer.send(email_template)conn|> put_flash(:success, "Activation code was sent to #{user.email}")diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.exindex f971a66e55..2b6d97bbea 100644--- a/lib/plausible_web/controllers/invitation_controller.ex+++ b/lib/plausible_web/controllers/invitation_controller.ex@@ -91,22 +91,22 @@ defmodule PlausibleWeb.InvitationController dodefp notify_invitation_accepted(%Invitation{role: :owner} = invitation) doPlausibleWeb.Email.ownership_transfer_accepted(invitation)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddefp notify_invitation_accepted(invitation) doPlausibleWeb.Email.invitation_accepted(invitation)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddefp notify_invitation_rejected(%Invitation{role: :owner} = invitation) doPlausibleWeb.Email.ownership_transfer_rejected(invitation)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddefp notify_invitation_rejected(invitation) doPlausibleWeb.Email.invitation_rejected(invitation)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddef remove_invitation(conn, %{"invitation_id" => invitation_id}) dodiff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.exindex 6f1ec1c092..8b4b50a5e4 100644--- a/lib/plausible_web/controllers/site/membership_controller.ex+++ b/lib/plausible_web/controllers/site/membership_controller.ex@@ -68,7 +68,7 @@ defmodule PlausibleWeb.Site.MembershipController doPlausibleWeb.Email.new_user_invitation(invitation)end- Plausible.Mailer.send_email(email_template)+ Plausible.Mailer.send(email_template)conn|> put_flash(@@ -124,7 +124,7 @@ defmodule PlausibleWeb.Site.MembershipController do|> Repo.preload([:site, :inviter])PlausibleWeb.Email.ownership_transfer_request(invitation, user)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()conn|> put_flash(:success, "Site transfer request has been sent to #{email}")@@ -199,7 +199,7 @@ defmodule PlausibleWeb.Site.MembershipController doRepo.delete!(membership)PlausibleWeb.Email.site_member_removed(membership)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send()redirect_target =if membership.user.id == conn.assigns[:current_user].id dodiff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex d4a73964a9..78b3156c56 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -77,7 +77,7 @@ defmodule PlausibleWeb.SiteController do{:ok, %{site: site}} ->if is_first_site doPlausibleWeb.Email.welcome_email(user)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send()endconndiff --git a/lib/workers/check_usage.ex b/lib/workers/check_usage.exindex fbc2e05a73..3bacfb05af 100644--- a/lib/workers/check_usage.ex+++ b/lib/workers/check_usage.ex@@ -79,7 +79,7 @@ defmodule Plausible.Workers.CheckUsage dosite_allowance)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)subscriber|> Plausible.Auth.GracePeriod.start_manual_lock_changeset(last_cycle_usage)@@ -100,7 +100,7 @@ defmodule Plausible.Workers.CheckUsage dosuggested_plan)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)subscriber|> Plausible.Auth.GracePeriod.start_changeset(last_cycle_usage)diff --git a/lib/workers/import_google_analytics.ex b/lib/workers/import_google_analytics.exindex 2db423f508..e21c8a9cc2 100644--- a/lib/workers/import_google_analytics.ex+++ b/lib/workers/import_google_analytics.ex@@ -34,7 +34,7 @@ defmodule Plausible.Workers.ImportGoogleAnalytics doEnum.each(site.memberships, fn membership ->if membership.role in [:owner, :admin] doPlausibleWeb.Email.import_success(membership.user, site)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()endend)@@ -62,7 +62,7 @@ defmodule Plausible.Workers.ImportGoogleAnalytics doEnum.each(site.memberships, fn membership ->if membership.role in [:owner, :admin] doPlausibleWeb.Email.import_failure(membership.user, site)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()endend)enddiff --git a/lib/workers/notify_annual_renewal.ex b/lib/workers/notify_annual_renewal.exindex f4215b842e..40fde54a7a 100644--- a/lib/workers/notify_annual_renewal.ex+++ b/lib/workers/notify_annual_renewal.ex@@ -46,11 +46,11 @@ defmodule Plausible.Workers.NotifyAnnualRenewal docase user.subscription.status do"active" ->template = PlausibleWeb.Email.yearly_renewal_notification(user)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)"deleted" ->template = PlausibleWeb.Email.yearly_expiration_notification(user)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)_ ->Sentry.capture_message("Invalid subscription for renewal", user: user)diff --git a/lib/workers/send_check_stats_emails.ex b/lib/workers/send_check_stats_emails.exindex 3ab24bffb3..c0a820bc62 100644--- a/lib/workers/send_check_stats_emails.ex+++ b/lib/workers/send_check_stats_emails.ex@@ -29,7 +29,7 @@ defmodule Plausible.Workers.SendCheckStatsEmails dodefp send_check_stats_email(user) doPlausibleWeb.Email.check_stats_email(user)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()Repo.insert_all("check_stats_emails", [%{diff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.exindex 5a7eb477b9..2edd232241 100644--- a/lib/workers/send_email_report.ex+++ b/lib/workers/send_email_report.ex@@ -79,6 +79,6 @@ defmodule Plausible.Workers.SendEmailReport doname: name)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)endenddiff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.exindex fb365ee206..8406601b83 100644--- a/lib/workers/send_site_setup_emails.ex+++ b/lib/workers/send_site_setup_emails.ex@@ -76,7 +76,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_create_site_email(user) doPlausibleWeb.Email.create_site_email(user)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()Repo.insert_all("create_site_emails", [%{@@ -88,7 +88,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_setup_success_email(user, site) doPlausibleWeb.Email.site_setup_success(user, site)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()Repo.insert_all("setup_success_emails", [%{@@ -100,7 +100,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_setup_help_email(user, site) doPlausibleWeb.Email.site_setup_help(user, site)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()Repo.insert_all("setup_help_emails", [%{diff --git a/lib/workers/send_trial_notifications.ex b/lib/workers/send_trial_notifications.exindex e5a84a2236..28fd1bd17e 100644--- a/lib/workers/send_trial_notifications.ex+++ b/lib/workers/send_trial_notifications.ex@@ -51,25 +51,25 @@ defmodule Plausible.Workers.SendTrialNotifications dodefp send_one_week_reminder(user) doPlausibleWeb.Email.trial_one_week_reminder(user)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddefp send_tomorrow_reminder(user) dousage = Plausible.Billing.usage_breakdown(user)PlausibleWeb.Email.trial_upgrade_email(user, "tomorrow", usage)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddefp send_today_reminder(user) dousage = Plausible.Billing.usage_breakdown(user)PlausibleWeb.Email.trial_upgrade_email(user, "today", usage)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()enddefp send_over_reminder(user) doPlausibleWeb.Email.trial_over_email(user)- |> Plausible.Mailer.send_email_safe()+ |> Plausible.Mailer.send()endenddiff --git a/lib/workers/spike_notifier.ex b/lib/workers/spike_notifier.exindex 52cde6cf1a..ddd0331b11 100644--- a/lib/workers/spike_notifier.ex+++ b/lib/workers/spike_notifier.ex@@ -58,6 +58,6 @@ defmodule Plausible.Workers.SpikeNotifier dodashboard_link)- Plausible.Mailer.send_email_safe(template)+ Plausible.Mailer.send(template)endend