Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Retry on 408 timeout from Browserless.io (#5800)

Artur Pata7b4d86f4bcbf
diff --git a/extra/lib/plausible/installation_support/browserless_config.ex b/extra/lib/plausible/installation_support/browserless_config.ex
index fa40fb645c..a34807d336 100644
--- a/extra/lib/plausible/installation_support/browserless_config.ex
+++ b/extra/lib/plausible/installation_support/browserless_config.ex
@@ -4,14 +4,39 @@ defmodule Plausible.InstallationSupport.BrowserlessConfig do
"""
use Plausible
- def retry_browserless_request(_request, %{status: status}) do
- case status do
- # rate limit
- 429 -> {:delay, 1000}
- # unexpected but we've manually verified these requests can succeed on retry
- 400 -> {:delay, 500}
- # other errors
- _ -> false
+ @retry_policy_by_status %{
+ # rate limit
+ 429 => {:delay, :timer.seconds(1)},
+ # timeout
+ 408 => {:delay, :timer.seconds(0.5)},
+ # even 400 are verified manually to sometimes succeed on retry
+ 400 => {:delay, :timer.seconds(0.5)}
+ }
+
+ @doc """
+ Examples:
+
+ iex> retry_browserless_request([429, 400]).(nil, %{status: 429})
+ {:delay, :timer.seconds(1)}
+
+ iex> retry_browserless_request([429, 400]).(nil, %{status: 400})
+ {:delay, :timer.seconds(0.5)}
+
+ iex> retry_browserless_request([429, 400]).(nil, %{status: 408})
+ nil
+
+ iex> retry_browserless_request([429, 400]).(nil, :some_error)
+ false
+ """
+
+ def retry_browserless_request(statuses_to_retry) do
+ policies = Map.take(@retry_policy_by_status, statuses_to_retry)
+
+ fn _request, response_or_error ->
+ case response_or_error do
+ %{status: status} -> Map.get(policies, status)
+ _ -> false
+ end
end
end
diff --git a/extra/lib/plausible/installation_support/checks/detection.ex b/extra/lib/plausible/installation_support/checks/detection.ex
index ab2aeaa559..299904d530 100644
--- a/extra/lib/plausible/installation_support/checks/detection.ex
+++ b/extra/lib/plausible/installation_support/checks/detection.ex
@@ -85,7 +85,7 @@ defmodule Plausible.InstallationSupport.Checks.Detection do
}
}),
params: %{timeout: @endpoint_timeout_ms},
- retry: &BrowserlessConfig.retry_browserless_request/2,
+ retry: BrowserlessConfig.retry_browserless_request([429, 400]),
retry_log_level: :warning,
max_retries: @max_retries
]
diff --git a/extra/lib/plausible/installation_support/checks/installation_v2.ex b/extra/lib/plausible/installation_support/checks/installation_v2.ex
index 7371679aed..3aa0667280 100644
--- a/extra/lib/plausible/installation_support/checks/installation_v2.ex
+++ b/extra/lib/plausible/installation_support/checks/installation_v2.ex
@@ -108,7 +108,7 @@ defmodule Plausible.InstallationSupport.Checks.InstallationV2 do
}
}),
params: %{timeout: @endpoint_timeout_ms},
- retry: &BrowserlessConfig.retry_browserless_request/2,
+ retry: BrowserlessConfig.retry_browserless_request([429, 408, 400]),
retry_log_level: :warning,
max_retries: @max_retries,
receive_timeout: @endpoint_timeout_ms + 2_000
diff --git a/test/plausible/installation_support/browserless_config_test.exs b/test/plausible/installation_support/browserless_config_test.exs
new file mode 100644
index 0000000000..8bc38ca622
--- /dev/null
+++ b/test/plausible/installation_support/browserless_config_test.exs
@@ -0,0 +1,8 @@
+defmodule Plausible.InstallationSupport.BrowserlessConfigTest do
+ use Plausible
+ use ExUnit.Case
+
+ on_ee do
+ doctest Plausible.InstallationSupport.BrowserlessConfig, import: true
+ end
+end
diff --git a/tracker/installation_support/verifier-v2.js b/tracker/installation_support/verifier-v2.js
index 2225d434e9..bdf9ff97ff 100644
--- a/tracker/installation_support/verifier-v2.js
+++ b/tracker/installation_support/verifier-v2.js
@@ -29,6 +29,7 @@ async function verifyPlausibleInstallation(options) {
const disallowedByCsp = checkDisallowedByCSP(responseHeaders, cspHostToCheck)
+ forceIgnoreWebdriverCondition()
const { stopRecording, getInterceptedFetch } = startRecordingEventFetchCalls()
const {
@@ -278,4 +279,8 @@ async function testPlausibleFunction({ timeoutMs, debug }) {
})
}
+function forceIgnoreWebdriverCondition() {
+ window.__plausible = true
+}
+
window.verifyPlausibleInstallation = verifyPlausibleInstallation