Add latest changes from gitlab-org/gitlab@master

13 files changed, 20 insertions, 32 deletions

diff --git a/config/application.rb b/config/application.rb
index 28c1eba920b..cad5c8bbe76 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,7 +22,6 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab/current_settings')
     require_dependency Rails.root.join('lib/gitlab/middleware/read_only')
     require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check')
-    require_dependency Rails.root.join('lib/gitlab/runtime')
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -256,7 +255,7 @@ module Gitlab
     caching_config_hash[:compress] = false
     caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
     caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
-    if Gitlab::Runtime.multi_threaded?
+    if Sidekiq.server? || defined?(::Puma) # threaded context
       caching_config_hash[:pool_size] = Gitlab::Redis::Cache.pool_size
       caching_config_hash[:pool_timeout] = 1
     end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index dc804197fef..2939e13ef94 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -46,7 +46,7 @@ Rails.application.configure do
   # Do not log asset requests
   config.assets.quiet = true
 
-  config.allow_concurrency = Gitlab::Runtime.multi_threaded?
+  config.allow_concurrency = defined?(::Puma)
 
   # BetterErrors live shell (REPL) on every stack frame
   BetterErrors::Middleware.allow_ip!("127.0.0.1/0")
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7ec18547b2f..09bcf49a9a5 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -75,5 +75,5 @@ Rails.application.configure do
 
   config.eager_load = true
 
-  config.allow_concurrency = Gitlab::Runtime.multi_threaded?
+  config.allow_concurrency = defined?(::Puma)
 end
diff --git a/config/initializers/0_runtime_identify.rb b/config/initializers/0_runtime_identify.rb
deleted file mode 100644
index 2b5d08102eb..00000000000
--- a/config/initializers/0_runtime_identify.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  Gitlab::AppLogger.info("Runtime: #{Gitlab::Runtime.name}")
-rescue => e
-  message = <<-NOTICE
-  \n!! RUNTIME IDENTIFICATION FAILED: #{e}
-  Runtime based configuration settings may not work properly.
-  If you continue to see this error, please file an issue via
-  https://gitlab.com/gitlab-org/gitlab/issues/new
-  NOTICE
-  Gitlab::AppLogger.error(message)
-end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index bb0c4696eff..8e4aa5701b4 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -364,7 +364,7 @@ Gitlab.ee do
   # To ensure acceptable performance we only allow feature to be used with
   # multithreaded web-server Puma. This will be removed once download logic is moved
   # to GitLab workhorse
-  Settings.dependency_proxy['enabled'] = false unless Gitlab::Runtime.puma?
+  Settings.dependency_proxy['enabled'] = false unless defined?(::Puma)
 end
 
 #
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index d14dc071b7b..c14ee1458bc 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -4,11 +4,11 @@ require 'prometheus/client'
 def prometheus_default_multiproc_dir
   return unless Rails.env.development? || Rails.env.test?
 
-  if Gitlab::Runtime.sidekiq?
+  if Sidekiq.server?
     Rails.root.join('tmp/prometheus_multiproc_dir/sidekiq')
-  elsif Gitlab::Runtime.unicorn?
+  elsif defined?(Unicorn::Worker)
     Rails.root.join('tmp/prometheus_multiproc_dir/unicorn')
-  elsif Gitlab::Runtime.puma?
+  elsif defined?(::Puma)
     Rails.root.join('tmp/prometheus_multiproc_dir/puma')
   else
     Rails.root.join('tmp/prometheus_multiproc_dir')
@@ -48,9 +48,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
   Gitlab::Cluster::LifecycleEvents.on_master_start do
     ::Prometheus::Client.reinitialize_on_pid_change(force: true)
 
-    if Gitlab::Runtime.unicorn?
+    if defined?(::Unicorn)
       Gitlab::Metrics::Samplers::UnicornSampler.instance(Settings.monitoring.unicorn_sampler_interval).start
-    elsif Gitlab::Runtime.puma?
+    elsif defined?(::Puma)
       Gitlab::Metrics::Samplers::PumaSampler.instance(Settings.monitoring.puma_sampler_interval).start
     end
 
@@ -58,7 +58,7 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
   end
 end
 
