Merge branch 'fix-metrics-doorkeeper' into 'master'

Fix GitLab Performance Monitoring content types for Doorkeeper

Closes #46412

See merge request gitlab-org/gitlab-ce!18984

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/web_transaction.rb b/lib/gitlab/metrics/web_transaction.rb
index 7cf33ca9e8a..3799aaebf1c 100644
--- a/lib/gitlab/metrics/web_transaction.rb
+++ b/lib/gitlab/metrics/web_transaction.rb
@@ -28,7 +28,11 @@ module Gitlab
         controller = @env[CONTROLLER_KEY]
 
         action = "#{controller.action_name}"
-        suffix = controller.request_format
+
+        # Devise exposes a method called "request_format" that does the below.
+        # However, this method is not available to all controllers (e.g. certain
+        # Doorkeeper controllers). As such we use the underlying code directly.
+        suffix = controller.request.format.try(:ref)
 
         if suffix && suffix != :html
           action += ".#{suffix}"