diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-31 15:38:26 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-10 09:34:46 +0300 |
| commit | 98145dc5f816f6f554697f16190f5736e33eddec (patch) | |
| tree | c0bc5bace99ed9ead134834d366f3bfd067c207f | |
| parent | 1fcd135553544e8ec291d22d335f27ad60c93ca9 (diff) | |
repository: Don't manually inject the correlation ID
We're injecting the correlation ID into the Git process that'll create
the archive for us in the `GetArchive()` RPC. This is not required
though because we always inject the correlation ID via the command
package because we use LabKit's environment injector.
Remove the duplicate logic.
| -rw-r--r-- | internal/gitaly/service/repository/archive.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/internal/gitaly/service/repository/archive.go b/internal/gitaly/service/repository/archive.go index d7ccbb95c..040fa4aba 100644 --- a/internal/gitaly/service/repository/archive.go +++ b/internal/gitaly/service/repository/archive.go @@ -20,7 +20,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/log" "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/v15/streamio" - "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/protobuf/proto" ) @@ -216,7 +215,6 @@ func (s *server) handleArchive(p archiveParams) error { env = append( env, smudgeEnv, - fmt.Sprintf("CORRELATION_ID=%s", correlation.ExtractFromContext(p.ctx)), fmt.Sprintf("%s=%s", log.GitalyLogDirEnvKey, p.loggingDir), ) config = append(config, smudgeGitConfig) |