Merge pull request #1596 from mrueg/fix-uncompressed-content-header

ArthurSens · web-flow · commit 67121dc55a7c · 2024-08-23T16:09:01.000-03:00
fix: Unset Content-Encoding header when uncompressed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 1.20.2 / 2024-08-23
+
+* [BUGFIX] promhttp: Unset Content-Encoding header when data is uncompressed. #1596
+
 ## 1.20.1 / 2024-08-20
 
 * [BUGFIX] process-collector: Fixed unregistered descriptor error when using process collector with `PedanticRegistry` on linux machines. #1587
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.20.1
+1.20.2
diff --git a/prometheus/promhttp/http.go b/prometheus/promhttp/http.go
@@ -203,8 +203,10 @@ func HandlerForTransactional(reg prometheus.TransactionalGatherer, opts HandlerO
 
 		defer closeWriter()
 
-		rsp.Header().Set(contentEncodingHeader, encodingHeader)
-
+		// Set Content-Encoding only when data is compressed
+		if encodingHeader != string(Identity) {
+			rsp.Header().Set(contentEncodingHeader, encodingHeader)
+		}
 		enc := expfmt.NewEncoder(w, contentType)
 
 		// handleError handles the error according to opts.ErrorHandling
diff --git a/prometheus/promhttp/http_test.go b/prometheus/promhttp/http_test.go
@@ -267,7 +267,7 @@ func TestInstrumentMetricHandler(t *testing.T) {
 		t.Errorf("got HTTP status code %d, want %d", got, want)
 	}
 
-	if got, want := writer.Header().Get(contentEncodingHeader), string(Identity); got != want {
+	if got, want := writer.Header().Get(contentEncodingHeader), ""; got != want {
 		t.Errorf("got HTTP content encoding header %s, want %s", got, want)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ func TestInstrumentMetricHandler(t *testing.T) {`
`267`	`267`	`t.Errorf("got HTTP status code %d, want %d", got, want)`
`268`	`268`	`}`
`269`	`269`
`270`		`- if got, want := writer.Header().Get(contentEncodingHeader), string(Identity); got != want {`
	`270`	`+ if got, want := writer.Header().Get(contentEncodingHeader), ""; got != want {`
`271`	`271`	`t.Errorf("got HTTP content encoding header %s, want %s", got, want)`
`272`	`272`	`}`
`273`	`273`