mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1411 from prometheus/revert-1387-main 

Revert "change api http.client to interface"
This commit is contained in:
Arthur Silva Sens 2023-12-23 10:41:26 -03:00 committed by GitHub
parent 239b12347d 2280fb19f6
commit 96f1aec289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/client.go
View File

@ -36,18 +36,14 @@ var DefaultRoundTripper http.RoundTripper = &http.Transport{
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 10 * time.Second,
} }
type HttpClient interface {
Do(req *http.Request) (*http.Response, error)
}
// Config defines configuration parameters for a new client. // Config defines configuration parameters for a new client.
type Config struct { type Config struct {
// The address of the Prometheus to connect to. // The address of the Prometheus to connect to.
Address string Address string
// Client is used by the Client to drive HTTP requests. If not provided, // 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. // a new one based on the provided RoundTripper (or DefaultRoundTripper) will be used.
Client HttpClient Client *http.Client
// RoundTripper is used by the Client to drive HTTP requests. If not // RoundTripper is used by the Client to drive HTTP requests. If not
// provided, DefaultRoundTripper will be used. // provided, DefaultRoundTripper will be used.
@ -61,13 +57,13 @@ func (cfg *Config) roundTripper() http.RoundTripper {
return cfg.RoundTripper return cfg.RoundTripper
} }
func (cfg *Config) client() HttpClient { func (cfg *Config) client() http.Client {
if cfg.Client == nil { if cfg.Client == nil {
return &http.Client{ return http.Client{
Transport: cfg.roundTripper(), Transport: cfg.roundTripper(),
} }
} }
return cfg.Client return *cfg.Client
} }
func (cfg *Config) validate() error { func (cfg *Config) validate() error {
@ -105,7 +101,7 @@ func NewClient(cfg Config) (Client, error) {
type httpClient struct { type httpClient struct {
endpoint *url.URL endpoint *url.URL
client HttpClient client http.Client
} }
func (c *httpClient) URL(ep string, args map[string]string) *url.URL { func (c *httpClient) URL(ep string, args map[string]string) *url.URL {

2
api/client_test.go
View File

@ -105,7 +105,7 @@ func TestClientURL(t *testing.T) {
hclient := &httpClient{ hclient := &httpClient{
endpoint: ep, endpoint: ep,
client: &http.Client{Transport: DefaultRoundTripper}, client: http.Client{Transport: DefaultRoundTripper},
} }
u := hclient.URL(test.endpoint, test.args) u := hclient.URL(test.endpoint, test.args)