diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-07-01 12:13:17 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-07-01 12:13:17 +0000 |
| commit | 4bb41c5e966f5a9a0a5812a6448107c652354b59 (patch) | |
| tree | 60a69e715fd31f48eed0d0bb4a4f79f588baf91f | |
| parent | b569f842b37434efd0cbae4b0c197391e0610b12 (diff) | |
| parent | 521454831ee9e899e046ed288596865df55e8832 (diff) | |
| download | gitlab-ce-4bb41c5e966f5a9a0a5812a6448107c652354b59.tar.gz | |
Merge branch '18592-syntaxhighlighter-slow' into 'master'
Specific metrics for code on Banzai::Filter::SyntaxHighlightFilter
See merge request !5038
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 3 | ||||
| -rw-r--r-- | lib/banzai/filter/syntax_highlight_filter.rb | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index e2fa16e4eee..daa7ed2a1e5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,6 +27,7 @@ v 8.10.0 (unreleased) - Better caching of git calls on ProjectsController#show. - Add API endpoint for a group issues !4520 (mahcsig) - Add Bugzilla integration !4930 (iamtjg) + - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab - Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w) - Add basic system information like memory and disk usage to the admin panel diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 75f89d524e7..44601f2b2bd 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -132,6 +132,9 @@ if Gitlab::Metrics.enabled? config.instrument_instance_methods(API::Helpers) config.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker) + + config.instrument_instance_methods(Rouge::Plugins::Redcarpet) + config.instrument_instance_methods(Rouge::Formatters::HTMLGitlab) end GC::Profiler.enable diff --git a/lib/banzai/filter/syntax_highlight_filter.rb b/lib/banzai/filter/syntax_highlight_filter.rb index 62a79c62e20..536b478979f 100644 --- a/lib/banzai/filter/syntax_highlight_filter.rb +++ b/lib/banzai/filter/syntax_highlight_filter.rb @@ -27,12 +27,17 @@ module Banzai highlighted = "<pre>#{code}</pre>" end - # Replace the parent `pre` element with the entire highlighted block - node.parent.replace(highlighted) + # Extracted to a method to measure it + replace_parent_pre_element(node, highlighted) end private + def replace_parent_pre_element(node, highlighted) + # Replace the parent `pre` element with the entire highlighted block + node.parent.replace(highlighted) + end + # Override Rouge::Plugins::Redcarpet#rouge_formatter def rouge_formatter(lexer) Rouge::Formatters::HTMLGitlab.new( |