Merge branch 'performance-bar-sql' into 'master'

Remove Sherlock usage from the performance bar Closes #39351 See merge request gitlab-org/gitlab-ce!15000

Merge branch 'performance-bar-sql' into 'master'
057c81b1 · Rémy Coutable · e16add22 · 189b5c3c · 057c81b1
Commit 057c81b1 authored Oct 24, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

peek_query_tracker.rb lib/gitlab/performance_bar/peek_query_tracker.rb +2 -2

No files found.
--- a/lib/gitlab/performance_bar/peek_query_tracker.rb
+++ b/lib/gitlab/performance_bar/peek_query_tracker.rb
@@ -36,8 +36,8 @@ module Gitlab
      end

      def track_query(raw_query, bindings, start, finish)
-        query = Gitlab::Sherlock::Query.new(raw_query, start, finish)
-        query_info = { duration: query.duration.round(3), sql: query.formatted_query }
+        duration = finish - start
+        query_info = { duration: duration.round(3), sql: raw_query }

        PEEK_DB_CLIENT.query_details << query_info
      end