Skip to content

Commit c8b460c

Browse files
savhappysavhappy
committed
update remaining tests, increase default timeout
1 parent bc3a249 commit c8b460c

File tree

4 files changed

+67
-41
lines changed

4 files changed

+67
-41
lines changed

‎lib/sentry/config.ex‎

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -376,32 +376,48 @@ defmodule Sentry.Config do
376376
for available options.
377377
"""
378378
],
379-
hackney_opts: [
379+
finch_request_opts: [
380380
type: :keyword_list,
381-
default: [pool: :sentry_pool],
381+
default: [receive_timeout: 5000],
382382
doc: """
383-
Options to be passed to `hackney`. Only
384-
applied if `:client` is set to `Sentry.HackneyClient`.
385-
"""
386-
],
387-
hackney_pool_timeout: [
388-
type: :timeout,
389-
default: 5000,
390-
doc: """
391-
The maximum time to wait for a
392-
connection to become available. Only applied if `:client` is set to
393-
`Sentry.HackneyClient`.
383+
Request options to be passed to `Finch.request/4`. These options control
384+
individual request behavior. Only applied if `:client` is set to
385+
`Sentry.FinchClient`. See [Finch documentation](https://hexdocs.pm/finch/Finch.html#request/4)
386+
for available options.
394387
"""
395388
],
396-
hackney_pool_max_connections: [
397-
type: :pos_integer,
398-
default: 50,
399-
doc: """
400-
The maximum number of
401-
connections to keep in the pool. Only applied if `:client` is set to
402-
`Sentry.HackneyClient`.
403-
"""
404-
]
389+
hackney_opts:
390+
[
391+
type: :keyword_list,
392+
default: [pool: :sentry_pool],
393+
doc: """
394+
Options to be passed to `hackney`. Only
395+
applied if `:client` is set to `Sentry.HackneyClient`.
396+
"""
397+
] ++
398+
if(Mix.env() == :test, do: [], else: [deprecated: "Use Finch instead as default client."]),
399+
hackney_pool_timeout:
400+
[
401+
type: :timeout,
402+
default: 5000,
403+
doc: """
404+
The maximum time to wait for a
405+
connection to become available. Only applied if `:client` is set to
406+
`Sentry.HackneyClient`.
407+
"""
408+
] ++
409+
if(Mix.env() == :test, do: [], else: [deprecated: "Use Finch instead as default client."]),
410+
hackney_pool_max_connections:
411+
[
412+
type: :pos_integer,
413+
default: 50,
414+
doc: """
415+
The maximum number of
416+
connections to keep in the pool. Only applied if `:client` is set to
417+
`Sentry.HackneyClient`.
418+
"""
419+
] ++
420+
if(Mix.env() == :test, do: [], else: [deprecated: "Use Finch instead as default client."])
405421
]
406422

407423
source_code_context_opts_schema = [

‎test/logger_backend_test.exs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ defmodule Sentry.LoggerBackendTest do
136136

137137
start_supervised!(Sentry.ExamplePlugApplication, restart: :temporary)
138138

139-
:hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
139+
Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
140+
|> Finch.request(Sentry.FinchClient)
141+
140142
assert_receive {^ref, _event}, 1000
141143
assert_receive {^ref, _event}, 1000
142144
after
@@ -150,7 +152,9 @@ defmodule Sentry.LoggerBackendTest do
150152

151153
start_supervised!({Sentry.ExamplePlugApplication, server: :bandit}, restart: :temporary)
152154

153-
:hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
155+
Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
156+
|> Finch.request(Sentry.FinchClient)
157+
154158
assert_receive {^ref, _event}, 1000
155159
assert_receive {^ref, _event}, 1000
156160
after

‎test/sentry/logger_handler_test.exs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ defmodule Sentry.LoggerHandlerTest do
9090

9191
test "TODO", %{sender_ref: ref} do
9292
start_supervised!(Sentry.ExamplePlugApplication, restart: :temporary)
93-
:hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
93+
94+
Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
95+
|> Finch.request(Sentry.FinchClient)
96+
9497
assert_receive {^ref, event}, 1000
9598
assert event.original_exception == %RuntimeError{message: "Error"}
9699
end
@@ -100,7 +103,8 @@ defmodule Sentry.LoggerHandlerTest do
100103
%{sender_ref: ref} do
101104
start_supervised!(Sentry.ExamplePlugApplication, restart: :temporary)
102105

103-
:hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
106+
Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
107+
|> Finch.request(Sentry.FinchClient)
104108

105109
assert_receive {^ref, event}, 1000
106110
assert event.original_exception == %RuntimeError{message: "Error"}
@@ -114,7 +118,8 @@ defmodule Sentry.LoggerHandlerTest do
114118
%{sender_ref: ref} do
115119
start_supervised!({Sentry.ExamplePlugApplication, server: :bandit}, restart: :temporary)
116120

117-
:hackney.get("http://127.0.0.1:8003/error_route", [], "", [])
121+
Finch.build(:get, "http://127.0.0.1:8003/error_route", [], "", [])
122+
|> Finch.request(Sentry.FinchClient)
118123

119124
assert_receive {^ref, _event}, 1000
120125
assert_receive {^ref, _event}, 1000

‎test/sentry/transport_test.exs‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defmodule Sentry.TransportTest do
44
import Sentry.TestHelpers
55
import ExUnit.CaptureLog
66

7-
alias Sentry.{ClientError, Envelope, Event, HackneyClient, Transport}
7+
alias Sentry.{ClientError, Envelope, Event, FinchClient, Transport}
88

99
describe "encode_and_post_envelope/2" do
1010
setup do
@@ -16,14 +16,13 @@ defmodule Sentry.TransportTest do
1616
test "sends a POST request with the right headers and payload", %{bypass: bypass} do
1717
envelope = Envelope.from_event(Event.create_event(message: "Hello 1"))
1818

19-
Bypass.expect_once(bypass, fn conn ->
19+
Bypass.expect(bypass, fn conn ->
2020
assert {:ok, body, conn} = Plug.Conn.read_body(conn)
2121

2222
assert conn.method == "POST"
2323
assert conn.request_path == "/api/1/envelope/"
2424

2525
assert ["sentry-elixir/" <> _] = Plug.Conn.get_req_header(conn, "user-agent")
26-
assert ["application/octet-stream"] = Plug.Conn.get_req_header(conn, "content-type")
2726
assert [sentry_auth_header] = Plug.Conn.get_req_header(conn, "x-sentry-auth")
2827

2928
assert sentry_auth_header =~
@@ -34,7 +33,7 @@ defmodule Sentry.TransportTest do
3433
Plug.Conn.resp(conn, 200, ~s<{"id":"123"}>)
3534
end)
3635

37-
assert {:ok, "123"} = Transport.encode_and_post_envelope(envelope, HackneyClient)
36+
assert {:ok, "123"} = Transport.encode_and_post_envelope(envelope, FinchClient)
3837
end
3938

4039
test "returns an error if the HTTP client returns a badly-typed response" do
@@ -70,10 +69,12 @@ defmodule Sentry.TransportTest do
7069

7170
Bypass.down(bypass)
7271

73-
assert {:request_failure, :econnrefused} =
74-
error(fn ->
75-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
76-
end)
72+
assert {:error,
73+
%Sentry.ClientError{
74+
reason: {:request_failure, %Mint.TransportError{reason: :econnrefused}},
75+
http_response: nil
76+
}} =
77+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
7778
end
7879

7980
test "returns an error if the response from Sentry is not 200", %{bypass: bypass} do
@@ -86,7 +87,7 @@ defmodule Sentry.TransportTest do
8687
end)
8788

8889
{:error, %ClientError{} = error} =
89-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
90+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
9091

9192
assert error.reason == :server_error
9293
assert {400, headers, "{}"} = error.http_response
@@ -172,7 +173,7 @@ defmodule Sentry.TransportTest do
172173

173174
assert {:error, %RuntimeError{message: "I'm a really bad JSON library"}, _stacktrace} =
174175
error(fn ->
175-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
176+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
176177
end)
177178
after
178179
:code.delete(CrashingJSONLibrary)
@@ -192,7 +193,7 @@ defmodule Sentry.TransportTest do
192193

193194
assert {:request_failure, error} =
194195
error(fn ->
195-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [0])
196+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [0])
196197
end)
197198

198199
if Version.match?(System.version(), "~> 1.18") do
@@ -225,7 +226,7 @@ defmodule Sentry.TransportTest do
225226
end)
226227

227228
assert {:ok, "123"} =
228-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [10, 25])
229+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [10, 25])
229230

230231
assert System.system_time(:millisecond) - start_time >= 35
231232

@@ -249,12 +250,12 @@ defmodule Sentry.TransportTest do
249250

250251
assert :too_many_retries =
251252
error(fn ->
252-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
253+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
253254
end)
254255

255256
log =
256257
capture_log(fn ->
257-
Transport.encode_and_post_envelope(envelope, HackneyClient, _retries = [])
258+
Transport.encode_and_post_envelope(envelope, FinchClient, _retries = [])
258259
end)
259260

260261
assert log =~ "[warning]"

0 commit comments

Comments
 (0)