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

Merge pull request #1398 from prometheus/scraperef2 

Handle scrape timeout on request.
This commit is contained in:
Fabian Reinartz 2016-02-16 15:11:09 +01:00
parent 1f70345d0c 66767121ab
commit 73e38c534a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
retrieval/target.go
View File

@ -28,6 +28,8 @@ import (
"github.com/prometheus/common/expfmt" "github.com/prometheus/common/expfmt"
"github.com/prometheus/common/log" "github.com/prometheus/common/log"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"golang.org/x/net/context"
"golang.org/x/net/context/ctxhttp"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
@ -219,8 +221,6 @@ func (t *Target) Update(cfg *config.ScrapeConfig, labels, metaLabels model.Label
} }
func newHTTPClient(cfg *config.ScrapeConfig) (*http.Client, error) { func newHTTPClient(cfg *config.ScrapeConfig) (*http.Client, error) {
rt := httputil.NewDeadlineRoundTripper(time.Duration(cfg.ScrapeTimeout), cfg.ProxyURL.URL)
tlsOpts := httputil.TLSOptions{ tlsOpts := httputil.TLSOptions{
InsecureSkipVerify: cfg.TLSConfig.InsecureSkipVerify, InsecureSkipVerify: cfg.TLSConfig.InsecureSkipVerify,
CAFile: cfg.TLSConfig.CAFile, CAFile: cfg.TLSConfig.CAFile,
@ -233,11 +233,13 @@ func newHTTPClient(cfg *config.ScrapeConfig) (*http.Client, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Get a default roundtripper with the scrape timeout. // The only timeout we care about is the configured scrape timeout.
tr := rt.(*http.Transport) // It is applied on request. So we leave out any timings here.
// Set the TLS config from above var rt http.RoundTripper = &http.Transport{
tr.TLSClientConfig = tlsConfig Proxy: http.ProxyURL(cfg.ProxyURL.URL),
rt = tr DisableKeepAlives: true,
TLSClientConfig: tlsConfig,
}
// If a bearer token is provided, create a round tripper that will set the // If a bearer token is provided, create a round tripper that will set the
// Authorization header correctly on each request. // Authorization header correctly on each request.
@ -502,7 +504,7 @@ func (t *Target) scrape(appender storage.SampleAppender) error {
appender = t.wrapAppender(appender) appender = t.wrapAppender(appender)
httpClient := t.httpClient client := t.httpClient
t.RUnlock() t.RUnlock()
req, err := http.NewRequest("GET", t.URL().String(), nil) req, err := http.NewRequest("GET", t.URL().String(), nil)
@ -511,7 +513,8 @@ func (t *Target) scrape(appender storage.SampleAppender) error {
} }
req.Header.Add("Accept", acceptHeader) req.Header.Add("Accept", acceptHeader)
resp, err := httpClient.Do(req) ctx, _ := context.WithTimeout(context.Background(), t.timeout())
resp, err := ctxhttp.Do(ctx, client, req)
if err != nil { if err != nil {
return err return err
} }