1 files changed, 1 insertions, 15 deletions
diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb
index 9d314a56e58..60686509332 100644
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -5,16 +5,8 @@ module Gitlab
     module Prometheus
       include Gitlab::CurrentSettings
 
-      def metrics_folder_present?
-        ENV.has_key?('prometheus_multiproc_dir') &&
-          ::Dir.exist?(ENV['prometheus_multiproc_dir']) &&
-          ::File.writable?(ENV['prometheus_multiproc_dir'])
-      end
-
       def prometheus_metrics_enabled?
-        return @prometheus_metrics_enabled if defined?(@prometheus_metrics_enabled)
-
-        @prometheus_metrics_enabled = prometheus_metrics_enabled_unmemoized
+        @prometheus_metrics_enabled ||= current_application_settings[:prometheus_metrics_enabled] || false
       end
 
       def registry
@@ -44,12 +36,6 @@ module Gitlab
           NullMetric.new
         end
       end
-
-      private
-
-      def prometheus_metrics_enabled_unmemoized
-        metrics_folder_present? && current_application_settings[:prometheus_metrics_enabled] || false
-      end
     end
   end
 end