diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2019-02-18 22:57:22 +0200 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2019-04-18 09:57:16 +0200 |
| commit | 4f4de36cacbcd137e9db2a7b1449bb803bf1f395 (patch) | |
| tree | 7514b0a3c310091bf0b909fc9544968fbe4619ab /app/controllers/application_controller.rb | |
| parent | d9e5edf198803aded681cb900c50bc454fade7f3 (diff) | |
| download | gitlab-ce-an-use-labkit.tar.gz | |
Migrate correlation and tracing code to LabKitan-use-labkit
This change is a fairly straightforward refactor to extract the tracing
and correlation-id code from the gitlab rails codebase into the new
LabKit-Ruby project.
The corresponding import into LabKit-Ruby was in
https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1
The code itself remains very similar for now.
Extracting it allows us to reuse it in other projects, such as
Gitaly-Ruby. This will give us the advantages of correlation-ids and
distributed tracing in that project too.
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d5f1e35a79b..ceaa84acaba 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -128,7 +128,7 @@ class ApplicationController < ActionController::Base payload[:ua] = request.env["HTTP_USER_AGENT"] payload[:remote_ip] = request.remote_ip - payload[Gitlab::CorrelationId::LOG_KEY] = Gitlab::CorrelationId.current_id + payload[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id logged_user = auth_user |