From b933367ab3d8df50f0ebd0690d306536f7a654db Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Tue, 17 May 2016 00:10:32 +0200 Subject: Instrument all Grape API helpers --- config/initializers/metrics.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/initializers/metrics.rb') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index b2d08d87bac..2338916e9da 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -118,6 +118,8 @@ if Gitlab::Metrics.enabled? # Instrument the classes used for checking if somebody has push access. config.instrument_instance_methods(Gitlab::GitAccess) config.instrument_instance_methods(Gitlab::GitAccessWiki) + + config.instrument_instance_methods(API::Helpers) end GC::Profiler.enable -- cgit v1.2.1 From 897273d17974e414501c4152182a7cb634602d1b Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 25 May 2016 11:45:34 +0200 Subject: Couple ProxyTiming to Metrics middleware --- config/initializers/metrics.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config/initializers/metrics.rb') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 2338916e9da..2a7979cae54 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -12,6 +12,7 @@ if Gitlab::Metrics.enabled? Gitlab::Application.configure do |config| config.middleware.use(Gitlab::Metrics::RackMiddleware) + config.middleware.use(Gitlab::Middleware::ProxyTiming) end Sidekiq.configure_server do |config| -- cgit v1.2.1 From c049534da635b3252c564162150b041a2b823860 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 25 May 2016 14:55:23 +0200 Subject: Align class name with field name --- config/initializers/metrics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/initializers/metrics.rb') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 2a7979cae54..540e10c1ec1 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -12,7 +12,7 @@ if Gitlab::Metrics.enabled? Gitlab::Application.configure do |config| config.middleware.use(Gitlab::Metrics::RackMiddleware) - config.middleware.use(Gitlab::Middleware::ProxyTiming) + config.middleware.use(Gitlab::Middleware::ProxyFlightTime) end Sidekiq.configure_server do |config| -- cgit v1.2.1 From 5771114f9b5dba9c17b273a5dec0ef6900f6da9d Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 26 May 2016 17:53:21 +0200 Subject: Rename metric to 'rails queue duration' --- config/initializers/metrics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/initializers/metrics.rb') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 540e10c1ec1..0c788714714 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -12,7 +12,7 @@ if Gitlab::Metrics.enabled? Gitlab::Application.configure do |config| config.middleware.use(Gitlab::Metrics::RackMiddleware) - config.middleware.use(Gitlab::Middleware::ProxyFlightTime) + config.middleware.use(Gitlab::Middleware::RailsQueueDuration) end Sidekiq.configure_server do |config| -- cgit v1.2.1 From d485ec9f1c7bf00a3c87e3e91b6a306f234a5232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Thu, 2 Jun 2016 16:47:39 -0400 Subject: Instrument `RepositoryCheck::SingleRepositoryWorker` manually This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware. --- config/initializers/metrics.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config/initializers/metrics.rb') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 0c788714714..2673093b96a 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -121,6 +121,13 @@ if Gitlab::Metrics.enabled? config.instrument_instance_methods(Gitlab::GitAccessWiki) config.instrument_instance_methods(API::Helpers) + + config.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker) + # Iterate over each non-super private instance method to keep up to date if + # internals change + RepositoryCheck::SingleRepositoryWorker.private_instance_methods(false).each do |method| + config.instrument_instance_method(RepositoryCheck::SingleRepositoryWorker, method) + end end GC::Profiler.enable -- cgit v1.2.1 From ffd316483ce01591e84996dfaedd539480226e5a Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 13 Jun 2016 11:59:42 +0200 Subject: Instrument all Banzai::ReferenceParser classes Now that this code is no longer part of Banzai::Filter it needs to be instrumented explicitly. --- config/initializers/metrics.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'config/initializers/metrics.rb') diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 2673093b96a..f6509ee43f1 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -96,13 +96,18 @@ if Gitlab::Metrics.enabled? config.instrument_instance_methods(const) end - # Instruments all Banzai filters - Dir[Rails.root.join('lib', 'banzai', 'filter', '*.rb')].each do |file| - klass = File.basename(file, File.extname(file)).camelize - const = Banzai::Filter.const_get(klass) + # 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) - config.instrument_methods(const) - config.instrument_instance_methods(const) + config.instrument_methods(const) + config.instrument_instance_methods(const) + end end config.instrument_methods(Banzai::Renderer) -- cgit v1.2.1