-if Gitlab::Runtime.app_server?
+if defined?(::Unicorn) || defined?(::Puma)
   Gitlab::Cluster::LifecycleEvents.on_master_start do
     Gitlab::Metrics::Exporter::WebExporter.instance.start
   end
diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb
index 2cf0f0439a9..61f1d299960 100644
--- a/config/initializers/active_record_lifecycle.rb
+++ b/config/initializers/active_record_lifecycle.rb
@@ -2,7 +2,7 @@
 
 # Don't handle sidekiq configuration as it
 # has its own special active record configuration here
-if defined?(ActiveRecord::Base) && !Gitlab::Runtime.sidekiq?
+if defined?(ActiveRecord::Base) && !Sidekiq.server?
   Gitlab::Cluster::LifecycleEvents.on_worker_start do
     ActiveSupport.on_load(:active_record) do
       ActiveRecord::Base.establish_connection
diff --git a/config/initializers/cluster_events_before_phased_restart.rb b/config/initializers/cluster_events_before_phased_restart.rb
index aae5470d6ae..cbb1dd1a53a 100644
--- a/config/initializers/cluster_events_before_phased_restart.rb
+++ b/config/initializers/cluster_events_before_phased_restart.rb
@@ -5,8 +5,10 @@
 #
 # Follow-up the issue: https://gitlab.com/gitlab-org/gitlab/issues/34107
 
-if Gitlab::Runtime.puma?
+if defined?(::Puma)
   Puma::Cluster.prepend(::Gitlab::Cluster::Mixins::PumaCluster)
-elsif Gitlab::Runtime.unicorn?
+end
+
+if defined?(::Unicorn::HttpServer)
   Unicorn::HttpServer.prepend(::Gitlab::Cluster::Mixins::UnicornHttpServer)
 end
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 509f04c9b02..d8c2821066b 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -2,7 +2,7 @@
 
 # when running on puma, scale connection pool size with the number
 # of threads per worker process
-if Gitlab::Runtime.puma?
+if defined?(::Puma)
   db_config = Gitlab::Database.config ||
       Rails.application.config.database_configuration[Rails.env]
   puma_options = Puma.cli_config.options
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 0acbe6a9258..a8207862739 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -1,5 +1,5 @@
 # Only use Lograge for Rails
-unless Gitlab::Runtime.sidekiq?
+unless Sidekiq.server?
   filename = File.join(Rails.root, 'log', "#{Rails.env}_json.log")
 
   Rails.application.configure do
diff --git a/config/initializers/rack_timeout.rb b/config/initializers/rack_timeout.rb
index 1f1264de208..246cf3482a4 100644
--- a/config/initializers/rack_timeout.rb
+++ b/config/initializers/rack_timeout.rb
@@ -9,7 +9,7 @@
 # and it's used only as the last resort. In such case this termination is
 # logged and we should fix the potential timeout issue in the code itself.
 
-if Gitlab::Runtime.puma? && !Rails.env.test?
+if defined?(::Puma) && !Rails.env.test?
   require 'rack/timeout/base'
 
   Gitlab::Application.configure do |config|
diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb
index 0ae57021fcf..5b55a06692e 100644
--- a/config/initializers/tracing.rb
+++ b/config/initializers/tracing.rb
@@ -13,7 +13,7 @@ if Labkit::Tracing.enabled?
   end
 
   # Instrument Sidekiq server calls when running Sidekiq server
-  if Gitlab::Runtime.sidekiq?
+  if Sidekiq.server?
     Sidekiq.configure_server do |config|
       config.server_middleware do |chain|
         chain.add Labkit::Tracing::Sidekiq::ServerMiddleware
diff --git a/config/initializers/validate_puma.rb b/config/initializers/validate_puma.rb
index 5abcfbfe6be..64bd6e7bbc1 100644
--- a/config/initializers/validate_puma.rb
+++ b/config/initializers/validate_puma.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-if Gitlab::Runtime.puma? && ::Puma.cli_config.options[:workers].to_i.zero?
+if defined?(::Puma) && ::Puma.cli_config.options[:workers].to_i.zero?
   raise 'Puma is only supported in Cluster-mode: workers > 0'
 end