diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /lib/gitlab/instrumentation | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'lib/gitlab/instrumentation')
-rw-r--r-- | lib/gitlab/instrumentation/redis_interceptor.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/gitlab/instrumentation/redis_interceptor.rb b/lib/gitlab/instrumentation/redis_interceptor.rb index b5a5f8fd984..8a64abb9f62 100644 --- a/lib/gitlab/instrumentation/redis_interceptor.rb +++ b/lib/gitlab/instrumentation/redis_interceptor.rb @@ -1,14 +1,12 @@ # frozen_string_literal: true -require 'redis' - module Gitlab module Instrumentation module RedisInterceptor APDEX_EXCLUDE = %w[brpop blpop brpoplpush bzpopmin bzpopmax xread xreadgroup].freeze def call(*args, &block) - start = Time.now # must come first so that 'start' is always defined + start = Gitlab::Metrics::System.monotonic_time # must come first so that 'start' is always defined instrumentation_class.instance_count_request instrumentation_class.redis_cluster_validate!(args.first) @@ -17,7 +15,7 @@ module Gitlab instrumentation_class.instance_count_exception(ex) raise ex ensure - duration = Time.now - start + duration = Gitlab::Metrics::System.monotonic_time - start unless APDEX_EXCLUDE.include?(command_from_args(args)) instrumentation_class.instance_observe_duration(duration) @@ -99,7 +97,3 @@ module Gitlab end end end - -class ::Redis::Client - prepend ::Gitlab::Instrumentation::RedisInterceptor -end |