Add latest changes from gitlab-org/gitlab@master

13 files changed, 76 insertions, 27 deletions

diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 0e6db54eb46..f2bff51df38 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -100,8 +100,8 @@ module Gitlab
   end
 
   def self.process_name
-    return 'sidekiq' if Sidekiq.server?
-    return 'console' if defined?(Rails::Console)
+    return 'sidekiq' if Gitlab::Runtime.sidekiq?
+    return 'console' if Gitlab::Runtime.console?
     return 'test' if Rails.env.test?
 
     'web'
diff --git a/lib/gitlab/cluster/lifecycle_events.rb b/lib/gitlab/cluster/lifecycle_events.rb
index 2b3dc94fc5e..4ae75e0db0a 100644
--- a/lib/gitlab/cluster/lifecycle_events.rb
+++ b/lib/gitlab/cluster/lifecycle_events.rb
@@ -149,10 +149,10 @@ module Gitlab
 
         def in_clustered_environment?
           # Sidekiq doesn't fork
-          return false if Sidekiq.server?
+          return false if Gitlab::Runtime.sidekiq?
 
           # Unicorn always forks
-          return true if defined?(::Unicorn)
+          return true if Gitlab::Runtime.unicorn?
 
           # Puma sometimes forks
           return true if in_clustered_puma?
@@ -162,7 +162,7 @@ module Gitlab
         end
 
         def in_clustered_puma?
-          return false unless defined?(::Puma)
+          return false unless Gitlab::Runtime.puma?
 
           @puma_options && @puma_options[:workers] && @puma_options[:workers] > 0
         end
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 9e033c705bd..25785089a34 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -29,7 +29,7 @@ module Gitlab
     PEM_REGEX = /\-+BEGIN CERTIFICATE\-+.+?\-+END CERTIFICATE\-+/m.freeze
     SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'
     MAXIMUM_GITALY_CALLS = 30
-    CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze
+    CLIENT_NAME = (Gitlab::Runtime.sidekiq? ? 'gitlab-sidekiq' : 'gitlab-web').freeze
     GITALY_METADATA_FILENAME = '.gitaly-metadata'
 
     MUTEX = Mutex.new
@@ -382,17 +382,13 @@ module Gitlab
     end
 
     def self.long_timeout
-      if web_app_server?
+      if Gitlab::Runtime.web_server?
         default_timeout
       else
         6.hours
       end
     end
 
