diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-06 21:46:31 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-06 21:46:31 +0100 |
| commit | ebb5d9f4db3c2d5818f5efda1b09fcd1be7285e8 (patch) | |
| tree | 5d51a48a32a92fdedf7b907a32caa172d1c0d923 /lib | |
| parent | 3560b11922fd180eea5cafd0e763e0e601c5c4ee (diff) | |
| download | gitlab-ce-ebb5d9f4db3c2d5818f5efda1b09fcd1be7285e8.tar.gz | |
Revert "Prefer to use correlation-id in logs"
This reverts commit 3560b11922fd180eea5cafd0e763e0e601c5c4ee.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/correlation_id.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/sentry.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/correlation_id.rb b/lib/gitlab/correlation_id.rb index 8431d88f8eb..0f9bde4390e 100644 --- a/lib/gitlab/correlation_id.rb +++ b/lib/gitlab/correlation_id.rb @@ -2,7 +2,7 @@ module Gitlab module CorrelationId - LOG_KEY = 'correlation-id'.freeze + LOG_KEY = 'correlation_id'.freeze class << self def use_id(correlation_id, &blk) diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 158f7d47bd2..255601382b1 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -193,7 +193,7 @@ module Gitlab feature = feature_stack && feature_stack[0] metadata['call_site'] = feature.to_s if feature metadata['gitaly-servers'] = address_metadata(remote_storage) if remote_storage - metadata[Gitlab::CorrelationId::LOG_KEY] = Gitlab::CorrelationId.current_id if Gitlab::CorrelationId.current_id + metadata['correlation_id'] = Gitlab::CorrelationId.current_id if Gitlab::CorrelationId.current_id metadata.merge!(server_feature_flags) diff --git a/lib/gitlab/sentry.rb b/lib/gitlab/sentry.rb index 3d82934f268..46d01964eac 100644 --- a/lib/gitlab/sentry.rb +++ b/lib/gitlab/sentry.rb @@ -45,7 +45,7 @@ module Gitlab context # Make sure we've set everything we know in the context tags = { - correlation_id: Gitlab::CorrelationId.current_id + Gitlab::CorrelationId::LOG_KEY.to_sym => Gitlab::CorrelationId.current_id } Raven.capture_exception(exception, tags: tags, extra: extra) |