From c9f0070b649cac40eb7a93639726aee63a1f4cc8 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Tue, 24 Oct 2017 11:57:29 +0300 Subject: Make subscriber tests pass, after refactoring metrics --- lib/gitlab/metrics/subscribers/action_view.rb | 2 +- lib/gitlab/metrics/subscribers/rails_cache.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/gitlab/metrics') diff --git a/lib/gitlab/metrics/subscribers/action_view.rb b/lib/gitlab/metrics/subscribers/action_view.rb index 891fa92e3f7..3da474fc1ec 100644 --- a/lib/gitlab/metrics/subscribers/action_view.rb +++ b/lib/gitlab/metrics/subscribers/action_view.rb @@ -28,7 +28,7 @@ module Gitlab values = values_for(event) tags = tags_for(event) - self.metric_view_rendering_duration_seconds.observe( + metric_view_rendering_duration_seconds.observe( current_transaction.labels.merge(tags), event.duration ) diff --git a/lib/gitlab/metrics/subscribers/rails_cache.rb b/lib/gitlab/metrics/subscribers/rails_cache.rb index 7383e384d66..efd3c9daf79 100644 --- a/lib/gitlab/metrics/subscribers/rails_cache.rb +++ b/lib/gitlab/metrics/subscribers/rails_cache.rb @@ -15,7 +15,7 @@ module Gitlab if event.payload[:hit] current_transaction.increment(:cache_read_hit_count, 1, false) else - self.metric_cache_misses_total.increment(current_transaction.labels) + metric_cache_misses_total.increment(current_transaction.labels) current_transaction.increment(:cache_read_miss_count, 1, false) end end @@ -41,14 +41,14 @@ module Gitlab def cache_generate(event) return unless current_transaction - self.metric_cache_misses_total.increment(current_transaction.labels) + metric_cache_misses_total.increment(current_transaction.labels) current_transaction.increment(:cache_read_miss_count, 1) end def observe(key, duration) return unless current_transaction - self.metric_cache_operation_duration_seconds.observe(current_transaction.labels.merge({ operation: key }), duration / 1000.0) + metric_cache_operation_duration_seconds.observe(current_transaction.labels.merge({ operation: key }), duration / 1000.0) current_transaction.increment(:cache_duration, duration, false) current_transaction.increment(:cache_count, 1, false) current_transaction.increment("cache_#{key}_duration".to_sym, duration, false) -- cgit v1.2.3