fix: return partial results for multiple targets (#331)

burningalchemist · web-flow · commit 5e5096e1089c · 2023-09-20T18:09:55.000+02:00
diff --git a/cmd/sql_exporter/promhttp.go b/cmd/sql_exporter/promhttp.go
@@ -38,17 +38,13 @@ func ExporterHandlerFor(exporter sql_exporter.Exporter) http.Handler {
 		if err != nil {
 			if errors.Is(err, context.DeadlineExceeded) {
 				klog.Errorf("Timeout collecting metrics from target: %s", err)
-				http.Error(w, "Timeout collecting metrics from target, "+err.Error(), http.StatusInternalServerError)
-				return
 			}
 			if len(mfs) == 0 {
 				klog.Errorf("No metrics gathered: %s", err)
 				http.Error(w, "No metrics gathered, "+err.Error(), http.StatusInternalServerError)
 				return
 			}
 			klog.Errorf("Error gathering metrics: %s", err)
-			http.Error(w, "Error gathering metrics, "+err.Error(), http.StatusInternalServerError)
-			return
 		}
 
 		contentType := expfmt.Negotiate(req.Header)

Original file line number	Diff line number	Diff line change
`@@ -38,17 +38,13 @@ func ExporterHandlerFor(exporter sql_exporter.Exporter) http.Handler {`
`38`	`38`	`if err != nil {`
`39`	`39`	`if errors.Is(err, context.DeadlineExceeded) {`
`40`	`40`	`klog.Errorf("Timeout collecting metrics from target: %s", err)`
`41`		`- http.Error(w, "Timeout collecting metrics from target, "+err.Error(), http.StatusInternalServerError)`
`42`		`- return`
`43`	`41`	`}`
`44`	`42`	`if len(mfs) == 0 {`
`45`	`43`	`klog.Errorf("No metrics gathered: %s", err)`
`46`	`44`	`http.Error(w, "No metrics gathered, "+err.Error(), http.StatusInternalServerError)`
`47`	`45`	`return`
`48`	`46`	`}`
`49`	`47`	`klog.Errorf("Error gathering metrics: %s", err)`
`50`		`- http.Error(w, "Error gathering metrics, "+err.Error(), http.StatusInternalServerError)`
`51`		`- return`
`52`	`48`	`}`
`53`	`49`
`54`	`50`	`contentType := expfmt.Negotiate(req.Header)`