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
Scroll Depth Release: ingestion flag check for incremental load increase (#5106)
RobertJoonas74f9717f5b8c
diff --git a/lib/plausible/ingestion/event.ex b/lib/plausible/ingestion/event.exindex 47faa59d88..9c7c356150 100644--- a/lib/plausible/ingestion/event.ex+++ b/lib/plausible/ingestion/event.ex@@ -36,6 +36,7 @@ defmodule Plausible.Ingestion.Event do| :verification_agent| :lock_timeout| :no_session_for_engagement+ | :engagement_ff_throttle@type t() :: %__MODULE__{domain: String.t() | nil,@@ -57,15 +58,15 @@ defmodule Plausible.Ingestion.Event dofor domain <- domains, do: drop(new(domain, request), :spam_referrer)elseEnum.reduce(domains, [], fn domain, acc ->- case GateKeeper.check(domain) do- {:allow, site} ->- processed =- domain- |> new(site, request)- |> process_unless_dropped(pipeline(), context)-- [processed | acc]-+ with {:allow, site} <- GateKeeper.check(domain),+ :ok <- check_engagements_flag(domain, request) do+ processed =+ domain+ |> new(site, request)+ |> process_unless_dropped(pipeline(), context)++ [processed | acc]+ else{:deny, reason} ->[drop(new(domain, request), reason) | acc]end@@ -76,6 +77,16 @@ defmodule Plausible.Ingestion.Event do{:ok, %{dropped: dropped, buffered: buffered}}end+ defp check_engagements_flag(domain, %{event_name: "engagement"}) do+ if FunWithFlags.enabled?(:engagements, for: %Plausible.Site{domain: domain}) do+ :ok+ else+ {:deny, :engagement_ff_throttle}+ end+ end++ defp check_engagements_flag(_, _), do: :ok+@spec telemetry_event_buffered() :: [atom()]def telemetry_event_buffered() do[:plausible, :ingest, :event, :buffered]diff --git a/test/plausible/ingestion/event_test.exs b/test/plausible/ingestion/event_test.exsindex 2af62536da..0b64ff341f 100644--- a/test/plausible/ingestion/event_test.exs+++ b/test/plausible/ingestion/event_test.exs@@ -336,6 +336,24 @@ defmodule Plausible.Ingestion.EventTest doassert dropped.drop_reason == :no_session_for_engagementend+ test "TEMPORARY: drops engagement if FF not enabled for site" do+ site = new_site()++ FunWithFlags.disable(:engagements, for_actor: "site:#{site.domain}")++ payload = %{+ name: "engagement",+ url: "https://#{site.domain}/123",+ d: "#{site.domain}"+ }++ conn = build_conn(:post, "/api/events", payload)++ assert {:ok, request} = Request.build(conn)+ assert {:ok, %{buffered: [], dropped: [dropped]}} = Event.build_and_buffer(request)+ assert dropped.drop_reason == :engagement_ff_throttle+ end+@tag :ee_onlytest "saves revenue amount" dosite = new_site()diff --git a/test/test_helper.exs b/test/test_helper.exsindex f2114ce256..da85677609 100644--- a/test/test_helper.exs+++ b/test/test_helper.exs@@ -8,6 +8,7 @@ Application.ensure_all_started(:double)FunWithFlags.enable(:channels)FunWithFlags.enable(:scroll_depth)+FunWithFlags.enable(:engagements)FunWithFlags.enable(:teams)FunWithFlags.enable(:saved_segments)