Merge branch 'sherlock-ignore-cache' into 'master'

Ignore SQL CACHE hits in Sherlock See merge request gitlab-org/gitlab-ce!15182

Merge branch 'sherlock-ignore-cache' into 'master'
4250f38f · Rémy Coutable · 0b97aa5e · e3b626da · 4250f38f
Commit 4250f38f authored Nov 03, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

transaction.rb lib/gitlab/sherlock/transaction.rb +3 -1

No files found.
--- a/lib/gitlab/sherlock/transaction.rb
+++ b/lib/gitlab/sherlock/transaction.rb
@@ -89,7 +89,9 @@ module Gitlab
        ActiveSupport::Notifications.subscribe('sql.active_record') do |_, start, finish, _, data|
          next unless same_thread?

-          track_query(data[:sql].strip, data[:binds], start, finish)
+          unless data.fetch(:cached, data[:name] == 'CACHE')
+            track_query(data[:sql].strip, data[:binds], start, finish)
+          end
        end
      end