fix: set db events rate as tenant.max_events_per_second (#1608)

Author: edgurgel

lib/extensions/postgres_cdc_rls/replication_poller.ex

@@ -31,7 +31,8 @@ defmodule Extensions.PostgresCdcRls.ReplicationPoller do
     tenant_id = args["id"]
     Logger.metadata(external_id: tenant_id, project: tenant_id)
 
-    rate_counter_args = Tenants.db_events_per_second_rate(tenant_id, 4000)
+    %Realtime.Api.Tenant{} = tenant = Tenants.Cache.get_tenant_by_external_id(tenant_id)
+    rate_counter_args = Tenants.db_events_per_second_rate(tenant)
 
     RateCounter.new(rate_counter_args)
 

lib/realtime/tenants.ex

@@ -233,20 +233,9 @@ defmodule Realtime.Tenants do
   end
 
   @doc "RateCounter arguments for counting database events per second."
-  @spec db_events_per_second_rate(Tenant.t() | String.t()) :: RateCounter.Args.t()
-  def db_events_per_second_rate(%Tenant{} = tenant), do: db_events_per_second_rate(tenant.external_id)
-
-  def db_events_per_second_rate(tenant_id) when is_binary(tenant_id) do
-    opts = [
-      telemetry: %{
-        event_name: [:channel, :db_events],
-        measurements: %{},
-        metadata: %{tenant: tenant_id}
-      }
-    ]
-
-    %RateCounter.Args{id: db_events_per_second_key(tenant_id), opts: opts}
-  end
+  @spec db_events_per_second_rate(Tenant.t()) :: RateCounter.Args.t()
+  def db_events_per_second_rate(%Tenant{} = tenant),
+    do: db_events_per_second_rate(tenant.external_id, tenant.max_events_per_second)
 
   @doc "RateCounter arguments for counting database events per second with a limit."
   @spec db_events_per_second_rate(String.t(), non_neg_integer) :: RateCounter.Args.t()

mix.exs

@@ -4,7 +4,7 @@ defmodule Realtime.MixProject do
   def project do
     [
       app: :realtime,
-      version: "2.61.0",
+      version: "2.61.1",
       elixir: "~> 1.18",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,

test/realtime/extensions/cdc_rls/replication_poller_test.exs

@@ -37,6 +37,10 @@ defmodule Realtime.Extensions.PostgresCdcRls.ReplicationPollerTest do
 
       tenant = Containers.checkout_tenant(run_migrations: true)
 
+      {:ok, tenant} =
+        Realtime.Api.get_tenant_by_external_id(tenant.external_id)
+        |> Realtime.Api.update_tenant(%{"max_events_per_second" => 123})
+
       subscribers_pids_table = :ets.new(__MODULE__, [:public, :bag])
       subscribers_nodes_table = :ets.new(__MODULE__, [:public, :set])
 
@@ -71,7 +75,17 @@ defmodule Realtime.Extensions.PostgresCdcRls.ReplicationPollerTest do
       Process.sleep(1100)
 
       rate = Realtime.Tenants.db_events_per_second_rate(tenant)
-      assert {:ok, %RateCounter{sum: sum}} = RateCounter.get(rate)
+
+      assert {:ok,
+              %RateCounter{
+                sum: sum,
+                limit: %{
+                  value: 123,
+                  measurement: :avg,
+                  triggered: false
+                }
+              }} = RateCounter.get(rate)
+
       assert sum == 0
     end
 

test/realtime/monitoring/prom_ex/plugins/tenant_test.exs

@@ -25,7 +25,7 @@ defmodule Realtime.PromEx.Plugins.TenantTest do
 
                 def fake_db_event(external_id) do
                   external_id
-                  |> Realtime.Tenants.db_events_per_second_rate()
+                  |> Realtime.Tenants.db_events_per_second_rate(100)
                   |> Realtime.RateCounter.new()
 
                   external_id