diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-07-23 11:38:15 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-07-23 11:38:15 +0000 |
commit | f915b5e07e466072283865b3987f056f5794ec59 (patch) | |
tree | f2d9bf1abc64702c863c45b178d95c6616735546 | |
parent | 2411ecb5762f8e04a6c6f61cc50ed25f29f55be3 (diff) | |
parent | 4d376c667d72e0eca22b4abe76e0bf09434fc4bd (diff) | |
download | gitlab-ce-f915b5e07e466072283865b3987f056f5794ec59.tar.gz |
Merge branch 'sh-remove-banzai-instrumentation' into 'master'
Remove method instrumentation for Banzai filters and reference parsers
See merge request gitlab-org/gitlab-ce!20770
-rw-r--r-- | changelogs/unreleased/sh-remove-banzai-instrumentation.yml | 5 | ||||
-rw-r--r-- | config/initializers/8_metrics.rb | 14 |
2 files changed, 5 insertions, 14 deletions
diff --git a/changelogs/unreleased/sh-remove-banzai-instrumentation.yml b/changelogs/unreleased/sh-remove-banzai-instrumentation.yml new file mode 100644 index 00000000000..8bb3cd5942b --- /dev/null +++ b/changelogs/unreleased/sh-remove-banzai-instrumentation.yml @@ -0,0 +1,5 @@ +--- +title: Remove method instrumentation for Banzai filters and reference parsers +merge_request: 20770 +author: +type: performance diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index 8a851b89c56..fe37b7710aa 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -58,20 +58,6 @@ def instrument_classes(instrumentation) instrumentation.instrument_instance_methods(const) end - # Instruments all Banzai filters and reference parsers - { - Filter: Rails.root.join('lib', 'banzai', 'filter', '*.rb'), - ReferenceParser: Rails.root.join('lib', 'banzai', 'reference_parser', '*.rb') - }.each do |const_name, path| - Dir[path].each do |file| - klass = File.basename(file, File.extname(file)).camelize - const = Banzai.const_get(const_name).const_get(klass) - - instrumentation.instrument_methods(const) - instrumentation.instrument_instance_methods(const) - end - end - instrumentation.instrument_methods(Banzai::Renderer) instrumentation.instrument_methods(Banzai::Querying) |