diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2021-05-24 09:35:16 +0000 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2021-05-24 09:35:16 +0000 |
| commit | 8116ccb9cbc0a60803b3a9896057c79c70016eb3 (patch) | |
| tree | 85e5feca1050427113d9fe6e5051c52331b3a7ab /internal/config/config.go | |
| parent | 90b606cde3d71d8a4450a5b5da9be4454c7b379f (diff) | |
| parent | de13980f3795679958a65881a813723da37894f5 (diff) | |
| download | gitlab-shell-8116ccb9cbc0a60803b3a9896057c79c70016eb3.tar.gz | |
Merge branch '501-fix-opentracing-init' into 'main'
Fix opentracing setup for gitlab-sshd
Closes #501
See merge request gitlab-org/gitlab-shell!473
Diffstat (limited to 'internal/config/config.go')
| -rw-r--r-- | internal/config/config.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index e3dd7c2..c112038 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -9,8 +9,10 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitlab-shell/client" + "gitlab.com/gitlab-org/labkit/tracing" yaml "gopkg.in/yaml.v2" + + "gitlab.com/gitlab-org/gitlab-shell/client" ) const ( @@ -83,7 +85,7 @@ func (c *Config) ApplyGlobalState() { func (c *Config) HttpClient() *client.HttpClient { c.httpClientOnce.Do(func() { - c.httpClient = client.NewHTTPClient( + client := client.NewHTTPClient( c.GitlabUrl, c.GitlabRelativeURLRoot, c.HttpSettings.CaFile, @@ -91,6 +93,11 @@ func (c *Config) HttpClient() *client.HttpClient { c.HttpSettings.SelfSignedCert, c.HttpSettings.ReadTimeoutSeconds, ) + + tr := client.Transport + client.Transport = tracing.NewRoundTripper(tr) + + c.httpClient = client }) return c.httpClient |