1 files changed, 11 insertions, 4 deletions
diff --git a/lib/gitlab/metrics/rack_middleware.rb b/lib/gitlab/metrics/rack_middleware.rb
index d01d47a6a7a..47f88727fc8 100644
--- a/lib/gitlab/metrics/rack_middleware.rb
+++ b/lib/gitlab/metrics/rack_middleware.rb
@@ -71,10 +71,17 @@ 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}"
+        begin
+          route = endpoint.route
+        rescue
+          # endpoint.route is calling env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]
+          # but env[Grape::Env::GRAPE_ROUTING_ARGS] is nil in the case of a 405 response
+          # so we're rescuing exceptions and bailing out
+        end
+
+        if route
+          path = endpoint_paths_cache[route.request_method][route.path]
+          trans.action = "Grape##{route.request_method} #{path}"
         end
       end