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

Fix issue where presence of http.status_code tag may cause other criteria to be skipped #1799

Merged
merged 2 commits into from
Oct 13, 2022
Merged

Fix issue where presence of http.status_code tag may cause other criteria to be skipped #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e8bcf8
Fix issue where presence of http.status_code tag may cause other crit…
mdisibio Oct 13, 2022
d925bb4
changelog
mdisibio Oct 13, 2022
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 @@ -44,6 +44,7 @@ Internal types are updated to use `scope` instead of `instrumentation_library`.
* [BUGFIX] Honor caching and buffering settings when finding traces by id [#1697](https://github.com/grafana/tempo/pull/1697) (@joe-elliott)
* [BUGFIX] Correctly propagate errors from the iterator layer up through the queriers [#1723](https://github.com/grafana/tempo/pull/1723) (@joe-elliott)
* [BUGFIX] Make multitenancy work with HTTP [#1781](https://github.com/grafana/tempo/pull/1781) (@gouthamve)
* [BUGFIX] Fix parquet search bug fix on http.status_code that may cause incorrect results to be returned [#1799](https://github.com/grafana/tempo/pull/1799) (@mdisibio)

## v1.5.0 / 2022-08-17

Expand Down
2 changes: 1 addition & 1 deletion tempodb/encoding/vparquet/block_search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func makePipelineWithRowGroups(ctx context.Context, req *tempopb.SearchRequest,
if k == LabelHTTPStatusCode {
if i, err := strconv.Atoi(v); err == nil {
resourceIters = append(resourceIters, makeIter(column, pq.NewIntBetweenPredicate(int64(i), int64(i)), ""))
break
continue
}
// Non-numeric string field
otherAttrConditions[k] = v
Expand Down
8 changes: 8 additions & 0 deletions tempodb/encoding/vparquet/block_search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,14 @@ func TestBackendBlockSearch(t *testing.T) {

// Span attributes
makeReq("foo", "baz"),

// Multiple
{
Tags: map[string]string{
"http.status_code": "500",
"service.name": "asdf",
},
},
}
for _, req := range searchesThatDontMatch {
res, err := b.Search(ctx, req, defaultSearchOptions())
Expand Down