diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-06-06 23:34:33 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-06 23:34:33 +0000 |
commit | 327ff31ebb853d50b322af544f85d39a0c7c5dea (patch) | |
tree | 4cab50d41d9d32dfe6249e577e3a400fce6345a0 | |
parent | 40a9d05464960bfdef2612e2b6e4c5c2752d4663 (diff) | |
parent | d0e68506d1d6885beac8fbbf51e86608ff28a6e6 (diff) | |
download | gitlab-ce-327ff31ebb853d50b322af544f85d39a0c7c5dea.tar.gz |
Merge branch '60303-replace-sidekiq-mtail-metrics' into 'master'
Adds sidekiq worker label for ruby metrics
Closes #60303
See merge request gitlab-org/gitlab-ce!29215
-rw-r--r-- | changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml | 5 | ||||
-rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/metrics/samplers/ruby_sampler.rb | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml b/changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml new file mode 100644 index 00000000000..90b72ec05c7 --- /dev/null +++ b/changelogs/unreleased/60303-replace-sidekiq-mtail-metrics.yml @@ -0,0 +1,5 @@ +--- +title: Replaces sidekiq mtail metrics with ruby instrumentation metrics +merge_request: 29215 +author: +type: changed diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 68f8487d377..4da683014d4 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -19,12 +19,6 @@ Gitlab::Application.configure do |config| config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware) end -Sidekiq.configure_server do |config| - config.on(:startup) do - Gitlab::Metrics::SidekiqMetricsExporter.instance.start - end -end - if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? Gitlab::Cluster::LifecycleEvents.on_worker_start do defined?(::Prometheus::Client.reinitialize_on_pid_change) && Prometheus::Client.reinitialize_on_pid_change diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb index 4d9c43f37e7..17eacbd21d8 100644 --- a/lib/gitlab/metrics/samplers/ruby_sampler.rb +++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb @@ -77,10 +77,10 @@ module Gitlab end def worker_label + return { worker: 'sidekiq' } if Sidekiq.server? return {} unless defined?(Unicorn::Worker) worker_no = ::Prometheus::Client::Support::Unicorn.worker_id - if worker_no { worker: worker_no } else |