fix http response header

Signed-off-by: logeable <logeable@gmail.com>
jaegertracing · Apr 6, 2021 · efe7ddb · efe7ddb
1 parent 33e8e96
commit efe7ddb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/healthcheck/handler.go b/pkg/healthcheck/handler.go
@@ -98,9 +98,10 @@ func (hc *HealthCheck) Handler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		state := hc.getState()
 		template := hc.responses[state.status]
-		w.WriteHeader(template.statusCode)
 
 		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(template.statusCode)
+
 		w.Write(hc.createRespBody(state, template))
 	})
 }

diff --git a/pkg/healthcheck/handler_test.go b/pkg/healthcheck/handler_test.go
@@ -16,6 +16,8 @@
 package healthcheck_test
 
 import (
+	"net/http"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -49,3 +51,11 @@ func TestStatusSetGet(t *testing.T) {
 	assert.Equal(t, Ready, hc.Get())
 	assert.Equal(t, map[string]string{"level": "info", "msg": "Health Check state change", "status": "ready"}, logBuf.JSONLine(0))
 }
+
+func TestHealthCheck_Handler_ContentType(t *testing.T) {
+	rec := httptest.NewRecorder()
+	New().Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/", nil))
+	resp := rec.Result()
+
+	assert.Equal(t, "application/json", resp.Header.Get("Content-Type"))
+}