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
Remove :sampling_adjustments feature flag (#5771)
Adam Rutkowski3bc098a906ea
diff --git a/extra/lib/plausible/stats/sampling.ex b/extra/lib/plausible/stats/sampling.exindex 84b9f16915..f78953c585 100644--- a/extra/lib/plausible/stats/sampling.ex+++ b/extra/lib/plausible/stats/sampling.ex@@ -54,27 +54,25 @@ defmodule Plausible.Stats.Sampling doenddefp decide_sample_rate(site, query) do- sampling_adjustments? = FunWithFlags.enabled?(:sampling_adjustments, for: site)-if Plausible.Sites.consolidated?(site) and not Enum.empty?(query.consolidated_site_ids) doquery.consolidated_site_ids|> SamplingCache.consolidated_get()- |> fractional_sample_rate(query, sampling_adjustments?)+ |> fractional_sample_rate(query)elsesite.id|> SamplingCache.get()- |> fractional_sample_rate(query, sampling_adjustments?)+ |> fractional_sample_rate(query)endend- def fractional_sample_rate(nil = _traffic_30_day, _query, _sampling_adjustments?),+ def fractional_sample_rate(nil = _traffic_30_day, _query),do: :no_sampling- def fractional_sample_rate(traffic_30_day, query, sampling_adjustments?) do+ def fractional_sample_rate(traffic_30_day, query) dodate_range = Query.date_range(query)duration = Date.diff(date_range.last, date_range.first)- estimated_traffic = estimate_traffic(traffic_30_day, duration, query, sampling_adjustments?)+ estimated_traffic = estimate_traffic(traffic_30_day, duration, query)fraction =if(estimated_traffic > 0,@@ -87,22 +85,16 @@ defmodule Plausible.Stats.Sampling doduration < 1 -> :no_sampling# If sampling doesn't have a significant effect, don't samplefraction > 0.4 -> :no_sampling- true -> max(fraction, min_sample_rate(sampling_adjustments?))+ true -> max(fraction, min_sample_rate())endend- defp min_sample_rate(false = _sampling_adjustments?), do: 0.01- defp min_sample_rate(true = _sampling_adjustments?), do: 0.013+ defp min_sample_rate(), do: 0.013- defp estimate_traffic(traffic_30_day, duration, query, sampling_adjustments?) do+ defp estimate_traffic(traffic_30_day, duration, query) doduration_adjusted_traffic = traffic_30_day / 30.0 * duration- if sampling_adjustments? do- duration_adjusted_traffic- |> estimate_by_filters(query.filters)- else- duration_adjusted_traffic- end+ estimate_by_filters(duration_adjusted_traffic, query.filters)end@filter_traffic_multiplier 1 / 20.0diff --git a/test/plausible/stats/sampling_test.exs b/test/plausible/stats/sampling_test.exsindex 4d9e8e6f25..92fbcda19b 100644--- a/test/plausible/stats/sampling_test.exs+++ b/test/plausible/stats/sampling_test.exs@@ -4,55 +4,53 @@ defmodule Plausible.Stats.SamplingTest douse Plausibleon_ee do- import Plausible.Stats.Sampling, only: [fractional_sample_rate: 3]+ import Plausible.Stats.Sampling, only: [fractional_sample_rate: 2]alias Plausible.Stats.{Query, DateTimeRange, Sampling}describe "&fractional_sample_rate/2" do@threshold Sampling.default_sample_threshold()test "no traffic estimate" do- assert fractional_sample_rate(nil, query(30), false) == :no_sampling+ assert fractional_sample_rate(nil, query(30)) == :no_samplingendtest "scales sampling rate according to query duration" do- assert fractional_sample_rate(@threshold * 2, query(30), false) == :no_sampling- assert fractional_sample_rate(@threshold * 2, query(60), false) == 0.25- assert fractional_sample_rate(@threshold * 2, query(100), false) == 0.15+ assert fractional_sample_rate(@threshold * 2, query(30)) == :no_sampling+ assert fractional_sample_rate(@threshold * 2, query(60)) == 0.25+ assert fractional_sample_rate(@threshold * 2, query(100)) == 0.15- assert fractional_sample_rate(@threshold * 5, query(1), false) == :no_sampling- assert fractional_sample_rate(@threshold * 5, query(5), false) == :no_sampling- assert fractional_sample_rate(@threshold * 5, query(10), false) == :no_sampling- assert fractional_sample_rate(@threshold * 5, query(15), false) == 0.40- assert fractional_sample_rate(@threshold * 5, query(30), false) == 0.20- assert fractional_sample_rate(@threshold * 5, query(60), false) == 0.10- assert fractional_sample_rate(@threshold * 5, query(100), false) == 0.06+ assert fractional_sample_rate(@threshold * 5, query(1)) == :no_sampling+ assert fractional_sample_rate(@threshold * 5, query(5)) == :no_sampling+ assert fractional_sample_rate(@threshold * 5, query(10)) == :no_sampling+ assert fractional_sample_rate(@threshold * 5, query(15)) == 0.40+ assert fractional_sample_rate(@threshold * 5, query(30)) == 0.20+ assert fractional_sample_rate(@threshold * 5, query(60)) == 0.10+ assert fractional_sample_rate(@threshold * 5, query(100)) == 0.06- assert fractional_sample_rate(@threshold * 15, query(2), false) == :no_sampling- assert fractional_sample_rate(@threshold * 15, query(5), false) == 0.40- assert fractional_sample_rate(@threshold * 15, query(10), false) == 0.20+ assert fractional_sample_rate(@threshold * 15, query(2)) == :no_sampling+ assert fractional_sample_rate(@threshold * 15, query(5)) == 0.40+ assert fractional_sample_rate(@threshold * 15, query(10)) == 0.20endtest "short durations" do- assert fractional_sample_rate(@threshold * 15, query(1, unit: :hour), false) ==+ assert fractional_sample_rate(@threshold * 15, query(1, unit: :hour)) ==:no_samplingendtest "very low sampling rate" do- assert fractional_sample_rate(@threshold * 500, query(30), false) == 0.01- assert fractional_sample_rate(@threshold * 500, query(30), true) == 0.013+ assert fractional_sample_rate(@threshold * 500, query(30)) == 0.013end@filter ["is", "event:name", ["pageview"]]test "scales sampling rate according to query filters (when sampling adjustments are enabled)" do- assert fractional_sample_rate(@threshold * 50, query(30, filters: []), true) == 0.02+ assert fractional_sample_rate(@threshold * 50, query(30, filters: [])) == 0.02- assert fractional_sample_rate(@threshold * 50, query(30, filters: [@filter]), true) ==+ assert fractional_sample_rate(@threshold * 50, query(30, filters: [@filter])) ==0.40assert fractional_sample_rate(@threshold * 50,- query(30, filters: [@filter, @filter]),- true+ query(30, filters: [@filter, @filter])) == :no_samplingendend