Merge branch '25908-fix-grape-after-update' into 'master'

Use Grape's new Route methods

See merge request !8223

changelogs/unreleased/25908-fix-grape-after-update.yml

+---
+title: Use Grape's new Route methods
+merge_request:
+author:

lib/gitlab/metrics/rack_middleware.rb

@@ -70,8 +70,8 @@ module Gitlab
       def tag_endpoint(trans, env)
         endpoint = env[ENDPOINT_KEY]
-        path = endpoint_paths_cache[endpoint.route.route_method][endpoint.route.route_path]
-        trans.action = "Grape##{endpoint.route.route_method} #{path}"
+        path = endpoint_paths_cache[endpoint.route.request_method][endpoint.route.path]
+        trans.action = "Grape##{endpoint.route.request_method} #{path}"
       end
       private

spec/lib/gitlab/metrics/rack_middleware_spec.rb

@@ -33,7 +33,7 @@ describe Gitlab::Metrics::RackMiddleware do
     end
     it 'tags a transaction with the method and path of the route in the grape endpoint' do
-      route    = double(:route, route_method: "GET", route_path: "/:version/projects/:id/archive(.:format)")
+      route    = double(:route, request_method: "GET", path: "/:version/projects/:id/archive(.:format)")
       endpoint = double(:endpoint, route: route)
       env['api.endpoint'] = endpoint
@@ -117,7 +117,7 @@ describe Gitlab::Metrics::RackMiddleware do
     let(:transaction) { middleware.transaction_from_env(env) }
     it 'tags a transaction with the method and path of the route in the grape endpount' do
-      route    = double(:route, route_method: "GET", route_path: "/:version/projects/:id/archive(.:format)")
+      route    = double(:route, request_method: "GET", path: "/:version/projects/:id/archive(.:format)")
       endpoint = double(:endpoint, route: route)
       env['api.endpoint'] = endpoint