Set appropriate headers in /services endpoint.

jmcarp · jmcarp · commit 28b56777db9d · 2021-12-23T11:33:59.000-05:00
Signed-off-by: Josh Carp &lt;jm.carp@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * [BUGFIX] AlertManager: remove stale template files. #4495
 * [BUGFIX] Distributor: fix bug in query-exemplar where some results would get dropped. #4582
 * [BUGFIX] Update Thanos dependency: compactor tracing support, azure blocks storage memory fix. #4585
+* [BUGFIX] Set appropriate `Content-Type` header for /services endpoint, which previously hard-coded `text/plain`. #4596
 
 ## 1.11.0 2021-11-25
 
diff --git a/pkg/cortex/status.go b/pkg/cortex/status.go
@@ -50,9 +50,6 @@ func init() {
 }
 
 func (t *Cortex) servicesHandler(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(200)
-	w.Header().Set("Content-Type", "text/plain")
-
 	svcs := make([]renderService, 0)
 	for mod, s := range t.ServiceMap {
 		svcs = append(svcs, renderService{

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,6 @@ func init() {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (t Cortex) servicesHandler(w http.ResponseWriter, r http.Request) {`
`53`		`- w.WriteHeader(200)`
`54`		`- w.Header().Set("Content-Type", "text/plain")`
`55`		`-`
`56`	`53`	`svcs := make([]renderService, 0)`
`57`	`54`	`for mod, s := range t.ServiceMap {`
`58`	`55`	`svcs = append(svcs, renderService{`