Compare commits

...

3 Commits

@ -12,16 +12,64 @@ defmodule Plausible.ClickhouseRepo do
end
end
defmodule KeepRouteContext do
alias Plausible.ClickhouseRepo
def init(_opts), do: nil
def call(conn, _) do
ClickhouseRepo.set_context(%{request_path: conn.request_path})
conn
end
end
@logger_metadata_key __MODULE__
def set_context(new) when is_map(new) do
metadata =
case :logger.get_process_metadata() do
%{@logger_metadata_key => ctx} -> Map.update(ctx, :log_comment, new, &Map.merge(&1, new))
_ -> %{:log_comment => new}
end
:logger.update_process_metadata(%{@logger_metadata_key => metadata})
end
def get_context() do
case :logger.get_process_metadata() do
%{@logger_metadata_key => %{log_comment: log_comment}} ->
log_comment
%{} ->
%{}
:undefined ->
%{}
end
end
@impl true
def prepare_query(_operation, query, opts) do
setting = {:log_comment, Jason.encode!(get_context())}
opts =
Keyword.update(opts, :settings, [setting], fn settings -> [setting | settings] end)
{query, opts}
end
@task_timeout 60_000
def parallel_tasks(queries) do
ctx = OpenTelemetry.Ctx.get_current()
otel_ctx = OpenTelemetry.Ctx.get_current()
ch_ctx = get_context()
context_carrier = fn fun ->
OpenTelemetry.Ctx.attach(otel_ctx)
set_context(ch_ctx)
execute_with_tracing = fn fun ->
OpenTelemetry.Ctx.attach(ctx)
fun.()
end
Task.async_stream(queries, execute_with_tracing, max_concurrency: 3, timeout: @task_timeout)
Task.async_stream(queries, context_carrier, max_concurrency: 3, timeout: @task_timeout)
|> Enum.to_list()
|> Keyword.values()
end

@ -13,32 +13,38 @@ defmodule Plausible.Stats do
def breakdown(site, query, prop, metrics, pagination) do
include_sentry_replay_info()
Plausible.ClickhouseRepo.set_context(%{query_type: :breakdown})
Breakdown.breakdown(site, query, prop, metrics, pagination)
end
def aggregate(site, query, metrics) do
Plausible.ClickhouseRepo.set_context(%{query_type: :aggregate})
include_sentry_replay_info()
Aggregate.aggregate(site, query, metrics)
end
def timeseries(site, query, metrics) do
Plausible.ClickhouseRepo.set_context(%{query_type: :timeseries})
include_sentry_replay_info()
Timeseries.timeseries(site, query, metrics)
end
def current_visitors(site) do
Plausible.ClickhouseRepo.set_context(%{query_type: :current_visitors})
include_sentry_replay_info()
CurrentVisitors.current_visitors(site)
end
on_full_build do
def funnel(site, query, funnel) do
Plausible.ClickhouseRepo.set_context(%{query_type: :funnel})
include_sentry_replay_info()
Plausible.Stats.Funnel.funnel(site, query, funnel)
end
end
def filter_suggestions(site, query, filter_name, filter_search) do
Plausible.ClickhouseRepo.set_context(%{query_type: :filter_suggestions})
include_sentry_replay_info()
FilterSuggestions.filter_suggestions(site, query, filter_name, filter_search)
end

@ -15,6 +15,8 @@ defmodule Plausible.Stats.Query do
@type t :: %__MODULE__{}
def from(site, params) do
Plausible.ClickhouseRepo.set_context(params)
query =
query_by_period(site, params)
|> put_interval(params)

@ -14,6 +14,7 @@ defmodule PlausibleWeb.Router do
plug PlausibleWeb.SessionTimeoutPlug, timeout_after_seconds: @two_weeks_in_seconds
plug PlausibleWeb.AuthPlug
plug PlausibleWeb.LastSeenPlug
plug Plausible.ClickhouseRepo.KeepRouteContext
end
pipeline :shared_link do
@ -38,6 +39,7 @@ defmodule PlausibleWeb.Router do
plug :accepts, ["json"]
plug :fetch_session
plug PlausibleWeb.AuthPlug
plug Plausible.ClickhouseRepo.KeepRouteContext
end
pipeline :internal_stats_api do
@ -45,10 +47,12 @@ defmodule PlausibleWeb.Router do
plug :fetch_session
plug PlausibleWeb.AuthorizeSiteAccess
plug PlausibleWeb.Plugs.NoRobots
plug Plausible.ClickhouseRepo.KeepRouteContext
end
pipeline :public_api do
plug :accepts, ["json"]
plug Plausible.ClickhouseRepo.KeepRouteContext
end
on_full_build do

Loading…
Cancel
Save