Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Increase GA import request receive_timeout to 30s (#2274)
Vinicius Brasilc07361fbce83
diff --git a/lib/plausible/google/http.ex b/lib/plausible/google/http.exindex 92ff983130..e8957f0a27 100644--- a/lib/plausible/google/http.ex+++ b/lib/plausible/google/http.ex@@ -34,7 +34,7 @@ defmodule Plausible.Google.HTTP do[{"Authorization", "Bearer #{report_request.access_token}"}],params)- |> http_client.request(Plausible.Finch)+ |> http_client.request(Plausible.Finch, receive_timeout: 30_000)with {:ok, %{status: 200, body: body}} <- response,{:ok, report} <- parse_report_from_response(body),diff --git a/test/plausible/google/api_test.exs b/test/plausible/google/api_test.exsindex 72cb457262..0002befc45 100644--- a/test/plausible/google/api_test.exs+++ b/test/plausible/google/api_test.exs@@ -18,7 +18,7 @@ defmodule Plausible.Google.ApiTest dotest "will fetch and persist import data from Google Analytics", %{site: site, buffer: buffer} dofinch_double =Finch- |> stub(:request, fn _, _ ->+ |> stub(:request, fn _, _, _ ->{:ok, %Finch.Response{status: 200, body: @ok_response}}end)@@ -54,11 +54,11 @@ defmodule Plausible.Google.ApiTest do} dofinch_double =Finch- |> stub(:request, fn _, _ -> {:error, :timeout} end)- |> stub(:request, fn _, _ -> {:error, :nx_domain} end)- |> stub(:request, fn _, _ -> {:error, :closed} end)- |> stub(:request, fn _, _ -> {:ok, %Finch.Response{status: 503}} end)- |> stub(:request, fn _, _ -> {:ok, %Finch.Response{status: 502}} end)+ |> stub(:request, fn _, _, _ -> {:error, :timeout} end)+ |> stub(:request, fn _, _, _ -> {:error, :nx_domain} end)+ |> stub(:request, fn _, _, _ -> {:error, :closed} end)+ |> stub(:request, fn _, _, _ -> {:ok, %Finch.Response{status: 503}} end)+ |> stub(:request, fn _, _, _ -> {:ok, %Finch.Response{status: 502}} end)request = %Plausible.Google.ReportRequest{view_id: "123",@@ -77,17 +77,17 @@ defmodule Plausible.Google.ApiTest dobuffer: buffer)- assert_receive({Finch, :request, [_, _]})- assert_receive({Finch, :request, [_, _]})- assert_receive({Finch, :request, [_, _]})- assert_receive({Finch, :request, [_, _]})- assert_receive({Finch, :request, [_, _]})+ assert_receive({Finch, :request, [_, _, [receive_timeout: 30_000]]})+ assert_receive({Finch, :request, [_, _, [receive_timeout: 30_000]]})+ assert_receive({Finch, :request, [_, _, [receive_timeout: 30_000]]})+ assert_receive({Finch, :request, [_, _, [receive_timeout: 30_000]]})+ assert_receive({Finch, :request, [_, _, [receive_timeout: 30_000]]})endtest "does not fail when report does not have rows key", %{site: site, buffer: buffer} dofinch_double =Finch- |> stub(:request, fn _, _ ->+ |> stub(:request, fn _, _, _ ->{:ok,%Finch.Response{status: 200, body: File.read!("fixture/ga_report_empty_rows.json")}}end)