-    def self.web_app_server?
-      defined?(::Unicorn) || defined?(::Puma)
-    end
-
     def self.storage_metadata_file_path(storage)
       Gitlab::GitalyClient::StorageSettings.allow_disk_access do
         File.join(
diff --git a/lib/gitlab/gpg.rb b/lib/gitlab/gpg.rb
index e3c474bc0fe..7e6f6a519a6 100644
--- a/lib/gitlab/gpg.rb
+++ b/lib/gitlab/gpg.rb
@@ -135,7 +135,7 @@ module Gitlab
     end
 
     def cleanup_time
-      Sidekiq.server? ? BG_CLEANUP_RUNTIME_S : FG_CLEANUP_RUNTIME_S
+      Gitlab::Runtime.sidekiq? ? BG_CLEANUP_RUNTIME_S : FG_CLEANUP_RUNTIME_S
     end
 
     def tmp_keychains_created
diff --git a/lib/gitlab/health_checks/puma_check.rb b/lib/gitlab/health_checks/puma_check.rb
index 7aafe29fbae..9f09070a57d 100644
--- a/lib/gitlab/health_checks/puma_check.rb
+++ b/lib/gitlab/health_checks/puma_check.rb
@@ -18,7 +18,7 @@ module Gitlab
         end
 
         def check
-          return unless defined?(::Puma)
+          return unless Gitlab::Runtime.puma?
 
           stats = Puma.stats
           stats = JSON.parse(stats)
diff --git a/lib/gitlab/health_checks/unicorn_check.rb b/lib/gitlab/health_checks/unicorn_check.rb
index a30ae015257..cdc6d2a7519 100644
--- a/lib/gitlab/health_checks/unicorn_check.rb
+++ b/lib/gitlab/health_checks/unicorn_check.rb
@@ -30,7 +30,7 @@ module Gitlab
         # to change so we can cache the list of servers.
         def http_servers
           strong_memoize(:http_servers) do
-            next unless defined?(::Unicorn::HttpServer)
+            next unless Gitlab::Runtime.unicorn?
 
             ObjectSpace.each_object(::Unicorn::HttpServer).to_a
           end
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb
index 2c243a0d0ae..22b9a038768 100644
--- a/lib/gitlab/highlight.rb
+++ b/lib/gitlab/highlight.rb
@@ -68,7 +68,7 @@ module Gitlab
     end
 
     def timeout_time
-      Sidekiq.server? ? TIMEOUT_BACKGROUND : TIMEOUT_FOREGROUND
+      Gitlab::Runtime.sidekiq? ? TIMEOUT_BACKGROUND : TIMEOUT_FOREGROUND
     end
 
     def link_dependencies(text, highlighted_text)
diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
index 269d90fa971..1f252572461 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 ||= Sidekiq.server? ? 'sidekiq_' : 'rails_'
+          @series_prefix ||= Gitlab::Runtime.sidekiq? ? '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 1eae0a7bf45..4e16e335bee 100644
--- a/lib/gitlab/metrics/samplers/influx_sampler.rb
+++ b/lib/gitlab/metrics/samplers/influx_sampler.rb
@@ -39,14 +39,10 @@ module Gitlab
         end
 
         def add_metric(series, values, tags = {})
-          prefix = sidekiq? ? 'sidekiq_' : 'rails_'
+          prefix = Gitlab::Runtime.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 355f938704e..8c4d150adad 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 defined?(::Unicorn::HttpServer)
+          return [] unless Gitlab::Runtime.unicorn?
 
           @http_servers ||= ObjectSpace.each_object(::Unicorn::HttpServer).to_a
         end
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index 412d00c6939..beceed3fa75 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -22,10 +22,10 @@ module Gitlab
         def pool_size
           # heuristic constant 5 should be a config setting somewhere -- related to CPU count?
           size = 5
-          if Sidekiq.server?
+          if Gitlab::Runtime.sidekiq?
             # the pool will be used in a multi-threaded context
             size += Sidekiq.options[:concurrency]
-          elsif defined?(::Puma)
+          elsif Gitlab::Runtime.puma?
             size += Puma.cli_config.options[:max_threads]
           end
 
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb
new file mode 100644
index 00000000000..33b7b68e64e
--- /dev/null
+++ b/lib/gitlab/runtime.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gitlab
+  # Provides routines to identify the current runtime as which the application
+  # executes, such as whether it is an application server and which one.
+  module Runtime
+    AmbiguousProcessError = Class.new(StandardError)
+    UnknownProcessError = Class.new(StandardError)
+
+    class << self
+      def identify
+        matches = []
+        matches << :puma if puma?
+        matches << :unicorn if unicorn?
+        matches << :console if console?
+        matches << :sidekiq if sidekiq?
+
+        if matches.one?
+          matches.first
+        elsif matches.none?
+          raise UnknownProcessError.new(
+            "Failed to identify runtime for process #{Process.pid} (#{$0})"
+          )
+        else
+          raise AmbiguousProcessError.new(
+            "Ambiguous runtime #{matches} for process #{Process.pid} (#{$0})"
+          )
+        end
+      end
+
+      def puma?
+        !!defined?(::Puma)
+      end
+
+      # For unicorn, we need to check for actual server instances to avoid false positives.
+      def unicorn?
+        !!(defined?(::Unicorn) && defined?(::Unicorn::HttpServer))
+      end
+
+      def sidekiq?
+        !!(defined?(::Sidekiq) && Sidekiq.server?)
+      end
+
+      def console?
+        !!defined?(::Rails::Console)
+      end
+
+      def web_server?
+        puma? || unicorn?
+      end
+
+      def multi_threaded?
+        puma? || sidekiq?
+      end
+    end
+  end
+end
diff --git a/lib/prometheus/pid_provider.rb b/lib/prometheus/pid_provider.rb
index 228639357ac..32beeb0d31e 100644
--- a/lib/prometheus/pid_provider.rb
+++ b/lib/prometheus/pid_provider.rb
@@ -5,11 +5,11 @@ module Prometheus
     extend self
 
     def worker_id
-      if Sidekiq.server?
+      if Gitlab::Runtime.sidekiq?
         sidekiq_worker_id
-      elsif defined?(Unicorn::Worker)
+      elsif Gitlab::Runtime.unicorn?
         unicorn_worker_id
-      elsif defined?(::Puma)
+      elsif Gitlab::Runtime.puma?
         puma_worker_id
       else
         unknown_process_id