HTTP Client: Make ResponseHeaderTimeout default timeout in http client (#34597)
* HTTP Client: Add `ResponseHeaderTimeout` - split from `DialContext` timeout * Fixes according to reviewer's comments * Use grafana-plugin-sdk-go v0.100.0
This commit is contained in:
@@ -76,6 +76,7 @@ func (ds *DataSource) HTTPClientOptions() sdkhttpclient.Options {
|
||||
opts := sdkhttpclient.Options{
|
||||
Timeouts: &sdkhttpclient.TimeoutOptions{
|
||||
Timeout: ds.getTimeout(),
|
||||
DialTimeout: time.Duration(setting.DataProxyDialTimeout) * time.Second,
|
||||
KeepAlive: time.Duration(setting.DataProxyKeepAlive) * time.Second,
|
||||
TLSHandshakeTimeout: time.Duration(setting.DataProxyTLSHandshakeTimeout) * time.Second,
|
||||
ExpectContinueTimeout: time.Duration(setting.DataProxyExpectContinueTimeout) * time.Second,
|
||||
|
||||
@@ -78,6 +78,7 @@ var (
|
||||
// HTTP server options
|
||||
DataProxyLogging bool
|
||||
DataProxyTimeout int
|
||||
DataProxyDialTimeout int
|
||||
DataProxyTLSHandshakeTimeout int
|
||||
DataProxyExpectContinueTimeout int
|
||||
DataProxyMaxIdleConns int
|
||||
@@ -823,7 +824,8 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
|
||||
// read data proxy settings
|
||||
dataproxy := iniFile.Section("dataproxy")
|
||||
DataProxyLogging = dataproxy.Key("logging").MustBool(false)
|
||||
DataProxyTimeout = dataproxy.Key("timeout").MustInt(30)
|
||||
DataProxyTimeout = dataproxy.Key("timeout").MustInt(10)
|
||||
DataProxyDialTimeout = dataproxy.Key("dialTimeout").MustInt(30)
|
||||
DataProxyKeepAlive = dataproxy.Key("keep_alive_seconds").MustInt(30)
|
||||
DataProxyTLSHandshakeTimeout = dataproxy.Key("tls_handshake_timeout_seconds").MustInt(10)
|
||||
DataProxyExpectContinueTimeout = dataproxy.Key("expect_continue_timeout_seconds").MustInt(1)
|
||||
|
||||
Reference in New Issue
Block a user