1 files changed, 10 insertions, 6 deletions
diff --git a/lib/gitlab/database/query_analyzers/query_recorder.rb b/lib/gitlab/database/query_analyzers/query_recorder.rb
index b54f3442512..63b4fbb8c1d 100644
--- a/lib/gitlab/database/query_analyzers/query_recorder.rb
+++ b/lib/gitlab/database/query_analyzers/query_recorder.rb
@@ -5,21 +5,19 @@ module Gitlab
     module QueryAnalyzers
       class QueryRecorder < Base
         LOG_PATH = 'query_recorder/'
+        LIST_PARAMETER_REGEX = %r{\$\d+(?:\s*,\s*\$\d+)+}.freeze
+        SINGLE_PARAMETER_REGEX = %r{\$\d+}.freeze
 
         class << self
-          def raw?
-            true
-          end
-
           def enabled?
             # Only enable QueryRecorder in CI on database MRs or default branch
             ENV['CI_MERGE_REQUEST_LABELS']&.include?('database') ||
               (ENV['CI_COMMIT_REF_NAME'].present? && ENV['CI_COMMIT_REF_NAME'] == ENV['CI_DEFAULT_BRANCH'])
           end
 
-          def analyze(sql)
+          def analyze(parsed)
             payload = {
-              sql: sql
+              normalized: normalize_query(parsed.sql)
             }
 
             log_query(payload)
@@ -42,6 +40,12 @@ module Gitlab
 
             File.write(log_file, log_line, mode: 'a')
           end
+
+          def normalize_query(query)
+            query
+              .gsub(LIST_PARAMETER_REGEX, '?,?,?') # Replace list parameters with ?,?,?
+              .gsub(SINGLE_PARAMETER_REGEX, '?')   # Replace single parameters with ?
+          end
         end
       end
     end