Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect body format after reading from cache and restore content-type header #3759

Merged
merged 3 commits into from
Jun 7, 2024
Merged

Detect body format after reading from cache and restore content-type header #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dd36f0
Detect body format after reading from cache and restore content-type …
mdisibio Jun 7, 2024
de60e89
comment
mdisibio Jun 7, 2024
ea24bba
changelog
mdisibio Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* [ENHANCEMENT] Performance improvement for `rate() by ()` queries [#3719](https://github.com/grafana/tempo/pull/3719) (@mapno)
* [ENHANCEMENT] Use multiple goroutines to unmarshal responses in parallel in the query frontend. [#3713](https://github.com/grafana/tempo/pull/3713) (@joe-elliott)
* [BUGFIX] Fix metrics queries when grouping by attributes that may not exist [#3734](https://github.com/grafana/tempo/pull/3734) (@mdisibio)
* [BUGFIX] Fix frontend parsing error on cached responses [#3759](https://github.com/grafana/tempo/pull/3759) (@mdisibio)
* [BUGFIX] max_global_traces_per_user: take into account ingestion.tenant_shard_size when converting to local limit [#3618](https://github.com/grafana/tempo/pull/3618) (@kvrhdn)

## v2.5.0
Expand Down
20 changes: 18 additions & 2 deletions modules/frontend/pipeline/sync_handler_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/go-kit/log/level"
"github.com/gogo/protobuf/jsonpb"
"github.com/gogo/protobuf/proto"
"github.com/grafana/tempo/pkg/api"
"github.com/grafana/tempo/pkg/cache"
)

Expand Down Expand Up @@ -39,11 +40,26 @@ func (c cachingWare) RoundTrip(req *http.Request) (*http.Response, error) {
if ok && len(key) > 0 {
body := c.cache.fetchBytes(key)
if len(body) > 0 {
return &http.Response{
resp := &http.Response{
Header: http.Header{},
StatusCode: http.StatusOK,
Status: http.StatusText(http.StatusOK),
Body: io.NopCloser(bytes.NewBuffer(body)),
}, nil
}

// We aren't capturing the original content type in the cache, just the raw bytes.
// Detect it and readd it, so the upstream code can parse the body.
// TODO - Cache should capture all of the relevant parts of the
// original response including both content-type and content-length headers, possibly more.
// But upgrading the cache format requires migration/detection of previous format either way.
// It's tempting to use https://pkg.go.dev/net/http#DetectContentType but it doesn't detect
// json or proto.
if body[0] == '{' {
resp.Header.Add(api.HeaderContentType, api.HeaderAcceptJSON)
} else {
resp.Header.Add(api.HeaderContentType, api.HeaderAcceptProtobuf)
}
return resp, nil
}
}

Expand Down
Loading