diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-22 13:54:15 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-22 13:54:15 +0300 |
| commit | 8a55de1d785178786b9ae7c185ea1d1f187f7470 (patch) | |
| tree | 78a5345828a402ed04cb6def68364be912331cb8 /lib | |
| parent | 9ea31b373fdb75bb6aa04d006e5f493158897efa (diff) | |
| download | pleroma-8a55de1d785178786b9ae7c185ea1d1f187f7470.tar.gz pleroma-8a55de1d785178786b9ae7c185ea1d1f187f7470.zip | |
[#3059] Fixed Phoenix 1.5 telemetry processing.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/application.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index d7e3a649f..51e9dda3b 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -151,7 +151,10 @@ defmodule Pleroma.Application do Pleroma.Web.Endpoint.MetricsExporter.setup() Pleroma.Web.Endpoint.PipelineInstrumenter.setup() - Pleroma.Web.Endpoint.Instrumenter.setup() + + # Note: disabled until prometheus-phx is integrated into prometheus-phoenix: + # Pleroma.Web.Endpoint.Instrumenter.setup() + PrometheusPhx.setup() end defp cachex_children do diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 56562c12f..f15aab8cb 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -9,6 +9,8 @@ defmodule Pleroma.Web.Endpoint do socket("/socket", Pleroma.Web.UserSocket) + plug Plug.Telemetry, event_prefix: [:phoenix, :endpoint] + plug(Pleroma.Web.Plugs.SetLocalePlug) plug(CORSPlug) plug(Pleroma.Web.Plugs.HTTPSecurityPlug) |