diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-03 18:08:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-03 18:08:33 +0300 |
| commit | 511e761b41b81484c85e3d125f45873ce38e9201 (patch) | |
| tree | 6bb98a6356de6e1d736951d2eef6ec83e6aa3dd2 /config/initializers | |
| parent | 4247e67be1faa9d52691757dad954a7fa63e8bfe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/correlation_id.rb | 3 | ||||
| -rw-r--r-- | config/initializers/labkit_middleware.rb | 3 | ||||
| -rw-r--r-- | config/initializers/tracing.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/initializers/correlation_id.rb b/config/initializers/correlation_id.rb deleted file mode 100644 index 2a7c138dc40..00000000000 --- a/config/initializers/correlation_id.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -Rails.application.config.middleware.use(Gitlab::Middleware::CorrelationId) diff --git a/config/initializers/labkit_middleware.rb b/config/initializers/labkit_middleware.rb new file mode 100644 index 00000000000..ea4103f052f --- /dev/null +++ b/config/initializers/labkit_middleware.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +Rails.application.config.middleware.use(Labkit::Middleware::Rack) diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb index 0ae57021fcf..aaf74eb4cd3 100644 --- a/config/initializers/tracing.rb +++ b/config/initializers/tracing.rb @@ -2,7 +2,7 @@ if Labkit::Tracing.enabled? Rails.application.configure do |config| - config.middleware.insert_after Gitlab::Middleware::CorrelationId, ::Labkit::Tracing::RackMiddleware + config.middleware.insert_after Labkit::Middleware::Rack, ::Labkit::Tracing::RackMiddleware end # Instrument the Sidekiq client |