mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 21:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Do not double count in OOO histogram (#300)

Browse source 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Ganesh Vernekar 2022-07-22 13:47:51 +05:30 committed by GitHub
parent 2836e5513f
commit 4b2198d7ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tsdb/head_append.go
View file

@ -552,7 +552,7 @@ func (a *headAppender) Commit() (err error) {
series = a.sampleSeries[i] series = a.sampleSeries[i]
series.Lock() series.Lock()
oooSample, delta, err := series.appendable(s.T, s.V, a.headMaxt, a.minValidTime, oooTimeWindow) oooSample, _, err := series.appendable(s.T, s.V, a.headMaxt, a.minValidTime, oooTimeWindow)
switch err { switch err {
case storage.ErrOutOfOrderSample: case storage.ErrOutOfOrderSample:
samplesAppended-- samplesAppended--
@ -615,7 +615,7 @@ func (a *headAppender) Commit() (err error) {
// - the sample.t is beyond any previously ingested timestamp // - the sample.t is beyond any previously ingested timestamp
// - the sample is an exact duplicate of the 'head sample' // - the sample is an exact duplicate of the 'head sample'
delta, ok, chunkCreated = series.append(s.T, s.V, a.appendID, a.head.chunkDiskMapper) _, ok, chunkCreated = series.append(s.T, s.V, a.appendID, a.head.chunkDiskMapper)
// TODO: handle overwrite. // TODO: handle overwrite.
// this would be storage.ErrDuplicateSampleForTimestamp, it has no attached counter // this would be storage.ErrDuplicateSampleForTimestamp, it has no attached counter
@ -634,9 +634,6 @@ func (a *headAppender) Commit() (err error) {
} }
} }
if delta > 0 {
a.head.metrics.oooHistogram.Observe(float64(delta) / 1000)
}
if chunkCreated { if chunkCreated {
a.head.metrics.chunks.Inc() a.head.metrics.chunks.Inc()
a.head.metrics.chunksCreated.Inc() a.head.metrics.chunksCreated.Inc()