diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
commit | 184c2ced0761bd8dd7032619d16d3983fed7944a (patch) | |
tree | cc82b32ee7c1797509da3cf384617e4ffa2e1733 /lib/gitlab | |
parent | 238d22c07218adf2b8f3db630ee8b74ca6f29df5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/metrics/system.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/request_context.rb | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb index cc0cfc8e29e..2a61b3de405 100644 --- a/lib/gitlab/metrics/system.rb +++ b/lib/gitlab/metrics/system.rb @@ -65,6 +65,8 @@ module Gitlab end def self.thread_cpu_time + # Not all OS kernels are supporting `Process::CLOCK_THREAD_CPUTIME_ID` + # Refer: https://gitlab.com/gitlab-org/gitlab/issues/30567#note_221765627 return unless defined?(Process::CLOCK_THREAD_CPUTIME_ID) Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :float_second) diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb index ab2549d5e68..13187836e02 100644 --- a/lib/gitlab/request_context.rb +++ b/lib/gitlab/request_context.rb @@ -6,6 +6,10 @@ module Gitlab def client_ip Gitlab::SafeRequestStore[:client_ip] end + + def start_thread_cpu_time + Gitlab::SafeRequestStore[:start_thread_cpu_time] + end end def initialize(app) @@ -23,6 +27,8 @@ module Gitlab Gitlab::SafeRequestStore[:client_ip] = req.ip + Gitlab::SafeRequestStore[:start_thread_cpu_time] = Gitlab::Metrics::System.thread_cpu_time + @app.call(env) end end |