diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-08 03:27:19 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-08 03:27:19 +0300 |
| commit | 4fb5e47928fb80d6a8d529e0044af226ba9d1eae (patch) | |
| tree | f6f5c6fb0cd7c1f48b06acedca85432598d88b73 /lib | |
| parent | e13345c0ba99f23ff105cca46049b1411136dcd1 (diff) | |
| parent | 6c426c0e393702d50a93afb7b712ef7a834f0384 (diff) | |
Merge branch '55054-correlation-ids-being-passed-through-grpc-metadata-are-incorrect' into 'master'
Fix for incorrect Correlation-ID key being passed through GRPC metadata
Closes #55054
See merge request gitlab-org/gitlab-ce!23666
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 255601382b1..11021ee06b3 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['correlation_id'] = Gitlab::CorrelationId.current_id if Gitlab::CorrelationId.current_id + metadata['x-gitlab-correlation-id'] = Gitlab::CorrelationId.current_id if Gitlab::CorrelationId.current_id metadata.merge!(server_feature_flags) |