Merge branch 'remove-prometheus-nif' into 'develop'

Prometheus: Remove flaky process collection NIF. See merge request pleroma/pleroma!1281
2019-06-13 18:37:12 +00:00 · 2019-06-13 18:37:12 +00:00 · da4af72180
commit da4af72180
parent 6f5a0cc14e 315f090f59
2 changed files with 0 additions and 2 deletions
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -174,7 +174,6 @@ defmodule Pleroma.Application do
      Pleroma.Repo.Instrumenter.setup()
    end

-    Prometheus.Registry.register_collector(:prometheus_process_collector)
    Pleroma.Web.Endpoint.MetricsExporter.setup()
    Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
    Pleroma.Web.Endpoint.Instrumenter.setup()
--- a/mix.exs
+++ b/mix.exs
@ -136,7 +136,6 @@ defmodule Pleroma.Mixfile do
      {:prometheus_plugs, "~> 1.1"},
      {:prometheus_phoenix, "~> 1.2"},
      {:prometheus_ecto, "~> 1.4"},
-      {:prometheus_process_collector, "~> 1.4"},
      {:recon, github: "ferd/recon", tag: "2.4.0"},
      {:quack, "~> 0.1.1"},
      {:benchee, "~> 1.0"},