From cee07c5919e1a9c792e44c261dd8abfd76a2a993 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 24 May 2016 17:07:41 +0200 Subject: Measure proxy timing: needs influxdb code --- config/initializers/proxy_timing.rb | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/initializers/proxy_timing.rb (limited to 'config') diff --git a/config/initializers/proxy_timing.rb b/config/initializers/proxy_timing.rb new file mode 100644 index 00000000000..9161bd9b6c9 --- /dev/null +++ b/config/initializers/proxy_timing.rb @@ -0,0 +1 @@ +Rails.application.config.middleware.use(Gitlab::Middleware::ProxyTiming) -- 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 + config/initializers/proxy_timing.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 config/initializers/proxy_timing.rb (limited to 'config') 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| diff --git a/config/initializers/proxy_timing.rb b/config/initializers/proxy_timing.rb deleted file mode 100644 index 9161bd9b6c9..00000000000 --- a/config/initializers/proxy_timing.rb +++ /dev/null @@ -1 +0,0 @@ -Rails.application.config.middleware.use(Gitlab::Middleware::ProxyTiming) -- 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') 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') 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