Remove unnecessary logic

Author: apata

lib/plausible/clickhouse_repo.ex

@@ -61,54 +61,39 @@ defmodule Plausible.ClickhouseRepo do
     opts =
       opts
       |> Keyword.update(:settings, [log_comment: log_comment], fn current_settings ->
-        [{:log_comment, log_comment} | current_settings]
-      end)
-
-    opts =
-      if plausible_query do
-        opts
-        |> Keyword.update!(:settings, fn current_settings ->
-          current_settings |> Enum.concat(get_extra_connection_settings(log_comment_data))
-        end)
-        |> Keyword.update!(:settings, fn current_settings ->
-          should_use_workload? =
-            Map.get(plausible_query.debug_metadata, :phoenix_controller, nil) in [
-              PlausibleWeb.Api.ExternalStatsController |> to_string(),
-              PlausibleWeb.Api.ExternalQueryApiController |> to_string()
-            ]
-
-          if should_use_workload? do
-            [{:workload, "external_api"} | current_settings]
+        extra_settings =
+          on_ee do
+            get_extra_connection_settings(plausible_query)
           else
-            current_settings
+            []
           end
-        end)
-      else
-        opts
-      end
 
-    {query, opts}
-  end
-
-  defp get_extra_connection_settings(%{params: params}) do
-    keys =
-      params
-      |> Map.keys()
-      |> Enum.filter(fn k ->
-        case k do
-          "clickhouse_readonly" -> false
-          "clickhouse_" <> _k -> true
-          _ -> false
-        end
+        [{:log_comment, log_comment}]
+        |> Enum.concat(extra_settings)
+        |> Enum.concat(current_settings)
       end)
 
-    Enum.map(keys, fn k ->
-      {k |> String.trim_leading("clickhouse_") |> String.to_atom(), params[k]}
-    end)
+    {query, opts}
   end
 
-  defp get_extra_connection_settings(_) do
-    []
+  on_ee do
+    @external_controllers [
+      PlausibleWeb.Api.ExternalStatsController |> to_string(),
+      PlausibleWeb.Api.ExternalQueryApiController |> to_string()
+    ]
+    defp get_extra_connection_settings(
+           %{debug_metadata: %{phoenix_controller: controller}} = _plausible_query
+         ) do
+      if controller in @external_controllers do
+        [{:workload, "external_api"}]
+      else
+        []
+      end
+    end
+
+    defp get_extra_connection_settings(_plausible_query) do
+      []
+    end
   end
 
   def get_config_without_ch_query_execution_timeout() do

lib/plausible_web/controllers/api/system_controller.ex

@@ -41,7 +41,7 @@ defmodule PlausibleWeb.Api.SystemController do
 
     clickhouse_health_task =
       Task.async(fn ->
-        Plausible.ClickhouseRepo.query("SELECT 1", [], [settings: [workload: "ingestion"]])
+        Ecto.Adapters.SQL.query(Plausible.ClickhouseRepo, "SELECT 1", [])
       end)
 
     postgres_health =