plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-11-23 11:12:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixup error reporting (ref #2181) (#2204)

Browse Source 
* Fixup error reporting (ref #2181)

Fixes two problems:

 - `extra` sent to Sentry is always expected to be a map
 - no `String.Chars` protocol is implemented for `Finch.Error` struct

* Use explicit paths in http client tests

* Make HTTP Client tests sync
This commit is contained in:
Adam Rutkowski 2022-09-12 12:46:23 +02:00 committed by GitHub
parent aa7d7a35bd
commit cc4d4bb8e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/plausible/google/http.ex
View File

@ -105,7 +105,7 @@ defmodule Plausible.Google.HTTP do
|> then(&{:ok, &1})
{:error, reason} = e ->
Logger.error("Google Analytics: failed to list sites: #{reason}")
Logger.error("Google Analytics: failed to list sites: #{inspect(reason)}")
e
end
end
@ -142,8 +142,8 @@ defmodule Plausible.Google.HTTP do
Sentry.capture_message("Error fetching Google view ID", extra: Jason.decode!(body))
{:error, body}
{:error, %{reason: reason}} ->
Sentry.capture_message("Error fetching Google view ID", extra: inspect(reason))
{:error, %{reason: reason} = e} ->
Sentry.capture_message("Error fetching Google view ID", extra: e)
{:error, reason}
end
end
@ -187,8 +187,8 @@ defmodule Plausible.Google.HTTP do
Sentry.capture_message("Error fetching Google queries", extra: Jason.decode!(body))
{:error, :unknown}
{:error, %{reason: reason}} ->
Sentry.capture_message("Error fetching Google queries", extra: reason)
{:error, %{reason: _} = e} ->
Sentry.capture_message("Error fetching Google queries", extra: e)
{:error, :unknown}
end
end
@ -218,8 +218,8 @@ defmodule Plausible.Google.HTTP do
|> Map.get("error")
|> then(&{:error, &1})
{:error, %{reason: reason}} ->
Sentry.capture_message("Error fetching Google queries", extra: reason)
{:error, %{reason: _} = e} ->
Sentry.capture_message("Error fetching Google queries", extra: e)
{:error, :unknown}
end
end
@ -265,8 +265,8 @@ defmodule Plausible.Google.HTTP do
Sentry.capture_message("Error fetching Google view ID", extra: Jason.decode!(body))
{:error, body}
{:error, %{reason: reason}} ->
Sentry.capture_message("Error fetching Google view ID", extra: reason)
{:error, %{reason: reason} = e} ->
Sentry.capture_message("Error fetching Google view ID", extra: e)
{:error, reason}
end
end

22
test/plausible/http_client_test.exs
View File

@ -1,5 +1,5 @@
defmodule Plausible.HTTPClientTest do
use ExUnit.Case, async: true
use ExUnit.Case, async: false
alias Plausible.HTTPClient
alias Plug.Conn
@ -10,19 +10,21 @@ defmodule Plausible.HTTPClientTest do
end
test "get/2 works", %{bypass: bypass} do
Bypass.expect_once(bypass, "GET", "/", fn conn ->
Bypass.expect_once(bypass, "GET", "/get", fn conn ->
Conn.resp(conn, 200, "ok")
end)
assert {:ok, %Finch.Response{status: 200, body: "ok"}} = HTTPClient.get(bypass_url(bypass))
assert {:ok, %Finch.Response{status: 200, body: "ok"}} =
HTTPClient.get(bypass_url(bypass, path: "/get"))
end
test "post/3 works", %{bypass: bypass} do
Bypass.expect_once(bypass, "POST", "/", fn conn ->
Bypass.expect_once(bypass, "POST", "/post", fn conn ->
Conn.resp(conn, 200, "ok")
end)
assert {:ok, %Finch.Response{status: 200, body: "ok"}} = HTTPClient.post(bypass_url(bypass))
assert {:ok, %Finch.Response{status: 200, body: "ok"}} =
HTTPClient.post(bypass_url(bypass, path: "/post"))
end
test "post/3 doesn't alter params if binary passed",
@ -32,7 +34,7 @@ defmodule Plausible.HTTPClientTest do
body = "raw binary"
headers = []
Bypass.expect_once(bypass, "POST", "/", fn conn ->
Bypass.expect_once(bypass, "POST", "/post", fn conn ->
opts = Plug.Parsers.init(parsers: [:urlencoded, {:json, json_decoder: Jason}])
conn
@ -41,7 +43,7 @@ defmodule Plausible.HTTPClientTest do
end)
assert {:ok, %Finch.Response{status: 200, body: ^body}} =
HTTPClient.post(bypass_url(bypass), headers, body)
HTTPClient.post(bypass_url(bypass, path: "/post"), headers, body)
end
test "post/3 URL-encodes params if request content-type is set to application/x-www-form-urlencoded and a map is supplied",
@ -51,7 +53,7 @@ defmodule Plausible.HTTPClientTest do
body = %{hello: :world, alice: :bob}
headers = [{"Content-Type", "application/x-www-form-urlencoded"}]
Bypass.expect_once(bypass, "POST", "/", fn conn ->
Bypass.expect_once(bypass, "POST", "/post", fn conn ->
opts = Plug.Parsers.init(parsers: [:urlencoded])
conn = Plug.Parsers.call(conn, opts)
@ -62,7 +64,7 @@ defmodule Plausible.HTTPClientTest do
end)
assert {:ok, %Finch.Response{status: 200, body: "ok"}} =
HTTPClient.post(bypass_url(bypass), headers, body)
HTTPClient.post(bypass_url(bypass, path: "/post"), headers, body)
end
test "post/3 JSON-encodes params if request content-type is other than application/x-www-form-urlencoded and a map is supplied",
@ -100,7 +102,7 @@ defmodule Plausible.HTTPClientTest do
HTTPClient.post(bypass_url(bypass, path: "/any"), headers_no_content_type, params)
end
defp bypass_url(bypass, opts \\ []) do
defp bypass_url(bypass, opts) do
port = bypass.port
path = Keyword.get(opts, :path, "/")