Skip to content

Commit

Permalink
Merge pull request #1411 from prometheus/revert-1387-main
Browse files Browse the repository at this point in the history
Revert "change api http.client to interface"
  • Loading branch information
Arthur Silva Sens authored Dec 23, 2023
2 parents 239b123 + 2280fb1 commit 96f1aec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
16 changes: 6 additions & 10 deletions api/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,14 @@ var DefaultRoundTripper http.RoundTripper = &http.Transport{
TLSHandshakeTimeout: 10 * time.Second,
}

type HttpClient interface {
Do(req *http.Request) (*http.Response, error)
}

// Config defines configuration parameters for a new client.
type Config struct {
// The address of the Prometheus to connect to.
Address string

// Client is used by the Client to drive HTTP requests. If not provided,
// a new http.Client based on the provided RoundTripper (or DefaultRoundTripper) will be used.
Client HttpClient
// a new one based on the provided RoundTripper (or DefaultRoundTripper) will be used.
Client *http.Client

// RoundTripper is used by the Client to drive HTTP requests. If not
// provided, DefaultRoundTripper will be used.
Expand All @@ -61,13 +57,13 @@ func (cfg *Config) roundTripper() http.RoundTripper {
return cfg.RoundTripper
}

func (cfg *Config) client() HttpClient {
func (cfg *Config) client() http.Client {
if cfg.Client == nil {
return &http.Client{
return http.Client{
Transport: cfg.roundTripper(),
}
}
return cfg.Client
return *cfg.Client
}

func (cfg *Config) validate() error {
Expand Down Expand Up @@ -105,7 +101,7 @@ func NewClient(cfg Config) (Client, error) {

type httpClient struct {
endpoint *url.URL
client HttpClient
client http.Client
}

func (c *httpClient) URL(ep string, args map[string]string) *url.URL {
Expand Down
2 changes: 1 addition & 1 deletion api/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func TestClientURL(t *testing.T) {

hclient := &httpClient{
endpoint: ep,
client: &http.Client{Transport: DefaultRoundTripper},
client: http.Client{Transport: DefaultRoundTripper},
}

u := hclient.URL(test.endpoint, test.args)
Expand Down

0 comments on commit 96f1aec

Please sign in to comment.