fix: scrape timeout message of targets list

tkestack · Jan 18, 2021 · 681196f · 681196f
1 parent d0ecb04
commit 681196f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/explore/explore.go b/pkg/explore/explore.go
@@ -142,6 +142,7 @@ func (e *Explore) Run(ctx context.Context, con int) error {
 					hash := tar.target.Hash
 					err := e.exploreOnce(ctx, tar)
 					if err != nil {
+						e.logger.Error(err.Error())
 						go func() {
 							time.Sleep(e.retryInterval)
 							e.targetsLock.Lock()

diff --git a/pkg/sidecar/proxy.go b/pkg/sidecar/proxy.go
@@ -130,6 +130,9 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// send origin result to prometheus
 	if _, err := io.Copy(w, bytes.NewBuffer(data)); err != nil {
 		scrapErr = fmt.Errorf("copy data to prometheus failed %v", err)
+		if time.Now().Sub(start) > time.Duration(jobInfo.Config.ScrapeTimeout) {
+			scrapErr = fmt.Errorf("scrape timeout")
+		}
 		return
 	}