Merge branch '26051-fix-missing-endpoint-route-method' into 'master'

Don't instrument 405 Grape calls

Closes #26051

See merge request !8445

changelogs/unreleased/26051-fix-missing-endpoint-route-method.yml

+---
+title: Don't instrument 405 Grape calls
+merge_request: 8445
+author:

lib/api/api.rb

@@ -14,7 +14,11 @@ module API
     end
 
     # Retain 405 error rather than a 500 error for Grape 0.15.0+.
-    # See: https://github.com/ruby-grape/grape/commit/252bfd27c320466ec3c0751812cf44245e97e5de
+    # https://github.com/ruby-grape/grape/blob/a3a28f5b5dfbb2797442e006dbffd750b27f2a76/UPGRADING.md#changes-to-method-not-allowed-routes
+    rescue_from Grape::Exceptions::MethodNotAllowed do |e|
+      error! e.message, e.status, e.headers
+    end
+
     rescue_from Grape::Exceptions::Base do |e|
       error! e.message, e.status, e.headers
     end

lib/ci/api/api.rb

@@ -8,6 +8,16 @@ module Ci
         rack_response({ 'message' => '404 Not found' }.to_json, 404)
       end
 
+      # Retain 405 error rather than a 500 error for Grape 0.15.0+.
+      # https://github.com/ruby-grape/grape/blob/a3a28f5b5dfbb2797442e006dbffd750b27f2a76/UPGRADING.md#changes-to-method-not-allowed-routes
+      rescue_from Grape::Exceptions::MethodNotAllowed do |e|
+        error! e.message, e.status, e.headers
+      end
+
+      rescue_from Grape::Exceptions::Base do |e|
+        error! e.message, e.status, e.headers
+      end
+
       rescue_from :all do |exception|
         handle_api_exception(exception)
       end

lib/gitlab/metrics/rack_middleware.rb

@@ -70,9 +70,13 @@ module Gitlab
 
       def tag_endpoint(trans, env)
         endpoint = env[ENDPOINT_KEY]
+
+        # endpoint.route is nil in the case of a 405 response
+        if endpoint.route
           path = endpoint_paths_cache[endpoint.route.request_method][endpoint.route.path]
           trans.action = "Grape##{endpoint.route.request_method} #{path}"
         end
+      end
 
       private