Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 14 insertions, 14 deletions

diff --git a/scripts/perf/gc/print_gc_stats.rb b/scripts/perf/gc/print_gc_stats.rb
index 4aeb2f1ef07..a15b6f5b0e0 100755
--- a/scripts/perf/gc/print_gc_stats.rb
+++ b/scripts/perf/gc/print_gc_stats.rb
@@ -60,7 +60,7 @@ gc_stat_keys = ENV['GC_STAT_KEYS'].to_s.split(',').map(&:to_sym)
 values = []
 values << ENV['SETTING_CSV']
 values += gc_stat_keys.map { |k| gc_stats[k] }
-values << ::Gitlab::Metrics::System.memory_usage_rss
+values << ::Gitlab::Metrics::System.memory_usage_rss[:total]
 values << gc_total_time
 values << tms.utime + tms.cutime
 values << tms.stime + tms.cstime
diff --git a/scripts/perf/query_limiting_report.rb b/scripts/perf/query_limiting_report.rb
index 364cd6fc5d4..6326b2590ae 100755
--- a/scripts/perf/query_limiting_report.rb
+++ b/scripts/perf/query_limiting_report.rb
@@ -124,19 +124,19 @@ class QueryLimitingReport
 
       file_lines.each_index do |index|
         line = file_lines[index]
-        if line =~ /#{CODE_LINES_SEARCH_STRING}/o
-          issue_iid = line.slice(%r{issues/(\d+)\D}, 1)
-          line_number = index + 1
-          code_line = {
-            file_location: "#{filename}:#{line_number}",
-            filename: filename,
-            line_number: line_number,
-            line: line,
-            issue_iid: issue_iid.to_i,
-            has_issue_iid: !issue_iid.nil?
-          }
-          code_lines << code_line
-        end
+        next unless line =~ /#{CODE_LINES_SEARCH_STRING}/o
+
+        issue_iid = line.slice(%r{issues/(\d+)\D}, 1)
+        line_number = index + 1
+        code_line = {
+          file_location: "#{filename}:#{line_number}",
+          filename: filename,
+          line_number: line_number,
+          line: line,
+          issue_iid: issue_iid.to_i,
+          has_issue_iid: !issue_iid.nil?
+        }
+        code_lines << code_line
       end
     end