7 files changed, 89 insertions, 18 deletions
diff --git a/lib/gitlab/metrics/dashboard/finder.rb b/lib/gitlab/metrics/dashboard/finder.rb
index c8591a81a05..a4964ae0ebc 100644
--- a/lib/gitlab/metrics/dashboard/finder.rb
+++ b/lib/gitlab/metrics/dashboard/finder.rb
@@ -78,7 +78,7 @@ module Gitlab
           end
 
           def predefined_dashboard_services_for(project)
-            # Only list the self monitoring dashboard on the self monitoring project,
+            # Only list the self-monitoring dashboard on the self-monitoring project,
             # since it is the only dashboard (at time of writing) that shows data
             # about GitLab itself.
             if project.self_monitoring?
diff --git a/lib/gitlab/metrics/global_search_slis.rb b/lib/gitlab/metrics/global_search_slis.rb
index 3400a6c78ef..200c6eb4043 100644
--- a/lib/gitlab/metrics/global_search_slis.rb
+++ b/lib/gitlab/metrics/global_search_slis.rb
@@ -5,12 +5,12 @@ module Gitlab
     module GlobalSearchSlis
       class << self
         # The following targets are the 99.95th percentile of code searches
-        # gathered on 24-08-2022
+        # gathered on 25-10-2022
         # from https://log.gprd.gitlab.net/goto/0c89cd80-23af-11ed-8656-f5f2137823ba (internal only)
-        BASIC_CONTENT_TARGET_S = 7.031
-        BASIC_CODE_TARGET_S = 21.903
-        ADVANCED_CONTENT_TARGET_S = 4.865
-        ADVANCED_CODE_TARGET_S = 13.546
+        BASIC_CONTENT_TARGET_S = 8.812
+        BASIC_CODE_TARGET_S = 27.538
+        ADVANCED_CONTENT_TARGET_S = 2.452
+        ADVANCED_CODE_TARGET_S = 15.52
 
         def initialize_slis!
           Gitlab::Metrics::Sli::Apdex.initialize_sli(:global_search, possible_labels)
