Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2019-02-18 23:57:22 +0300
committerAndrew Newdigate <andrew@gitlab.com>2019-04-18 10:57:16 +0300
commit4f4de36cacbcd137e9db2a7b1449bb803bf1f395 (patch)
tree7514b0a3c310091bf0b909fc9544968fbe4619ab /lib/gitlab/json_logger.rb
parentd9e5edf198803aded681cb900c50bc454fade7f3 (diff)
Migrate correlation and tracing code to 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 'lib/gitlab/json_logger.rb')
-rw-r--r--lib/gitlab/json_logger.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/json_logger.rb b/lib/gitlab/json_logger.rb
index a5a5759cc89..ab34fb03158 100644
--- a/lib/gitlab/json_logger.rb
+++ b/lib/gitlab/json_logger.rb
@@ -10,7 +10,7 @@ module Gitlab
data = {}
data[:severity] = severity
data[:time] = timestamp.utc.iso8601(3)
- data[Gitlab::CorrelationId::LOG_KEY] = Gitlab::CorrelationId.current_id
+ data[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id
case message
when String