Commit 4fb5e479 authored by Stan Hu's avatar Stan Hu

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
parents e13345c0 6c426c0e
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment