Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

2 files changed, 0 insertions, 46 deletions

diff --git a/lib/gitlab/metrics/exporter/base_exporter.rb b/lib/gitlab/metrics/exporter/base_exporter.rb
index 2aea8d655fa..ba2eb729d7b 100644
--- a/lib/gitlab/metrics/exporter/base_exporter.rb
+++ b/lib/gitlab/metrics/exporter/base_exporter.rb
@@ -71,28 +71,17 @@ module Gitlab
         end
 
         def rack_app
-          readiness = readiness_probe
-          liveness = liveness_probe
           pid = thread_name
           gc_requests = @gc_requests
 
           Rack::Builder.app do
             use Rack::Deflater
             use Gitlab::Metrics::Exporter::MetricsMiddleware, pid
-            use Gitlab::Metrics::Exporter::HealthChecksMiddleware, readiness, liveness
             use Gitlab::Metrics::Exporter::GcRequestMiddleware if gc_requests
             use ::Prometheus::Client::Rack::Exporter if ::Gitlab::Metrics.metrics_folder_present?
             run -> (env) { [404, {}, ['']] }
           end
         end
-
-        def readiness_probe
-          ::Gitlab::HealthChecks::Probes::Collection.new
-        end
-
-        def liveness_probe
-          ::Gitlab::HealthChecks::Probes::Collection.new
-        end
       end
     end
   end
diff --git a/lib/gitlab/metrics/exporter/health_checks_middleware.rb b/lib/gitlab/metrics/exporter/health_checks_middleware.rb
deleted file mode 100644
index c43b8004b72..00000000000
--- a/lib/gitlab/metrics/exporter/health_checks_middleware.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Metrics
-    module Exporter
-      class HealthChecksMiddleware
-        def initialize(app, readiness_probe, liveness_probe)
-          @app = app
-          @readiness_probe = readiness_probe
-          @liveness_probe = liveness_probe
-        end
-
-        def call(env)
-          case env['PATH_INFO']
-          when '/readiness' then render_probe(@readiness_probe)
-          when '/liveness' then render_probe(@liveness_probe)
-          else @app.call(env)
-          end
-        end
-
-        private
-
-        def render_probe(probe)
-          result = probe.execute
-
-          [
-            result.http_status,
-            { 'Content-Type' => 'application/json; charset=utf-8' },
-            [result.json.to_json]
-          ]
-        end
-      end
-    end
-  end
-end