Only enable unicorn metrics when not in sidekiq mode.
+ remove rebased test case
This commit is contained in:
parent
c9f0070b64
commit
765ddaeb85
|
|
@ -29,6 +29,9 @@ Sidekiq.configure_server do |config|
|
|||
end
|
||||
|
||||
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
|
||||
end
|
||||
|
|
|
|||
|
|
@ -21,10 +21,6 @@ describe Gitlab::Metrics::SidekiqMiddleware do
|
|||
let(:test_worker_class) { double(:class, name: 'TestWorker') }
|
||||
let(:worker) { double(:worker, class: test_worker_class) }
|
||||
|
||||
it 'reports correct action based on worker class' do
|
||||
|
||||
end
|
||||
|
||||
it 'tracks the transaction' do
|
||||
run(worker, message)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue