From a6176abf95ef9216889a2a8ac7b7655f7367c85d Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Wed, 10 Apr 2019 21:11:55 +0000 Subject: [PATCH] Merge branch 'sh-disable-diff-instrumentation' into 'master' Disable method instrumentation for diffs Closes #52898 See merge request gitlab-org/gitlab-ce!27235 (cherry picked from commit b9e6e72501173c29a30ee1b4a2afb9ee9d3b1117) b397ad8a Disable method instrumentation for diffs --- changelogs/unreleased/sh-disable-diff-instrumentation.yml | 5 +++++ config/initializers/zz_metrics.rb | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/sh-disable-diff-instrumentation.yml diff --git a/changelogs/unreleased/sh-disable-diff-instrumentation.yml b/changelogs/unreleased/sh-disable-diff-instrumentation.yml new file mode 100644 index 00000000000..55f4c2a8510 --- /dev/null +++ b/changelogs/unreleased/sh-disable-diff-instrumentation.yml @@ -0,0 +1,5 @@ +--- +title: Disable method instrumentation for diffs +merge_request: 27235 +author: +type: performance diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 151cad3ef9a..5aa6f73c5c5 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -30,7 +30,6 @@ def instrument_classes(instrumentation) # are included. %w(app services [^concerns]**) => %w(app services), %w(lib gitlab conflicts) => ['lib'], - %w(lib gitlab diff) => ['lib'], %w(lib gitlab email message) => ['lib'], %w(lib gitlab checks) => ['lib'] } -- GitLab