diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-14 11:39:19 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-14 11:39:19 +0000 |
| commit | 4b964011cfd6861403726248574f5926edc5d495 (patch) | |
| tree | 9decb7fc9224b6e8625200200eeacf33eae02183 /lib | |
| parent | ab3fb00c429133ac4aa98887314dba3a167b919c (diff) | |
| parent | 120fbbd4875f340b5c863b7e0e3eabcb2796e15d (diff) | |
| download | gitlab-ce-4b964011cfd6861403726248574f5926edc5d495.tar.gz | |
Merge branch '18528-cpu-time-instrumentation' into 'master'
Measure CPU time for instrumented methods
See merge request !4640
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/instrumentation.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/gitlab/metrics/instrumentation.rb b/lib/gitlab/metrics/instrumentation.rb index 0f115893a15..ad9ce3fa442 100644 --- a/lib/gitlab/metrics/instrumentation.rb +++ b/lib/gitlab/metrics/instrumentation.rb @@ -149,13 +149,16 @@ module Gitlab trans = Gitlab::Metrics::Instrumentation.transaction if trans - start = Time.now - retval = super - duration = (Time.now - start) * 1000.0 + start = Time.now + cpu_start = Gitlab::Metrics::System.cpu_time + retval = super + duration = (Time.now - start) * 1000.0 if duration >= Gitlab::Metrics.method_call_threshold + cpu_duration = Gitlab::Metrics::System.cpu_time - cpu_start + trans.add_metric(Gitlab::Metrics::Instrumentation::SERIES, - { duration: duration }, + { duration: duration, cpu_duration: cpu_duration }, method: #{label.inspect}) end |