Merge pull request #92 from jcreixell/fix-error-handling-upstream

Fix loop that never returns on http error

Author: henrymcconville

exporter/http.go

@@ -40,7 +40,7 @@ func asyncHTTPGets(targets []string, token string) ([]*Response, error) {
 		case r := <-ch:
 			if r.err != nil {
 				log.Errorf("Error scraping API, Error: %v", r.err)
-				break
+				return nil, r.err
 			}
 			responses = append(responses, r)
 

test/github_exporter_test.go

@@ -54,6 +54,22 @@ func TestGithubExporter(t *testing.T) {
 		End()
 }
 
+func TestGithubExporterHttpErrorHandling(t *testing.T) {
+	test, collector := apiTest(withConfig("myOrg/myRepo"))
+	defer prometheus.Unregister(&collector)
+
+	// Test that the exporter returns when an error occurs
+	// Ideally a new gauge should be added to keep track of scrape errors
+	// following prometheus exporter guidelines
+	test.Mocks(
+		githubPullsError(),
+	).
+		Get("/metrics").
+		Expect(t).
+		Status(http.StatusOK).
+		End()
+}
+
 func apiTest(conf config.Config) (*apitest.APITest, exporter.Exporter) {
 	exp := exporter.Exporter{
 		APIMetrics: exporter.AddMetrics(),
@@ -118,6 +134,15 @@ func githubPulls() *apitest.Mock {
 		End()
 }
 
+func githubPullsError() *apitest.Mock {
+	return apitest.NewMock().
+		Get("https://api.github.com/repos/myOrg/myRepo/pulls").
+		Header("Authorization", "token 12345").
+		RespondWith().
+		Status(http.StatusBadRequest).
+		End()
+}
+
 func readFile(path string) string {
 	bytes, err := ioutil.ReadFile(path)
 	if err != nil {