diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
| commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
| tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /lib/gitlab/metrics/requests_rack_middleware.rb | |
| parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) | |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'lib/gitlab/metrics/requests_rack_middleware.rb')
| -rw-r--r-- | lib/gitlab/metrics/requests_rack_middleware.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/metrics/requests_rack_middleware.rb b/lib/gitlab/metrics/requests_rack_middleware.rb index cfdac5264e0..f635deabf76 100644 --- a/lib/gitlab/metrics/requests_rack_middleware.rb +++ b/lib/gitlab/metrics/requests_rack_middleware.rb @@ -27,6 +27,8 @@ module Gitlab 'not_owned', 'source_code_management', FEATURE_CATEGORY_DEFAULT].freeze + REQUEST_URGENCY_KEY = 'gitlab.request_urgency' + def initialize(app) @app = app end @@ -125,8 +127,6 @@ module Gitlab end def record_error(urgency, status) - return unless Feature.enabled?(:gitlab_metrics_error_rate_sli, type: :development) - Gitlab::Metrics::RailsSlis.request_error_rate.increment( labels: labels_from_context.merge(request_urgency: urgency.name), error: ::Gitlab::Metrics.server_error?(status) @@ -142,7 +142,9 @@ module Gitlab def urgency_for_env(env) endpoint_urgency = - if env['api.endpoint'].present? + if env[REQUEST_URGENCY_KEY].present? + env[REQUEST_URGENCY_KEY] + elsif env['api.endpoint'].present? env['api.endpoint'].options[:for].try(:urgency_for_app, env['api.endpoint']) elsif env['action_controller.instance'].present? && env['action_controller.instance'].respond_to?(:urgency) env['action_controller.instance'].urgency |