From 8e4e72ed83af448197d13717ef255e859328e1b6 Mon Sep 17 00:00:00 2001 From: Sean Rankine Date: Wed, 26 Jun 2024 16:22:19 +0100 Subject: [PATCH] Add error message for non-200 status codes If the request is not sucessful we confusingly get a time parse error (because there is no Last-Modified header and string to parse). This makes it more explicit when the exporter is failing due to a non-200 response. --- main.go | 5 +++++ main_test.go | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index a36711a..6d36e64 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "net/http" "os" "time" @@ -59,6 +60,10 @@ func fetchMirrorFreshnessMetric(backend string, url string) (float64, error) { return -1, err } + if resp.StatusCode != http.StatusOK { + return -1, fmt.Errorf("request failed with status code: %s", resp.Status) + } + lastModified := resp.Header.Get("Last-Modified") t, err := time.Parse(time.RFC1123, lastModified) diff --git a/main_test.go b/main_test.go index 80d39db..254acba 100644 --- a/main_test.go +++ b/main_test.go @@ -22,7 +22,7 @@ func setup() (*metrics, *Config) { return m, cfg } -func createTestServer(lastModified time.Time) *httptest.Server { +func createTestServer(lastModified time.Time, statusCode int) *httptest.Server { return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { backend := r.Header.Get("Backend-Override") if backend == "backend1" || backend == "backend2" { @@ -31,6 +31,7 @@ func createTestServer(lastModified time.Time) *httptest.Server { } w.Header().Set("Last-Modified", lastModified.Format(http.TimeFormat)) + w.WriteHeader(statusCode) } else { http.Error(w, "Backend-Override header not set to backend1 or backend2", http.StatusBadRequest) } @@ -39,7 +40,7 @@ func createTestServer(lastModified time.Time) *httptest.Server { func TestFetchMirrorFreshnessMetric(t *testing.T) { timestamp := time.Date(2006, time.January, 2, 15, 4, 5, 0, time.UTC) - ts := createTestServer(timestamp) + ts := createTestServer(timestamp, http.StatusOK) defer ts.Close() freshness, err := fetchMirrorFreshnessMetric("backend1", ts.URL) @@ -49,11 +50,21 @@ func TestFetchMirrorFreshnessMetric(t *testing.T) { assert.Equal(t, expectedFreshness, freshness) } +func TestFetchMirrorFreshnessMetric500StatusCode(t *testing.T) { + timestamp := time.Date(2006, time.January, 2, 15, 4, 5, 0, time.UTC) + ts := createTestServer(timestamp, http.StatusInternalServerError) + defer ts.Close() + + _, err := fetchMirrorFreshnessMetric("backend1", ts.URL) + assert.Error(t, err) + assert.Contains(t, err.Error(), "request failed with status code") +} + func TestUpdateMetrics(t *testing.T) { m, cfg := setup() timestamp := time.Date(2006, time.January, 2, 15, 4, 5, 0, time.UTC) - ts := createTestServer(timestamp) + ts := createTestServer(timestamp, http.StatusOK) defer ts.Close() cfg.MirrorFreshnessUrl = ts.URL