Commit 765ddaeb authored by Pawel Chojnacki's avatar Pawel Chojnacki

Only enable unicorn metrics when not in sidekiq mode.

+ remove rebased test case
parent c9f0070b
...@@ -29,6 +29,9 @@ Sidekiq.configure_server do |config| ...@@ -29,6 +29,9 @@ Sidekiq.configure_server do |config|
end end
if Gitlab::Metrics.prometheus_metrics_enabled? if Gitlab::Metrics.prometheus_metrics_enabled?
Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start unless Sidekiq.server?
Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
end
Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start
end end
...@@ -21,10 +21,6 @@ describe Gitlab::Metrics::SidekiqMiddleware do ...@@ -21,10 +21,6 @@ describe Gitlab::Metrics::SidekiqMiddleware do
let(:test_worker_class) { double(:class, name: 'TestWorker') } let(:test_worker_class) { double(:class, name: 'TestWorker') }
let(:worker) { double(:worker, class: test_worker_class) } let(:worker) { double(:worker, class: test_worker_class) }
it 'reports correct action based on worker class' do
end
it 'tracks the transaction' do it 'tracks the transaction' do
run(worker, message) run(worker, message)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment