fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fix: fallback to gauge for protofmt-based negotiations

rexagod · rexagod · commit 2a06c450615c · 2024-03-27T23:53:23.000+05:30
diff --git a/pkg/metricshandler/metrics_handler.go b/pkg/metricshandler/metrics_handler.go
@@ -188,8 +188,8 @@ func (m *MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	contentType := expfmt.NegotiateIncludingOpenMetrics(r.Header)
 
-	// Assume text/plain if no Content-Type header is set.
-	if contentType == expfmt.FmtUnknown {
+	// We do not support protobuf at the moment. Fall back to FmtText if the negotiated exposition format is not FmtOpenMetrics See: https://github.com/kubernetes/kube-state-metrics/issues/2022.
+	if contentType != expfmt.FmtOpenMetrics_1_0_0 && contentType != expfmt.FmtOpenMetrics_0_0_1 {
 		contentType = expfmt.FmtText
 	}
 	resHeader.Set("Content-Type", string(contentType))

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,8 @@ func (m MetricsHandler) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`188`	`188`
`189`	`189`	`contentType := expfmt.NegotiateIncludingOpenMetrics(r.Header)`
`190`	`190`
`191`		`- // Assume text/plain if no Content-Type header is set.`
`192`		`- if contentType == expfmt.FmtUnknown {`
	`191`	`+ // We do not support protobuf at the moment. Fall back to FmtText if the negotiated exposition format is not FmtOpenMetrics See: https://github.com/kubernetes/kube-state-metrics/issues/2022.`
	`192`	`+ if contentType != expfmt.FmtOpenMetrics_1_0_0 && contentType != expfmt.FmtOpenMetrics_0_0_1 {`
`193`	`193`	`contentType = expfmt.FmtText`
`194`	`194`	`}`
`195`	`195`	`resHeader.Set("Content-Type", string(contentType))`