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

Fix counter reset for rate function #482

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Fix counter reset for rate function #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions engine/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,15 @@ or
end: time.Unix(3000, 0),
step: 2 * time.Second,
},
{
name: "rate with counter reset and step larger than window",
load: `load 30s
http_requests_total{pod="nginx-1", series="1"} 0+1x3 0+1x2 0+1x3`,
query: `rate(http_requests_total[1m])`,
start: time.Unix(0, 0),
end: time.Unix(200, 0),
step: 90 * time.Second,
},
{
name: "sum rate",
load: `load 30s
Expand Down
8 changes: 5 additions & 3 deletions ringbuffer/rate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type RateBuffer struct {
// last is the last sample in the current evaluation step.
last Sample

currentMint int64
selectRange int64
step int64
offset int64
Expand Down Expand Up @@ -83,6 +84,7 @@ func NewRateBuffer(opts query.Options, isCounter, isRate bool, selectRange, offs
stepRanges: stepRanges,
firstSamples: firstSamples,
last: Sample{T: math.MinInt64},
currentMint: math.MaxInt64,
}
}

Expand All @@ -93,7 +95,7 @@ func (r *RateBuffer) MaxT() int64 { return r.last.T }
func (r *RateBuffer) Push(t int64, v Value) {
// Detect resets and store the current and previous sample so that
// the rate is properly adjusted.
if v.H != nil && r.last.V.H != nil {
if r.last.T >= r.currentMint && v.H != nil && r.last.V.H != nil {
if v.H.DetectReset(r.last.V.H) {
r.resets = append(r.resets, Sample{
T: r.last.T,
Expand All @@ -104,7 +106,7 @@ func (r *RateBuffer) Push(t int64, v Value) {
V: Value{H: v.H.Copy()},
})
}
} else if r.last.V.F > v.F {
} else if r.last.T >= r.currentMint && r.last.V.F > v.F {
r.resets = append(r.resets, Sample{T: r.last.T, V: Value{F: r.last.V.F}})
r.resets = append(r.resets, Sample{T: t, V: Value{F: v.F}})
}
Expand Down Expand Up @@ -142,7 +144,7 @@ func (r *RateBuffer) Push(t int64, v Value) {
}

func (r *RateBuffer) Reset(mint int64, evalt int64) {
r.evalTs = evalt
r.currentMint, r.evalTs = mint, evalt
if r.stepRanges[0].mint == mint {
return
}
Expand Down
Loading