Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'

Adds link_to_gfm method instrumentation See merge request !13069

Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'
484ddab9 · Sean McGivern · Simon Knox · 58a476c8 · 484ddab9 · 484ddab9
Commit 484ddab9 authored Jul 25, 2017 by Sean McGivern Committed by Simon Knox Jul 27, 2017
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

add-instrumentation-to-link-to-gfm.yml changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml +4 -0

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

No files found.
--- a/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml
+++ b/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml
+---
+title: Add instrumentation to MarkupHelper#link_to_gfm
+merge_request: 13069
+author:
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -114,6 +114,9 @@ def instrument_classes(instrumentation)
  # This is a Rails scope so we have to instrument it manually.
  instrumentation.instrument_method(Project, :visible_to_user)

+  # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/34509
+  instrumentation.instrument_method(MarkupHelper, :link_to_gfm)
+
  # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159
  instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits)
 end