diff --git a/lib/gitlab/metrics/loose_foreign_keys_slis.rb b/lib/gitlab/metrics/loose_foreign_keys_slis.rb
new file mode 100644
index 00000000000..5d8245aa609
--- /dev/null
+++ b/lib/gitlab/metrics/loose_foreign_keys_slis.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module LooseForeignKeysSlis
+      class << self
+        def initialize_slis!
+          Gitlab::Metrics::Sli::Apdex.initialize_sli(:loose_foreign_key_clean_ups, possible_labels)
+          Gitlab::Metrics::Sli::ErrorRate.initialize_sli(:loose_foreign_key_clean_ups, possible_labels)
+        end
+
+        def record_apdex(success:, db_config_name:)
+          Gitlab::Metrics::Sli::Apdex[:loose_foreign_key_clean_ups].increment(
+            labels: labels(db_config_name),
+            success: success
+          )
+        end
+
+        def record_error_rate(error:, db_config_name:)
+          Gitlab::Metrics::Sli::ErrorRate[:loose_foreign_key_clean_ups].increment(
+            labels: labels(db_config_name),
+            error: error
+          )
+        end
+
+        private
+
+        def possible_labels
+          ::Gitlab::Database.db_config_names.map do |db_config_name|
+            {
+              db_config_name: db_config_name,
+              feature_category: :database
+            }
+          end
+        end
+
+        def labels(db_config_name)
+          {
+            db_config_name: db_config_name,
+            feature_category: :database
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index c6b0a0c5e76..f39ec9cc8ab 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -39,7 +39,6 @@ module Gitlab
             docstring 'Method calls real duration'
             label_keys label_keys
             buckets [0.01, 0.05, 0.1, 0.5, 1]
-            with_feature :prometheus_metrics_method_instrumentation
           end
         end
 
diff --git a/lib/gitlab/metrics/samplers/base_sampler.rb b/lib/gitlab/metrics/samplers/base_sampler.rb
index b2a9de21145..e62a62a935e 100644
--- a/lib/gitlab/metrics/samplers/base_sampler.rb
+++ b/lib/gitlab/metrics/samplers/base_sampler.rb
@@ -46,11 +46,11 @@ module Gitlab
         # 2. Don't sample data at the same interval two times in a row.
         def sleep_interval
           while step = @interval_steps.sample
-            if step != @last_step
-              @last_step = step
+            next if step == @last_step
 
-              return @interval + @last_step
-            end
+            @last_step = step
+
+            return @interval + @last_step
           end
         end
 
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index 4fe338ffc7f..5a7ca6b6c04 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -35,6 +35,8 @@ module Gitlab
             process_cpu_seconds_total: ::Gitlab::Metrics.gauge(metric_name(:process, :cpu_seconds_total), 'Process CPU seconds total'),
             process_max_fds: ::Gitlab::Metrics.gauge(metric_name(:process, :max_fds), 'Process max fds'),
             process_resident_memory_bytes: ::Gitlab::Metrics.gauge(metric_name(:process, :resident_memory_bytes), 'Memory used (RSS)', labels),
+            process_resident_anon_memory_bytes: ::Gitlab::Metrics.gauge(metric_name(:process, :resident_anon_memory_bytes), 'Anonymous memory used (RSS)', labels),
+            process_resident_file_memory_bytes: ::Gitlab::Metrics.gauge(metric_name(:process, :resident_file_memory_bytes), 'File backed memory used (RSS)', labels),
             process_unique_memory_bytes: ::Gitlab::Metrics.gauge(metric_name(:process, :unique_memory_bytes), 'Memory used (USS)', labels),
             process_proportional_memory_bytes: ::Gitlab::Metrics.gauge(metric_name(:process, :proportional_memory_bytes), 'Memory used (PSS)', labels),
             process_start_time_seconds: ::Gitlab::Metrics.gauge(metric_name(:process, :start_time_seconds), 'Process start time seconds'),
@@ -95,7 +97,10 @@ module Gitlab
         end
 
         def set_memory_usage_metrics
-          metrics[:process_resident_memory_bytes].set(labels, System.memory_usage_rss)
+          rss = System.memory_usage_rss
+          metrics[:process_resident_memory_bytes].set(labels, rss[:total])
+          metrics[:process_resident_anon_memory_bytes].set(labels, rss[:anon])
+          metrics[:process_resident_file_memory_bytes].set(labels, rss[:file])
 
           if Gitlab::Utils.to_boolean(ENV['enable_memory_uss_pss'] || '1')
             memory_uss_pss = System.memory_usage_uss_pss
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb
index affadc4274c..9b0ae84dec2 100644
--- a/lib/gitlab/metrics/system.rb
+++ b/lib/gitlab/metrics/system.rb
@@ -18,7 +18,9 @@ module Gitlab
 
       PRIVATE_PAGES_PATTERN = /^(Private_Clean|Private_Dirty|Private_Hugetlb):\s+(?<value>\d+)/.freeze
       PSS_PATTERN = /^Pss:\s+(?<value>\d+)/.freeze
-      RSS_PATTERN = /VmRSS:\s+(?<value>\d+)/.freeze
+      RSS_TOTAL_PATTERN = /^VmRSS:\s+(?<value>\d+)/.freeze
+      RSS_ANON_PATTERN = /^RssAnon:\s+(?<value>\d+)/.freeze
+      RSS_FILE_PATTERN = /^RssFile:\s+(?<value>\d+)/.freeze
       MAX_OPEN_FILES_PATTERN = /Max open files\s*(?<value>\d+)/.freeze
       MEM_TOTAL_PATTERN = /^MemTotal:\s+(?<value>\d+) (.+)/.freeze
 
@@ -27,7 +29,7 @@ module Gitlab
         {
           version: RUBY_DESCRIPTION,
           gc_stat: GC.stat,
-          memory_rss: memory_usage_rss,
+          memory_rss: memory_usage_rss[:total],
           memory_uss: proportional_mem[:uss],
           memory_pss: proportional_mem[:pss],
           time_cputime: cpu_time,
@@ -38,7 +40,21 @@ module Gitlab
 
       # Returns the given process' RSS (resident set size) in bytes.
       def memory_usage_rss(pid: 'self')
-        sum_matches(PROC_STATUS_PATH % pid, rss: RSS_PATTERN)[:rss].kilobytes
+        results = { total: 0, anon: 0, file: 0 }
+
+        safe_yield_procfile(PROC_STATUS_PATH % pid) do |io|
+          io.each_line do |line|
+            if (value = parse_metric_value(line, RSS_TOTAL_PATTERN)) > 0
+              results[:total] = value.kilobytes
+            elsif (value = parse_metric_value(line, RSS_ANON_PATTERN)) > 0
+              results[:anon] = value.kilobytes
+            elsif (value = parse_metric_value(line, RSS_FILE_PATTERN)) > 0
+              results[:file] = value.kilobytes
+            end
+          end
+        end
+
+        results
       end
 
       # Returns the given process' USS/PSS (unique/proportional set size) in bytes.
@@ -115,9 +131,7 @@ module Gitlab
         safe_yield_procfile(proc_file) do |io|
           io.each_line do |line|
             patterns.each do |metric, pattern|
-              match = line.match(pattern)
-              value = match&.named_captures&.fetch('value', 0)
-              results[metric] += value.to_i
+              results[metric] += parse_metric_value(line, pattern)
             end
           end
         end
@@ -125,6 +139,13 @@ module Gitlab
         results
       end
 
+      def parse_metric_value(line, pattern)
+        match = line.match(pattern)
+        return 0 unless match
+
+        match.named_captures.fetch('value', 0).to_i
+      end
+
       def proc_stat_entries
         safe_yield_procfile(PROC_STAT_PATH) do |io|
           io.read.split(' ')