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
Load site sparklines in parallel (#6075)
Adam Rutkowskib1e0cdbc3862
diff --git a/extra/lib/plausible/stats/consolidated_view.ex b/extra/lib/plausible/stats/consolidated_view.exdeleted file mode 100644index ed22668e3b..0000000000--- a/extra/lib/plausible/stats/consolidated_view.ex+++ /dev/null@@ -1,106 +0,0 @@-defmodule Plausible.Stats.ConsolidatedView do- alias Plausible.{Site, Stats}- alias Plausible.Stats.QueryBuilder- require Logger-- @spec overview_24h(Site.t(), NaiveDateTime.t()) :: map()- def overview_24h(%Site{consolidated: true} = view, now \\ NaiveDateTime.utc_now()) do- stats = query_24h_stats(view)- intervals = query_24h_intervals(view, now)-- Map.merge(stats, intervals)- end-- @spec safe_overview_24h(Site.t()) ::- {:ok, map()} | {:error, :inaccessible} | {:error, :not_found}- def safe_overview_24h(nil), do: {:error, :not_found}-- def safe_overview_24h(%Site{} = view) do- try do- {:ok, overview_24h(view)}- catch- kind, value ->- Logger.error(- "Could not render 24h consolidated view stats: #{inspect(kind)} #{inspect(value)}"- )-- {:error, :inaccessible}- end- end-- def empty_24h_intervals(now \\ NaiveDateTime.utc_now()) do- first = NaiveDateTime.add(now, -24, :hour)- {:ok, time} = Time.new(first.hour, 0, 0)- first = NaiveDateTime.new!(NaiveDateTime.to_date(first), time)-- for offset <- 0..24, into: %{} do- {NaiveDateTime.add(first, offset, :hour), 0}- end- end-- defp query_24h_stats(view) do- stats_query =- QueryBuilder.build!(view,- input_date_range: :"24h",- metrics: [:visitors, :visits, :pageviews, :views_per_visit],- include: [compare: :previous_period]- )-- %Stats.QueryResult{- results: [- %{- metrics: [visitors, visits, pageviews, views_per_visit],- comparison: %{- change: [visitors_change, visits_change, pageviews_change, views_per_visit_change]- }- }- ]- } = Stats.query(view, stats_query)-- %{- visitors: visitors,- visits: visits,- pageviews: pageviews,- views_per_visit: views_per_visit,- visitors_change: visitors_change,- visits_change: visits_change,- pageviews_change: pageviews_change,- views_per_visit_change: views_per_visit_change- }- end-- defp query_24h_intervals(view, now) do- graph_query =- QueryBuilder.build!(view,- metrics: [:visitors],- input_date_range: :"24h",- dimensions: ["time:hour"],- order_by: [{"time:hour", :asc}]- )-- %Stats.QueryResult{results: results} = Stats.query(view, graph_query)-- placeholder =- empty_24h_intervals(now)-- results =- Enum.map(- results,- fn %{metrics: [visitors], dimensions: [timestamp]} ->- {NaiveDateTime.from_iso8601!(timestamp), visitors}- end- )- |> Enum.into(%{})-- graph_data =- placeholder- |> Enum.reduce([], fn {interval, 0}, acc ->- [{interval, results[interval] || 0} | acc]- end)- |> Enum.sort_by(fn {interval, _} -> interval end, NaiveDateTime)-- %{- intervals: Enum.map(graph_data, fn {k, v} -> %{interval: k, visitors: v} end)- }- end-enddiff --git a/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex b/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.exindex bab4180bd9..3331436bef 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex@@ -12,21 +12,20 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.ConsolidatedViews dodef update(%{team: team}, socket) doconsolidated_view = ConsolidatedView.get(team)- hourly_stats =+ sparkline_intervals =with true <- connected?(socket),- {:ok, hourly_stats} <- Stats.ConsolidatedView.safe_overview_24h(consolidated_view) do- hourly_stats.intervals+ {:ok, sparkline} <- Stats.Sparkline.safe_overview_24h(consolidated_view) do+ sparkline.intervalselse_ ->- Stats.ConsolidatedView.empty_24h_intervals()- |> Enum.map(fn {i, v} -> %{interval: i, visitors: v} end)+ Stats.Sparkline.empty_24h_intervals()end{:ok,assign(socket,team: team,consolidated_views: List.wrap(consolidated_view),- hourly_stats: hourly_stats+ sparkline_intervals: sparkline_intervals)}end@@ -67,7 +66,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.ConsolidatedViews do<.td><span class="h-[24px] text-indigo-500"><PlausibleWeb.Live.Components.Visitors.chart- intervals={@hourly_stats}+ intervals={@sparkline_intervals}height={20}/></span>diff --git a/extra/lib/plausible_web/live/customer_support/team/components/sites.ex b/extra/lib/plausible_web/live/customer_support/team/components/sites.exindex 9719a2a876..39af4de21e 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/sites.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/sites.ex@@ -11,11 +11,16 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Sites dohourly_stats =if connected?(socket) do- Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(sites)+ Plausible.Stats.Sparkline.parallel_overview(sites)elsesites|> Enum.map(fn site ->- {site.domain, Plausible.Stats.Clickhouse.empty_24h_intervals()}+ {site.domain,+ %{+ intervals: Plausible.Stats.Sparkline.empty_24h_intervals(),+ visitors: 0,+ visitors_change: 0+ }}end)|> Enum.into(%{})enddiff --git a/lib/plausible/stats/api_query_parser.ex b/lib/plausible/stats/api_query_parser.exindex 6a8b0380e2..eca5bf26f9 100644--- a/lib/plausible/stats/api_query_parser.ex+++ b/lib/plausible/stats/api_query_parser.ex@@ -23,7 +23,7 @@ defmodule Plausible.Stats.ApiQueryParser dodef default_pagination(), do: @default_pagination- def parse(params) when is_map(params) do+ def parse(params, opts \\ []) when is_map(params) dowith :ok <- JSONSchema.validate(params),{:ok, input_date_range} <- parse_input_date_range(params["date_range"]),{:ok, metrics} <- parse_metrics(Map.fetch!(params, "metrics")),@@ -40,7 +40,8 @@ defmodule Plausible.Stats.ApiQueryParser dodimensions: dimensions,order_by: order_by,pagination: pagination,- include: include+ include: include,+ now: Keyword.get(opts, :now)})}endenddiff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.exindex 40265f2af9..dd652d8d42 100644--- a/lib/plausible/stats/clickhouse.ex+++ b/lib/plausible/stats/clickhouse.ex@@ -4,7 +4,7 @@ defmodule Plausible.Stats.Clickhouse douse Plausible.ClickhouseRepouse Plausible.Stats.SQL.Fragments- import Ecto.Query, only: [from: 2, dynamic: 1, dynamic: 2]+ import Ecto.Query, only: [from: 2]alias Plausible.Timezonesalias Plausible.Stats@@ -99,134 +99,4 @@ defmodule Plausible.Stats.Clickhouse do))end-- @spec empty_24h_visitors_hourly_intervals([Plausible.Site.t()], NaiveDateTime.t()) :: map()- def empty_24h_visitors_hourly_intervals(sites, now \\ NaiveDateTime.utc_now()) do- sites- |> Enum.map(fn site ->- {site.domain,- %{- intervals: empty_24h_intervals(now),- visitors: 0,- change: 0- }}- end)- |> Map.new()- end-- @spec last_24h_visitors_hourly_intervals([Plausible.Site.t()], NaiveDateTime.t()) :: map()- def last_24h_visitors_hourly_intervals(sites, now \\ NaiveDateTime.utc_now())- def last_24h_visitors_hourly_intervals([], _), do: %{}-- def last_24h_visitors_hourly_intervals(sites, now) do- site_id_to_domain_mapping = for site <- sites, do: {site.id, site.domain}, into: %{}- now = now |> NaiveDateTime.truncate(:second)-- placeholder = empty_24h_visitors_hourly_intervals(sites, now)-- base_query = base_24h_events_query(sites)-- previous_query = visitors_24h_total(base_query, now, -48, -24)-- previous_result =- previous_query- |> ClickhouseRepo.all()- |> Enum.reduce(%{}, fn- %{total_visitors: total, site_id: site_id}, acc -> Map.put_new(acc, site_id, total)- end)-- total_q = visitors_24h_total(base_query, now, -24, 0)-- current_q =- from(- e in base_query,- join: total_q in subquery(total_q),- on: e.site_id == total_q.site_id,- where: e.timestamp >= ^NaiveDateTime.add(now, -24, :hour),- where: e.timestamp <= ^now,- select: %{- site_id: e.site_id,- interval: fragment("toStartOfHour(timestamp)"),- visitors: uniq(e.user_id),- total: fragment("any(total_visitors)")- },- group_by: [e.site_id, fragment("toStartOfHour(timestamp)")],- order_by: [e.site_id, fragment("toStartOfHour(timestamp)")]- )-- on_ee do- current_q = Plausible.Stats.Sampling.add_query_hint(current_q)- end-- result =- current_q- |> ClickhouseRepo.all()- |> Enum.group_by(& &1.site_id)- |> Enum.map(fn {site_id, entries} ->- %{total: visitors} = List.first(entries)-- full_entries =- (entries ++ empty_24h_intervals(now))- |> Enum.uniq_by(& &1.interval)- |> Enum.sort_by(& &1.interval, NaiveDateTime)-- change = Plausible.Stats.Compare.percent_change(previous_result[site_id], visitors) || 100-- {site_id_to_domain_mapping[site_id],- %{intervals: full_entries, visitors: visitors, change: change}}- end)- |> Map.new()-- Map.merge(placeholder, result)- end-- defp visitors_24h_total(base_query, now, offset1, offset2) do- query =- from e in base_query,- where: e.timestamp >= ^NaiveDateTime.add(now, offset1, :hour),- where: e.timestamp <= ^NaiveDateTime.add(now, offset2, :hour),- select: %{- site_id: e.site_id,- total_visitors: fragment("toUInt64(round(uniq(user_id) * any(_sample_factor)))")- },- group_by: [e.site_id]-- on_ee do- query = Plausible.Stats.Sampling.add_query_hint(query)- end-- query- end-- defp base_24h_events_query(sites) do- cutoff_times_condition =- Enum.reduce(sites, dynamic(false), fn- %{native_stats_start_at: nil}, dynamic ->- dynamic-- site, dynamic ->- dynamic(- [e],- ^dynamic or (e.site_id == ^site.id and e.timestamp >= ^site.native_stats_start_at)- )- end)-- from e in "events_v2",- where: e.name != "engagement",- where: e.site_id in ^Enum.map(sites, & &1.id),- where: ^cutoff_times_condition- end-- def empty_24h_intervals(now \\ NaiveDateTime.utc_now()) do- first = NaiveDateTime.add(now, -24, :hour)- {:ok, time} = Time.new(first.hour, 0, 0)- first = NaiveDateTime.new!(NaiveDateTime.to_date(first), time)-- for offset <- 0..24 do- %{- interval: NaiveDateTime.add(first, offset, :hour),- visitors: 0- }- end- endenddiff --git a/lib/plausible/stats/legacy/legacy_query_builder.ex b/lib/plausible/stats/legacy/legacy_query_builder.exindex 7e7c46d29e..03bc4b917a 100644--- a/lib/plausible/stats/legacy/legacy_query_builder.ex+++ b/lib/plausible/stats/legacy/legacy_query_builder.ex@@ -11,7 +11,7 @@ defmodule Plausible.Stats.Legacy.QueryBuilder doalias Plausible.Stats.{Filters, Interval, Query, ApiQueryParser, QueryBuilder, DateTimeRange}def from(site, params, debug_metadata, now \\ nil) do- now = now || Plausible.Stats.Query.Test.get_fixed_now()+ now = now || DateTime.utc_now(:second)query =Querydiff --git a/lib/plausible/stats/parsed_query_params.ex b/lib/plausible/stats/parsed_query_params.exindex f596be2a51..dbf7100767 100644--- a/lib/plausible/stats/parsed_query_params.ex+++ b/lib/plausible/stats/parsed_query_params.ex@@ -13,6 +13,7 @@ defmodule Plausible.Stats.ParsedQueryParams dodimensions: [],order_by: nil,pagination: nil,+ now: nil,include: %Plausible.Stats.QueryInclude{}def new!(params) when is_map(params) dodiff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex e9294cc862..3d8c138b66 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -51,16 +51,16 @@ defmodule Plausible.Stats.Query dodef parse_and_build(%Plausible.Site{domain: domain} = site,%{"site_id" => domain} = params,- debug_metadata \\ %{}+ opts \\ []) dowith {:ok, %ParsedQueryParams{} = parsed_query_params} <-- ApiQueryParser.parse(params) do- QueryBuilder.build(site, parsed_query_params, debug_metadata)+ ApiQueryParser.parse(params, opts) do+ QueryBuilder.build(site, parsed_query_params, Keyword.get(opts, :debug_metadata, %{}))endend- def parse_and_build!(site, params, debug_metadata \\ %{}) do- case parse_and_build(site, params, debug_metadata) do+ def parse_and_build!(site, params, opts \\ []) do+ case parse_and_build(site, params, opts) do{:ok, query} ->query@@ -73,8 +73,13 @@ defmodule Plausible.Stats.Query doBuilds query from old-style stats APIv1 params. New code should use `Query.parse_and_build`or `QueryBuilder.build` with already parsed params."""- def from(site, params, debug_metadata \\ %{}, now \\ nil) do- Legacy.QueryBuilder.from(site, params, debug_metadata, now)+ def from(site, params, opts \\ []) do+ Legacy.QueryBuilder.from(+ site,+ params,+ Keyword.get(opts, :debug_metadata, %{}),+ Keyword.get(opts, :now)+ )enddef date_range(query, options \\ []) dodiff --git a/lib/plausible/stats/query/test.ex b/lib/plausible/stats/query/test.exdeleted file mode 100644index 84e6e1fd7b..0000000000--- a/lib/plausible/stats/query/test.ex+++ /dev/null@@ -1,15 +0,0 @@-defmodule Plausible.Stats.Query.Test do- @moduledoc """- Module used in tests to 'set' the current time.- """-- @now_key :__now-- def fix_now(now) do- Process.put(@now_key, now)- end-- def get_fixed_now() do- Process.get(@now_key) || DateTime.utc_now(:second)- end-enddiff --git a/lib/plausible/stats/query_builder.ex b/lib/plausible/stats/query_builder.exindex cea96a920d..05c91c65f2 100644--- a/lib/plausible/stats/query_builder.ex+++ b/lib/plausible/stats/query_builder.ex@@ -143,7 +143,7 @@ defmodule Plausible.Stats.QueryBuilder doenddefp do_build(parsed_query_params, site, debug_metadata) do- now = Plausible.Stats.Query.Test.get_fixed_now()+ now = parsed_query_params.now || DateTime.utc_now(:second)%ParsedQueryParams{input_date_range: input_date_range,diff --git a/lib/plausible/stats/sparkline.ex b/lib/plausible/stats/sparkline.exnew file mode 100644index 0000000000..50f419ad14--- /dev/null+++ b/lib/plausible/stats/sparkline.ex@@ -0,0 +1,133 @@+defmodule Plausible.Stats.Sparkline do+ @moduledoc """+ Module used to generate sparkline overview data for sites, including consolidated views.+ The sparkline graphs are used in site index and in CRM.+ """++ alias Plausible.{Site, Stats}+ alias Plausible.Stats.QueryBuilder+ require Logger++ @spec parallel_overview([Site.t()], NaiveDateTime.t()) :: map()+ def parallel_overview(sites, now \\ NaiveDateTime.utc_now()) when is_list(sites) do+ Task.async_stream(+ sites,+ fn site ->+ {site.domain, safe_overview_24h(site, now)}+ end,+ timeout: 5000,+ on_timeout: :kill_task,+ max_concurrency: 4+ )+ |> Enum.reduce(%{}, fn+ {:ok, {domain, {:ok, stats}}}, acc ->+ Map.put(acc, domain, stats)++ _, acc ->+ acc+ end)+ end++ @spec overview_24h(Site.t(), NaiveDateTime.t()) :: map()+ def overview_24h(view_or_site, now \\ NaiveDateTime.utc_now()) do+ stats = query_24h_stats(view_or_site, now)+ intervals = query_24h_intervals(view_or_site, now)++ Map.merge(stats, intervals)+ end++ @spec safe_overview_24h(Site.t(), NaiveDateTime.t()) ::+ {:ok, map()} | {:error, :inaccessible} | {:error, :not_found}++ def safe_overview_24h(site, now \\ NaiveDateTime.utc_now())+ def safe_overview_24h(nil, _now), do: {:error, :not_found}++ def safe_overview_24h(%Site{} = site, now) do+ try do+ {:ok, overview_24h(site, now)}+ catch+ kind, reason ->+ message = Exception.format(kind, reason, __STACKTRACE__)++ Sentry.capture_message(+ "Could not render overview 24h - site will be kept in loading indefinitely",+ extra: %{+ error: message,+ site: site.domain,+ comment: "Probing error volume"+ }+ )++ {:error, :inaccessible}+ end+ end++ def empty_24h_intervals(now \\ NaiveDateTime.utc_now()) do+ first = NaiveDateTime.add(now, -24, :hour)+ {:ok, time} = Time.new(first.hour, 0, 0)+ first = NaiveDateTime.new!(NaiveDateTime.to_date(first), time)++ for offset <- 0..24 do+ %{interval: to_string(NaiveDateTime.add(first, offset, :hour)), visitors: 0}+ end+ end++ defp query_24h_stats(view_or_site, now) do+ stats_query =+ QueryBuilder.build!(view_or_site,+ now: DateTime.from_naive!(now, "Etc/UTC"),+ input_date_range: :"24h",+ metrics: [:visitors, :visits, :pageviews, :views_per_visit],+ include: [compare: :previous_period]+ )++ %Stats.QueryResult{+ results: [+ %{+ metrics: [visitors, visits, pageviews, views_per_visit],+ comparison: %{+ change: [visitors_change, visits_change, pageviews_change, views_per_visit_change]+ }+ }+ ]+ } = Stats.query(view_or_site, stats_query)++ %{+ visitors: visitors,+ visits: visits,+ pageviews: pageviews,+ views_per_visit: views_per_visit,+ visitors_change: visitors_change,+ visits_change: visits_change,+ pageviews_change: pageviews_change,+ views_per_visit_change: views_per_visit_change+ }+ end++ defp query_24h_intervals(view_or_site, now) do+ graph_query =+ QueryBuilder.build!(view_or_site,+ now: DateTime.from_naive!(now, "Etc/UTC"),+ metrics: [:visitors],+ input_date_range: :"24h",+ dimensions: ["time:hour"],+ order_by: [{"time:hour", :asc}],+ include: [time_labels: true]+ )++ %Stats.QueryResult{results: results, meta: %{values: [time_labels: time_labels]}} =+ Stats.query(view_or_site, graph_query)++ visitors_by_timestamp =+ Map.new(results, fn %{dimensions: [timestamp], metrics: [visitors]} ->+ {timestamp, visitors}+ end)++ %{+ intervals:+ Enum.map(time_labels, fn timestamp ->+ %{interval: timestamp, visitors: Map.get(visitors_by_timestamp, timestamp, 0)}+ end)+ }+ end+enddiff --git a/lib/plausible_web/controllers/api/external_query_api_controller.ex b/lib/plausible_web/controllers/api/external_query_api_controller.exindex f609371f6d..eb983a4b56 100644--- a/lib/plausible_web/controllers/api/external_query_api_controller.ex+++ b/lib/plausible_web/controllers/api/external_query_api_controller.ex@@ -9,7 +9,10 @@ defmodule PlausibleWeb.Api.ExternalQueryApiController dodef query(conn, params) dosite = Repo.preload(conn.assigns.site, :owners)- case Query.parse_and_build(site, params, debug_metadata(conn)) do+ case Query.parse_and_build(site, params,+ debug_metadata: debug_metadata(conn),+ now: conn.private[:now]+ ) do{:ok, query} ->results = Plausible.Stats.query(site, query)json(conn, results)diff --git a/lib/plausible_web/controllers/api/external_stats_controller.ex b/lib/plausible_web/controllers/api/external_stats_controller.exindex 0e69b0ab0c..77ad190aec 100644--- a/lib/plausible_web/controllers/api/external_stats_controller.ex+++ b/lib/plausible_web/controllers/api/external_stats_controller.ex@@ -16,7 +16,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController dowith :ok <- validate_period(params),:ok <- validate_date(params),- query <- Query.from(site, params, debug_metadata(conn)),+ query <- Query.from(site, params, debug_metadata: debug_metadata(conn)),:ok <- validate_filters(site, query.filters),{:ok, metrics} <- parse_and_validate_metrics(params, query),:ok <- ensure_custom_props_access(site, query) do@@ -36,7 +36,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController dowith :ok <- validate_period(params),:ok <- validate_date(params),:ok <- validate_property(params),- query <- Query.from(site, params, debug_metadata(conn)),+ query <- Query.from(site, params, debug_metadata: debug_metadata(conn)),:ok <- validate_filters(site, query.filters),{:ok, metrics} <- parse_and_validate_metrics(params, query),{:ok, limit} <- validate_or_default_limit(params),@@ -253,7 +253,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController dowith :ok <- validate_period(params),:ok <- validate_date(params),:ok <- validate_interval(params),- query <- Query.from(site, params, debug_metadata(conn)),+ query <- Query.from(site, params, debug_metadata: debug_metadata(conn)),:ok <- validate_filters(site, query.filters),{:ok, metrics} <- parse_and_validate_metrics(params, query),:ok <- ensure_custom_props_access(site, query) dodiff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex f38ed623fd..ff4cef88f3 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -96,12 +96,13 @@ defmodule PlausibleWeb.Api.StatsController do"""def main_graph(conn, params) dosite = conn.assigns[:site]+ now = conn.private[:now]with {:ok, dates} <- parse_date_params(params),:ok <- validate_interval(params),:ok <- validate_interval_granularity(site, params, dates),params <- realtime_period_to_30m(params),- query = Query.from(site, params, debug_metadata(conn)),+ query = Query.from(site, params, debug_metadata: debug_metadata(conn), now: now),query <- Query.set_include(query, :trim_relative_date_range, true),{:ok, metric} <- parse_and_validate_graph_metric(params, query) do{timeseries_result, comparison_result, _meta} = Stats.timeseries(site, query, [metric])@@ -189,7 +190,7 @@ defmodule PlausibleWeb.Api.StatsController doquery =site- |> Query.from(params, debug_metadata(conn))+ |> Query.from(params, debug_metadata: debug_metadata(conn))|> Query.set_include(:imports_meta, true)%{@@ -472,7 +473,7 @@ defmodule PlausibleWeb.Api.StatsController dodef sources(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:source")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -512,7 +513,7 @@ defmodule PlausibleWeb.Api.StatsController dodef channels(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:channel")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -554,7 +555,7 @@ defmodule PlausibleWeb.Api.StatsController dosite = Plausible.Repo.preload(conn.assigns.site, :team)with :ok <- Plausible.Billing.Feature.Funnels.check_availability(site.team),- query <- Query.from(site, params, debug_metadata(conn)),+ query <- Query.from(site, params, debug_metadata: debug_metadata(conn)),:ok <- validate_funnel_query(query),{funnel_id, ""} <- Integer.parse(funnel_id),{:ok, funnel} <- Stats.funnel(site, query, funnel_id) do@@ -606,7 +607,7 @@ defmodule PlausibleWeb.Api.StatsController dodef utm_mediums(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:utm_medium")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -641,7 +642,7 @@ defmodule PlausibleWeb.Api.StatsController dodef utm_campaigns(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:utm_campaign")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -676,7 +677,7 @@ defmodule PlausibleWeb.Api.StatsController dodef utm_contents(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:utm_content")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -711,7 +712,7 @@ defmodule PlausibleWeb.Api.StatsController dodef utm_terms(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:utm_term")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -746,7 +747,7 @@ defmodule PlausibleWeb.Api.StatsController dodef utm_sources(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:utm_source")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -781,7 +782,7 @@ defmodule PlausibleWeb.Api.StatsController dodef referrers(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:referrer")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -816,7 +817,7 @@ defmodule PlausibleWeb.Api.StatsController dodef referrer_drilldown(conn, %{"referrer" => "Google"} = params) dosite = conn.assigns[:site]- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))is_admin =if current_user = conn.assigns[:current_user] do@@ -872,7 +873,7 @@ defmodule PlausibleWeb.Api.StatsController doparams = Map.put(params, "property", "visit:referrer")query =- Query.from(site, params, debug_metadata(conn))+ Query.from(site, params, debug_metadata: debug_metadata(conn))|> Query.add_filter([:is, "visit:source", [referrer]])pagination = parse_pagination(params)@@ -905,7 +906,7 @@ defmodule PlausibleWeb.Api.StatsController dosite = conn.assigns[:site]params = Map.put(params, "property", "event:page")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))extra_metrics =if params["detailed"] do@@ -949,7 +950,7 @@ defmodule PlausibleWeb.Api.StatsController dodef entry_pages(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:entry_page")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -992,7 +993,7 @@ defmodule PlausibleWeb.Api.StatsController dodef exit_pages(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:exit_page")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn)){limit, page} = parse_pagination(params)extra_metrics =@@ -1041,7 +1042,7 @@ defmodule PlausibleWeb.Api.StatsController dodef countries(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:country")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -1104,7 +1105,7 @@ defmodule PlausibleWeb.Api.StatsController dodef regions(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:region")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -1150,7 +1151,7 @@ defmodule PlausibleWeb.Api.StatsController dodef cities(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:city")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)metrics =@@ -1201,7 +1202,7 @@ defmodule PlausibleWeb.Api.StatsController dodef browsers(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:browser")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -1239,7 +1240,7 @@ defmodule PlausibleWeb.Api.StatsController dodef browser_versions(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:browser_version")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -1286,7 +1287,7 @@ defmodule PlausibleWeb.Api.StatsController dodef operating_systems(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:os")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -1324,7 +1325,7 @@ defmodule PlausibleWeb.Api.StatsController dodef operating_system_versions(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:os_version")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -1371,7 +1372,7 @@ defmodule PlausibleWeb.Api.StatsController dodef screen_sizes(conn, params) dosite = conn.assigns[:site]params = Map.put(params, "property", "visit:device")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))pagination = parse_pagination(params)extra_metrics =@@ -1419,7 +1420,7 @@ defmodule PlausibleWeb.Api.StatsController do|> realtime_period_to_30m()|> Map.put("property", "event:goal")- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))metrics = [:visitors, :events, :conversion_rate] ++ @revenue_metrics@@ -1462,7 +1463,7 @@ defmodule PlausibleWeb.Api.StatsController dodef all_custom_prop_values(conn, params) dosite = conn.assigns.site- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))prop_names = Plausible.Stats.CustomProps.fetch_prop_names(site, query)@@ -1499,7 +1500,7 @@ defmodule PlausibleWeb.Api.StatsController doparams = Map.put(params, "property", prefixed_prop)- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))metrics =if toplevel_goal_filter?(query) do@@ -1537,7 +1538,7 @@ defmodule PlausibleWeb.Api.StatsController do|> put_status(:bad_request)|> json(%{"error" => "Search parameter 'q' is required"})else- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))json(conn,@@ -1549,7 +1550,7 @@ defmodule PlausibleWeb.Api.StatsController dodef custom_prop_value_filter_suggestions(conn, %{"prop_key" => prop_key} = params) dosite = conn.assigns[:site]- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))json(conn,diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex de342a0932..331c1ecb82 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -134,7 +134,7 @@ defmodule PlausibleWeb.StatsController dodef csv_export(conn, params) doif is_nil(params["interval"]) or Plausible.Stats.Interval.valid?(params["interval"]) dosite = Plausible.Repo.preload(conn.assigns.site, :owners)- query = Query.from(site, params, debug_metadata(conn))+ query = Query.from(site, params, debug_metadata: debug_metadata(conn))date_range = Query.date_range(query)diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex 8c71fd3351..b5cedfd26d 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -28,7 +28,7 @@ defmodule PlausibleWeb.Live.Sites do:team_invitations,Teams.Invitations.all(user))- |> assign(:hourly_stats, %{})+ |> assign(:sparklines, %{})|> assign(:filter_text, String.trim(params["filter_text"] || ""))|> assign(init_consolidated_view_assigns(user, team))@@ -205,7 +205,7 @@ defmodule PlausibleWeb.Live.Sites do}can_manage_consolidated_view?={@can_manage_consolidated_view?}consolidated_view={@consolidated_view}- consolidated_stats={@consolidated_stats}+ consolidated_sparkline={@consolidated_sparkline}current_user={@current_user}current_team={@current_team}/>@@ -213,13 +213,13 @@ defmodule PlausibleWeb.Live.Sites do<.site:if={site.entry_type in ["pinned_site", "site"]}site={site}- hourly_stats={Map.get(@hourly_stats, site.domain, :loading)}+ sparkline={Map.get(@sparklines, site.domain, :loading)}/><.invitation:if={site.entry_type == "invitation"}site={site}invitation={@invitations_map[hd(site.invitations).invitation_id]}- hourly_stats={Map.get(@hourly_stats, site.domain, :loading)}+ sparkline={Map.get(@sparklines, site.domain, :loading)}/><% end %></ul>@@ -404,48 +404,48 @@ defmodule PlausibleWeb.Live.Sites do</h3></div><span- :if={is_map(@consolidated_stats)}+ :if={is_map(@consolidated_sparkline)}class="max-w-sm sm:max-w-none text-indigo-500 my-auto"data-test-id="consolidated-view-chart-loaded"><PlausibleWeb.Live.Components.Visitors.chart- intervals={@consolidated_stats.intervals}+ intervals={@consolidated_sparkline.intervals}height={80}/></span></div><div- :if={is_map(@consolidated_stats)}+ :if={is_map(@consolidated_sparkline)}data-test-id="consolidated-view-stats-loaded"class="flex flex-col flex-1 justify-between gap-y-2.5 sm:gap-y-5"><div class="flex flex-col sm:flex-row justify-between gap-2.5 sm:gap-2 flex-1 w-full"><.consolidated_view_stat- value={large_number_format(@consolidated_stats.visitors)}+ value={large_number_format(@consolidated_sparkline.visitors)}label="Unique visitors"- change={@consolidated_stats.visitors_change}+ change={@consolidated_sparkline.visitors_change}/><.consolidated_view_stat- value={large_number_format(@consolidated_stats.visits)}+ value={large_number_format(@consolidated_sparkline.visits)}label="Total visits"- change={@consolidated_stats.visits_change}+ change={@consolidated_sparkline.visits_change}/></div><div class="flex flex-col sm:flex-row justify-between gap-2.5 sm:gap-2 flex-1 w-full"><.consolidated_view_stat- value={large_number_format(@consolidated_stats.pageviews)}+ value={large_number_format(@consolidated_sparkline.pageviews)}label="Total pageviews"- change={@consolidated_stats.pageviews_change}+ change={@consolidated_sparkline.pageviews_change}/><.consolidated_view_stat- value={@consolidated_stats.views_per_visit}+ value={@consolidated_sparkline.views_per_visit}label="Views per visit"- change={@consolidated_stats.views_per_visit_change}+ change={@consolidated_sparkline.views_per_visit_change}/></div></div><div- :if={@consolidated_stats == :loading}+ :if={@consolidated_sparkline == :loading}class="flex flex-col gap-y-2 min-h-[254px] h-full text-center animate-pulse"data-test-id="consolidated-viw-stats-loading">@@ -486,7 +486,7 @@ defmodule PlausibleWeb.Live.Sites doattr(:site, Plausible.Site, required: true)attr(:invitation, :map, required: true)- attr(:hourly_stats, :map, required: true)+ attr(:sparkline, :map, required: true)def invitation(assigns) doassigns =@@ -512,7 +512,7 @@ defmodule PlausibleWeb.Live.Sites doPending invitation</.pill></div>- <.site_stats hourly_stats={@hourly_stats} />+ <.site_stats sparkline={@sparkline} /></div><.invitation_modal id={@modal_id} site={@site} invitation={@invitation} /></li>@@ -520,7 +520,7 @@ defmodule PlausibleWeb.Live.Sites doendattr(:site, Plausible.Site, required: true)- attr(:hourly_stats, :map, required: true)+ attr(:sparkline, :map, required: true)def site(assigns) do~H"""@@ -554,7 +554,7 @@ defmodule PlausibleWeb.Live.Sites do</h3></div></div>- <.site_stats hourly_stats={@hourly_stats} />+ <.site_stats sparkline={@sparkline} /></div></.unstyled_link>@@ -644,36 +644,36 @@ defmodule PlausibleWeb.Live.Sites do"""end- attr(:hourly_stats, :any, required: true)+ attr(:sparkline, :any, required: true)def site_stats(assigns) do~H"""<div class={["flex flex-col gap-y-2 h-[122px] text-center animate-pulse",- is_map(@hourly_stats) && " hidden"+ is_map(@sparkline) && " hidden"]}><div class="flex-2 dark:bg-gray-750 bg-gray-100 rounded-md"></div><div class="flex-1 dark:bg-gray-750 bg-gray-100 rounded-md"></div></div>- <div :if={is_map(@hourly_stats)}>+ <div :if={is_map(@sparkline)}><span class="flex flex-col gap-y-5 text-gray-600 dark:text-gray-400 text-sm truncate"><span class="max-w-sm sm:max-w-none text-indigo-500"><PlausibleWeb.Live.Components.Visitors.chart- intervals={@hourly_stats.intervals}+ intervals={@sparkline.intervals}height={80}/></span><div class="flex justify-between items-end"><div class="flex flex-col"><p class="text-lg sm:text-xl font-bold text-gray-900 dark:text-gray-100">- {large_number_format(@hourly_stats.visitors)}+ {large_number_format(@sparkline.visitors)}</p><p class="text-gray-600 dark:text-gray-400">- visitor<span :if={@hourly_stats.visitors != 1}>s</span> in last 24h+ visitor<span :if={@sparkline.visitors != 1}>s</span> in last 24h</p></div>- <.percentage_change change={@hourly_stats.change} />+ <.percentage_change change={@sparkline.visitors_change} /></div></span></div>@@ -970,25 +970,16 @@ defmodule PlausibleWeb.Live.Sites doteam: assigns.current_team)- hourly_stats =+ sparklines =if connected?(socket) do- try do- Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(sites.entries)- catch- kind, value ->- Logger.error(- "Could not render 24h visitors hourly intervals: #{inspect(kind)} #{inspect(value)}"- )-- %{}- end+ Plausible.Stats.Sparkline.parallel_overview(sites.entries)else%{}end- consolidated_stats =+ consolidated_sparkline =if connected?(socket),- do: load_consolidated_stats(assigns.consolidated_view),+ do: load_consolidated_sparkline(assigns.consolidated_view),else: :loadinginvitations = extract_invitations(sites.entries, assigns.current_team)@@ -997,8 +988,8 @@ defmodule PlausibleWeb.Live.Sites dosocket,sites: sites,invitations: invitations,- hourly_stats: hourly_stats,- consolidated_stats: consolidated_stats || Map.get(assigns, :consolidated_stats)+ sparklines: sparklines,+ consolidated_sparkline: consolidated_sparkline || Map.get(assigns, :consolidated_sparkline))end@@ -1098,7 +1089,7 @@ defmodule PlausibleWeb.Live.Sites do[consolidated_view: nil,can_manage_consolidated_view?: false,- consolidated_stats: nil,+ consolidated_sparkline: nil,no_consolidated_view_reason: nil,consolidated_view_cta_dismissed?: false]@@ -1123,7 +1114,7 @@ defmodule PlausibleWeb.Live.Sites do%{consolidated_view: view,can_manage_consolidated_view?: ConsolidatedView.can_manage?(user, team),- consolidated_stats: :loading,+ consolidated_sparkline: :loading,no_consolidated_view_reason: nil,consolidated_view_cta_dismissed?: ConsolidatedView.cta_dismissed?(user, team)}@@ -1137,8 +1128,8 @@ defmodule PlausibleWeb.Live.Sites doendend- defp load_consolidated_stats(consolidated_view) do- case Plausible.Stats.ConsolidatedView.safe_overview_24h(consolidated_view) do+ defp load_consolidated_sparkline(consolidated_view) do+ case Plausible.Stats.Sparkline.safe_overview_24h(consolidated_view) do{:ok, stats} -> stats{:error, :not_found} -> nil{:error, :inaccessible} -> :loading@@ -1150,6 +1141,6 @@ defmodule PlausibleWeb.Live.Sites dodefp init_consolidated_view_assigns(_user, _team),do: no_consolidated_view(no_consolidated_view_reason: :unavailable)- defp load_consolidated_stats(_consolidated_view), do: nil+ defp load_consolidated_sparkline(_consolidated_view), do: nilendenddiff --git a/test/plausible/consolidated_view/cache_sync_test.exs b/test/plausible/consolidated_view/cache_sync_test.exsindex 1007aa0fe2..1c56ace698 100644--- a/test/plausible/consolidated_view/cache_sync_test.exs+++ b/test/plausible/consolidated_view/cache_sync_test.exs@@ -4,16 +4,11 @@ defmodule Plausible.CondolidatedView.CacheSyncTest doon_ee doalias Plausible.ConsolidatedView.Cache- setup do- Sentry.put_config(:test_mode, true)-- on_exit(fn ->- Sentry.put_config(:test_mode, false)- end)+ setup %{test_pid: test_pid} do+ Plausible.Test.Support.Sentry.setup(test_pid)endtest "big views get cropped up to 14k", %{test: test} do- assert :ok = Sentry.Test.start_collecting_sentry_reports(){:ok, _pid} = start_test_cache(test)Plausible.Cache.Adapter.put(test, "key", Enum.to_list(1..20_000))diff --git a/test/plausible/installation_support/detection/checks_observability_test.exs b/test/plausible/installation_support/detection/checks_observability_test.exsindex 39c817a1b6..6da95d9bf4 100644--- a/test/plausible/installation_support/detection/checks_observability_test.exs+++ b/test/plausible/installation_support/detection/checks_observability_test.exs@@ -30,17 +30,7 @@ defmodule Plausible.InstallationSupport.Detection.ChecksObservabilityTest do%{})- Sentry.put_config(:test_mode, true)- Sentry.put_config(:send_result, :sync)- Sentry.put_config(:dedup_events, false)-- assert :ok = Sentry.Test.start_collecting(owner: test_pid)-- on_exit(fn ->- Sentry.put_config(:test_mode, false)- Sentry.put_config(:send_result, :none)- Sentry.put_config(:dedup_events, true)- end)+ Plausible.Test.Support.Sentry.setup(test_pid)endtest "successful detection -> no logs, no sentry, telemetry :success" dodiff --git a/test/plausible/installation_support/verification/checks_observability_test.exs b/test/plausible/installation_support/verification/checks_observability_test.exsindex 871ca05805..0e7bbd5a95 100644--- a/test/plausible/installation_support/verification/checks_observability_test.exs+++ b/test/plausible/installation_support/verification/checks_observability_test.exs@@ -31,17 +31,7 @@ defmodule Plausible.InstallationSupport.Verification.ChecksObservabilityTest do%{})- Sentry.put_config(:test_mode, true)- Sentry.put_config(:send_result, :sync)- Sentry.put_config(:dedup_events, false)-- assert :ok = Sentry.Test.start_collecting(owner: test_pid)-- on_exit(fn ->- Sentry.put_config(:test_mode, false)- Sentry.put_config(:send_result, :none)- Sentry.put_config(:dedup_events, true)- end)+ Plausible.Test.Support.Sentry.setup(test_pid)endtest "known installation issue detected is considered handled" dodiff --git a/test/plausible/stats/clickhouse_test.exs b/test/plausible/stats/clickhouse_test.exsindex ff03bed01b..12076fb1fe 100644--- a/test/plausible/stats/clickhouse_test.exs+++ b/test/plausible/stats/clickhouse_test.exs@@ -3,333 +3,6 @@ defmodule Plausible.Stats.ClickhouseTest doalias Plausible.Stats.Clickhouse- describe "last_24_visitors_hourly_intervals/1" do- test "returns no data on no sites" do- assert Clickhouse.last_24h_visitors_hourly_intervals([]) == %{}- end-- test "returns empty intervals placeholder on no clickhouse stats" do- fixed_now = ~N[2023-10-26 10:00:15]- site = new_site()- domain = site.domain-- assert Clickhouse.last_24h_visitors_hourly_intervals(- [site],- fixed_now- ) ==- %{- domain => %{- change: 0,- visitors: 0,- intervals: [- %{interval: ~N[2023-10-25 10:00:00], visitors: 0},- %{interval: ~N[2023-10-25 11:00:00], visitors: 0},- %{interval: ~N[2023-10-25 12:00:00], visitors: 0},- %{interval: ~N[2023-10-25 13:00:00], visitors: 0},- %{interval: ~N[2023-10-25 14:00:00], visitors: 0},- %{interval: ~N[2023-10-25 15:00:00], visitors: 0},- %{interval: ~N[2023-10-25 16:00:00], visitors: 0},- %{interval: ~N[2023-10-25 17:00:00], visitors: 0},- %{interval: ~N[2023-10-25 18:00:00], visitors: 0},- %{interval: ~N[2023-10-25 19:00:00], visitors: 0},- %{interval: ~N[2023-10-25 20:00:00], visitors: 0},- %{interval: ~N[2023-10-25 21:00:00], visitors: 0},- %{interval: ~N[2023-10-25 22:00:00], visitors: 0},- %{interval: ~N[2023-10-25 23:00:00], visitors: 0},- %{interval: ~N[2023-10-26 00:00:00], visitors: 0},- %{interval: ~N[2023-10-26 01:00:00], visitors: 0},- %{interval: ~N[2023-10-26 02:00:00], visitors: 0},- %{interval: ~N[2023-10-26 03:00:00], visitors: 0},- %{interval: ~N[2023-10-26 04:00:00], visitors: 0},- %{interval: ~N[2023-10-26 05:00:00], visitors: 0},- %{interval: ~N[2023-10-26 06:00:00], visitors: 0},- %{interval: ~N[2023-10-26 07:00:00], visitors: 0},- %{interval: ~N[2023-10-26 08:00:00], visitors: 0},- %{interval: ~N[2023-10-26 09:00:00], visitors: 0},- %{interval: ~N[2023-10-26 10:00:00], visitors: 0}- ]- }- }- end-- test "returns clickhouse data merged with placeholder" do- fixed_now = ~N[2023-10-26 10:00:15]- site = new_site()-- user_id = 111-- populate_stats(site, [- build(:pageview, timestamp: ~N[2023-10-25 11:01:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:00:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:01:00]),- build(:pageview, timestamp: ~N[2023-10-26 10:00:14])- ])-- assert %{- change: 100,- visitors: 5,- intervals: [- %{interval: ~N[2023-10-25 10:00:00], visitors: 0},- %{interval: ~N[2023-10-25 11:00:00], visitors: 1},- %{interval: ~N[2023-10-25 12:00:00], visitors: 0},- %{interval: ~N[2023-10-25 13:00:00], visitors: 2},- %{interval: ~N[2023-10-25 14:00:00], visitors: 0},- %{interval: ~N[2023-10-25 15:00:00], visitors: 1},- %{interval: ~N[2023-10-25 16:00:00], visitors: 0},- %{interval: ~N[2023-10-25 17:00:00], visitors: 0},- %{interval: ~N[2023-10-25 18:00:00], visitors: 0},- %{interval: ~N[2023-10-25 19:00:00], visitors: 0},- %{interval: ~N[2023-10-25 20:00:00], visitors: 0},- %{interval: ~N[2023-10-25 21:00:00], visitors: 0},- %{interval: ~N[2023-10-25 22:00:00], visitors: 0},- %{interval: ~N[2023-10-25 23:00:00], visitors: 0},- %{interval: ~N[2023-10-26 00:00:00], visitors: 0},- %{interval: ~N[2023-10-26 01:00:00], visitors: 0},- %{interval: ~N[2023-10-26 02:00:00], visitors: 0},- %{interval: ~N[2023-10-26 03:00:00], visitors: 0},- %{interval: ~N[2023-10-26 04:00:00], visitors: 0},- %{interval: ~N[2023-10-26 05:00:00], visitors: 0},- %{interval: ~N[2023-10-26 06:00:00], visitors: 0},- %{interval: ~N[2023-10-26 07:00:00], visitors: 0},- %{interval: ~N[2023-10-26 08:00:00], visitors: 0},- %{interval: ~N[2023-10-26 09:00:00], visitors: 0},- %{interval: ~N[2023-10-26 10:00:00], visitors: 1}- ]- } = Clickhouse.last_24h_visitors_hourly_intervals([site], fixed_now)[site.domain]- end-- test "ignores visits before native stats start time (after reset)" do- fixed_now = ~N[2023-10-26 10:00:15]- site1 = insert(:site, native_stats_start_at: ~N[2023-10-25 14:15:00])- site2 = insert(:site, native_stats_start_at: ~N[2023-10-23 12:00:00])-- user_id1 = 111- user_id2 = 222-- populate_stats(site1, [- build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),- build(:pageview, user_id: user_id1, timestamp: ~N[2023-10-25 15:00:00]),- build(:pageview, user_id: user_id1, timestamp: ~N[2023-10-25 15:01:00])- ])-- populate_stats(site2, [- build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),- build(:pageview, user_id: user_id2, timestamp: ~N[2023-10-25 15:00:00]),- build(:pageview, user_id: user_id2, timestamp: ~N[2023-10-25 15:01:00])- ])-- assert %{- change: 100,- visitors: 1,- intervals: [- %{interval: ~N[2023-10-25 10:00:00], visitors: 0},- %{interval: ~N[2023-10-25 11:00:00], visitors: 0},- %{interval: ~N[2023-10-25 12:00:00], visitors: 0},- %{interval: ~N[2023-10-25 13:00:00], visitors: 0},- %{interval: ~N[2023-10-25 14:00:00], visitors: 0},- %{interval: ~N[2023-10-25 15:00:00], visitors: 1},- %{interval: ~N[2023-10-25 16:00:00], visitors: 0},- %{interval: ~N[2023-10-25 17:00:00], visitors: 0},- %{interval: ~N[2023-10-25 18:00:00], visitors: 0},- %{interval: ~N[2023-10-25 19:00:00], visitors: 0},- %{interval: ~N[2023-10-25 20:00:00], visitors: 0},- %{interval: ~N[2023-10-25 21:00:00], visitors: 0},- %{interval: ~N[2023-10-25 22:00:00], visitors: 0},- %{interval: ~N[2023-10-25 23:00:00], visitors: 0},- %{interval: ~N[2023-10-26 00:00:00], visitors: 0},- %{interval: ~N[2023-10-26 01:00:00], visitors: 0},- %{interval: ~N[2023-10-26 02:00:00], visitors: 0},- %{interval: ~N[2023-10-26 03:00:00], visitors: 0},- %{interval: ~N[2023-10-26 04:00:00], visitors: 0},- %{interval: ~N[2023-10-26 05:00:00], visitors: 0},- %{interval: ~N[2023-10-26 06:00:00], visitors: 0},- %{interval: ~N[2023-10-26 07:00:00], visitors: 0},- %{interval: ~N[2023-10-26 08:00:00], visitors: 0},- %{interval: ~N[2023-10-26 09:00:00], visitors: 0},- %{interval: ~N[2023-10-26 10:00:00], visitors: 0}- ]- } = Clickhouse.last_24h_visitors_hourly_intervals([site1], fixed_now)[site1.domain]-- assert %{- change: 100,- visitors: 3,- intervals: [- %{interval: ~N[2023-10-25 10:00:00], visitors: 0},- %{interval: ~N[2023-10-25 11:00:00], visitors: 0},- %{interval: ~N[2023-10-25 12:00:00], visitors: 0},- %{interval: ~N[2023-10-25 13:00:00], visitors: 2},- %{interval: ~N[2023-10-25 14:00:00], visitors: 0},- %{interval: ~N[2023-10-25 15:00:00], visitors: 1},- %{interval: ~N[2023-10-25 16:00:00], visitors: 0},- %{interval: ~N[2023-10-25 17:00:00], visitors: 0},- %{interval: ~N[2023-10-25 18:00:00], visitors: 0},- %{interval: ~N[2023-10-25 19:00:00], visitors: 0},- %{interval: ~N[2023-10-25 20:00:00], visitors: 0},- %{interval: ~N[2023-10-25 21:00:00], visitors: 0},- %{interval: ~N[2023-10-25 22:00:00], visitors: 0},- %{interval: ~N[2023-10-25 23:00:00], visitors: 0},- %{interval: ~N[2023-10-26 00:00:00], visitors: 0},- %{interval: ~N[2023-10-26 01:00:00], visitors: 0},- %{interval: ~N[2023-10-26 02:00:00], visitors: 0},- %{interval: ~N[2023-10-26 03:00:00], visitors: 0},- %{interval: ~N[2023-10-26 04:00:00], visitors: 0},- %{interval: ~N[2023-10-26 05:00:00], visitors: 0},- %{interval: ~N[2023-10-26 06:00:00], visitors: 0},- %{interval: ~N[2023-10-26 07:00:00], visitors: 0},- %{interval: ~N[2023-10-26 08:00:00], visitors: 0},- %{interval: ~N[2023-10-26 09:00:00], visitors: 0},- %{interval: ~N[2023-10-26 10:00:00], visitors: 0}- ]- } = Clickhouse.last_24h_visitors_hourly_intervals([site2], fixed_now)[site2.domain]- end-- test "returns clickhouse data merged with placeholder for multiple sites" do- fixed_now = ~N[2023-10-26 10:00:15]- site1 = new_site()- site2 = new_site()- site3 = new_site()-- user_id = 111-- populate_stats(site1, [- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 13:00:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 13:01:00]),- build(:pageview, timestamp: ~N[2023-10-25 15:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 15:58:00])- ])-- populate_stats(site2, [- build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:00:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:01:00])- ])-- assert result =- Clickhouse.last_24h_visitors_hourly_intervals([site1, site2, site3], fixed_now)-- assert result[site1.domain].visitors == 3- assert result[site1.domain].change == 100- assert result[site2.domain].visitors == 3- assert result[site2.domain].change == 100- assert result[site3.domain].visitors == 0- assert result[site3.domain].change == 0-- find_interval = fn result, domain, interval ->- Enum.find(result[domain].intervals, &(&1.interval == interval))- end-- assert find_interval.(result, site1.domain, ~N[2023-10-25 13:00:00]).visitors == 1- assert find_interval.(result, site1.domain, ~N[2023-10-25 15:00:00]).visitors == 2- assert find_interval.(result, site2.domain, ~N[2023-10-25 13:00:00]).visitors == 2- assert find_interval.(result, site2.domain, ~N[2023-10-25 15:00:00]).visitors == 1- end-- test "returns calculated change" do- fixed_now = ~N[2023-10-26 10:00:15]- site = new_site()-- populate_stats(site, [- build(:pageview, timestamp: ~N[2023-10-24 11:58:00]),- build(:pageview, timestamp: ~N[2023-10-24 12:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:59:00])- ])-- assert %{- change: 50,- visitors: 3- } = Clickhouse.last_24h_visitors_hourly_intervals([site], fixed_now)[site.domain]- end-- test "calculates uniques correctly across hour boundaries" do- fixed_now = ~N[2023-10-26 10:00:15]- site = new_site()-- user_id = 111-- populate_stats(site, [- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:59:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 16:00:00])- ])-- result = Clickhouse.last_24h_visitors_hourly_intervals([site], fixed_now)[site.domain]- assert result[:visitors] == 1- end-- test "another one" do- fixed_now = ~N[2023-10-26 10:00:15]- site = new_site()-- user_id = 111-- populate_stats(site, [- build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),- build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:00:00]),- build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 16:00:00])- ])-- assert %{- change: 100,- visitors: 3,- intervals: [- %{interval: ~N[2023-10-25 10:00:00], visitors: 0},- %{interval: ~N[2023-10-25 11:00:00], visitors: 0},- %{interval: ~N[2023-10-25 12:00:00], visitors: 0},- %{interval: ~N[2023-10-25 13:00:00], visitors: 2},- %{interval: ~N[2023-10-25 14:00:00], visitors: 0},- %{interval: ~N[2023-10-25 15:00:00], visitors: 1},- %{interval: ~N[2023-10-25 16:00:00], visitors: 1},- %{interval: ~N[2023-10-25 17:00:00], visitors: 0},- %{interval: ~N[2023-10-25 18:00:00], visitors: 0},- %{interval: ~N[2023-10-25 19:00:00], visitors: 0},- %{interval: ~N[2023-10-25 20:00:00], visitors: 0},- %{interval: ~N[2023-10-25 21:00:00], visitors: 0},- %{interval: ~N[2023-10-25 22:00:00], visitors: 0},- %{interval: ~N[2023-10-25 23:00:00], visitors: 0},- %{interval: ~N[2023-10-26 00:00:00], visitors: 0},- %{interval: ~N[2023-10-26 01:00:00], visitors: 0},- %{interval: ~N[2023-10-26 02:00:00], visitors: 0},- %{interval: ~N[2023-10-26 03:00:00], visitors: 0},- %{interval: ~N[2023-10-26 04:00:00], visitors: 0},- %{interval: ~N[2023-10-26 05:00:00], visitors: 0},- %{interval: ~N[2023-10-26 06:00:00], visitors: 0},- %{interval: ~N[2023-10-26 07:00:00], visitors: 0},- %{interval: ~N[2023-10-26 08:00:00], visitors: 0},- %{interval: ~N[2023-10-26 09:00:00], visitors: 0},- %{interval: ~N[2023-10-26 10:00:00], visitors: 0}- ]- } = Clickhouse.last_24h_visitors_hourly_intervals([site], fixed_now)[site.domain]- end-- test "excludes engagement events from visitor counts" do- fixed_now = ~N[2025-10-20 12:49:15]- site = new_site()-- populate_stats(site, [- build(:pageview, user_id: 111, timestamp: ~N[2025-10-20 12:00:00]),- build(:pageview, user_id: 222, timestamp: ~N[2025-10-20 10:50:00]),- build(:engagement,- user_id: 222,- pathname: "/blog",- timestamp: ~N[2025-10-20 10:50:01],- scroll_depth: 20,- engagement_time: 50_000- )- ])-- result = Clickhouse.last_24h_visitors_hourly_intervals([site], fixed_now)[site.domain]-- assert %{visitors: 2} = result- end- end-describe "imported_pageview_counts/1" dotest "gets pageview counts for each of sites' imports" dosite = new_site()diff --git a/test/plausible/stats/comparisons_test.exs b/test/plausible/stats/comparisons_test.exsindex 876e83c64e..65532714d3 100644--- a/test/plausible/stats/comparisons_test.exs+++ b/test/plausible/stats/comparisons_test.exs@@ -6,14 +6,13 @@ defmodule Plausible.Stats.ComparisonsTest dodescribe "with period set to this month" dotest "shifts back this month period when mode is previous_period", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-02 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-03-02],- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-02 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -24,14 +23,13 @@ defmodule Plausible.Stats.ComparisonsTest dotest "shifts back this month period when it's the first day of the month and mode is previous_period",%{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-03-01],- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -42,14 +40,13 @@ defmodule Plausible.Stats.ComparisonsTest dotest "matches the day of the week when nearest day is original query start date and mode is previous_period",%{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-02 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-03-02],- include: [compare: :previous_period, compare_match_day_of_week: true]+ include: [compare: :previous_period, compare_match_day_of_week: true],+ now: ~U[2023-03-02 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -61,14 +58,13 @@ defmodule Plausible.Stats.ComparisonsTest dotest "custom time zone sets timezone to UTC" dosite = insert(:site, timezone: "US/Eastern")- Plausible.Stats.Query.Test.fix_now(~U[2023-03-02 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-03-02],- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-02 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -80,14 +76,13 @@ defmodule Plausible.Stats.ComparisonsTest dodescribe "with period set to previous month" dotest "shifts back using the same number of days when mode is previous_period", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-02-01],- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -97,14 +92,13 @@ defmodule Plausible.Stats.ComparisonsTest doendtest "shifts back the full month when mode is year_over_year", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-02-01],- include: [compare: :year_over_year]+ include: [compare: :year_over_year],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -116,14 +110,13 @@ defmodule Plausible.Stats.ComparisonsTest dotest "shifts back whole month plus one day when mode is year_over_year and a leap year", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2020-02-01],- include: [compare: :year_over_year]+ include: [compare: :year_over_year],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -135,14 +128,13 @@ defmodule Plausible.Stats.ComparisonsTest dotest "matches the day of the week when mode is previous_period keeping the same day", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-02-01],- include: [compare: :previous_period, compare_match_day_of_week: true]+ include: [compare: :previous_period, compare_match_day_of_week: true],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -152,14 +144,13 @@ defmodule Plausible.Stats.ComparisonsTest doendtest "matches the day of the week when mode is previous_period", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :month,relative_date: ~D[2023-01-01],- include: [compare: :previous_period, compare_match_day_of_week: true]+ include: [compare: :previous_period, compare_match_day_of_week: true],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -222,14 +213,13 @@ defmodule Plausible.Stats.ComparisonsTest dodescribe "with period set to year to date" dotest "shifts back by the same number of days when mode is previous_period", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :year,relative_date: ~D[2023-03-01],- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -239,14 +229,13 @@ defmodule Plausible.Stats.ComparisonsTest doendtest "shifts back by the same number of days when mode is year_over_year", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :year,relative_date: ~D[2023-03-01],- include: [compare: :year_over_year]+ include: [compare: :year_over_year],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -256,14 +245,13 @@ defmodule Plausible.Stats.ComparisonsTest doendtest "matches the day of the week when mode is year_over_year", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-01 14:00:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :year,relative_date: ~D[2023-03-01],- include: [compare: :year_over_year, compare_match_day_of_week: true]+ include: [compare: :year_over_year, compare_match_day_of_week: true],+ now: ~U[2023-03-01 14:00:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -456,13 +444,12 @@ defmodule Plausible.Stats.ComparisonsTest dodescribe "with period set to 24h" dotest "shifts back 24h period when mode is previous_period", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-15 18:30:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :"24h",- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-15 18:30:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -474,13 +461,12 @@ defmodule Plausible.Stats.ComparisonsTest doendtest "shifts back 24h period when mode is year_over_year", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2023-03-15 18:30:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :"24h",- include: [compare: :year_over_year]+ include: [compare: :year_over_year],+ now: ~U[2023-03-15 18:30:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -494,13 +480,12 @@ defmodule Plausible.Stats.ComparisonsTest dotest "custom time zone works with 24h comparison" dosite = insert(:site, timezone: "US/Eastern")- Plausible.Stats.Query.Test.fix_now(~U[2023-03-15 18:30:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :"24h",- include: [compare: :previous_period]+ include: [compare: :previous_period],+ now: ~U[2023-03-15 18:30:00Z])comparison_query = Comparisons.get_comparison_query(query)@@ -513,14 +498,14 @@ defmodule Plausible.Stats.ComparisonsTest dotest "shifts back 24h period to match day of week when mode is previous_period with match_day_of_week",%{site: site} do- # Wednesday- Plausible.Stats.Query.Test.fix_now(~U[2023-03-15 18:30:00Z])-query =QueryBuilder.build!(site,metrics: [:visitors],input_date_range: :"24h",- include: [compare: :previous_period, compare_match_day_of_week: true]+ include: [compare: :previous_period, compare_match_day_of_week: true],++ # Wednesday+ now: ~U[2023-03-15 18:30:00Z])comparison_query = Comparisons.get_comparison_query(query)diff --git a/test/plausible/stats/consolidated_view_test.exs b/test/plausible/stats/consolidated_view_test.exsindex d54900dd14..2203c4463b 100644--- a/test/plausible/stats/consolidated_view_test.exs+++ b/test/plausible/stats/consolidated_view_test.exs@@ -3,8 +3,7 @@ defmodule Plausible.Stats.ConsolidatedViewTest doon_ee dotest "returns stats for a consolidated view merged with placeholder" do- fixed_now = ~N[2023-10-26 10:00:15]- Plausible.Stats.Query.Test.fix_now(DateTime.from_naive!(fixed_now, "Etc/UTC"))+ now = ~N[2023-10-26 10:00:15]owner = new_user()site1 = new_site(owner: owner)@@ -28,7 +27,7 @@ defmodule Plausible.Stats.ConsolidatedViewTest doview = new_consolidated_view(team_of(owner))- result = Plausible.Stats.ConsolidatedView.overview_24h(view, fixed_now)+ result = Plausible.Stats.Sparkline.overview_24h(view, now)assert %{visitors_change: 100,@@ -39,38 +38,37 @@ defmodule Plausible.Stats.ConsolidatedViewTest dopageviews: 6,views_per_visit: 1.2,intervals: [- %{interval: ~N[2023-10-25 10:00:00], visitors: 0},- %{interval: ~N[2023-10-25 11:00:00], visitors: 1},- %{interval: ~N[2023-10-25 12:00:00], visitors: 0},- %{interval: ~N[2023-10-25 13:00:00], visitors: 2},- %{interval: ~N[2023-10-25 14:00:00], visitors: 0},- %{interval: ~N[2023-10-25 15:00:00], visitors: 1},- %{interval: ~N[2023-10-25 16:00:00], visitors: 0},- %{interval: ~N[2023-10-25 17:00:00], visitors: 0},- %{interval: ~N[2023-10-25 18:00:00], visitors: 0},- %{interval: ~N[2023-10-25 19:00:00], visitors: 0},- %{interval: ~N[2023-10-25 20:00:00], visitors: 0},- %{interval: ~N[2023-10-25 21:00:00], visitors: 0},- %{interval: ~N[2023-10-25 22:00:00], visitors: 0},- %{interval: ~N[2023-10-25 23:00:00], visitors: 0},- %{interval: ~N[2023-10-26 00:00:00], visitors: 0},- %{interval: ~N[2023-10-26 01:00:00], visitors: 0},- %{interval: ~N[2023-10-26 02:00:00], visitors: 0},- %{interval: ~N[2023-10-26 03:00:00], visitors: 0},- %{interval: ~N[2023-10-26 04:00:00], visitors: 0},- %{interval: ~N[2023-10-26 05:00:00], visitors: 0},- %{interval: ~N[2023-10-26 06:00:00], visitors: 0},- %{interval: ~N[2023-10-26 07:00:00], visitors: 0},- %{interval: ~N[2023-10-26 08:00:00], visitors: 0},- %{interval: ~N[2023-10-26 09:00:00], visitors: 0},- %{interval: ~N[2023-10-26 10:00:00], visitors: 1}+ %{interval: "2023-10-25 10:00:00", visitors: 0},+ %{interval: "2023-10-25 11:00:00", visitors: 1},+ %{interval: "2023-10-25 12:00:00", visitors: 0},+ %{interval: "2023-10-25 13:00:00", visitors: 2},+ %{interval: "2023-10-25 14:00:00", visitors: 0},+ %{interval: "2023-10-25 15:00:00", visitors: 1},+ %{interval: "2023-10-25 16:00:00", visitors: 0},+ %{interval: "2023-10-25 17:00:00", visitors: 0},+ %{interval: "2023-10-25 18:00:00", visitors: 0},+ %{interval: "2023-10-25 19:00:00", visitors: 0},+ %{interval: "2023-10-25 20:00:00", visitors: 0},+ %{interval: "2023-10-25 21:00:00", visitors: 0},+ %{interval: "2023-10-25 22:00:00", visitors: 0},+ %{interval: "2023-10-25 23:00:00", visitors: 0},+ %{interval: "2023-10-26 00:00:00", visitors: 0},+ %{interval: "2023-10-26 01:00:00", visitors: 0},+ %{interval: "2023-10-26 02:00:00", visitors: 0},+ %{interval: "2023-10-26 03:00:00", visitors: 0},+ %{interval: "2023-10-26 04:00:00", visitors: 0},+ %{interval: "2023-10-26 05:00:00", visitors: 0},+ %{interval: "2023-10-26 06:00:00", visitors: 0},+ %{interval: "2023-10-26 07:00:00", visitors: 0},+ %{interval: "2023-10-26 08:00:00", visitors: 0},+ %{interval: "2023-10-26 09:00:00", visitors: 0},+ %{interval: "2023-10-26 10:00:00", visitors: 1}]} = resultendtest "excludes engagement events from visitor counts" do- fixed_now = ~N[2025-10-20 12:49:15]- Plausible.Stats.Query.Test.fix_now(DateTime.from_naive!(fixed_now, "Etc/UTC"))+ now = ~N[2025-10-20 12:49:15]owner = new_user()site = new_site(owner: owner)@@ -89,14 +87,13 @@ defmodule Plausible.Stats.ConsolidatedViewTest do])view = new_consolidated_view(team_of(owner))- result = Plausible.Stats.ConsolidatedView.overview_24h(view, fixed_now)+ result = Plausible.Stats.Sparkline.overview_24h(view, now)assert %{visitors: 2} = resultendtest "filters out-of-range timeslots correctly" do- fixed_now = ~N[2025-10-20 12:49:15]- Plausible.Stats.Query.Test.fix_now(DateTime.from_naive!(fixed_now, "Etc/UTC"))+ now = ~N[2025-10-20 12:49:15]owner = new_user()site = new_site(owner: owner)@@ -110,23 +107,22 @@ defmodule Plausible.Stats.ConsolidatedViewTest do])view = new_consolidated_view(team_of(owner))- result = Plausible.Stats.ConsolidatedView.overview_24h(view, fixed_now)+ result = Plausible.Stats.Sparkline.overview_24h(view, now)expected_non_zero_intervals = [- {~N[2025-10-19 12:00:00], 1},- {~N[2025-10-20 12:00:00], 1}+ {"2025-10-19 12:00:00", 1},+ {"2025-10-20 12:00:00", 1}]consolidated_result = filter_only_non_zero_intervals(result.intervals)assert consolidated_result == expected_non_zero_intervals- assert List.first(result.intervals).interval == ~N[2025-10-19 12:00:00]- assert List.last(result.intervals).interval == ~N[2025-10-20 12:00:00]+ assert List.first(result.intervals).interval == "2025-10-19 12:00:00"+ assert List.last(result.intervals).interval == "2025-10-20 12:00:00"endtest "orders timeslots chronologically" do- fixed_now = ~N[2025-10-20 12:49:15]- Plausible.Stats.Query.Test.fix_now(DateTime.from_naive!(fixed_now, "Etc/UTC"))+ now = ~N[2025-10-20 12:49:15]owner = new_user()site = new_site(owner: owner)@@ -139,9 +135,9 @@ defmodule Plausible.Stats.ConsolidatedViewTest do])view = new_consolidated_view(team_of(owner))- result = Plausible.Stats.ConsolidatedView.overview_24h(view, fixed_now)+ result = Plausible.Stats.Sparkline.overview_24h(view, now)- timeslots = Enum.map(result.intervals, & &1.interval)+ timeslots = Enum.map(result.intervals, &NaiveDateTime.from_iso8601!(&1.interval))sorted_timeslots = Enum.sort(timeslots, NaiveDateTime)assert timeslots == sorted_timeslotsdiff --git a/test/plausible/stats/dashboard/query_parser_test.exs b/test/plausible/stats/dashboard/query_parser_test.exsindex fe0d7167b4..ec1ab1731f 100644--- a/test/plausible/stats/dashboard/query_parser_test.exs+++ b/test/plausible/stats/dashboard/query_parser_test.exs@@ -322,5 +322,14 @@ defmodule Plausible.Stats.Dashboard.QueryParserTest dotest "errors when segment filter cannot be parsed to integer" doassert {:error, :invalid_filters} = parse("?f=is,segment,MySegment", build(:site), %{})end++ test "now can't be fixed externally" do+ {:ok, parsed} =+ parse("?now=2026-02-17T10:08:52.272894Z", build(:site), %{+ "now" => "2026-02-17T10:08:52.272894Z"+ })++ assert parsed.now == nil+ endendenddiff --git a/test/plausible/stats/query/query_builder_test.exs b/test/plausible/stats/query/query_builder_test.exsindex bdada0bf19..1083819259 100644--- a/test/plausible/stats/query/query_builder_test.exs+++ b/test/plausible/stats/query/query_builder_test.exs@@ -54,11 +54,6 @@ defmodule Plausible.Stats.QueryBuilderTest dosetup [:create_user, :create_site]- setup do- Plausible.Stats.Query.Test.fix_now(@now)- :ok- end-describe "filter validation" dofor operation <- [:is,@@ -190,6 +185,7 @@ defmodule Plausible.Stats.QueryBuilderTest dotest "builds utc_time_range for #{input_date_range} input_date_range", %{site: site} doassert {:ok, query} =QueryBuilder.build(site, %ParsedQueryParams{+ now: @now,metrics: [:visitors],input_date_range: unquote(input_date_range)})@@ -202,7 +198,7 @@ defmodule Plausible.Stats.QueryBuilderTest dorelative_date = @now |> DateTime.to_date()# Replace the fixed now. Otherwise this test could pass ignoring relative_date- Plausible.Stats.Query.Test.fix_now(DateTime.utc_now(:second))+ now = DateTime.utc_now(:second)for {date_range_shortcut, expected_utc_time_range} <- [{:day, @date_range_day},@@ -217,6 +213,7 @@ defmodule Plausible.Stats.QueryBuilderTest do] doassert {:ok, query} =QueryBuilder.build(site, %ParsedQueryParams{+ now: now,metrics: [:visitors],relative_date: relative_date,input_date_range: date_range_shortcutdiff --git a/test/plausible/stats/query/query_comparisons_test.exs b/test/plausible/stats/query/query_comparisons_test.exsindex 4493694591..67d8f9ed2f 100644--- a/test/plausible/stats/query/query_comparisons_test.exs+++ b/test/plausible/stats/query/query_comparisons_test.exs@@ -122,8 +122,6 @@ defmodule Plausible.Stats.QueryComparisonsTest dosite: site} donow = ~U[2021-06-10 12:00:00Z]- Plausible.Stats.Query.Test.fix_now(now)-today = DateTime.to_date(now){:ok, query1} =@@ -131,7 +129,8 @@ defmodule Plausible.Stats.QueryComparisonsTest dometrics: [:visitors],dimensions: ["time"],input_date_range: {:last_n_days, 28},- include: %QueryInclude{time_labels: true, compare: :previous_period}+ include: %QueryInclude{time_labels: true, compare: :previous_period},+ now: now})query2 = Stats.Query.set_include(query1, :compare_match_day_of_week, true)@@ -181,14 +180,13 @@ defmodule Plausible.Stats.QueryComparisonsTest dobuild(:pageview, timestamp: ~N[2022-07-01 00:00:00])])- Plausible.Stats.Query.Test.fix_now(~U[2022-07-01 14:00:00Z])-assert {:ok, query} =QueryBuilder.build(site, %ParsedQueryParams{metrics: [:visitors],dimensions: ["time:day"],input_date_range: {:last_n_days, 91},- include: %QueryInclude{time_labels: true, compare: :year_over_year}+ include: %QueryInclude{time_labels: true, compare: :year_over_year},+ now: ~U[2022-07-01 14:00:00Z]})assert %Stats.QueryResult{results: results, meta: meta} = Stats.query(site, query)diff --git a/test/plausible/stats/query/query_from_test.exs b/test/plausible/stats/query/query_from_test.exsindex fb4ca3cef2..a5546f0b08 100644--- a/test/plausible/stats/query/query_from_test.exs+++ b/test/plausible/stats/query/query_from_test.exs@@ -36,7 +36,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses day format", %{site: site} do- q = Query.from(site, %{"period" => "day", "date" => "2019-01-01"}, %{}, @now)+ q = Query.from(site, %{"period" => "day", "date" => "2019-01-01"}, now: @now)assert q.utc_time_range.first == ~U[2019-01-01 05:00:00Z]assert q.utc_time_range.last == ~U[2019-01-02 04:59:59Z]@@ -44,7 +44,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "day format defaults to today", %{site: site} do- q = Query.from(site, %{"period" => "day"}, %{}, @now)+ q = Query.from(site, %{"period" => "day"}, now: @now)assert q.utc_time_range.first == ~U[2024-05-03 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -52,7 +52,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses realtime format", %{site: site} do- q = Query.from(site, %{"period" => "realtime"}, %{}, @now)+ q = Query.from(site, %{"period" => "realtime"}, now: @now)assert q.utc_time_range.first == ~U[2024-05-03 16:25:00Z]assert q.utc_time_range.last == ~U[2024-05-03 16:30:05Z]@@ -60,7 +60,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses month format", %{site: site} do- q = Query.from(site, %{"period" => "month", "date" => "2019-01-01"}, %{}, @now)+ q = Query.from(site, %{"period" => "month", "date" => "2019-01-01"}, now: @now)assert q.utc_time_range.first == ~U[2019-01-01 05:00:00Z]assert q.utc_time_range.last == ~U[2019-02-01 04:59:59Z]@@ -68,7 +68,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses 6 month format", %{site: site} do- q = Query.from(site, %{"period" => "6mo"}, %{}, @now)+ q = Query.from(site, %{"period" => "6mo"}, now: @now)assert q.utc_time_range.first == ~U[2023-11-01 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-01 03:59:59Z]@@ -76,7 +76,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses 12 month format", %{site: site} do- q = Query.from(site, %{"period" => "12mo"}, %{}, @now)+ q = Query.from(site, %{"period" => "12mo"}, now: @now)assert q.utc_time_range.first == ~U[2023-05-01 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-01 03:59:59Z]@@ -84,7 +84,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses year to date format", %{site: site} do- q = Query.from(site, %{"period" => "year"}, %{}, @now)+ q = Query.from(site, %{"period" => "year"}, now: @now)assert q.utc_time_range.first == ~U[2024-01-01 05:00:00Z]assert q.utc_time_range.last == ~U[2025-01-01 04:59:59Z]@@ -92,7 +92,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doendtest "parses all time", %{site: site} do- q = Query.from(site, %{"period" => "all"}, %{}, @now)+ q = Query.from(site, %{"period" => "all"}, now: @now)assert q.utc_time_range.first == ~U[2020-01-01 05:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -102,7 +102,7 @@ defmodule Plausible.Stats.Query.QueryFromTest dotest "parses all time in GMT+12 timezone", %{site: site} dosite = Map.put(site, :timezone, "Etc/GMT+12")- q = Query.from(site, %{"period" => "all"}, %{}, @now)+ q = Query.from(site, %{"period" => "all"}, now: @now)assert q.utc_time_range.first == ~U[2020-01-01 12:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 11:59:59Z]@@ -110,7 +110,7 @@ defmodule Plausible.Stats.Query.QueryFromTest dotest "all time shows today if site has no start date", %{site: site} dosite = Map.put(site, :stats_start_date, nil)- q = Query.from(site, %{"period" => "all"}, %{}, @now)+ q = Query.from(site, %{"period" => "all"}, now: @now)assert q.utc_time_range.first == ~U[2024-05-03 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -120,7 +120,7 @@ defmodule Plausible.Stats.Query.QueryFromTest dotest "all time shows hourly if site is completely new", %{site: site} dosite = Map.put(site, :stats_start_date, @now |> DateTime.to_date())- q = Query.from(site, %{"period" => "all"}, %{}, @now)+ q = Query.from(site, %{"period" => "all"}, now: @now)assert q.utc_time_range.first == ~U[2024-05-03 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -132,7 +132,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doyesterday = @now |> DateTime.to_date() |> Date.shift(day: -1)site = Map.put(site, :stats_start_date, yesterday)- q = Query.from(site, %{"period" => "all"}, %{}, @now)+ q = Query.from(site, %{"period" => "all"}, now: @now)assert q.utc_time_range.first == ~U[2024-05-02 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -144,7 +144,7 @@ defmodule Plausible.Stats.Query.QueryFromTest dolast_month = @now |> DateTime.to_date() |> Date.shift(month: -1)site = Map.put(site, :stats_start_date, last_month)- q = Query.from(site, %{"period" => "all"}, %{}, @now)+ q = Query.from(site, %{"period" => "all"}, now: @now)assert q.utc_time_range.first == ~U[2024-04-03 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -156,7 +156,7 @@ defmodule Plausible.Stats.Query.QueryFromTest dolast_month = @now |> DateTime.to_date() |> Date.shift(month: -1)site = Map.put(site, :stats_start_date, last_month)- q = Query.from(site, %{"period" => "all", "interval" => "week"}, %{}, @now)+ q = Query.from(site, %{"period" => "all", "interval" => "week"}, now: @now)assert q.utc_time_range.first == ~U[2024-04-03 04:00:00Z]assert q.utc_time_range.last == ~U[2024-05-04 03:59:59Z]@@ -176,8 +176,7 @@ defmodule Plausible.Stats.Query.QueryFromTest doQuery.from(site,%{"period" => "custom", "from" => "2019-01-01", "to" => "2019-01-15"},- %{},- @now+ now: @now)assert q.utc_time_range.first == ~U[2019-01-01 05:00:00Z]diff --git a/test/plausible/stats/query/query_parse_and_build_test.exs b/test/plausible/stats/query/query_parse_and_build_test.exsindex 4a0c19ef8a..ef705cc883 100644--- a/test/plausible/stats/query/query_parse_and_build_test.exs+++ b/test/plausible/stats/query/query_parse_and_build_test.exs@@ -55,11 +55,6 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest dosetup [:create_user, :create_site]- setup do- Plausible.Stats.Query.Test.fix_now(@now)- :ok- end-def check_goals(query, opts) doassert %Query{preloaded_goals: preloaded_goals,@@ -87,7 +82,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error =~ "Invalid metric"end@@ -98,7 +95,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -126,7 +123,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [@@ -159,7 +156,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest docode: :failed_schema_validation,message: "#/metrics: Expected items to be unique but they were not."}} =- Query.parse_and_build(site, params)+ Query.parse_and_build(site, params, now: @now)endtest "no metrics passed", %{site: site} do@@ -174,7 +171,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest docode: :failed_schema_validation,message: "#/metrics: Expected a minimum of 1 items but got 0."}} =- Query.parse_and_build(site, params)+ Query.parse_and_build(site, params, now: @now)endend@@ -197,7 +194,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -223,7 +220,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="#/filters/0: Invalid filter [\"#{unquote(operation)}\", \"event:name\", \"foo\"]"@@ -241,7 +239,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="#/filters/0: Invalid filter [\"#{unquote(operation)}\", \"event:name\", [\"foo\"]]"@@ -272,7 +271,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == ~s(#/filters/0: Invalid filter #{inspect(unquote(too_short_filter))})end@@ -298,7 +298,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == ~s(#/filters/0: Invalid filter #{inspect(unquote(too_long_filter))})end@@ -314,7 +315,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/filters/0: Invalid filter [\"exists?\", \"event:name\", [\"foo\"]]"end@@ -328,7 +331,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -358,7 +361,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -389,7 +392,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -416,7 +419,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "#/filters/0: Invalid filter [\"is\", \"event:device\", [\"foo\"]]"end@@ -431,7 +435,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "#/filters/0: Invalid filter [\"is\", \"visit:name\", [\"foo\"]]"end@@ -444,7 +449,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => "foobar"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/filters: Type mismatch. Expected Array but got String."end@@ -456,7 +463,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "visit:os_version", [123]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "Invalid filter '[\"is\", \"visit:os_version\", [123]]'."end@@ -468,7 +477,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "visit:city", [123, 456]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -492,7 +501,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "visit:city", ["123", "456"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -516,7 +525,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "visit:country", ["USA"]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid visit:country filter, visit:country needs to be a valid 2-letter country code."@@ -544,7 +554,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -594,7 +604,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -627,7 +637,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. Behavioral filters (has_done, has_not_done) can only be used with event dimension filters."@@ -643,7 +654,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. Behavioral filters (has_done, has_not_done) cannot be nested."@@ -658,7 +670,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [[unquote(operator), []]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/filters/0: Invalid filter [\"#{unquote(operator)}\", []]"endend@@ -671,7 +685,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:hostname", ["a.plausible.io"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -695,7 +709,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["not", ["is", "event:hostname", ["a.plausible.io"]]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. Dimension `event:hostname` can only be filtered at the top level."@@ -723,7 +738,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -762,7 +777,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="#/filters/0: Invalid filter [\"#{unquote(operation)}\", \"event:hostname\", [\"a.plausible.io\"], %{\"case_sensitive\" => false}]"@@ -787,7 +803,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Signup", "Purchase"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -817,7 +833,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["signup", "purchase"], %{"case_sensitive" => false}]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -849,7 +865,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["contains", "event:goal", ["Sign", "pur"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -879,7 +895,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["contains", "event:goal", ["sign", "CONT"], %{"case_sensitive" => false}]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -914,7 +930,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"include" => %{"imports" => true, "time_labels" => true, "total_rows" => true}}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -945,7 +961,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"include" => "foobar"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/include: Type mismatch. Expected Object but got String."end@@ -957,7 +975,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"include" => %{"time_labels" => true}}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "Invalid include.time_labels: requires a time dimension."endend@@ -972,7 +992,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"pagination" => %{"limit" => 100, "offset" => 200}}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -994,7 +1014,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"pagination" => %{"limit" => 100_000}}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/pagination/limit: Expected the value to be <= 10000"end@@ -1006,7 +1028,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"pagination" => %{"offset" => -5}}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/pagination/offset: Expected the value to be >= 0"endend@@ -1025,7 +1049,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1060,7 +1084,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. The goal `Signup` is not configured for this site. Find out how to configure goals here: https://plausible.io/docs/stats-api#filtering-by-goals"@@ -1076,7 +1101,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. The goal `Visit /thank-you` is not configured for this site. Find out how to configure goals here: https://plausible.io/docs/stats-api#filtering-by-goals"@@ -1092,7 +1118,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "#/filters/0: Invalid filter [\"is_not\", \"event:goal\", [\"Signup\"]]"end@@ -1113,7 +1140,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. Dimension `event:goal` can only be filtered at the top level."@@ -1140,7 +1168,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1181,7 +1209,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => unquote(shortcut)}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error =~ "Invalid date range"endend@@ -1204,7 +1234,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => unquote(shortcut)}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1229,7 +1259,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1252,7 +1282,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1273,7 +1303,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => ["2021-05-05", "2021-05-05"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1300,7 +1330,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest doDateTime.new!(~D[2024-01-02], ~T[23:59:59], "Etc/UTC"))- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1324,7 +1354,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest doexpected_utc_time_range =DateTimeRange.new!(~U[2024-08-29 14:12:34Z], ~U[2024-08-29 17:12:34Z])- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1346,7 +1376,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"metrics" => ["visitors"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "#/date_range: Invalid date range #{inspect(unquote(invalid_value))}"end@@ -1359,7 +1390,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"metrics" => ["visitors"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "Invalid date_range \"999999999mo\""end@@ -1373,7 +1405,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"metrics" => ["visitors"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "Invalid date_range '[\"2021-02-03T00:00:00\", \"2021-02-03T23:59:59\"]'."end@@ -1385,7 +1418,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"metrics" => ["visitors"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="#/date_range: Invalid date range [\"2021-02-03T00:00:00-25:00\", \"2021-02-03T23:59:59-25:00\"]"@@ -1398,7 +1432,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"metrics" => ["visitors"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="#/date_range: Invalid date range [\"2021-02-03T00:00:00Z\", \"2021-02-04\"]"@@ -1418,7 +1453,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest doexpected_utc_time_range =DateTimeRange.new!(~U[2022-09-11 04:00:00Z], ~U[2022-09-12 02:59:59Z])- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1446,7 +1481,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest doexpected_utc_time_range =DateTimeRange.new!(~U[2023-11-05 05:00:00Z], ~U[2023-11-06 04:59:59Z])- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1474,7 +1509,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest doexpected_utc_time_range =DateTimeRange.new!(~U[2024-03-23 03:00:00Z], ~U[2024-03-24 02:59:59Z])- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1501,7 +1536,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => [prefixed_dimension]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1527,7 +1562,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => [prefixed_dimension]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1550,7 +1585,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["time:minute"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/dimensions/0: Invalid dimension \"time:minute\""end@@ -1562,7 +1599,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:props:foobar"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1584,7 +1621,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:props:"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/dimensions/0: Invalid dimension \"event:props:\""end@@ -1596,7 +1635,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["visitors"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/dimensions/0: Invalid dimension \"visitors\""end@@ -1608,7 +1649,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => "foobar"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/dimensions: Type mismatch. Expected Array but got String."end@@ -1620,7 +1663,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:name", "event:name"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/dimensions: Expected items to be unique but they were not."endend@@ -1634,7 +1679,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"order_by" => [["events", "desc"], ["visitors", "asc"]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -1657,7 +1702,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"order_by" => [["event:name", "desc"]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors],@@ -1679,7 +1724,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"order_by" => [["visssss", "desc"]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "#/order_by/0/0: Invalid value in order_by \"visssss\""end@@ -1691,7 +1738,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"order_by" => [["events", "desc"]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid order_by entry '{:events, :desc}'. Entry is not a queried metric or dimension."@@ -1705,7 +1753,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"order_by" => [["event:name", "desc"]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid order_by entry '{\"event:name\", :desc}'. Entry is not a queried metric or dimension."@@ -1723,7 +1772,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["not", ["is", "event:props:foobar", ["foo"]]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="The owner of this site does not have access to the custom properties feature."@@ -1739,7 +1789,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:props:foobar"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="The owner of this site does not have access to the custom properties feature."@@ -1754,7 +1805,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Metric `conversion_rate` can only be queried with event:goal filters or dimensions."@@ -1771,7 +1823,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Signup"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:conversion_rate],@@ -1804,7 +1856,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:goal"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:conversion_rate],@@ -1835,7 +1887,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:goal"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:conversion_rate, :group_conversion_rate],@@ -1860,7 +1912,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:goal"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. When `conversion_rate` or `group_conversion_rate` metrics are used, custom property filters can only be used on top level."@@ -1875,7 +1928,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Metric `scroll_depth` can only be queried with event:page filters or dimensions."@@ -1889,7 +1943,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["not", ["is", "event:page", ["/"]]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Metric `scroll_depth` can only be queried with event:page filters or dimensions."@@ -1903,7 +1958,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:page", ["/"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:scroll_depth],@@ -1925,7 +1980,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:page"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:scroll_depth],@@ -1951,7 +2006,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Signup"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:views_per_visit],@@ -1978,7 +2033,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:page", ["/"]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "Metric `views_per_visit` cannot be queried with a filter on `event:page`."end@@ -1990,7 +2047,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:name"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "Metric `views_per_visit` cannot be queried with `dimensions`."endend@@ -2003,7 +2062,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Metric `time_on_page` can only be queried with event:page filters or dimensions."@@ -2017,7 +2077,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["time", "event:page"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:time_on_page],@@ -2039,7 +2099,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:page", ["/"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:time_on_page],@@ -2063,7 +2123,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Metric `time_on_page` can only be queried with event:page filters or dimensions."@@ -2085,7 +2146,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2120,7 +2181,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="The owner of this site does not have access to the revenue metrics feature."@@ -2145,7 +2207,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["PurchaseUSD", "Signup", "Subscription"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2180,7 +2242,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Purchase", "Signup", "Subscription"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2215,7 +2277,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Signup"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2250,7 +2312,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:goal"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2287,7 +2349,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Purchase", "Signup", "Subscription"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2326,7 +2388,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:goal", ["Signup"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:total_revenue, :average_revenue],@@ -2358,7 +2420,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"date_range" => "all"}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="#/metrics/0: Invalid metric \"total_revenue\"\n#/metrics/1: Invalid metric \"average_revenue\""@@ -2373,7 +2436,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["visit:device"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:bounce_rate],@@ -2395,7 +2458,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:props:foo"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Session metric(s) `bounce_rate` cannot be queried along with event dimension(s) `event:props:foo`"@@ -2409,7 +2473,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["visit:exit_page"]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Event metric(s) `events` cannot be queried along with session dimension(s) `visit:exit_page`"@@ -2423,7 +2488,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"dimensions" => ["event:page"]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:bounce_rate],@@ -2445,7 +2510,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "event:props:foo", ["(none)"]]]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:bounce_rate],@@ -2482,7 +2547,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "Invalid filters. You can only use up to 10 segment filters in a query."end@@ -2508,7 +2574,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "segment", [segment.id]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error == "Invalid filters. Some segments don't exist or aren't accessible."end@@ -2536,7 +2603,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "segment", [segment.id]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="The owner of this site does not have access to the custom properties feature."@@ -2573,7 +2641,8 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "segment", [segment.id]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)assert error =="Invalid filters. Dimension `event:goal` can only be filtered at the top level."@@ -2633,7 +2702,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -2685,7 +2754,7 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do]}- assert {:ok, query} = Query.parse_and_build(site, params)+ assert {:ok, query} = Query.parse_and_build(site, params, now: @now)assert_matches %Query{metrics: [:visitors, :events],@@ -2709,7 +2778,9 @@ defmodule Plausible.Stats.Query.QueryParseAndBuildTest do"filters" => [["is", "segment", ["123"]]]}- assert {:error, %QueryError{message: error}} = Query.parse_and_build(site, params)+ assert {:error, %QueryError{message: error}} =+ Query.parse_and_build(site, params, now: @now)+assert error == "Invalid filter '[\"is\", \"segment\", [\"123\"]]'."endenddiff --git a/test/plausible/stats/query/query_test.exs b/test/plausible/stats/query/query_test.exsindex 7afa30451e..280ad17a18 100644--- a/test/plausible/stats/query/query_test.exs+++ b/test/plausible/stats/query/query_test.exs@@ -64,8 +64,6 @@ defmodule Plausible.Stats.QueryTest doendtest "shows month to date with time labels trimmed", %{site: site} do- Plausible.Stats.Query.Test.fix_now(~U[2021-01-15 12:00:00Z])-populate_stats(site, [build(:pageview, timestamp: ~N[2021-01-01 00:00:00]),build(:pageview, timestamp: ~N[2021-01-15 00:00:00]),@@ -77,7 +75,8 @@ defmodule Plausible.Stats.QueryTest dometrics: [:visitors],input_date_range: :month,dimensions: ["time:day"],- include: %QueryInclude{trim_relative_date_range: true}+ include: %QueryInclude{trim_relative_date_range: true},+ now: ~U[2021-01-15 12:00:00Z]})%Stats.QueryResult{results: results, query: query} = Stats.query(site, query)diff --git a/test/plausible/stats/sparkline_test.exs b/test/plausible/stats/sparkline_test.exsnew file mode 100644index 0000000000..a1902210c1--- /dev/null+++ b/test/plausible/stats/sparkline_test.exs@@ -0,0 +1,363 @@+defmodule Plausible.Stats.SparklineTest do+ use Plausible.DataCase, async: true++ alias Plausible.Stats.Sparkline++ describe "errors" do+ setup %{test_pid: test_pid} do+ Plausible.Test.Support.Sentry.setup(test_pid)+ end++ test "safe overview catches errors" do+ bad_site = %Plausible.Site{domain: "bad-site"}+ assert Sparkline.safe_overview_24h(bad_site) == {:error, :inaccessible}++ assert [report] = Sentry.Test.pop_sentry_reports()++ assert report.extra.error =~+ "(FunctionClauseError) no function clause matching in NaiveDateTime.compare"++ assert report.extra.site == "bad-site"+ assert report.extra.comment == "Probing error volume"+ end+ end++ describe "parallel_overview" do+ test "returns no data on no sites" do+ assert Sparkline.parallel_overview([]) == %{}+ end++ test "returns empty intervals placeholder on no clickhouse stats" do+ now = ~N[2023-10-26 10:00:15]++ site = new_site()+ domain = site.domain++ assert %{+ ^domain => %{+ visitors: 0,+ pageviews: 0,+ pageviews_change: 0,+ views_per_visit: +0.0,+ views_per_visit_change: 0,+ visitors_change: 0,+ visits: 0,+ visits_change: 0,+ intervals: intervals+ }+ } =+ Sparkline.parallel_overview(+ [site],+ now+ )++ assert intervals == [+ %{interval: "2023-10-25 10:00:00", visitors: 0},+ %{interval: "2023-10-25 11:00:00", visitors: 0},+ %{interval: "2023-10-25 12:00:00", visitors: 0},+ %{interval: "2023-10-25 13:00:00", visitors: 0},+ %{interval: "2023-10-25 14:00:00", visitors: 0},+ %{interval: "2023-10-25 15:00:00", visitors: 0},+ %{interval: "2023-10-25 16:00:00", visitors: 0},+ %{interval: "2023-10-25 17:00:00", visitors: 0},+ %{interval: "2023-10-25 18:00:00", visitors: 0},+ %{interval: "2023-10-25 19:00:00", visitors: 0},+ %{interval: "2023-10-25 20:00:00", visitors: 0},+ %{interval: "2023-10-25 21:00:00", visitors: 0},+ %{interval: "2023-10-25 22:00:00", visitors: 0},+ %{interval: "2023-10-25 23:00:00", visitors: 0},+ %{interval: "2023-10-26 00:00:00", visitors: 0},+ %{interval: "2023-10-26 01:00:00", visitors: 0},+ %{interval: "2023-10-26 02:00:00", visitors: 0},+ %{interval: "2023-10-26 03:00:00", visitors: 0},+ %{interval: "2023-10-26 04:00:00", visitors: 0},+ %{interval: "2023-10-26 05:00:00", visitors: 0},+ %{interval: "2023-10-26 06:00:00", visitors: 0},+ %{interval: "2023-10-26 07:00:00", visitors: 0},+ %{interval: "2023-10-26 08:00:00", visitors: 0},+ %{interval: "2023-10-26 09:00:00", visitors: 0},+ %{interval: "2023-10-26 10:00:00", visitors: 0}+ ]++ assert intervals == Sparkline.empty_24h_intervals(now)+ end++ test "returns clickhouse data merged with placeholder" do+ now = ~U[2023-10-26 10:00:15Z]++ site = new_site()++ user_id = 111++ populate_stats(site, [+ build(:pageview, timestamp: ~N[2023-10-25 11:01:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:00:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:01:00]),+ build(:pageview, timestamp: ~N[2023-10-26 10:00:14])+ ])++ assert %{+ visitors: 5,+ visitors_change: 100,+ intervals: [+ %{interval: "2023-10-25 10:00:00", visitors: 0},+ %{interval: "2023-10-25 11:00:00", visitors: 1},+ %{interval: "2023-10-25 12:00:00", visitors: 0},+ %{interval: "2023-10-25 13:00:00", visitors: 2},+ %{interval: "2023-10-25 14:00:00", visitors: 0},+ %{interval: "2023-10-25 15:00:00", visitors: 1},+ %{interval: "2023-10-25 16:00:00", visitors: 0},+ %{interval: "2023-10-25 17:00:00", visitors: 0},+ %{interval: "2023-10-25 18:00:00", visitors: 0},+ %{interval: "2023-10-25 19:00:00", visitors: 0},+ %{interval: "2023-10-25 20:00:00", visitors: 0},+ %{interval: "2023-10-25 21:00:00", visitors: 0},+ %{interval: "2023-10-25 22:00:00", visitors: 0},+ %{interval: "2023-10-25 23:00:00", visitors: 0},+ %{interval: "2023-10-26 00:00:00", visitors: 0},+ %{interval: "2023-10-26 01:00:00", visitors: 0},+ %{interval: "2023-10-26 02:00:00", visitors: 0},+ %{interval: "2023-10-26 03:00:00", visitors: 0},+ %{interval: "2023-10-26 04:00:00", visitors: 0},+ %{interval: "2023-10-26 05:00:00", visitors: 0},+ %{interval: "2023-10-26 06:00:00", visitors: 0},+ %{interval: "2023-10-26 07:00:00", visitors: 0},+ %{interval: "2023-10-26 08:00:00", visitors: 0},+ %{interval: "2023-10-26 09:00:00", visitors: 0},+ %{interval: "2023-10-26 10:00:00", visitors: 1}+ ]+ } = Sparkline.parallel_overview([site], now)[site.domain]+ end++ test "ignores visits before native stats start time (after reset)" do+ now = ~N[2023-10-26 10:00:15]+ site1 = insert(:site, native_stats_start_at: ~N[2023-10-25 14:15:00])+ site2 = insert(:site, native_stats_start_at: ~N[2023-10-23 12:00:00])++ user_id1 = 111+ user_id2 = 222++ populate_stats(site1, [+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),+ build(:pageview, user_id: user_id1, timestamp: ~N[2023-10-25 15:00:00]),+ build(:pageview, user_id: user_id1, timestamp: ~N[2023-10-25 15:01:00])+ ])++ populate_stats(site2, [+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),+ build(:pageview, user_id: user_id2, timestamp: ~N[2023-10-25 15:00:00]),+ build(:pageview, user_id: user_id2, timestamp: ~N[2023-10-25 15:01:00])+ ])++ assert %{+ visitors_change: 100,+ visitors: 1,+ intervals: [+ %{interval: "2023-10-25 10:00:00", visitors: 0},+ %{interval: "2023-10-25 11:00:00", visitors: 0},+ %{interval: "2023-10-25 12:00:00", visitors: 0},+ %{interval: "2023-10-25 13:00:00", visitors: 0},+ %{interval: "2023-10-25 14:00:00", visitors: 0},+ %{interval: "2023-10-25 15:00:00", visitors: 1},+ %{interval: "2023-10-25 16:00:00", visitors: 0},+ %{interval: "2023-10-25 17:00:00", visitors: 0},+ %{interval: "2023-10-25 18:00:00", visitors: 0},+ %{interval: "2023-10-25 19:00:00", visitors: 0},+ %{interval: "2023-10-25 20:00:00", visitors: 0},+ %{interval: "2023-10-25 21:00:00", visitors: 0},+ %{interval: "2023-10-25 22:00:00", visitors: 0},+ %{interval: "2023-10-25 23:00:00", visitors: 0},+ %{interval: "2023-10-26 00:00:00", visitors: 0},+ %{interval: "2023-10-26 01:00:00", visitors: 0},+ %{interval: "2023-10-26 02:00:00", visitors: 0},+ %{interval: "2023-10-26 03:00:00", visitors: 0},+ %{interval: "2023-10-26 04:00:00", visitors: 0},+ %{interval: "2023-10-26 05:00:00", visitors: 0},+ %{interval: "2023-10-26 06:00:00", visitors: 0},+ %{interval: "2023-10-26 07:00:00", visitors: 0},+ %{interval: "2023-10-26 08:00:00", visitors: 0},+ %{interval: "2023-10-26 09:00:00", visitors: 0},+ %{interval: "2023-10-26 10:00:00", visitors: 0}+ ]+ } = Sparkline.parallel_overview([site1], now)[site1.domain]++ assert %{+ visitors_change: 100,+ visitors: 3,+ intervals: [+ %{interval: "2023-10-25 10:00:00", visitors: 0},+ %{interval: "2023-10-25 11:00:00", visitors: 0},+ %{interval: "2023-10-25 12:00:00", visitors: 0},+ %{interval: "2023-10-25 13:00:00", visitors: 2},+ %{interval: "2023-10-25 14:00:00", visitors: 0},+ %{interval: "2023-10-25 15:00:00", visitors: 1},+ %{interval: "2023-10-25 16:00:00", visitors: 0},+ %{interval: "2023-10-25 17:00:00", visitors: 0},+ %{interval: "2023-10-25 18:00:00", visitors: 0},+ %{interval: "2023-10-25 19:00:00", visitors: 0},+ %{interval: "2023-10-25 20:00:00", visitors: 0},+ %{interval: "2023-10-25 21:00:00", visitors: 0},+ %{interval: "2023-10-25 22:00:00", visitors: 0},+ %{interval: "2023-10-25 23:00:00", visitors: 0},+ %{interval: "2023-10-26 00:00:00", visitors: 0},+ %{interval: "2023-10-26 01:00:00", visitors: 0},+ %{interval: "2023-10-26 02:00:00", visitors: 0},+ %{interval: "2023-10-26 03:00:00", visitors: 0},+ %{interval: "2023-10-26 04:00:00", visitors: 0},+ %{interval: "2023-10-26 05:00:00", visitors: 0},+ %{interval: "2023-10-26 06:00:00", visitors: 0},+ %{interval: "2023-10-26 07:00:00", visitors: 0},+ %{interval: "2023-10-26 08:00:00", visitors: 0},+ %{interval: "2023-10-26 09:00:00", visitors: 0},+ %{interval: "2023-10-26 10:00:00", visitors: 0}+ ]+ } = Sparkline.parallel_overview([site2], now)[site2.domain]+ end++ test "returns clickhouse data merged with placeholder for multiple sites" do+ now = ~N[2023-10-26 10:00:15]+ site1 = new_site()+ site2 = new_site()+ site3 = new_site()++ user_id = 111++ populate_stats(site1, [+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 13:00:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 13:01:00]),+ build(:pageview, timestamp: ~N[2023-10-25 15:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 15:58:00])+ ])++ populate_stats(site2, [+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:00:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:01:00])+ ])++ assert result =+ Sparkline.parallel_overview([site1, site2, site3], now)++ assert result[site1.domain].visitors == 3+ assert result[site1.domain].visitors_change == 100+ assert result[site2.domain].visitors == 3+ assert result[site2.domain].visitors_change == 100+ assert result[site3.domain].visitors == 0+ assert result[site3.domain].visitors_change == 0++ find_interval = fn result, domain, interval ->+ Enum.find(result[domain].intervals, &(&1.interval == interval))+ end++ assert find_interval.(result, site1.domain, "2023-10-25 13:00:00").visitors == 1+ assert find_interval.(result, site1.domain, "2023-10-25 15:00:00").visitors == 2+ assert find_interval.(result, site2.domain, "2023-10-25 13:00:00").visitors == 2+ assert find_interval.(result, site2.domain, "2023-10-25 15:00:00").visitors == 1+ end++ test "returns calculated change" do+ now = ~N[2023-10-26 10:00:15]+ site = new_site()++ populate_stats(site, [+ build(:pageview, timestamp: ~N[2023-10-24 11:58:00]),+ build(:pageview, timestamp: ~N[2023-10-24 12:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00])+ ])++ assert %{+ visitors_change: 50,+ visitors: 3+ } = Sparkline.parallel_overview([site], now)[site.domain]+ end++ test "calculates uniques correctly across hour boundaries" do+ now = ~N[2023-10-26 10:00:15]+ site = new_site()++ user_id = 111++ populate_stats(site, [+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:59:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 16:00:00])+ ])++ result = Sparkline.parallel_overview([site], now)[site.domain]+ assert result[:visitors] == 1+ end++ test "another one" do+ now = ~N[2023-10-26 10:00:15]+ site = new_site()++ user_id = 111++ populate_stats(site, [+ build(:pageview, timestamp: ~N[2023-10-25 13:59:00]),+ build(:pageview, timestamp: ~N[2023-10-25 13:58:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 15:00:00]),+ build(:pageview, user_id: user_id, timestamp: ~N[2023-10-25 16:00:00])+ ])++ assert %{+ visitors_change: 100,+ visitors: 3,+ intervals: [+ %{interval: "2023-10-25 10:00:00", visitors: 0},+ %{interval: "2023-10-25 11:00:00", visitors: 0},+ %{interval: "2023-10-25 12:00:00", visitors: 0},+ %{interval: "2023-10-25 13:00:00", visitors: 2},+ %{interval: "2023-10-25 14:00:00", visitors: 0},+ %{interval: "2023-10-25 15:00:00", visitors: 1},+ %{interval: "2023-10-25 16:00:00", visitors: 1},+ %{interval: "2023-10-25 17:00:00", visitors: 0},+ %{interval: "2023-10-25 18:00:00", visitors: 0},+ %{interval: "2023-10-25 19:00:00", visitors: 0},+ %{interval: "2023-10-25 20:00:00", visitors: 0},+ %{interval: "2023-10-25 21:00:00", visitors: 0},+ %{interval: "2023-10-25 22:00:00", visitors: 0},+ %{interval: "2023-10-25 23:00:00", visitors: 0},+ %{interval: "2023-10-26 00:00:00", visitors: 0},+ %{interval: "2023-10-26 01:00:00", visitors: 0},+ %{interval: "2023-10-26 02:00:00", visitors: 0},+ %{interval: "2023-10-26 03:00:00", visitors: 0},+ %{interval: "2023-10-26 04:00:00", visitors: 0},+ %{interval: "2023-10-26 05:00:00", visitors: 0},+ %{interval: "2023-10-26 06:00:00", visitors: 0},+ %{interval: "2023-10-26 07:00:00", visitors: 0},+ %{interval: "2023-10-26 08:00:00", visitors: 0},+ %{interval: "2023-10-26 09:00:00", visitors: 0},+ %{interval: "2023-10-26 10:00:00", visitors: 0}+ ]+ } = Sparkline.parallel_overview([site], now)[site.domain]+ end++ test "excludes engagement events from visitor counts" do+ site = new_site()+ now = ~N[2025-10-20 12:49:15]++ populate_stats(site, [+ build(:pageview, user_id: 111, timestamp: ~N[2025-10-20 12:00:00]),+ build(:pageview, user_id: 222, timestamp: ~N[2025-10-20 10:50:00]),+ build(:engagement,+ user_id: 222,+ pathname: "/blog",+ timestamp: ~N[2025-10-20 10:50:01],+ scroll_depth: 20,+ engagement_time: 50_000+ )+ ])++ result = Sparkline.parallel_overview([site], now)[site.domain]++ assert %{visitors: 2} = result+ end+ end+enddiff --git a/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exsindex 0d1cb55df5..671afcdce8 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_timezone_test.exs@@ -16,11 +16,11 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryTimezoneTest dobuild(:pageview, timestamp: ~N[2024-01-02 14:00:00])])- # 9pm on Jan 1st, 2024 in EST (UTC-5)- Plausible.Stats.Query.Test.fix_now(~U[2024-01-02 02:00:00Z])-conn =- post(conn, "/api/v2/query", %{+ conn+ # 9pm on Jan 1st, 2024 in EST (UTC-5)+ |> Plug.Conn.put_private(:now, ~U[2024-01-02 02:00:00Z])+ |> post("/api/v2/query", %{"site_id" => site.domain,"metrics" => ["pageviews"],"date_range" => "day"@@ -44,11 +44,11 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryTimezoneTest dobuild(:pageview, timestamp: ~N[2024-01-02 12:00:00])])- # 01:00 on Jan 2nd, 2024 in JST (UTC+9)- Plausible.Stats.Query.Test.fix_now(~U[2024-01-01 16:00:00Z])-conn =- post(conn, "/api/v2/query", %{+ conn+ # 01:00 on Jan 2nd, 2024 in JST (UTC+9)+ |> Plug.Conn.put_private(:now, ~U[2024-01-01 16:00:00Z])+ |> post("/api/v2/query", %{"site_id" => site.domain,"metrics" => ["pageviews"],"date_range" => "day"diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exsindex 6270eb3148..21e1c52bc8 100644--- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs@@ -1348,11 +1348,10 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dobuild(:pageview, timestamp: ~N[2021-01-08 23:59:00])])- Plausible.Stats.Query.Test.fix_now(~U[2021-01-08 08:05:00Z])-conn =- get(- conn,+ conn+ |> Plug.Conn.put_private(:now, ~U[2021-01-08 08:05:00Z])+ |> get("/api/stats/#{site.domain}/main-graph?period=day&metric=visitors&date=2021-01-08&interval=hour")@@ -1380,11 +1379,10 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dobuild(:pageview, timestamp: ~N[2021-01-31 00:00:00])])- Plausible.Stats.Query.Test.fix_now(~U[2021-01-07 12:00:00Z])-conn =- get(- conn,+ conn+ |> Plug.Conn.put_private(:now, ~U[2021-01-07 12:00:00Z])+ |> get("/api/stats/#{site.domain}/main-graph?period=month&metric=visitors&date=2021-01-07&interval=day")@@ -1412,11 +1410,10 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dobuild(:pageview, timestamp: ~N[2021-02-09 00:00:00])])- Plausible.Stats.Query.Test.fix_now(~U[2021-02-07 12:00:00Z])-conn =- get(- conn,+ conn+ |> Plug.Conn.put_private(:now, ~U[2021-02-07 12:00:00Z])+ |> get("/api/stats/#{site.domain}/main-graph?period=year&metric=visitors&date=2021-02-07&interval=month")@@ -1594,11 +1591,10 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dobuild(:pageview, timestamp: ~N[2021-01-08 23:59:00])])- Plausible.Stats.Query.Test.fix_now(~U[2021-01-08 08:05:00Z])-conn =- get(- conn,+ conn+ |> Plug.Conn.put_private(:now, ~U[2021-01-08 08:05:00Z])+ |> get("/api/stats/#{site.domain}/main-graph?period=day&metric=visitors&date=2021-01-08&interval=hour&comparison=previous_period")diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exsindex e6d83d2155..d82683e316 100644--- a/test/plausible_web/live/sites_test.exs+++ b/test/plausible_web/live/sites_test.exs@@ -228,8 +228,9 @@ defmodule PlausibleWeb.Live.SitesTest dopopulate_stats(site, [build(:pageview), build(:pageview), build(:pageview)])- {:ok, _lv, html} = live(conn, "/sites")+ {:ok, lv, _html} = live(conn, "/sites")+ html = render(lv)site_card = text_of_element(html, "li[data-domain=\"#{site.domain}\"]")assert site_card =~ "3 visitors in last 24h"assert site_card =~ site.domaindiff --git a/test/support/sentry.ex b/test/support/sentry.exnew file mode 100644index 0000000000..8b9f3f537f--- /dev/null+++ b/test/support/sentry.ex@@ -0,0 +1,28 @@+defmodule Plausible.Test.Support.Sentry do+ @moduledoc """+ Helper for setting up Sentry test mode in ExUnit tests.++ Usage inside a `setup` callback:++ setup %{test_pid: test_pid} do+ Plausible.Test.Support.Sentry.setup(test_pid)+ end++ This enables Sentry's test mode, starts collecting reports owned by the+ test process, and restores the original config on exit.+ """++ def setup(test_pid) do+ Sentry.put_config(:test_mode, true)+ Sentry.put_config(:send_result, :sync)+ Sentry.put_config(:dedup_events, false)++ :ok = Sentry.Test.start_collecting(owner: test_pid)++ ExUnit.Callbacks.on_exit(fn ->+ Sentry.put_config(:test_mode, false)+ Sentry.put_config(:send_result, :none)+ Sentry.put_config(:dedup_events, true)+ end)+ end+end