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
feat: enable conversion optimization for all sites, remove feature flag (#6151)
Uku Taht4c8446b2dc3e
diff --git a/lib/plausible/stats/legacy/legacy_query_builder.ex b/lib/plausible/stats/legacy/legacy_query_builder.exindex d90eb893d6..03bc4b917a 100644--- a/lib/plausible/stats/legacy/legacy_query_builder.ex+++ b/lib/plausible/stats/legacy/legacy_query_builder.ex@@ -78,8 +78,7 @@ defmodule Plausible.Stats.Legacy.QueryBuilder dostruct!(query,preloaded_goals: preloaded_goals,revenue_warning: revenue_warning,- revenue_currencies: revenue_currencies,- optimized_conversions: FunWithFlags.enabled?(:optimized_conversions, for: site)+ revenue_currencies: revenue_currencies)enddiff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex d3be127fb5..9c50c0cfb7 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -32,8 +32,7 @@ defmodule Plausible.Stats.Query dotime_on_page_data: %{},sql_join_type: :left,smear_session_metrics: false,- optimize_name_filter?: true,- optimized_conversions: false+ optimize_name_filter?: truerequire OpenTelemetry.Tracer, as: Tracerdiff --git a/lib/plausible/stats/query_builder.ex b/lib/plausible/stats/query_builder.exindex 9e0679d73b..c7e882509a 100644--- a/lib/plausible/stats/query_builder.ex+++ b/lib/plausible/stats/query_builder.ex@@ -183,8 +183,7 @@ defmodule Plausible.Stats.QueryBuilder dorevenue_warning: revenue_warning,revenue_currencies: revenue_currencies,debug_metadata: debug_metadata,- optimize_name_filter?: FunWithFlags.enabled?(:optimize_name_filter, for: site),- optimized_conversions: FunWithFlags.enabled?(:optimized_conversions, for: site)+ optimize_name_filter?: FunWithFlags.enabled?(:optimize_name_filter, for: site))enddiff --git a/lib/plausible/stats/sql/query_builder.ex b/lib/plausible/stats/sql/query_builder.exindex 4fe888e337..8520c2e8c5 100644--- a/lib/plausible/stats/sql/query_builder.ex+++ b/lib/plausible/stats/sql/query_builder.ex@@ -212,7 +212,7 @@ defmodule Plausible.Stats.SQL.QueryBuilder dodefp dimension_group_by(q, :events, query, "event:goal" = dimension) dogoal_join_data = Plausible.Stats.Goals.goal_join_data(query)- if query.optimized_conversions and Enum.all?(goal_join_data.custom_props_keys, &Enum.empty?/1) do+ if Enum.all?(goal_join_data.custom_props_keys, &Enum.empty?/1) dofrom(e in q,join: goal in Expression.event_goal_join_no_props(goal_join_data),hints: "ARRAY",diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exsindex 2974a41ffc..9deb1ee2ce 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs@@ -651,70 +651,4 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryGoalDimensionTest do]endend-- describe "optimized_conversions flag" do- test "returns same results as baseline for goals without custom props", %{- conn: conn,- site: site- } do- FunWithFlags.enable(:optimized_conversions, for_actor: site)-- insert(:goal, %{site: site, event_name: "Purchase"})- insert(:goal, %{site: site, page_path: "/test"})-- populate_stats(site, [- build(:pageview, timestamp: ~N[2021-01-01 00:00:01], pathname: "/test"),- build(:event, name: "Purchase", timestamp: ~N[2021-01-01 00:00:03]),- build(:event, name: "Purchase", timestamp: ~N[2021-01-01 00:00:03])- ])-- conn =- post(conn, "/api/v2/query", %{- "site_id" => site.domain,- "date_range" => "all",- "metrics" => ["visitors"],- "dimensions" => ["event:goal"]- })-- assert json_response(conn, 200)["results"] == [- %{"dimensions" => ["Purchase"], "metrics" => [2]},- %{"dimensions" => ["Visit /test"], "metrics" => [1]}- ]- end-- test "falls back to full query when goals have custom props", %{conn: conn, site: site} do- FunWithFlags.enable(:optimized_conversions, for_actor: site)-- {:ok, _goal} =- Plausible.Goals.create(site, %{- "event_name" => "Purchase",- "custom_props" => %{"plan" => "premium"}- })-- populate_stats(site, [- build(:event,- name: "Purchase",- "meta.key": ["plan"],- "meta.value": ["premium"]- ),- build(:event,- name: "Purchase",- "meta.key": ["plan"],- "meta.value": ["free"]- )- ])-- conn =- post(conn, "/api/v2/query", %{- "site_id" => site.domain,- "date_range" => "all",- "metrics" => ["visitors"],- "dimensions" => ["event:goal"]- })-- assert json_response(conn, 200)["results"] == [- %{"dimensions" => ["Purchase"], "metrics" => [1]}- ]- end- endend