Skip to content

Commit

Permalink
Avoid panic by cheking whether entry is a span in batchCollector (#3847)
Browse files Browse the repository at this point in the history
* Avoid panic by cheking whether entry is a span in batchCollector

* CHANGELOG.md
  • Loading branch information
stoewer authored Jul 5, 2024
1 parent df5180d commit afe4b47
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit afe4b47

Please sign in to comment.