From 041b0ab7791aa0c19a32c3d25869679ede936572 Mon Sep 17 00:00:00 2001 From: RobertJoonas <56999674+RobertJoonas@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:03:07 +0000 Subject: [PATCH] trace aggregate and timeseries queries too (#3712) --- lib/plausible/stats/aggregate.ex | 2 ++ lib/plausible/stats/breakdown.ex | 7 ++----- lib/plausible/stats/query.ex | 8 +++++--- lib/plausible/stats/timeseries.ex | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex index 282b64684..1f14b8709 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) end session_metrics = Enum.filter(metrics, &(&1 in @session_metrics)) diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index cae6e131e..0d5377485 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -684,13 +684,10 @@ defmodule Plausible.Stats.Breakdown do end defp 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} ]) end diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 412d60747..a55420172 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -250,15 +250,17 @@ defmodule Plausible.Stats.Query do end end - @spec trace(%__MODULE__{}) :: %__MODULE__{} - def trace(%__MODULE__{} = query) do + @spec trace(%__MODULE__{}, [atom()]) :: %__MODULE__{} + def trace(%__MODULE__{} = query, metrics) do filter_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} ]) query diff --git a/lib/plausible/stats/timeseries.ex b/lib/plausible/stats/timeseries.ex index ce4b1183c..d87d35410 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,