Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/gitlab/metrics/rails_slis.rb b/lib/gitlab/metrics/rails_slis.rb
index 71da0085c8c..9fd4eec479e 100644
--- a/lib/gitlab/metrics/rails_slis.rb
+++ b/lib/gitlab/metrics/rails_slis.rb
@@ -6,6 +6,7 @@ module Gitlab
       class << self
         def initialize_request_slis!
           Gitlab::Metrics::Sli::Apdex.initialize_sli(:rails_request, possible_request_labels)
+          initialize_rails_request_error_rate
           Gitlab::Metrics::Sli::Apdex.initialize_sli(:graphql_query, possible_graphql_query_labels)
         end
 
@@ -13,6 +14,10 @@ module Gitlab
           Gitlab::Metrics::Sli::Apdex[:rails_request]
         end
 
+        def request_error_rate
+          Gitlab::Metrics::Sli::ErrorRate[:rails_request]
+        end
+
         def graphql_query_apdex
           Gitlab::Metrics::Sli::Apdex[:graphql_query]
         end
@@ -58,6 +63,12 @@ module Gitlab
             }
           end
         end
+
+        def initialize_rails_request_error_rate
+          return unless Feature.enabled?(:gitlab_metrics_error_rate_sli, type: :development)
+
+          Gitlab::Metrics::Sli::ErrorRate.initialize_sli(:rails_request, possible_request_labels)
+        end
       end
     end
   end