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
trace aggregate and timeseries queries too (#3712)
RobertJoonas041b0ab7791a
diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.exindex 282b64684e..1f14b87091 100644--- a/lib/plausible/stats/aggregate.ex+++ b/lib/plausible/stats/aggregate.ex@@ -24,6 +24,8 @@ defmodule Plausible.Stats.Aggregate do{nil, metrics}end+ Query.trace(query, metrics)+event_metrics = Enum.filter(metrics, &(&1 in @event_metrics))event_task = fn -> aggregate_events(site, query, event_metrics) endsession_metrics = Enum.filter(metrics, &(&1 in @session_metrics))diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.exindex cae6e131e5..0d5377485e 100644--- a/lib/plausible/stats/breakdown.ex+++ b/lib/plausible/stats/breakdown.ex@@ -684,13 +684,10 @@ defmodule Plausible.Stats.Breakdown doenddefp trace(query, property, metrics) do- Query.trace(query)-- metrics = Enum.sort(metrics) |> Enum.join(";")+ Query.trace(query, metrics)Tracer.set_attributes([- {"plausible.query.breakdown_property", property},- {"plausible.query.breakdown_metrics", metrics}+ {"plausible.query.breakdown_property", property}])enddiff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex 412d607478..a554201727 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -250,15 +250,17 @@ defmodule Plausible.Stats.Query doendend- @spec trace(%__MODULE__{}) :: %__MODULE__{}- def trace(%__MODULE__{} = query) do+ @spec trace(%__MODULE__{}, [atom()]) :: %__MODULE__{}+ def trace(%__MODULE__{} = query, metrics) dofilter_keys = Map.keys(query.filters) |> Enum.sort() |> Enum.join(";")+ metrics = metrics |> Enum.sort() |> Enum.join(";")Tracer.set_attributes([{"plausible.query.interval", query.interval},{"plausible.query.period", query.period},{"plausible.query.include_imported", query.include_imported},- {"plausible.query.filter_keys", filter_keys}+ {"plausible.query.filter_keys", filter_keys},+ {"plausible.query.metrics", metrics}])querydiff --git a/lib/plausible/stats/timeseries.ex b/lib/plausible/stats/timeseries.exindex ce4b1183c6..d87d354104 100644--- a/lib/plausible/stats/timeseries.ex+++ b/lib/plausible/stats/timeseries.ex@@ -33,6 +33,8 @@ defmodule Plausible.Stats.Timeseries do{nil, event_metrics}end+ Query.trace(query, metrics)+[event_result, session_result] =Plausible.ClickhouseRepo.parallel_tasks([fn -> events_timeseries(site, query, event_metrics) end,