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

Jump to bottom

Avoid panic by cheking whether entry is a span in batchCollector #3847

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Avoid panic by cheking whether entry is a span in batchCollector #3847

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
f48c3cc
Avoid panic by cheking whether entry is a span in batchCollector
stoewer Jul 5, 2024
5be5582
CHANGELOG.md
stoewer Jul 5, 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 @@ -22,6 +22,7 @@
* [ENHANCEMENT] Add caching to query range queries [#3796](https://github.com/grafana/tempo/pull/3796) (@mapno)
* [ENHANCEMENT] Add data quality metric to measure traces without a root [#3812](https://github.com/grafana/tempo/pull/3812) (@mapno)
* [ENHANCEMENT] Add a new helper method to allow debugging e2e tests [#3836](https://github.com/grafana/tempo/pull/3836) (@javiermolinar)
* [BUGFIX] Fix panic in certain metrics queries using `rate()` with `by` [#3847](https://github.com/grafana/tempo/pull/3847) (@stoewer)
* [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)
Expand Down
5 changes: 4 additions & 1 deletion tempodb/encoding/vparquet4/block_traceql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2704,7 +2704,10 @@ func (c *batchCollector) KeepGroup(res *parquetquery.IteratorResult) bool {
// Second pass. Update and further filter the spans
spans = res.OtherEntries[:0]
for _, e := range res.OtherEntries {
span := e.Value.(*span)
span, ok := e.Value.(*span)
if !ok {
continue
}

// Copy resource-level attributes to the span
// If the span already has an entry for this attribute it
Expand Down
Loading