diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2023-02-08 08:59:36 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2023-02-08 08:59:36 +0000 |
commit | c099100e01b47e39926318f56fe3247d080de070 (patch) | |
tree | 205d48ea470a72938501e7688cbcfc3151f3b3ef /client/httpclient.go | |
parent | 874ecd58af03542d0acdbf0ba0da856cf2ad638e (diff) | |
parent | 3a733910307284f8e5e33d63eadf521c74e146cf (diff) | |
download | gitlab-shell-c099100e01b47e39926318f56fe3247d080de070.tar.gz |
Merge branch 'id-define-standard-client' into 'main'
Define Do function for Gitlab net client
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/715
Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Alejandro RodrÃguez <alejandro@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Reviewed-by: Igor Drozdov <idrozdov@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Igor Drozdov <idrozdov@gitlab.com>
Diffstat (limited to 'client/httpclient.go')
-rw-r--r-- | client/httpclient.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/client/httpclient.go b/client/httpclient.go index 9b57add..05ed4ef 100644 --- a/client/httpclient.go +++ b/client/httpclient.go @@ -14,8 +14,6 @@ import ( "time" "github.com/hashicorp/go-retryablehttp" - "gitlab.com/gitlab-org/labkit/correlation" - "gitlab.com/gitlab-org/labkit/tracing" ) const ( @@ -121,7 +119,7 @@ func NewHTTPClientWithOpts(gitlabURL, gitlabRelativeURLRoot, caFile, caPath stri c.RetryWaitMax = hcc.retryWaitMax c.RetryWaitMin = hcc.retryWaitMin c.Logger = nil - c.HTTPClient.Transport = correlation.NewInstrumentedRoundTripper(tracing.NewRoundTripper(transport)) + c.HTTPClient.Transport = newTransport(transport) c.HTTPClient.Timeout = readTimeout(readTimeoutSeconds) client := &HttpClient{RetryableHTTP: c, Host: host} |