feat: enable conversion optimization for all sites, remove feature flag (#6151)

Author: ukutaht

lib/plausible/stats/legacy/legacy_query_builder.ex

@@ -78,8 +78,7 @@ defmodule Plausible.Stats.Legacy.QueryBuilder do
     struct!(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
     )
   end
 

lib/plausible/stats/query.ex

@@ -32,8 +32,7 @@ defmodule Plausible.Stats.Query do
             time_on_page_data: %{},
             sql_join_type: :left,
             smear_session_metrics: false,
-            optimize_name_filter?: true,
-            optimized_conversions: false
+            optimize_name_filter?: true
 
   require OpenTelemetry.Tracer, as: Tracer
 

lib/plausible/stats/query_builder.ex

@@ -183,8 +183,7 @@ defmodule Plausible.Stats.QueryBuilder do
       revenue_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)
     )
   end
 

lib/plausible/stats/sql/query_builder.ex

@@ -212,7 +212,7 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
   defp dimension_group_by(q, :events, query, "event:goal" = dimension) do
     goal_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) do
       from(e in q,
         join: goal in Expression.event_goal_join_no_props(goal_join_data),
         hints: "ARRAY",

test/plausible_web/controllers/api/external_stats_controller/query_goal_dimension_test.exs

@@ -651,70 +651,4 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryGoalDimensionTest do
              ]
     end
   end
-
-  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
-  end
 end