fix: metrics endpoints content type setting

* fix: metrics endpoints content type setting (was ineffective thus always returning text/plain) Signed-off-by: lvlcn-t <75443136+lvlcn-t@users.noreply.github.com>
telekom · Nov 17, 2024 · eea9e17 · eea9e17
1 parent dd455b1
commit eea9e17
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,11 @@
         "-cover",
         "-count=1",
         "-timeout=240s",
-        "-v"
-    ]
+        // "-test.short",
+        "-v",
+    ],
+    "go.testEnvVars": {
+        // "LOG_LEVEL": "debug",
+        "LOG_FORMAT": "text",
+    }
 }
diff --git a/pkg/sparrow/handlers.go b/pkg/sparrow/handlers.go
@@ -122,6 +122,7 @@ func (s *Sparrow) handleCheckMetrics(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	w.Header().Add("Content-Type", "application/json")
 	enc := json.NewEncoder(w)
 	enc.SetIndent("", "  ")
 
@@ -134,5 +135,4 @@ func (s *Sparrow) handleCheckMetrics(w http.ResponseWriter, r *http.Request) {
 		}
 		return
 	}
-	w.Header().Add("Content-Type", "application/json")
 }
diff --git a/pkg/sparrow/handlers_test.go b/pkg/sparrow/handlers_test.go
@@ -132,12 +132,18 @@ func TestSparrow_handleCheckMetrics(t *testing.T) {
 			if tt.wantCode == http.StatusBadRequest {
 				r = chiRequest(httptest.NewRequest(http.MethodGet, "/v1/metrics/", bytes.NewBuffer([]byte{})), "")
 			}
+			r.Header.Add("Accept", "application/json")
 
 			s.handleCheckMetrics(w, r)
-			resp := w.Result() //nolint:bodyclose
+			resp := w.Result()
+			defer resp.Body.Close()
 			body, _ := io.ReadAll(resp.Body)
 
 			if tt.wantCode == http.StatusOK {
+				if w.Header().Get("Content-Type") != "application/json" {
+					t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", w.Header().Get("Content-Type"), "application/json")
+				}
+
 				if tt.wantCode != resp.StatusCode {
 					t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", resp.StatusCode, tt.wantCode)
 				}
@@ -155,13 +161,14 @@ func TestSparrow_handleCheckMetrics(t *testing.T) {
 				if reflect.DeepEqual(got, want) {
 					t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", got, want)
 				}
-			} else {
-				if tt.wantCode != resp.StatusCode {
-					t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", resp.StatusCode, tt.wantCode)
-				}
-				if !reflect.DeepEqual(body, tt.want) {
-					t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", body, tt.want)
-				}
+				return
+			}
+
+			if tt.wantCode != resp.StatusCode {
+				t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", resp.StatusCode, tt.wantCode)
+			}
+			if !reflect.DeepEqual(body, tt.want) {
+				t.Errorf("Sparrow.getCheckMetrics() = %v, want %v", body, tt.want)
 			}
 		})
 	}