replace Sentry.capture_message with Logger.error where appropriate fo…

…r CE
plausible · Jan 21, 2025 · 4c14a9d · 4c14a9d
1 parent f0104cb
commit 4c14a9d
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 23 deletions.
diff --git a/lib/plausible/cache/adapter.ex b/lib/plausible/cache/adapter.ex
@@ -120,9 +120,8 @@ defmodule Plausible.Cache.Adapter do
     {:ok, result}
   catch
     :exit, {:timeout, _} ->
-      Sentry.capture_message(
-        "Timeout while executing with lock on key in '#{inspect(cache_name)}'",
-        extra: %{key: key}
+      Logger.error("Timeout while executing with lock on key in '#{inspect(cache_name)}'",
+        sentry: %{extra: %{key: key}}
       )
 
       {:error, :timeout}

diff --git a/lib/plausible/google/http.ex b/lib/plausible/google/http.ex
@@ -93,7 +93,11 @@ defmodule Plausible.Google.HTTP do
         {:error, error}
 
       {:error, %{reason: _} = e} ->
-        Sentry.capture_message("Error fetching Google queries", extra: %{error: inspect(e)})
+        # TODO
+        Logger.error("Error fetching Google queries",
+          sentry: %{extra: %{error: inspect(e)}}
+        )
+
         {:error, :unknown_error}
     end
   end

diff --git a/lib/plausible/ingestion/counters.ex b/lib/plausible/ingestion/counters.ex
@@ -82,14 +82,14 @@ defmodule Plausible.Ingestion.Counters do
 
         try do
           {_, _} = AsyncInsertRepo.insert_all(Record, records)
-        catch
-          _, thrown ->
-            Sentry.capture_message(
-              "Caught an error when trying to flush ingest counters.",
-              extra: %{
-                number_of_records: Enum.count(records),
-                error: inspect(thrown)
-              }
+        rescue
+          e ->
+            msg = Exception.format_error(e, __STACKTRACE__)
+
+            # TODO
+            Logger.error("Caught an error when trying to flush ingest counters:\n  " <> msg,
+              crash_reason: {e, __STACKTRACE__},
+              extra: %{number_of_records: Enum.count(records)}
             )
         end
     end

diff --git a/lib/plausible/ingestion/event.ex b/lib/plausible/ingestion/event.ex
@@ -10,6 +10,8 @@ defmodule Plausible.Ingestion.Event do
   alias Plausible.ClickhouseEventV2
   alias Plausible.Site.GateKeeper
 
+  require Logger
+
   defstruct domain: nil,
             site: nil,
             clickhouse_event_attrs: %{},
@@ -467,8 +469,9 @@ defmodule Plausible.Ingestion.Event do
         nil
 
       %Device{type: type} ->
-        Sentry.capture_message("Could not determine device type from UAInspector",
-          extra: %{type: type}
+        # TODO
+        Logger.error("Could not determine device type from UAInspector",
+          sentry: %{extra: %{type: type}}
         )
 
         nil

diff --git a/lib/plausible/verification/diagnostics.ex b/lib/plausible/verification/diagnostics.ex
@@ -363,6 +363,7 @@ defmodule Plausible.Verification.Diagnostics do
   end
 
   def interpret(diagnostics, url) do
+    # TODO
     Sentry.capture_message("Unhandled case for site verification",
       extra: %{
         message: inspect(diagnostics),

diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex
@@ -43,7 +43,7 @@ defmodule PlausibleWeb.Api.ExternalController do
   end
 
   def error(conn, _params) do
-    Sentry.capture_message("JS snippet error")
+    Logger.error("JS snippet error")
     send_resp(conn, 200, "")
   end
 

diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex
@@ -476,7 +476,7 @@ defmodule PlausibleWeb.AuthController do
         |> redirect(external: redirect_route)
 
       _any ->
-        Sentry.capture_message("Google OAuth callback failed. Reason: #{inspect(params)}")
+        Logger.error("Google OAuth callback failed. Reason: #{inspect(params)}")
 
         conn
         |> put_flash(

diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
@@ -614,8 +614,9 @@ defmodule PlausibleWeb.Live.Sites do
 
       {:noreply, socket}
     else
-      Sentry.capture_message("Attempting to toggle pin for invalid domain.",
-        extra: %{domain: domain, user: socket.assigns.current_user.id}
+      # TODO
+      Logger.error("Attempting to toggle pin for invalid domain.",
+        sentry: %{extra: %{domain: domain, user: socket.assigns.current_user.id}}
       )
 
       {:noreply, socket}

diff --git a/lib/plausible_web/views/email_view.ex b/lib/plausible_web/views/email_view.ex
@@ -16,6 +16,7 @@ defmodule PlausibleWeb.EmailView do
     Calendar.strftime(date, "%-d %b %Y")
   end
 
+  # TODO dsn() :: nil | {String.t(), String.t(), String.t()}
   def sentry_link(trace_id, dsn \\ Sentry.Config.dsn()) do
     search_query = URI.encode_query(%{query: trace_id})
     path = "/organizations/sentry/issues/"

diff --git a/lib/workers/import_analytics.ex b/lib/workers/import_analytics.ex
@@ -33,11 +33,13 @@ defmodule Plausible.Workers.ImportAnalytics do
         :ok
 
       {:error, error, error_opts} ->
-        Sentry.capture_message("Failed to import from #{site_import.source}",
-          extra: %{
-            import_id: site_import.id,
-            site: site_import.site.domain,
-            error: inspect(error)
+        Logger.error("Failed to import from #{site_import.source}",
+          sentry: %{
+            extra: %{
+              import_id: site_import.id,
+              site: site_import.site.domain,
+              error: inspect(error)
+            }
           }
         )