Merge pull request #1824 from Logflare/chore/remove-staging.exs

chore: consolidate config files, adjust Logflare.Cluster.Utils.cluster_size/0

config/dev.exs

@@ -91,5 +91,3 @@ config :open_api_spex, :cache_adapter, OpenApiSpex.Plug.NoneCache
 config :stripity_stripe,
   api_key: "sk_test_thisisaboguskey",
   api_base_url: "http://localhost:12111/v1/"
-
-import_config("telemetry.exs")

config/prod.exs

@@ -35,5 +35,3 @@ config :logger,
 config :logflare_logger_backend,
   flush_interval: 2_000,
   max_batch_size: 250
-
-import_config "telemetry.exs"

config/runtime.exs

@@ -261,3 +261,9 @@ case System.get_env("LOGFLARE_FEATURE_FLAG_OVERRIDE") do
         |> Enum.map(&Map.new/1)
         |> Enum.reduce(&Map.merge/2)
 end
+
+if config_env() != :test do
+  config :telemetry_poller, :default,
+    vm_measurements: [:memory, :total_run_queue_lengths],
+    period: 1_000
+end

lib/logflare/cluster/utils.ex

@@ -2,27 +2,31 @@ defmodule Logflare.Cluster.Utils do
   @moduledoc false
   require Logger
 
-  defp env_min_cluster_size, do: Application.get_env(:logflare, __MODULE__)[:min_cluster_size]
-
+  @spec node_list_all() :: [Node.t()]
   def node_list_all() do
     [Node.self() | Node.list()]
   end
 
+  @spec cluster_size() :: non_neg_integer()
   def cluster_size() do
-    lib_cluster_size = node_list_all() |> Enum.count()
+    lib_cluster_size = actual_cluster_size()
+    min_size = env_min_cluster_size()
 
-    if lib_cluster_size >= env_min_cluster_size() do
+    if lib_cluster_size >= min_size do
       lib_cluster_size
     else
-      Logger.error("Cluster size is #{lib_cluster_size} but expected #{env_min_cluster_size()}",
+      Logger.warning("Cluster size is #{lib_cluster_size} but expected #{min_size}",
         cluster_size: lib_cluster_size
       )
 
-      env_min_cluster_size()
+      min_size
     end
   end
 
+  @spec actual_cluster_size() :: non_neg_integer()
   def actual_cluster_size() do
     Enum.count(node_list_all())
   end
+
+  defp env_min_cluster_size, do: Application.get_env(:logflare, __MODULE__)[:min_cluster_size]
 end

test/logflare/cluster_test.exs

@@ -0,0 +1,28 @@
+defmodule Logflare.ClusterTest do
+  use ExUnit.Case, async: false
+  alias Logflare.Cluster
+
+  test "Cluster.Utils.node_list_all/0" do
+    assert [_|_] = Cluster.Utils.node_list_all()
+  end
+
+
+  test "cluster_size/0, actual_cluster_size/0" do
+    assert Cluster.Utils.cluster_size() == Cluster.Utils.actual_cluster_size()
+  end
+
+  describe "Cluster.Utils" do
+    setup do
+      config = Application.get_env(:logflare, Cluster.Utils)
+      Application.put_env(:logflare, Cluster.Utils, [min_cluster_size: 12])
+      on_exit(fn ->
+        Application.put_env(:logflare, Cluster.Utils, config)
+      end)
+    end
+    test "cluster_size/0, actual_cluster_size/0" do
+      assert Cluster.Utils.cluster_size() == 12
+      assert Cluster.Utils.actual_cluster_size() == 1
+    end
+
+  end
+end