Merge branch 'instrument-project-visible-to-user' into 'master'

Instrument Project.visible_to_user ## What does this MR do? This MR instruments `Project.visible_to_user` ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The method in question was not instrumented due to being a Rails scope. ## What are the relevant issue numbers? #12425 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] 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 !5793

Merge branch 'instrument-project-visible-to-user' into 'master'
ec73abcd · Rémy Coutable · 283b2c0b · e0fc43eb · ec73abcd · ec73abcd
Commit ec73abcd authored Aug 12, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

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

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@ v 8.11.0 (unreleased)
  - Pre-create all builds for a Pipeline when the new Pipeline is created !5295
  - Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
  - Show member roles to all users on members page
+  - Project.visible_to_user is instrumented again
  - Fix awardable button mutuality loading spinners (ClemMakesApps)
  - Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
  - Optimize maximum user access level lookup in loading of notes

--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -148,6 +148,9 @@ if Gitlab::Metrics.enabled?

    config.instrument_methods(Gitlab::Highlight)
    config.instrument_instance_methods(Gitlab::Highlight)
+
+    # This is a Rails scope so we have to instrument it manually.
+    config.instrument_method(Project, :visible_to_user)
  end

  GC::Profiler.enable