diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-26 19:51:40 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-26 19:51:40 +0000 |
| commit | 4feee8aaeb34c82643e787783416bfcd4a550c99 (patch) | |
| tree | 39b349d73751c0700d3f887bcdbaf9829f52d3e9 | |
| parent | 97ff3fcdeeac23d9ac2dd9a57b06abe46ace89a9 (diff) | |
| parent | 20f46637b7926e685ccbca282736b36fa2dd6d62 (diff) | |
| download | gitlab-ce-4feee8aaeb34c82643e787783416bfcd4a550c99.tar.gz | |
Merge branch '10-3-stable' into '10-3-stable-patch-1'
Resolve #41448
See merge request gitlab-org/gitlab-ce!16124
| -rw-r--r-- | lib/gitlab/metrics/method_call.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb index 329b07af5db..c2f9db56824 100644 --- a/lib/gitlab/metrics/method_call.rb +++ b/lib/gitlab/metrics/method_call.rb @@ -5,7 +5,7 @@ module Gitlab # Class for tracking timing information about method calls class MethodCall @@measurement_enabled_cache = Concurrent::AtomicBoolean.new(false) - @@measurement_enabled_cache_expires_at = Concurrent::AtomicFixnum.new(Time.now.to_i) + @@measurement_enabled_cache_expires_at = Concurrent::AtomicReference.new(Time.now.to_i) MUTEX = Mutex.new BASE_LABELS = { module: nil, method: nil }.freeze attr_reader :real_time, :cpu_time, :call_count, :labels |