Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

2 files changed, 4 insertions, 47 deletions

diff --git a/metrics_server/dependencies.rb b/metrics_server/dependencies.rb
index 233511eb505..c96fecd7cb7 100644
--- a/metrics_server/dependencies.rb
+++ b/metrics_server/dependencies.rb
@@ -11,11 +11,11 @@ require 'active_support/core_ext/numeric/bytes'
 require 'prometheus/client'
 require 'rack'
 
+require 'gitlab/utils/all'
+
 require_relative 'settings_overrides'
 
 require_relative '../lib/gitlab/daemon'
-require_relative '../lib/gitlab/utils'
-require_relative '../lib/gitlab/utils/strong_memoize'
 require_relative '../lib/prometheus/cleanup_multiproc_dir_service'
 require_relative '../lib/gitlab/metrics/prometheus'
 require_relative '../lib/gitlab/metrics'
diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb
index 530f3a000a9..7d4968f930c 100644
--- a/metrics_server/metrics_server.rb
+++ b/metrics_server/metrics_server.rb
@@ -7,10 +7,6 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass
   PumaProcessSupervisor = Class.new(Gitlab::ProcessSupervisor)
 
   class << self
-    def version
-      Rails.root.join('GITLAB_METRICS_EXPORTER_VERSION').read.chomp
-    end
-
     def start_for_puma
       metrics_dir = ::Prometheus::Client.configuration.multiprocess_files_dir
 
@@ -28,45 +24,10 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass
     end
 
     def start_for_sidekiq(**options)
-      if new_metrics_server?
-        self.spawn('sidekiq', **options)
-      else
-        self.fork('sidekiq', **options)
-      end
-    end
-
-    def spawn(target, metrics_dir:, **options)
-      return spawn_ruby_server(target, metrics_dir: metrics_dir, **options) unless new_metrics_server?
-
-      settings = settings_value(target)
-      path = options[:path]&.then { |p| Pathname.new(p) } || Pathname.new('')
-      cmd = path.join('gitlab-metrics-exporter').to_path
-      env = {
-        'GOGC' => '10', # Set Go GC heap goal to 10% to curb memory growth.
-        'GME_MMAP_METRICS_DIR' => metrics_dir.to_s,
-        'GME_PROBES' => 'self,mmap,mmap_stats',
-        'GME_SERVER_HOST' => settings['address'],
-        'GME_SERVER_PORT' => settings['port'].to_s
-      }
-
-      if settings['log_enabled']
-        env['GME_LOG_FILE'] = File.join(Rails.root, 'log', "#{name(target)}.log")
-        env['GME_LOG_LEVEL'] = 'info'
-      else
-        env['GME_LOG_LEVEL'] = 'quiet'
-      end
-
-      if settings['tls_enabled']
-        env['GME_CERT_FILE'] = settings['tls_cert_path']
-        env['GME_CERT_KEY'] = settings['tls_key_path']
-      end
-
-      Process.spawn(env, cmd, err: $stderr, out: $stdout, pgroup: true).tap do |pid|
-        Process.detach(pid)
-      end
+      self.fork('sidekiq', **options)
     end
 
-    def spawn_ruby_server(target, metrics_dir:, wipe_metrics_dir: false, **options)
+    def spawn(target, metrics_dir:, wipe_metrics_dir: false)
       ensure_valid_target!(target)
 
       cmd = "#{Rails.root}/bin/metrics-server"
@@ -126,10 +87,6 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass
       end
     end
 
-    def new_metrics_server?
-      Gitlab::Utils.to_boolean(ENV['GITLAB_GOLANG_METRICS_SERVER'])
-    end
-
     def ensure_valid_target!(target)
       raise "Target must be one of [puma,sidekiq]" unless %w(puma sidekiq).include?(target)
     end