mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 22:19:40 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2582 from mdlayher/scrape-header-rename

Browse source 
retrieval: make scrape timeout header consistent with others
This commit is contained in:
Julius Volz 2017-04-05 23:13:32 +02:00 committed by GitHub
parent 26bedc9e00 5e4f5fb5ad
commit 5f764d9940
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
retrieval/scrape.go
View file

@ -307,7 +307,7 @@ func (s *targetScraper) scrape(ctx context.Context, ts time.Time) (model.Samples
} }
req.Header.Add("Accept", acceptHeader) req.Header.Add("Accept", acceptHeader)
req.Header.Set("User-Agent", userAgentHeader) req.Header.Set("User-Agent", userAgentHeader)
req.Header.Set("Scrape-Timeout-Seconds", fmt.Sprintf("%f", s.timeout.Seconds())) req.Header.Set("X-Prometheus-Scrape-Timeout-Seconds", fmt.Sprintf("%f", s.timeout.Seconds()))
resp, err := ctxhttp.Do(ctx, s.client, req) resp, err := ctxhttp.Do(ctx, s.client, req)
if err != nil { if err != nil {

2
retrieval/scrape_test.go
View file

@ -588,7 +588,7 @@ func TestTargetScraperScrapeOK(t *testing.T) {
server := httptest.NewServer( server := httptest.NewServer(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
timeout := r.Header.Get("Scrape-Timeout-Seconds") timeout := r.Header.Get("X-Prometheus-Scrape-Timeout-Seconds")
if timeout != expectedTimeout { if timeout != expectedTimeout {
t.Errorf("Scrape timeout did not match expected timeout") t.Errorf("Scrape timeout did not match expected timeout")
t.Errorf("Expected: %v", expectedTimeout) t.Errorf("Expected: %v", expectedTimeout)