Skip to content

Commit

Permalink
feat: metric endpoint per tenant (#147)
Browse files Browse the repository at this point in the history
  • Loading branch information
abc3 authored Aug 10, 2023
1 parent 2540d0a commit 30054b0
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 3 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.27
0.2.28
1 change: 1 addition & 0 deletions lib/supavisor.ex
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ defmodule Supavisor do
@spec del_all_cache(String.t(), String.t()) :: map()
def del_all_cache(tenant, user) do
%{secrets: Cachex.del(Supavisor.Cache, {:secrets, tenant, user})}
%{metrics: Cachex.del(Supavisor.Cache, {:metrics, tenant})}
end

@spec get_local_pool(String.t(), String.t()) :: pid() | nil
Expand Down
1 change: 1 addition & 0 deletions lib/supavisor/application.ex
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ defmodule Supavisor.Application do
},
Supavisor.Vault,
{Cachex, name: Supavisor.Cache},
Supavisor.TenantsMetrics,
# Start the Endpoint (http/https)
SupavisorWeb.Endpoint
]
Expand Down
27 changes: 25 additions & 2 deletions lib/supavisor/monitoring/prom_ex.ex
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ defmodule Supavisor.Monitoring.PromEx do
Application.fetch_env!(:supavisor, :metrics_tags)
|> Enum.map_join(",", fn {k, v} -> "#{k}=\"#{v}\"" end)

Logger.debug("Default prom tags: #{def_tags}")

metrics =
PromEx.get_metrics(__MODULE__)
|> String.split("\n")
Expand All @@ -82,6 +80,31 @@ defmodule Supavisor.Monitoring.PromEx do
metrics
end

@spec do_cache_tenants_metrics() :: :ok
def do_cache_tenants_metrics() do
metrics = get_metrics() |> String.split("\n")

Registry.select(Supavisor.Registry.TenantSups, [{{:"$1", :_, :_}, [], [:"$1"]}])
|> Enum.uniq()
|> Enum.reduce(metrics, fn tenant, acc ->
{matched, rest} = Enum.split_with(acc, &String.contains?(&1, "tenant=\"#{tenant}\""))

if matched != [] do
Cachex.put(Supavisor.Cache, {:metrics, tenant}, Enum.join(matched, "\n"))
end

rest
end)
end

@spec get_tenant_metrics(String.t()) :: String.t()
def get_tenant_metrics(tenant) do
case Cachex.get(Supavisor.Cache, {:metrics, tenant}) do
{_, metrics} when is_binary(metrics) -> metrics
_ -> ""
end
end

@spec parse_and_add_tags(String.t(), String.t()) :: String.t()
defp parse_and_add_tags(line, def_tags) do
case Regex.run(~r/(?!\#)^(\w+)(?:{(.*?)})?\s*(.+)$/, line) do
Expand Down
1 change: 1 addition & 0 deletions lib/supavisor/syn_handler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ defmodule Supavisor.SynHandler do

# remove all Prometheus metrics for the specified tenant
PromEx.remove_metrics(tenant, user_alias)
Supavisor.del_all_cache(tenant, user_alias)
end

def resolve_registry_conflict(
Expand Down
40 changes: 40 additions & 0 deletions lib/supavisor/tenants_metrics.ex
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
defmodule Supavisor.TenantsMetrics do
@moduledoc false
use GenServer, restart: :transient
require Logger

alias Supavisor.Monitoring.PromEx

@check_timeout 10_000

def start_link(args) do
GenServer.start_link(__MODULE__, args, name: __MODULE__)
end

## Callbacks

@impl true
def init(_args) do
send(self(), :check_metrics)
{:ok, %{check_ref: make_ref()}}
end

@impl true
def handle_info(:check_metrics, state) do
Process.cancel_timer(state.check_ref)

PromEx.do_cache_tenants_metrics()

{:noreply, %{state | check_ref: check_metrics()}}
end

## Internal functions

defp check_metrics() do
Process.send_after(
self(),
:check_metrics,
@check_timeout
)
end
end
22 changes: 22 additions & 0 deletions lib/supavisor_web/controllers/metrics_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ defmodule SupavisorWeb.MetricsController do
|> send_resp(200, cluster_metrics)
end

def tenant(conn, %{"external_id" => ext_id}) do
cluster_metrics = fetch_cluster_metrics(ext_id)

code = if cluster_metrics == "", do: 404, else: 200

conn
|> put_resp_content_type("text/plain")
|> send_resp(code, cluster_metrics)
end

@spec fetch_cluster_metrics() :: String.t()
defp fetch_cluster_metrics() do
Node.list()
Expand All @@ -29,6 +39,18 @@ defmodule SupavisorWeb.MetricsController do
{node, :rpc.call(node, PromEx, :get_metrics, [], 10_000)}
end

@spec fetch_cluster_metrics(String.t()) :: String.t()
defp fetch_cluster_metrics(tenant) do
Node.list()
|> Task.async_stream(&fetch_node_metrics(&1, tenant), timeout: :infinity)
|> Enum.reduce(PromEx.get_tenant_metrics(tenant), &merge_node_metrics/2)
end

@spec fetch_node_metrics(atom(), String.t()) :: {atom(), term()}
defp fetch_node_metrics(node, tenant) do
{node, :rpc.call(node, PromEx, :get_tenant_metrics, [tenant], 10_000)}
end

defp merge_node_metrics({_, {node, {:badrpc, reason}}}, acc) do
Logger.error("Cannot fetch metrics from the node #{inspect(node)} because #{inspect(reason)}")
acc
Expand Down
1 change: 1 addition & 0 deletions lib/supavisor_web/router.ex
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ defmodule SupavisorWeb.Router do
pipe_through(:metrics)

get("/", MetricsController, :index)
get("/:external_id", MetricsController, :tenant)
end

# Other scopes may use custom stacks.
Expand Down

0 comments on commit 30054b0

Please sign in to comment.