diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-04 18:24:39 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-09 10:02:52 +0100 |
| commit | c28b0a539dcbbec8ba487067ff315cb5d57e5bdb (patch) | |
| tree | d1db4aba7fc14ff9766b2fb384b3c718d099fb4f /lib/gitlab/metrics/rack_middleware.rb | |
| parent | 8ab94120ee0a87c7b1158ebafea101e3952ec758 (diff) | |
| download | gitlab-ce-c28b0a539dcbbec8ba487067ff315cb5d57e5bdb.tar.gz | |
Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-method
Fixes #26051.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/gitlab/metrics/rack_middleware.rb')
| -rw-r--r-- | lib/gitlab/metrics/rack_middleware.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/rack_middleware.rb b/lib/gitlab/metrics/rack_middleware.rb index 91fb0bb317a..d01d47a6a7a 100644 --- a/lib/gitlab/metrics/rack_middleware.rb +++ b/lib/gitlab/metrics/rack_middleware.rb @@ -70,8 +70,12 @@ module Gitlab def tag_endpoint(trans, env) endpoint = env[ENDPOINT_KEY] - path = endpoint_paths_cache[endpoint.route.request_method][endpoint.route.path] - trans.action = "Grape##{endpoint.route.request_method} #{path}" + + # 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 |