Update maybe_log_send_result/2 with proper error (#789)

Author: savhappy

lib/sentry/client.ex

@@ -300,41 +300,40 @@ defmodule Sentry.Client do
     end
   end
 
-  defp maybe_log_send_result(_send_result, %Event{source: :logger}) do
+  def maybe_log_send_result(_send_result, %Event{source: :logger}) do
     :ok
   end
 
-  defp maybe_log_send_result(send_result, _other) do
-    message =
-      case send_result do
-        {:error, {:invalid_json, error}} ->
-          "Unable to encode JSON Sentry error - #{inspect(error)}"
-
-        {:error, {:request_failure, last_error}} ->
-          case last_error do
-            {kind, data, stacktrace}
-            when kind in [:exit, :throw, :error] and is_list(stacktrace) ->
-              Exception.format(kind, data, stacktrace)
-
-            _other ->
-              "Error in HTTP Request to Sentry - #{inspect(last_error)}"
-          end
-
-        {:error, {status, headers, _body}} ->
-          error_header =
-            :proplists.get_value("X-Sentry-Error", headers, nil) ||
-              :proplists.get_value("x-sentry-error", headers, nil) || ""
-
-          if error_header != "" do
-            "Received #{status} from Sentry server: #{error_header}"
-          else
-            "Received #{status} from Sentry server"
-          end
-
-        {:ok, _} ->
-          nil
-      end
+  def maybe_log_send_result(send_result, events) do
+    if is_list(events) && Enum.any?(events, &(&1.source == :logger)) do
+      :ok
+    else
+      message =
+        case send_result do
+          {:error, {:invalid_json, error}} ->
+            "Failed to send Sentry event. Unable to encode JSON Sentry error - #{inspect(error)}"
+
+          {:error, {:request_failure, last_error}} ->
+            case last_error do
+              {kind, data, stacktrace}
+              when kind in [:exit, :throw, :error] and is_list(stacktrace) ->
+                Exception.format(kind, data, stacktrace)
+
+              _other ->
+                "Failed to send Sentry event. Error in HTTP Request to Sentry - #{inspect(last_error)}"
+            end
 
-    if message, do: LoggerUtils.log(fn -> ["Failed to send Sentry event. ", message] end)
+          {:error, {status, headers, body}} ->
+            ClientError.server_error(status, headers, body) |> ClientError.message()
+
+          {:error, reason} ->
+            ClientError.new(reason) |> ClientError.message()
+
+          {:ok, _} ->
+            nil
+        end
+
+      if message, do: LoggerUtils.log(fn -> [message] end)
+    end
   end
 end

lib/sentry/transport/sender.ex

@@ -3,7 +3,7 @@ defmodule Sentry.Transport.Sender do
 
   use GenServer
 
-  alias Sentry.{Envelope, Event, LoggerUtils, Transport}
+  alias Sentry.{Envelope, Event, Transport, Client}
 
   require Logger
 
@@ -44,55 +44,11 @@ defmodule Sentry.Transport.Sender do
     event
     |> Envelope.from_event()
     |> Transport.post_envelope(client)
-    |> maybe_log_send_result([event])
+    |> Client.maybe_log_send_result([event])
 
     # We sent an event, so we can decrease the number of queued events.
     Transport.SenderPool.decrease_queued_events_counter()
 
     {:noreply, state}
   end
-
-  ## Helpers
-
-  defp maybe_log_send_result(send_result, events) do
-    if Enum.any?(events, &(&1.source == :logger)) do
-      :ok
-    else
-      message =
-        case send_result do
-          {:error, {:invalid_json, error}} ->
-            "Unable to encode JSON Sentry error - #{inspect(error)}"
-
-          {:error, {:request_failure, last_error}} ->
-            case last_error do
-              {kind, data, stacktrace}
-              when kind in [:exit, :throw, :error] and is_list(stacktrace) ->
-                Exception.format(kind, data, stacktrace)
-
-              _other ->
-                "Error in HTTP Request to Sentry - #{inspect(last_error)}"
-            end
-
-          {:error, http_reponse} ->
-            {status, headers, _body} = http_reponse
-
-            error_header =
-              :proplists.get_value("X-Sentry-Error", headers, nil) ||
-                :proplists.get_value("x-sentry-error", headers, nil) || ""
-
-            if error_header != "" do
-              "Received #{status} from Sentry server: #{error_header}"
-            else
-              "Received #{status} from Sentry server"
-            end
-
-          _ ->
-            nil
-        end
-
-      if message do
-        LoggerUtils.log(fn -> ["Failed to send Sentry event. ", message] end)
-      end
-    end
-  end
 end

test/sentry/client_test.exs

@@ -297,8 +297,8 @@ defmodule Sentry.ClientTest do
         end)
 
       assert log =~ "[info]"
-      assert log =~ "Failed to send Sentry event."
-      assert log =~ "Received 400 from Sentry server: Rate limiting."
+      assert log =~ "Sentry failed to report event"
+      assert log =~ "400"
     end
 
     test "returns an error if Sentry server responds with error status", %{bypass: bypass} do