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

Merge pull request #8960 from prometheus/improve-scrape-timeout-header-formatting 

Remove trailing zeros in scrape timeout header
This commit is contained in:
Richard Hartmann 2021-06-18 10:44:01 +02:00 committed by GitHub
parent 60918b8415 9d495afd2c
commit 6a055f118a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scrape/scrape.go
View File

@ -24,6 +24,7 @@ import (
"math" "math"
"net/http" "net/http"
"reflect" "reflect"
"strconv"
"sync" "sync"
"time" "time"
"unsafe" "unsafe"
@ -718,7 +719,7 @@ func (s *targetScraper) scrape(ctx context.Context, w io.Writer) (string, error)
req.Header.Add("Accept", acceptHeader) req.Header.Add("Accept", acceptHeader)
req.Header.Add("Accept-Encoding", "gzip") req.Header.Add("Accept-Encoding", "gzip")
req.Header.Set("User-Agent", userAgentHeader) req.Header.Set("User-Agent", userAgentHeader)
req.Header.Set("X-Prometheus-Scrape-Timeout-Seconds", fmt.Sprintf("%f", s.timeout.Seconds())) req.Header.Set("X-Prometheus-Scrape-Timeout-Seconds", strconv.FormatFloat(s.timeout.Seconds(), 'f', -1, 64))
s.req = req s.req = req
} }

2
scrape/scrape_test.go
View File

@ -1825,7 +1825,7 @@ func TestScrapeLoopOutOfBoundsTimeError(t *testing.T) {
func TestTargetScraperScrapeOK(t *testing.T) { func TestTargetScraperScrapeOK(t *testing.T) {
const ( const (
configTimeout = 1500 * time.Millisecond configTimeout = 1500 * time.Millisecond
expectedTimeout = "1.500000" expectedTimeout = "1.5"
) )
server := httptest.NewServer( server := httptest.NewServer(