Merge branch '36061-mr-ref-instrument' into 'master'

Instrument MergeRequest#fetch_ref See merge request !13980

Merge branch '36061-mr-ref-instrument' into 'master'
Instrument MergeRequest#fetch_ref See merge request !13980
5dd157be · Sean McGivern · d550aefe · 658e89a8 · 5dd157be · 5dd157be
Commit 5dd157be authored Sep 01, 2017 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

changelogs/unreleased/36061-mr-ref-instrument.yml changelogs/unreleased/36061-mr-ref-instrument.yml +5 -0

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

No files found.
--- a/changelogs/unreleased/36061-mr-ref-instrument.yml
+++ b/changelogs/unreleased/36061-mr-ref-instrument.yml
+---
+title: Instrument MergeRequest#fetch_ref
+merge_request:
+author:
+type: other
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -122,6 +122,7 @@ def instrument_classes(instrumentation)

  # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/36061
  instrumentation.instrument_instance_method(MergeRequest, :ensure_ref_fetched)
+  instrumentation.instrument_instance_method(MergeRequest, :fetch_ref)
 end
 # rubocop:enable Metrics/AbcSize