mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

fix: Unset Content-Encoding header when uncompressed
This commit is contained in:
Arthur Silva Sens 2024-08-23 16:09:01 -03:00 committed by GitHub
parent 2254d6c308 187acd4ca1
commit 67121dc55a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
## Unreleased ## Unreleased
## 1.20.2 / 2024-08-23
* [BUGFIX] promhttp: Unset Content-Encoding header when data is uncompressed. #1596
## 1.20.1 / 2024-08-20 ## 1.20.1 / 2024-08-20
* [BUGFIX] process-collector: Fixed unregistered descriptor error when using process collector with `PedanticRegistry` on linux machines. #1587 * [BUGFIX] process-collector: Fixed unregistered descriptor error when using process collector with `PedanticRegistry` on linux machines. #1587

2
VERSION
View File

@ -1 +1 @@
1.20.1 1.20.2

6
prometheus/promhttp/http.go
View File

@ -203,8 +203,10 @@ func HandlerForTransactional(reg prometheus.TransactionalGatherer, opts HandlerO
defer closeWriter() 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) enc := expfmt.NewEncoder(w, contentType)
// handleError handles the error according to opts.ErrorHandling // handleError handles the error according to opts.ErrorHandling

2
prometheus/promhttp/http_test.go
View File

@ -267,7 +267,7 @@ func TestInstrumentMetricHandler(t *testing.T) {
t.Errorf("got HTTP status code %d, want %d", got, want) 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) t.Errorf("got HTTP content encoding header %s, want %s", got, want)
} }