Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 3 deletions

diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
index 1f252572461..269d90fa971 100644
--- a/lib/gitlab/metrics/influx_db.rb
+++ b/lib/gitlab/metrics/influx_db.rb
@@ -150,7 +150,7 @@ module Gitlab
 
         # Returns the prefix to use for the name of a series.
         def series_prefix
-          @series_prefix ||= Gitlab::Runtime.sidekiq? ? 'sidekiq_' : 'rails_'
+          @series_prefix ||= Sidekiq.server? ? 'sidekiq_' : 'rails_'
         end
 
         # Allow access from other metrics related middlewares
diff --git a/lib/gitlab/metrics/samplers/influx_sampler.rb b/lib/gitlab/metrics/samplers/influx_sampler.rb
index 4e16e335bee..1eae0a7bf45 100644
--- a/lib/gitlab/metrics/samplers/influx_sampler.rb
+++ b/lib/gitlab/metrics/samplers/influx_sampler.rb
@@ -39,10 +39,14 @@ module Gitlab
         end
 
         def add_metric(series, values, tags = {})
-          prefix = Gitlab::Runtime.sidekiq? ? 'sidekiq_' : 'rails_'
+          prefix = sidekiq? ? 'sidekiq_' : 'rails_'
 
           @metrics << Metric.new("#{prefix}#{series}", values, tags)
         end
+
+        def sidekiq?
+          Sidekiq.server?
+        end
       end
     end
   end
diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
index 8c4d150adad..355f938704e 100644
--- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb
+++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
@@ -61,7 +61,7 @@ module Gitlab
         # it takes around 80ms. The instances of HttpServers are not a subject
         # to change so we can cache the list of servers.
         def http_servers
-          return [] unless Gitlab::Runtime.unicorn?
+          return [] unless defined?(::Unicorn::HttpServer)
 
           @http_servers ||= ObjectSpace.each_object(::Unicorn::HttpServer).to_a
         end