diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-16 23:12:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-16 23:12:55 +0000 |
| commit | 28eea9bdfd0b28ad044f76bd4fcf988329ca9921 (patch) | |
| tree | fa989c68e2de23557835942ebeaeefe37355ce5a | |
| parent | 4ade5ff42511d7931bebb28098c2dc2192caba3e (diff) | |
| parent | b933367ab3d8df50f0ebd0690d306536f7a654db (diff) | |
| download | gitlab-ce-28eea9bdfd0b28ad044f76bd4fcf988329ca9921.tar.gz | |
Merge branch 'instrument-api-helpers' into 'master'
Instrument all Grape API helpers
This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99).
See merge request !4169
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e1252d4b947..20e2fcb806c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -57,6 +57,7 @@ v 8.8.0 (unreleased) - Redesign navigation for profile and group pages - Add counter metrics for rails cache - Import pull requests from GitHub where the source or target branches were removed + - All Grape API helpers are now instrumented v 8.7.6 - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko) diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index b2d08d87bac..2338916e9da 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -118,6 +118,8 @@ if Gitlab::Metrics.enabled? # Instrument the classes used for checking if somebody has push access. config.instrument_instance_methods(Gitlab::GitAccess) config.instrument_instance_methods(Gitlab::GitAccessWiki) + + config.instrument_instance_methods(API::Helpers) end GC::Profiler.enable |