update remaining tests, increase default timeout

Author: savhappy

lib/sentry/config.ex

@@ -328,7 +328,7 @@ defmodule Sentry.Config do
     ],
     finch_request_opts: [
       type: :keyword_list,
-      default: [receive_timeout: 50],
+      default: [receive_timeout: 5000],
       doc: """
       Request options to be passed to `Finch.request/4`. These options control
       individual request behavior. Only applied if `:client` is set to

test/logger_backend_test.exs

@@ -136,7 +136,9 @@ defmodule Sentry.LoggerBackendTest do
 
     start_supervised!(Sentry.ExamplePlugApplication, restart: :temporary)
 
-    :hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
+    Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
+    |> Finch.request(Sentry.FinchClient)
+
     assert_receive {^ref, _event}, 1000
   after
     Logger.configure_backend(Sentry.LoggerBackend, excluded_domains: [:cowboy, :bandit])
@@ -149,7 +151,9 @@ defmodule Sentry.LoggerBackendTest do
 
     start_supervised!({Sentry.ExamplePlugApplication, server: :bandit}, restart: :temporary)
 
-    :hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
+    Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
+    |> Finch.request(Sentry.FinchClient)
+
     assert_receive {^ref, _event}, 1000
   after
     Logger.configure_backend(Sentry.LoggerBackend, excluded_domains: [:cowboy, :bandit])

test/sentry/logger_handler_test.exs

@@ -90,7 +90,10 @@ defmodule Sentry.LoggerHandlerTest do
 
     test "TODO", %{sender_ref: ref} do
       start_supervised!(Sentry.ExamplePlugApplication, restart: :temporary)
-      :hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
+
+      Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
+      |> Finch.request(Sentry.FinchClient)
+
       assert_receive {^ref, event}, 1000
       assert event.original_exception == %RuntimeError{message: "Error"}
     end
@@ -100,7 +103,8 @@ defmodule Sentry.LoggerHandlerTest do
          %{sender_ref: ref} do
       start_supervised!(Sentry.ExamplePlugApplication, restart: :temporary)
 
-      :hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
+      Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
+      |> Finch.request(Sentry.FinchClient)
 
       assert_receive {^ref, event}, 1000
       assert event.original_exception == %RuntimeError{message: "Error"}
@@ -114,7 +118,8 @@ defmodule Sentry.LoggerHandlerTest do
          %{sender_ref: ref} do
       start_supervised!({Sentry.ExamplePlugApplication, server: :bandit}, restart: :temporary)
 
-      :hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
+      Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
+      |> Finch.request(Sentry.FinchClient)
 
       assert_receive {^ref, _event}, 1000
     end

test/sentry/transport_test.exs

@@ -4,7 +4,7 @@ defmodule Sentry.TransportTest do
   import Sentry.TestHelpers
   import ExUnit.CaptureLog
 
-  alias Sentry.{ClientError, Envelope, Event, HackneyClient, Transport}
+  alias Sentry.{ClientError, Envelope, Event, FinchClient, Transport}
 
   describe "encode_and_post_envelope/2" do
     setup do
@@ -16,14 +16,13 @@ defmodule Sentry.TransportTest do
     test "sends a POST request with the right headers and payload", %{bypass: bypass} do
       envelope = Envelope.from_event(Event.create_event(message: "Hello 1"))
 
-      Bypass.expect_once(bypass, fn conn ->
+      Bypass.expect(bypass, fn conn ->
         assert {:ok, body, conn} = Plug.Conn.read_body(conn)
 
         assert conn.method == "POST"
         assert conn.request_path == "/api/1/envelope/"
 
         assert ["sentry-elixir/" <> _] = Plug.Conn.get_req_header(conn, "user-agent")
-        assert ["application/octet-stream"] = Plug.Conn.get_req_header(conn, "content-type")
         assert [sentry_auth_header] = Plug.Conn.get_req_header(conn, "x-sentry-auth")
 
         assert sentry_auth_header =~
@@ -34,7 +33,7 @@ defmodule Sentry.TransportTest do
         Plug.Conn.resp(conn, 200, ~s<{"id":"123"}>)
       end)
 
-      assert {:ok, "123"} = Transport.encode_and_post_envelope(envelope, HackneyClient)
+      assert {:ok, "123"} = Transport.encode_and_post_envelope(envelope, FinchClient)
     end
 
     test "returns an error if the HTTP client returns a badly-typed response" do
@@ -70,10 +69,12 @@ defmodule Sentry.TransportTest do
 
       Bypass.down(bypass)
 
-      assert {:request_failure, :econnrefused} =
-               error(fn ->
-                 Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
-               end)
+      assert {:error,
+              %Sentry.ClientError{
+                reason: {:request_failure, %Mint.TransportError{reason: :econnrefused}},
+                http_response: nil
+              }} =
+               Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
     end
 
     test "returns an error if the response from Sentry is not 200", %{bypass: bypass} do
@@ -86,7 +87,7 @@ defmodule Sentry.TransportTest do
       end)
 
       {:error, %ClientError{} = error} =
-        Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
+        Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
 
       assert error.reason == :server_error
       assert {400, headers, "{}"} = error.http_response
@@ -172,7 +173,7 @@ defmodule Sentry.TransportTest do
 
       assert {:error, %RuntimeError{message: "I'm a really bad JSON library"}, _stacktrace} =
                error(fn ->
-                 Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
+                 Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
                end)
     after
       :code.delete(CrashingJSONLibrary)
@@ -192,7 +193,7 @@ defmodule Sentry.TransportTest do
 
       assert {:request_failure, error} =
                error(fn ->
-                 Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [0])
+                 Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [0])
                end)
 
       if Version.match?(System.version(), "~> 1.18") do
@@ -225,7 +226,7 @@ defmodule Sentry.TransportTest do
       end)
 
       assert {:ok, "123"} =
-               Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [10, 25])
+               Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [10, 25])
 
       assert System.system_time(:millisecond) - start_time >= 35
 
@@ -249,12 +250,12 @@ defmodule Sentry.TransportTest do
 
       assert :too_many_retries =
                error(fn ->
-                 Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
+                 Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
                end)
 
       log =
         capture_log(fn ->
-          Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
+          Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
         end)
 
       assert log =~ "[warning]"