diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-07-14 11:37:14 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-07-14 11:37:14 +0000 |
commit | 970f20e192ebfe682a12ccf93ef206863fc0f450 (patch) | |
tree | 8baacaef6425fed5b819f77755a54234631fd88e | |
parent | 34da5a5de441558f0aa515e3945114d59057c2e9 (diff) | |
parent | a5b8d4bceaeef1ea49695e3bf25b2037f705d252 (diff) | |
download | gitlab-ce-970f20e192ebfe682a12ccf93ef206863fc0f450.tar.gz |
Merge branch 'instrument-ability' into 'master'
Instrument Ability
See merge request !12865
-rw-r--r-- | config/initializers/8_metrics.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index 5e34aac6527..c80d28746d6 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -174,6 +174,10 @@ if Gitlab::Metrics.enabled? loc && loc[0].start_with?(models) && method.source =~ regex end end + + # Ability is in app/models, is not an ActiveRecord model, but should still + # be instrumented. + Gitlab::Metrics::Instrumentation.instrument_methods(Ability) end Gitlab::Metrics::Instrumentation.configure do |config| |