Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 21 insertions, 8 deletions

diff --git a/lib/gitlab/performance_bar/stats.rb b/lib/gitlab/performance_bar/stats.rb
index d1504d88315..380340b80be 100644
--- a/lib/gitlab/performance_bar/stats.rb
+++ b/lib/gitlab/performance_bar/stats.rb
@@ -27,27 +27,40 @@ module Gitlab
       end
 
       def log_sql_queries(id, data)
-        return [] unless queries = data.dig('data', 'active-record', 'details')
-
-        queries.each do |query|
-          next unless location = parse_backtrace(query['backtrace'])
+        queries_by_location(data).each do |location, queries|
+          next unless location
 
-          log_info = location.merge(
+          duration = queries.sum { |query| query['duration'].to_f }
+          log_info = {
+            method_path: "#{location[:filename]}:#{location[:method]}",
+            filename: location[:filename],
             type: :sql,
             request_id: id,
-            duration_ms: query['duration'].to_f
-          )
+            count: queries.count,
+            duration_ms: duration
+          }
 
           logger.info(log_info)
         end
       end
 
+      def queries_by_location(data)
+        return [] unless queries = data.dig('data', 'active-record', 'details')
+
+        queries.group_by do |query|
+          parse_backtrace(query['backtrace'])
+        end
+      end
+
       def parse_backtrace(backtrace)
         return unless match = /(?<filename>.*):(?<filenum>\d+):in `(?<method>.*)'/.match(backtrace.first)
 
         {
           filename: match[:filename],
-          filenum: match[:filenum].to_i,
+          # filenum may change quite frequently with every change in the file,
+          # because the intention is to aggregate these queries, we group
+          # them rather by method name which should not change so frequently
+          # filenum: match[:filenum].to_i,
           method: match[:method]
         }
       end