Skip to content

Metrics Summary: fix panic edge case #2738

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

Merged
mdisibio merged 2 commits into from
Aug 1, 2023
Merged

Metrics Summary: fix panic edge case #2738

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
b47417d
fix panic edge case
mdisibio Jul 31, 2023
45972ec
changelog
mdisibio Jul 31, 2023
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 @@ -3,6 +3,7 @@
* [FEATURE] New encoding vParquet3 with support for dedicated attribute columns (@mapno, @stoewer) [#2649](https://github.com/grafana/tempo/pull/2649)
* [ENHANCEMENT] Assert ingestion rate limits as early as possible [#2640](https://github.com/grafana/tempo/pull/2703) (@mghildiy)
* [ENHANCEMENT] Add several metrics-generator fields to user-configurable overrides [#2711](https://github.com/grafana/tempo/pull/2711) (@kvrhdn)
* [BUGFIX] Fix panic in metrics summary api [#2738](https://github.com/grafana/tempo/pull/2738) (@mdisibio)

## v2.2.0 / 2023-07-31

Expand Down
10 changes: 8 additions & 2 deletions pkg/traceqlmetrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ import (
"github.com/pkg/errors"
)

const maxBuckets = 64

type LatencyHistogram struct {
buckets [64]int // Exponential buckets, powers of 2
buckets [maxBuckets]int // Exponential buckets, powers of 2
}

func New(buckets [64]int) *LatencyHistogram {
func New(buckets [maxBuckets]int) *LatencyHistogram {
return &LatencyHistogram{buckets: buckets}
}

Expand All @@ -26,6 +28,10 @@ func (m *LatencyHistogram) Record(durationNanos uint64) {
if durationNanos >= 2 {
bucket = int(math.Ceil(math.Log2(float64(durationNanos))))
}
if bucket >= maxBuckets {
bucket = maxBuckets - 1
}

m.buckets[bucket]++
}

Expand Down
7 changes: 7 additions & 0 deletions pkg/traceqlmetrics/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package traceqlmetrics

import (
"context"
"math"
"testing"

"github.com/grafana/tempo/pkg/traceql"
Expand Down Expand Up @@ -39,6 +40,12 @@ func TestPercentile(t *testing.T) {
p: 1.0,
value: uint64(1),
},
{
name: "edge case max bucket",
durations: []uint64{math.MaxUint64},
p: 1.0,
value: uint64(1 << (maxBuckets - 1)),
},
{
name: "edge case empty",
durations: []uint64{},
Expand Down