trace aggregate and timeseries queries too (#3712)

pull/3720/head r2024.01.22-324
RobertJoonas 3 years ago committed by GitHub
parent 36a8b36382
commit 041b0ab779
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -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))

@ -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

@ -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

@ -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,

Loading…
Cancel
Save