Merge branch 'instrument-nokogiri' into 'master'

Instrument Nokogiri parsing methods ## What does this MR do? This MR instruments the various parsing methods of Nokogiri. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? This allows us to see how much time is spent in Nokogiri. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5470

Merge branch 'instrument-nokogiri' into 'master'
720d3be2 · Rémy Coutable · 89872574 · 67012f4a · 720d3be2 · 720d3be2
Commit 720d3be2 authored Jul 25, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

metrics.rb config/initializers/metrics.rb +7 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.11.0 (unreleased)
  - Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
  - Limit git rev-list output count to one in forced push check
  - Retrieve rendered HTML from cache in one request
+  - Nokogiri's various parsing methods are now instrumented
  - Make fork counter always clickable !5463 (winniehell)
  - Load project invited groups and members eagerly in ProjectTeam#fetch_members
  - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)

--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -136,6 +136,13 @@ if Gitlab::Metrics.enabled?
    config.instrument_instance_methods(Rouge::Plugins::Redcarpet)
    config.instrument_instance_methods(Rouge::Formatters::HTMLGitlab)

+    [:XML, :HTML].each do |namespace|
+      namespace_mod = Nokogiri.const_get(namespace)
+
+      config.instrument_methods(namespace_mod)
+      config.instrument_methods(namespace_mod::Document)
+    end
+
    config.instrument_methods(Rinku)
  end