Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Hard-code sample rate based on fractional_hardcoded_sample_rate flag (#4762)

Karl-Aksel Puulmannb16bd91600de
diff --git a/extra/lib/plausible/stats/sampling.ex b/extra/lib/plausible/stats/sampling.ex
index bfe3d88d76..19b132e40e 100644
--- a/extra/lib/plausible/stats/sampling.ex
+++ b/extra/lib/plausible/stats/sampling.ex
@@ -17,8 +17,8 @@ defmodule Plausible.Stats.Sampling do
end
end
- @spec add_query_hint(Ecto.Query.t(), pos_integer()) :: Ecto.Query.t()
- def add_query_hint(%Ecto.Query{} = query, threshold) when is_integer(threshold) do
+ @spec add_query_hint(Ecto.Query.t(), pos_integer() | float()) :: Ecto.Query.t()
+ def add_query_hint(%Ecto.Query{} = query, threshold) when is_number(threshold) do
from(x in query, hints: unsafe_fragment(^"SAMPLE #{threshold}"))
end
@@ -27,15 +27,32 @@ defmodule Plausible.Stats.Sampling do
add_query_hint(query, @default_sample_threshold)
end
- @spec put_threshold(Plausible.Stats.Query.t(), map()) :: Plausible.Stats.Query.t()
- def put_threshold(query, params) do
+ @spec put_threshold(Plausible.Stats.Query.t(), Plausible.Site.t(), map()) ::
+ Plausible.Stats.Query.t()
+ def put_threshold(query, site, params) do
sample_threshold =
case params["sample_threshold"] do
- nil -> @default_sample_threshold
- "infinite" -> :infinite
- value -> String.to_integer(value)
+ nil ->
+ site_default_threshold(site)
+
+ "infinite" ->
+ :infinite
+
+ value_string ->
+ {value, _} = Float.parse(value_string)
+ value
end
Map.put(query, :sample_threshold, sample_threshold)
end
+
+ defp site_default_threshold(site) do
+ if FunWithFlags.enabled?(:fractional_hardcoded_sample_rate, for: site) do
+ # Hard-coded sample rate to temporarily fix an issue for a client.
+ # To be solved as part of https://3.basecamp.com/5308029/buckets/39750953/messages/7978775089
+ 0.1
+ else
+ @default_sample_threshold
+ end
+ end
end
diff --git a/lib/plausible/stats/legacy/legacy_query_builder.ex b/lib/plausible/stats/legacy/legacy_query_builder.ex
index 2383d89fb5..821424db9f 100644
--- a/lib/plausible/stats/legacy/legacy_query_builder.ex
+++ b/lib/plausible/stats/legacy/legacy_query_builder.ex
@@ -26,7 +26,7 @@ defmodule Plausible.Stats.Legacy.QueryBuilder do
|> Query.put_imported_opts(site, params)
on_ee do
- query = Plausible.Stats.Sampling.put_threshold(query, params)
+ query = Plausible.Stats.Sampling.put_threshold(query, site, params)
end
query
diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex
index 23b0fbfef2..e8aa529a1f 100644
--- a/lib/plausible/stats/query.ex
+++ b/lib/plausible/stats/query.ex
@@ -37,6 +37,10 @@ defmodule Plausible.Stats.Query do
|> put_experimental_reduced_joins(site, params)
|> struct!(v2: true, now: DateTime.utc_now(:second), debug_metadata: debug_metadata)
+ on_ee do
+ query = Plausible.Stats.Sampling.put_threshold(query, site, params)
+ end
+
{:ok, query}
end
end