Skip to content

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

Add metric for decode duration in remote persistor client (#5821)

Adrian Gruntkowski0abad8b0abd9
diff --git a/lib/plausible/ingestion/persistor/remote.ex b/lib/plausible/ingestion/persistor/remote.ex
index 2f7977340d..0b45861868 100644
--- a/lib/plausible/ingestion/persistor/remote.ex
+++ b/lib/plausible/ingestion/persistor/remote.ex
@@ -53,6 +53,10 @@ defmodule Plausible.Ingestion.Persistor.Remote do
[:plausible, :remote_ingest, :request, :duration]
end
+ def telemetry_decode_duration() do
+ [:plausible, :remote_ingest, :decode, :duration]
+ end
+
defp request(override_url, event, session_attrs, headers) do
Plausible.PromEx.Plugins.PlausibleMetrics.measure_duration(
telemetry_request_duration(),
@@ -90,16 +94,21 @@ defmodule Plausible.Ingestion.Persistor.Remote do
end
defp decode_payload(payload) do
- case Base.decode64(payload, padding: false) do
- {:ok, data} ->
- event_data = :erlang.binary_to_term(data)
- event = struct(Plausible.ClickhouseEventV2, event_data)
+ Plausible.PromEx.Plugins.PlausibleMetrics.measure_duration(
+ telemetry_decode_duration(),
+ fn ->
+ case Base.decode64(payload, padding: false) do
+ {:ok, data} ->
+ event_data = :erlang.binary_to_term(data)
+ event = struct(Plausible.ClickhouseEventV2, event_data)
- {:ok, event}
+ {:ok, event}
- _ ->
- {:error, :invalid_web_encoding}
- end
+ _ ->
+ {:error, :invalid_web_encoding}
+ end
+ end
+ )
catch
_, _ ->
{:error, :invalid_payload}
diff --git a/lib/plausible/telemetry/plausible_metrics.ex b/lib/plausible/telemetry/plausible_metrics.ex
index 8a5fff4dbb..8d139e6e7e 100644
--- a/lib/plausible/telemetry/plausible_metrics.ex
+++ b/lib/plausible/telemetry/plausible_metrics.ex
@@ -276,6 +276,15 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do
unit: {:native, :millisecond},
measurement: :duration
),
+ distribution(
+ metric_prefix ++ [:persistor, :remote, :decode, :duration, :millisecond],
+ event_name: Persistor.Remote.telemetry_decode_duration(),
+ reporter_options: [
+ buckets: [1, 10, 25, 50, 75, 100, 250, 350, 500, 750, 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(),