diff options
author | Stan Hu <stanhu@gmail.com> | 2018-12-07 18:29:00 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-12-07 18:29:00 +0300 |
commit | e17ccef5cadd7b8962a10bb43b1332658a54bd96 (patch) | |
tree | 05288b33ef4b4965e38a12c629041a4a6ad9d619 /lib/gitlab/gitaly_client.rb | |
parent | cda291f0c35d3724d2df916fcd95e00e84f469cf (diff) | |
parent | eb33ca49b8a402b347592c6cf982fb7619218370 (diff) |
Merge branch 'store-correlation-logs' into 'master'
Log and pass correlation-id between Unicorn, Sidekiq and Gitaly
See merge request gitlab-org/gitlab-ce!22844
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 9be553a8b86..255601382b1 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -193,6 +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['correlation_id'] = Gitlab::CorrelationId.current_id if Gitlab::CorrelationId.current_id metadata.merge!(server_feature_flags) |