diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-05-14 16:47:16 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-05-17 15:52:55 +0100 |
| commit | de13980f3795679958a65881a813723da37894f5 (patch) | |
| tree | d7968570d5ae972a737ceded3caf5d16dab484e7 /cmd/gitlab-shell | |
| parent | bc93a437b6cabb64360edfa698dacb4cc3ef02fe (diff) | |
| download | gitlab-shell-de13980f3795679958a65881a813723da37894f5.tar.gz | |
Fix opentracing setup for gitlab-sshd
Previously, opentracing (if configured) was initialized late in the
gitlab-shell process's lifespan, coming just before making a gRPC
call to Gitaly.
By moving the opentracing initialization to be at process startup, we
make it available for the whole process lifecycle, which is very useful
to gitlab-sshd, as it means we'll only call tracing.Initialize() once
on process startup, rather than once per SSH connection.
To get this working, we need to introduce a context to gitlab-sshd.
This carries the client/service name, but also carries an initial
correlation ID. The main outcome of this is that all calls to the
authorized_keys endpoint from a given gitlab-sshd process will now
share a correlation ID. I don't have a strong opinion about this either
way.
Changelog: fixed
Diffstat (limited to 'cmd/gitlab-shell')
| -rw-r--r-- | cmd/gitlab-shell/main.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/gitlab-shell/main.go b/cmd/gitlab-shell/main.go index 8286e66..16705eb 100644 --- a/cmd/gitlab-shell/main.go +++ b/cmd/gitlab-shell/main.go @@ -57,7 +57,7 @@ func main() { os.Exit(1) } - ctx, finished := command.ContextWithCorrelationID() + ctx, finished := command.Setup(executable.Name, config) defer finished() if err = cmd.Execute(ctx); err != nil { |