Commit a64b7cd3 authored by Robert Speicher's avatar Robert Speicher Committed by Robert Speicher

Merge branch 'performance-clock-adjustments' into 'master'

Use clock_gettime for all performance timestamps

This MR adjusts the performance monitoring code to use `Process.clock_gettime` (thus `clock_gettime(3)`) instead of `Time.now`.

Using `Time.now` / `Time.new` adds more overhead than `Process.clock_gettime`, it also doesn't provide a way of getting timestamps in nanoseconds (which `Process.clock_gettime` does allow).

See merge request !4899
(cherry picked from commit 53ad9522)
parent a87c99f7
...@@ -18,12 +18,12 @@ module Gitlab ...@@ -18,12 +18,12 @@ module Gitlab
# Measures the real and CPU execution time of the supplied block. # Measures the real and CPU execution time of the supplied block.
def measure def measure
start_real = Time.now start_real = System.monotonic_time
start_cpu = System.cpu_time start_cpu = System.cpu_time
retval = yield retval = yield
@real_time += (Time.now - start_real) * 1000.0 @real_time += System.monotonic_time - start_real
@cpu_time += System.cpu_time.to_f - start_cpu @cpu_time += System.cpu_time - start_cpu
@call_count += 1 @call_count += 1
retval retval
......
...@@ -4,16 +4,15 @@ module Gitlab ...@@ -4,16 +4,15 @@ module Gitlab
class Metric class Metric
JITTER_RANGE = 0.000001..0.001 JITTER_RANGE = 0.000001..0.001
attr_reader :series, :values, :tags, :created_at attr_reader :series, :values, :tags
# series - The name of the series (as a String) to store the metric in. # series - The name of the series (as a String) to store the metric in.
# values - A Hash containing the values to store. # values - A Hash containing the values to store.
# tags - A Hash containing extra tags to add to the metrics. # tags - A Hash containing extra tags to add to the metrics.
def initialize(series, values, tags = {}) def initialize(series, values, tags = {})
@values = values @values = values
@series = series @series = series
@tags = tags @tags = tags
@created_at = Time.now.utc
end end
# Returns a Hash in a format that can be directly written to InfluxDB. # Returns a Hash in a format that can be directly written to InfluxDB.
...@@ -27,20 +26,20 @@ module Gitlab ...@@ -27,20 +26,20 @@ module Gitlab
# #
# Due to the way InfluxDB is set up there's no solution to this problem, # Due to the way InfluxDB is set up there's no solution to this problem,
# all we can do is lower the amount of collisions. We do this by using # all we can do is lower the amount of collisions. We do this by using
# Time#to_f which returns the seconds as a Float providing greater # System.real_time which returns the nanoseconds as a Float providing
# accuracy. We then add a small random value that is large enough to # greater accuracy. We then add a small random value that is large
# distinguish most timestamps but small enough to not alter the amount # enough to distinguish most timestamps but small enough to not alter
# of seconds. # the timestamp significantly.
# #
# See https://gitlab.com/gitlab-com/operations/issues/175 for more # See https://gitlab.com/gitlab-com/operations/issues/175 for more
# information. # information.
time = @created_at.to_f + rand(JITTER_RANGE) time = System.real_time(:nanosecond) + rand(JITTER_RANGE)
{ {
series: @series, series: @series,
tags: @tags, tags: @tags,
values: @values, values: @values,
timestamp: (time * 1_000_000_000).to_i timestamp: time.to_i
} }
end end
end end
......
...@@ -34,13 +34,29 @@ module Gitlab ...@@ -34,13 +34,29 @@ module Gitlab
# THREAD_CPUTIME is not supported on OS X # THREAD_CPUTIME is not supported on OS X
if Process.const_defined?(:CLOCK_THREAD_CPUTIME_ID) if Process.const_defined?(:CLOCK_THREAD_CPUTIME_ID)
def self.cpu_time def self.cpu_time
Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :millisecond) Process.
clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :millisecond).to_f
end end
else else
def self.cpu_time def self.cpu_time
Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID, :millisecond) Process.
clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID, :millisecond).to_f
end end
end end
# Returns the current real time in a given precision.
#
# Returns the time as a Float.
def self.real_time(precision = :millisecond)
Process.clock_gettime(Process::CLOCK_REALTIME, precision).to_f
end
# Returns the current monotonic clock time in a given precision.
#
# Returns the time as a Float.
def self.monotonic_time(precision = :millisecond)
Process.clock_gettime(Process::CLOCK_MONOTONIC, precision).to_f
end
end end
end end
end end
...@@ -30,7 +30,7 @@ module Gitlab ...@@ -30,7 +30,7 @@ module Gitlab
end end
def duration def duration
@finished_at ? (@finished_at - @started_at) * 1000.0 : 0.0 @finished_at ? (@finished_at - @started_at) : 0.0
end end
def allocated_memory def allocated_memory
...@@ -41,12 +41,12 @@ module Gitlab ...@@ -41,12 +41,12 @@ module Gitlab
Thread.current[THREAD_KEY] = self Thread.current[THREAD_KEY] = self
@memory_before = System.memory_usage @memory_before = System.memory_usage
@started_at = Time.now @started_at = System.monotonic_time
yield yield
ensure ensure
@memory_after = System.memory_usage @memory_after = System.memory_usage
@finished_at = Time.now @finished_at = System.monotonic_time
Thread.current[THREAD_KEY] = nil Thread.current[THREAD_KEY] = nil
end end
......
...@@ -28,8 +28,20 @@ describe Gitlab::Metrics::System do ...@@ -28,8 +28,20 @@ describe Gitlab::Metrics::System do
end end
describe '.cpu_time' do describe '.cpu_time' do
it 'returns a Fixnum' do it 'returns a Float' do
expect(described_class.cpu_time).to be_an_instance_of(Fixnum) expect(described_class.cpu_time).to be_an_instance_of(Float)
end
end
describe '.real_time' do
it 'returns a Float' do
expect(described_class.real_time).to be_an_instance_of(Float)
end
end
describe '.monotonic_time' do
it 'returns a Float' do
expect(described_class.monotonic_time).to be_an_instance_of(Float)
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment