Skip to content

Commit 91e59c3

Browse files
mergify[bot]Kaan Yalti
andauthored
enhancement(5235): removed HTTPTransportSettings embedded struct field use from http downloader (#9346) (#9373)
(cherry picked from commit 5b3506b) Co-authored-by: Kaan Yalti <[email protected]>
1 parent 50c4b4d commit 91e59c3

File tree

1 file changed

+4
-4
lines changed
  • internal/pkg/agent/application/upgrade/artifact/download/http

1 file changed

+4
-4
lines changed

internal/pkg/agent/application/upgrade/artifact/download/http/downloader.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type Downloader struct {
5353

5454
// NewDownloader creates and configures Elastic Downloader
5555
func NewDownloader(log *logger.Logger, config *artifact.Config, upgradeDetails *details.Details) (*Downloader, error) {
56-
client, err := config.HTTPTransportSettings.Client(
56+
client, err := config.Client(
5757
httpcommon.WithAPMHTTPInstrumentation(),
5858
httpcommon.WithKeepaliveSettings{Disable: false, IdleConnTimeout: 30 * time.Second},
5959
)
@@ -77,7 +77,7 @@ func NewDownloaderWithClient(log *logger.Logger, config *artifact.Config, client
7777

7878
func (e *Downloader) Reload(c *artifact.Config) error {
7979
// reload client
80-
client, err := c.HTTPTransportSettings.Client(
80+
client, err := c.Client(
8181
httpcommon.WithAPMHTTPInstrumentation(),
8282
)
8383
if err != nil {
@@ -209,9 +209,9 @@ func (e *Downloader) downloadFile(ctx context.Context, artifactName, filename, f
209209
}
210210
}
211211

212-
loggingObserver := newLoggingProgressObserver(e.log, e.config.HTTPTransportSettings.Timeout)
212+
loggingObserver := newLoggingProgressObserver(e.log, e.config.Timeout)
213213
detailsObserver := newDetailsProgressObserver(e.upgradeDetails)
214-
dp := newDownloadProgressReporter(sourceURI, e.config.HTTPTransportSettings.Timeout, fileSize, loggingObserver, detailsObserver)
214+
dp := newDownloadProgressReporter(sourceURI, e.config.Timeout, fileSize, loggingObserver, detailsObserver)
215215
dp.Report(ctx)
216216
_, err = io.Copy(destinationFile, io.TeeReader(resp.Body, dp))
217217
if err != nil {

0 commit comments

Comments
 (0)