summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-07-14 11:37:14 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-14 15:01:50 +0100
commitd11a2dd8737cbc8a29acfb9100243c6a487b9423 (patch)
tree6439724487dedb81715a7ef8a84194f6f5ddeba2
parent3e48796de12848df4401245383c99e3a026ba09c (diff)
downloadgitlab-ce-d11a2dd8737cbc8a29acfb9100243c6a487b9423.tar.gz
Merge branch 'instrument-ability' into 'master'
Instrument Ability See merge request !12865
-rw-r--r--config/initializers/8_metrics.rb4
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|