Merge branch 'instrument-ability' into 'master'

Instrument Ability See merge request !12865

Merge branch 'instrument-ability' into 'master'
d11a2dd8 · Yorick Peterse · James Edwards-Jones · 3e48796d · d11a2dd8
Commit d11a2dd8 authored Jul 14, 2017 by Yorick Peterse Committed by James Edwards-Jones Jul 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

8_metrics.rb config/initializers/8_metrics.rb +4 -0

No files found.
--- 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|