fix(tests): stop relying on global request_retries value (#992)

Author: solnic

config/config.exs

@@ -13,6 +13,8 @@ if config_env() == :test do
     test_mode: true,
     traces_sample_rate: 1.0
 
+  config :sentry, request_retries: []
+
   if System.version() > "1.16.0" do
     config :logger, :default_handler, false
 

lib/sentry/transport/sender.ex

@@ -60,10 +60,12 @@ defmodule Sentry.Transport.Sender do
 
   @impl GenServer
   def handle_cast({:send, client, %Event{} = event, counter_key}, %__MODULE__{} = state) do
+    retries = Application.get_env(:sentry, :request_retries, Transport.default_retries())
+
     _ =
       event
       |> Envelope.from_event()
-      |> Transport.encode_and_post_envelope(client)
+      |> Transport.encode_and_post_envelope(client, retries)
 
     # We sent an event, so we can decrease the number of queued events.
     Transport.SenderPool.decrease_queued_events_counter(counter_key)
@@ -76,10 +78,12 @@ defmodule Sentry.Transport.Sender do
         {:send, client, %Transaction{} = transaction, counter_key},
         %__MODULE__{} = state
       ) do
+    retries = Application.get_env(:sentry, :request_retries, Transport.default_retries())
+
     _ =
       transaction
       |> Envelope.from_transaction()
-      |> Transport.encode_and_post_envelope(client)
+      |> Transport.encode_and_post_envelope(client, retries)
 
     # We sent a transaction, so we can decrease the number of queued transactions.
     Transport.SenderPool.decrease_queued_transactions_counter(counter_key)

test/mix/sentry.send_test_event_test.exs

@@ -66,13 +66,6 @@ defmodule Mix.Tasks.Sentry.SendTestEventTest do
       Plug.Conn.resp(conn, 500, ~s<{"id": "340"}>)
     end)
 
-    original_retries =
-      Application.get_env(:sentry, :request_retries, Sentry.Transport.default_retries())
-
-    on_exit(fn -> Application.put_env(:sentry, :request_retries, original_retries) end)
-
-    Application.put_env(:sentry, :request_retries, [])
-
     put_test_config(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     assert_raise Mix.Error, ~r/Error sending event/, fn ->

test/sentry/client_report/sender_test.exs

@@ -7,13 +7,6 @@ defmodule Sentry.ClientReportTest do
   alias Sentry.Event
 
   setup do
-    original_retries =
-      Application.get_env(:sentry, :request_retries, Sentry.Transport.default_retries())
-
-    on_exit(fn -> Application.put_env(:sentry, :request_retries, original_retries) end)
-
-    Application.put_env(:sentry, :request_retries, [])
-
     bypass = Bypass.open()
     put_test_config(dsn: "http://public:secret@localhost:#{bypass.port}/1")
     %{bypass: bypass}