[#1] fix telemetry

diff --git a/config/config.exs b/config/config.exs
index 1e086f44ce190cb649c877606a46d50aea9a7f5f..4fd63f99d6d0a0ce2d4ce1285c3dd12245fe96a0 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -10,7 +10,7 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 
 config :pleroma, Pleroma.Repo,
   types: Pleroma.PostgresTypes,
-  loggers: [Pleroma.Repo.Instrumenter, Ecto.LogEntry]
+  telemetry_event: [Pleroma.Repo.Instrumenter]
 
 config :pleroma, Pleroma.Captcha,
   enabled: false,

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 03dcbab1af40b4952f4089df9137d4aa5e36edf4..c3f3126c69c703abc9b29690d258b41a948712ef 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -127,6 +127,24 @@ defmodule Pleroma.Application do
     Supervisor.start_link(children, opts)
   end
 
+  defp setup_instrumenters() do
+    require Prometheus.Registry
+
+    :ok =
+      :telemetry.attach(
+        "prometheus-ecto",
+        [:pleroma, :repo, :query],
+        &Pleroma.Repo.Instrumenter.handle_event/4,
+        %{}
+      )
+
+    Prometheus.Registry.register_collector(:prometheus_process_collector)
+    Pleroma.Web.Endpoint.MetricsExporter.setup()
+    Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
+    Pleroma.Web.Endpoint.Instrumenter.setup()
+    Pleroma.Repo.Instrumenter.setup()
+  end
+
   def enabled_hackney_pools do
     [:media] ++
       if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
@@ -141,13 +159,6 @@ defmodule Pleroma.Application do
       end
   end
 
-  defp setup_instrumenters() do
-    Pleroma.Web.Endpoint.MetricsExporter.setup()
-    Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
-    Pleroma.Web.Endpoint.Instrumenter.setup()
-    Pleroma.Repo.Instrumenter.setup()
-  end
-
   if Mix.env() == :test do
     defp streamer_child, do: []
     defp chat_child, do: []