Skip to content

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

Measure total `Persistor.Remote` request duration, outside `Finch` (#5811)

Adrian Gruntkowskidaf1c1a9cd01
diff --git a/lib/plausible/ingestion/persistor/remote.ex b/lib/plausible/ingestion/persistor/remote.ex
index 65b479425c..2f7977340d 100644
--- a/lib/plausible/ingestion/persistor/remote.ex
+++ b/lib/plausible/ingestion/persistor/remote.ex
@@ -21,13 +21,7 @@ defmodule Plausible.Ingestion.Persistor.Remote do
{"x-previous-user-id", previous_user_id}
]
- case Req.post(persistor_url(override_url),
- finch: Plausible.Finch,
- body: encode_payload(event, session_attrs),
- headers: headers,
- retry: &handle_transient_error/2,
- max_retries: @max_transient_retries
- ) do
+ case request(override_url, event, session_attrs, headers) do
{:ok, %{status: 200, body: event_payload}} ->
case decode_payload(event_payload) do
{:ok, event} ->
@@ -55,6 +49,25 @@ defmodule Plausible.Ingestion.Persistor.Remote do
end
end
+ def telemetry_request_duration() do
+ [:plausible, :remote_ingest, :request, :duration]
+ end
+
+ defp request(override_url, event, session_attrs, headers) do
+ Plausible.PromEx.Plugins.PlausibleMetrics.measure_duration(
+ telemetry_request_duration(),
+ fn ->
+ Req.post(persistor_url(override_url),
+ finch: Plausible.Finch,
+ body: encode_payload(event, session_attrs),
+ headers: headers,
+ retry: &handle_transient_error/2,
+ max_retries: @max_transient_retries
+ )
+ end
+ )
+ end
+
defp handle_transient_error(_request, %Req.HTTPError{protocol: :http2, reason: :disconnected}) do
true
end
diff --git a/lib/plausible/telemetry/plausible_metrics.ex b/lib/plausible/telemetry/plausible_metrics.ex
index 4b5e3af1fd..ea3d543ae5 100644
--- a/lib/plausible/telemetry/plausible_metrics.ex
+++ b/lib/plausible/telemetry/plausible_metrics.ex
@@ -267,6 +267,15 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do
defp persistor_metrics(metric_prefix) do
[
+ distribution(
+ metric_prefix ++ [:persistor, :remote, :request, :total_duration, :millisecond],
+ event_name: Persistor.Remote.telemetry_request_duration(),
+ reporter_options: [
+ buckets: [10, 100, 500, 1_000, 5_000, 10_000, 30_000]
+ ],
+ unit: {:native, :millisecond},
+ measurement: :duration
+ ),
distribution(
metric_prefix ++ [:persistor, :remote, :request, :duration, :millisecond],
event_name: Persistor.TelemetryHandler.request_event(),