diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-12-12 18:52:08 +0100 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-12-12 18:52:08 +0100 |
commit | da19ce625ba8a0db9921fd85e331e70b14a5625b (patch) | |
tree | 180dff45ca0d10ee99ea70d452e38d193ecf5bc5 | |
parent | fd0a5168542f3a69815c99dc21f39587064f872d (diff) | |
download | gitlab-ce-da19ce625ba8a0db9921fd85e331e70b14a5625b.tar.gz |
Expire feature flag cache after 1minute
-rw-r--r-- | lib/gitlab/metrics/method_call.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/metrics/method_call_spec.rb | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb index a844100e5a8..c58e54916e6 100644 --- a/lib/gitlab/metrics/method_call.rb +++ b/lib/gitlab/metrics/method_call.rb @@ -80,7 +80,7 @@ module Gitlab def call_measurement_enabled? expires_at = @@measurement_enabled_cache_expires_at.value if expires_at < Time.now.to_i - if @@measurement_enabled_cache_expires_at.compare_and_set(expires_at, (Time.now + 30.seconds).to_i) + if @@measurement_enabled_cache_expires_at.compare_and_set(expires_at, 1.minute.from_now.to_i) @@measurement_enabled_cache.value = Feature.get(:prometheus_metrics_method_instrumentation).enabled? end end diff --git a/spec/lib/gitlab/metrics/method_call_spec.rb b/spec/lib/gitlab/metrics/method_call_spec.rb index f98d7e48b17..c11da42ed29 100644 --- a/spec/lib/gitlab/metrics/method_call_spec.rb +++ b/spec/lib/gitlab/metrics/method_call_spec.rb @@ -40,15 +40,13 @@ describe Gitlab::Metrics::MethodCall do end it 'expires feature check cache after 30 seconds' do - 10.times do - method_call.measure { 'foo' } - end + method_call.measure { 'foo' } - Timecop.travel(Time.now + 30.seconds) do + Timecop.travel(1.minute.from_now) do method_call.measure { 'foo' } end - Timecop.travel(Time.now + 31.seconds) do + Timecop.travel(1.minute.from_now + 1.second) do method_call.measure { 'foo' } end |