Port 'Don't disable HTTP keep-alives for remote storage connections.' to 2.0 (see #3173)
Removes configurability introduced in #3160 in favour of hard-coding, per advice from @brian-brazil.
This commit is contained in:
parent
56820726fa
commit
0997191b18
|
@ -55,7 +55,7 @@ type ClientConfig struct {
|
||||||
|
|
||||||
// NewClient creates a new Client.
|
// NewClient creates a new Client.
|
||||||
func NewClient(index int, conf *ClientConfig) (*Client, error) {
|
func NewClient(index int, conf *ClientConfig) (*Client, error) {
|
||||||
httpClient, err := httputil.NewClientFromConfig(conf.HTTPClientConfig, "remote_storage")
|
httpClient, err := httputil.NewClientFromConfigAndOptions(conf.HTTPClientConfig, "remote_storage", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,12 @@ func newClient(rt http.RoundTripper) *http.Client {
|
||||||
// NewClientFromConfig returns a new HTTP client configured for the
|
// NewClientFromConfig returns a new HTTP client configured for the
|
||||||
// given config.HTTPClientConfig. The name is used as go-conntrack metric label.
|
// given config.HTTPClientConfig. The name is used as go-conntrack metric label.
|
||||||
func NewClientFromConfig(cfg config.HTTPClientConfig, name string) (*http.Client, error) {
|
func NewClientFromConfig(cfg config.HTTPClientConfig, name string) (*http.Client, error) {
|
||||||
|
return NewClientFromConfigAndOptions(cfg, name, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewClientFromConfigAndOptions returns a new HTTP client configured for the
|
||||||
|
// given config.HTTPClientConfig. The name is used as go-conntrack metric label.
|
||||||
|
func NewClientFromConfigAndOptions(cfg config.HTTPClientConfig, name string, disableKeepAlives bool) (*http.Client, error) {
|
||||||
tlsConfig, err := NewTLSConfig(cfg.TLSConfig)
|
tlsConfig, err := NewTLSConfig(cfg.TLSConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -43,7 +49,7 @@ func NewClientFromConfig(cfg config.HTTPClientConfig, name string) (*http.Client
|
||||||
var rt http.RoundTripper = &http.Transport{
|
var rt http.RoundTripper = &http.Transport{
|
||||||
Proxy: http.ProxyURL(cfg.ProxyURL.URL),
|
Proxy: http.ProxyURL(cfg.ProxyURL.URL),
|
||||||
MaxIdleConns: 20000,
|
MaxIdleConns: 20000,
|
||||||
DisableKeepAlives: false,
|
DisableKeepAlives: disableKeepAlives,
|
||||||
TLSClientConfig: tlsConfig,
|
TLSClientConfig: tlsConfig,
|
||||||
DisableCompression: true,
|
DisableCompression: true,
|
||||||
// 5 minutes is typically above the maximum sane scrape interval. So we can
|
// 5 minutes is typically above the maximum sane scrape interval. So we can
|
||||||
|
|
Loading…
Reference in New Issue