diff options
author | Sean McGivern <sean@gitlab.com> | 2019-07-03 12:16:01 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-07-03 12:16:01 +0300 |
commit | f90a7601c40c82bd230f9c014bc4f64744e77b5e (patch) | |
tree | 2986d7a2254df60a2d77a6e803e63f652c567c52 /lib | |
parent | e674e62a0dd33eb4e0819de50f5f5074de3c0303 (diff) | |
parent | dac8e99ee7580df80faf72954912185f63e5f2a2 (diff) |
Merge branch 'sh-improve-redis-peek' into 'master'
Add Redis call details in Peek performance bar
See merge request gitlab-org/gitlab-ce!30191
Diffstat (limited to 'lib')
-rw-r--r-- | lib/peek/views/redis.rb | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/lib/peek/views/redis.rb b/lib/peek/views/redis.rb new file mode 100644 index 00000000000..ad3c3c9fe01 --- /dev/null +++ b/lib/peek/views/redis.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +require 'redis' +require 'peek-redis' + +module Gitlab + module Peek + module RedisInstrumented + def call(*args, &block) + start = Time.now + super(*args, &block) + ensure + duration = (Time.now - start) + add_call_details(duration, args) + end + + private + + def add_call_details(duration, args) + # redis-rb passes an array (e.g. [:get, key]) + return unless args.length == 1 + + detail_store << { + cmd: args.first, + duration: duration, + backtrace: Gitlab::Profiler.clean_backtrace(caller) + } + end + + def detail_store + ::Gitlab::SafeRequestStore['redis_call_details'] ||= [] + end + end + end +end + +module Peek + module Views + module RedisDetailed + def results + super.merge(details: details) + end + + def details + detail_store + .sort { |a, b| b[:duration] <=> a[:duration] } + .map(&method(:format_call_details)) + end + + def detail_store + ::Gitlab::SafeRequestStore['redis_call_details'] ||= [] + end + + def format_call_details(call) + call.merge(cmd: format_command(call[:cmd]), + duration: (call[:duration] * 1000).round(3)) + end + + def format_command(cmd) + # Scrub out the value of the SET calls to avoid binary + # data or large data from spilling into the view + if cmd.length >= 2 && cmd.first =~ /set/i + cmd[-1] = "<redacted>" + end + + cmd.join(' ') + end + end + end +end + +class Redis::Client + prepend Gitlab::Peek::RedisInstrumented +end + +module Peek + module Views + class Redis < View + prepend Peek::Views::RedisDetailed + end + end +end |