Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/samplers/base_sampler.rb b/lib/gitlab/metrics/samplers/base_sampler.rb
index 39a49187e45..7f9055fed5d 100644
--- a/lib/gitlab/metrics/samplers/base_sampler.rb
+++ b/lib/gitlab/metrics/samplers/base_sampler.rb
@@ -9,7 +9,9 @@ module Gitlab
         attr_reader :interval
 
         # interval - The sampling interval in seconds.
-        def initialize(interval = self.class::SAMPLING_INTERVAL_SECONDS)
+        def initialize(interval = nil)
+          interval ||= ENV[interval_env_key]&.to_i
+          interval ||= self.class::DEFAULT_SAMPLING_INTERVAL_SECONDS
           interval_half = interval.to_f / 2
 
           @interval = interval
@@ -50,6 +52,14 @@ module Gitlab
 
         attr_reader :running
 
+        def sampler_class
+          self.class.name.demodulize
+        end
+
+        def interval_env_key
+          "#{sampler_class.underscore.upcase}_INTERVAL_SECONDS"
+        end
+
         def start_working
           @running = true