diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-06-28 18:36:27 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-06-28 22:41:31 +0200 |
commit | 5d6d68697dceec6a8c5a8947118abe527ad09ba1 (patch) | |
tree | 569fd48de25510b93437775aedb5605295e2c5bb /Bugzilla.pm | |
parent | f63319ac7da3fc3f9107c21ad715b8af9566fde4 (diff) | |
download | bugzilla-5d6d68697dceec6a8c5a8947118abe527ad09ba1.tar.gz bugzilla-5d6d68697dceec6a8c5a8947118abe527ad09ba1.tar.xz |
Remove metrics stuff
Diffstat (limited to 'Bugzilla.pm')
-rw-r--r-- | Bugzilla.pm | 69 |
1 files changed, 2 insertions, 67 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index 74fa257f2..cf22ecc32 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -48,10 +48,6 @@ use Bugzilla::Util; use Bugzilla::CPAN; use Bugzilla::Bloomfilter; -use Bugzilla::Metrics::Collector; -use Bugzilla::Metrics::Template; -use Bugzilla::Metrics::Memcached; - use Date::Parse; use DateTime::TimeZone; use Encode; @@ -139,30 +135,6 @@ sub init_page { my $script = basename($0); - # BMO - init metrics collection if required - if (i_am_cgi() && $script eq 'show_bug.cgi') { - # we need to measure loading the params, so default to on - Bugzilla->metrics_enabled(1); - Bugzilla->metrics($script); - # we can now hit params to check if we really should be enabled. - # note - we can't use anything which uses templates or the database, as - # that would initialise those modules with metrics enabled. - if (!Bugzilla->params->{metrics_enabled}) { - Bugzilla->metrics_enabled(0); - } - else { - # to avoid generating massive amounts of data, we're only interested in - # a small subset of users - my $user_id = Bugzilla->cgi->cookie('Bugzilla_login'); - if (!$user_id - || !grep { $user_id == $_ } - split(/\s*,\s*/, Bugzilla->params->{metrics_user_ids})) - { - Bugzilla->metrics_enabled(0); - } - } - } - # Because of attachment_base, attachment.cgi handles this itself. if ($script ne 'attachment.cgi') { do_ssl_redirect_if_required(); @@ -231,12 +203,7 @@ sub init_page { ##################################################################### sub template { - # BMO - use metrics subclass if required - if (Bugzilla->metrics_enabled) { - request_cache->{template} ||= Bugzilla::Metrics::Template->create(); - } else { - request_cache->{template} ||= Bugzilla::Template->create(); - } + request_cache->{template} ||= Bugzilla::Template->create(); request_cache->{template}->{_is_main} = 1; return request_cache->{template}; @@ -806,37 +773,10 @@ sub process_cache { return $_process_cache; } -# BMO - Instrumentation - -sub metrics_enabled { - if (defined $_[1]) { - if (!$_[1] - && request_cache->{metrics_enabled} - && request_cache->{metrics}) - { - request_cache->{metrics}->cancel(); - delete request_cache->{metrics}; - } - request_cache->{metrics_enabled} = $_[1]; - } - else { - return request_cache->{metrics_enabled}; - } -} - -sub metrics { - return request_cache->{metrics} ||= Bugzilla::Metrics::Collector->new($_[1]); -} - # This is a memcached wrapper, which provides cross-process and cross-system # caching. sub memcached { - # BMO - use metrics subclass if required - if (Bugzilla->metrics_enabled) { - return request_cache->{memcached} ||= Bugzilla::Metrics::Memcached->_new(); - } else { - return request_cache->{memcached} ||= Bugzilla::Memcached->_new(); - } + return request_cache->{memcached} ||= Bugzilla::Memcached->_new(); } sub elastic { @@ -882,11 +822,6 @@ sub markdown_parser { sub _cleanup { return if $^C; - # BMO - finalise and report on metrics - if (Bugzilla->metrics_enabled) { - Bugzilla->metrics->finish(); - } - # BMO - allow "end of request" processing Bugzilla::Hook::process('request_cleanup'); Bugzilla::Bug->CLEANUP; |