Commit 970f20e1 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'instrument-ability' into 'master'

Instrument Ability

See merge request !12865
parents 34da5a5d a5b8d4bc
...@@ -174,6 +174,10 @@ if Gitlab::Metrics.enabled? ...@@ -174,6 +174,10 @@ if Gitlab::Metrics.enabled?
loc && loc[0].start_with?(models) && method.source =~ regex loc && loc[0].start_with?(models) && method.source =~ regex
end end
end end
# Ability is in app/models, is not an ActiveRecord model, but should still
# be instrumented.
Gitlab::Metrics::Instrumentation.instrument_methods(Ability)
end end
Gitlab::Metrics::Instrumentation.configure do |config| Gitlab::Metrics::Instrumentation.configure do |config|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment