diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-10-30 15:29:47 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-10-30 15:29:47 +0300 |
| commit | a83fd20118ee1436bfa5691fc605fbd7fc4a90d0 (patch) | |
| tree | cb3cc3a71514afcc529b86dbe46bd5ab9bd7901d | |
| parent | d2cf18f0f763f3d5037977d37b2c221ed685faca (diff) | |
| parent | e0fe54139555bb896050761edf9b32dac799645d (diff) | |
Merge branch 'an/logging-on-client-streams' into 'master'
Enable log tagging on client streamed requests
See merge request gitlab-org/gitaly!429
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | internal/server/server.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f2c8775a..9f7294665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ UNRELEASED - Update gitlab_git to b3ba3996e0bd329eaa574ff53c69673efaca6eef and set `GL_USERNAME` env variable for hook excecution https://gitlab.com/gitlab-org/gitaly/merge_requests/423 +- Enable logging in client-streamed and bidi GRPC requests + https://gitlab.com/gitlab-org/gitaly/merge_requests/429 v0.50.0 diff --git a/internal/server/server.go b/internal/server/server.go index bf855cc3a..721b3f95e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -27,7 +27,7 @@ func New(rubyServer *rubyserver.Server) *grpc.Server { grpc_logrus.ReplaceGrpcLogger(logrusEntry) ctxTagOpts := []grpc_ctxtags.Option{ - grpc_ctxtags.WithFieldExtractor(fieldextractors.RepositoryFieldExtractor), + grpc_ctxtags.WithFieldExtractorForInitialReq(fieldextractors.RepositoryFieldExtractor), } lh := limithandler.New() |