summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-04-10 21:11:55 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-11 09:14:07 +0000
commite476b49d5ab2c02328787c211e832e886e3cde1d (patch)
tree5ced3fc9596a6a9dde65fe88009f24a67e18289e
parentbd8f532d80e5b220f552a492cb0beca7e6b725d7 (diff)
downloadgitlab-ce-e476b49d5ab2c02328787c211e832e886e3cde1d.tar.gz
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
-rw-r--r--changelogs/unreleased/sh-disable-diff-instrumentation.yml5
-rw-r--r--config/initializers/zz_metrics.rb1
2 files changed, 5 insertions, 1 deletions
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']
}