Skip to content

Commit 2dcab87

Browse files
amanycodesamanycodes
committed
replaced success metric and removed comments
Signed-off-by: amanycodes <amanycodes@gmail.com>
1 parent c2c2103 commit 2dcab87

File tree

5 files changed

+38
-81
lines changed

5 files changed

+38
-81
lines changed

‎tsdb/block_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ func createHeadWithOOOSamples(tb testing.TB, w *wlog.WL, series []storage.Series
738738
require.NoError(tb, app.Commit())
739739

740740
oooSamplesAppended := 0
741-
require.Equal(tb, float64(0), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends)))
741+
require.Equal(tb, float64(0), prom_testutil.ToFloat64(head.metrics.outOfOrderSamplesAppended))
742742

743743
app = head.Appender(context.Background())
744744
for i, lset := range oooSampleLabels {
@@ -751,11 +751,11 @@ func createHeadWithOOOSamples(tb testing.TB, w *wlog.WL, series []storage.Series
751751
}
752752
require.NoError(tb, app.Commit())
753753

754-
actOOOAppended := prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends))
754+
actOOOAppended := prom_testutil.ToFloat64(head.metrics.outOfOrderSamplesAppended)
755755
require.GreaterOrEqual(tb, actOOOAppended, float64(oooSamplesAppended-len(series)))
756756
require.LessOrEqual(tb, actOOOAppended, float64(oooSamplesAppended))
757757

758-
require.Equal(tb, float64(totalSamples), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends)))
758+
require.Equal(tb, float64(totalSamples), prom_testutil.ToFloat64(head.metrics.samplesAppended))
759759

760760
return head
761761
}

‎tsdb/head.go‎

Lines changed: 27 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -351,26 +351,22 @@ type headMetrics struct {
351351
chunksCreated prometheus.Counter
352352
chunksRemoved prometheus.Counter
353353
gcDuration prometheus.Summary
354-
successfulSamplesAppended *prometheus.CounterVec
355-
// samplesAppended *prometheus.CounterVec
356-
// outOfOrderSamplesAppended *prometheus.CounterVec
357-
// outOfBoundSamples *prometheus.CounterVec
358-
// outOfOrderSamples *prometheus.CounterVec
359-
// tooOldSamples *prometheus.CounterVec
360-
walTruncateDuration prometheus.Summary
361-
walCorruptionsTotal prometheus.Counter
362-
dataTotalReplayDuration prometheus.Gauge
363-
headTruncateFail prometheus.Counter
364-
headTruncateTotal prometheus.Counter
365-
checkpointDeleteFail prometheus.Counter
366-
checkpointDeleteTotal prometheus.Counter
367-
checkpointCreationFail prometheus.Counter
368-
checkpointCreationTotal prometheus.Counter
369-
mmapChunkCorruptionTotal prometheus.Counter
370-
snapshotReplayErrorTotal prometheus.Counter // Will be either 0 or 1.
371-
oooHistogram prometheus.Histogram
372-
mmapChunksTotal prometheus.Counter
373-
sampleAppendFailures *prometheus.CounterVec
354+
samplesAppended *prometheus.CounterVec
355+
outOfOrderSamplesAppended *prometheus.CounterVec
356+
walTruncateDuration prometheus.Summary
357+
walCorruptionsTotal prometheus.Counter
358+
dataTotalReplayDuration prometheus.Gauge
359+
headTruncateFail prometheus.Counter
360+
headTruncateTotal prometheus.Counter
361+
checkpointDeleteFail prometheus.Counter
362+
checkpointDeleteTotal prometheus.Counter
363+
checkpointCreationFail prometheus.Counter
364+
checkpointCreationTotal prometheus.Counter
365+
mmapChunkCorruptionTotal prometheus.Counter
366+
snapshotReplayErrorTotal prometheus.Counter // Will be either 0 or 1.
367+
oooHistogram prometheus.Histogram
368+
mmapChunksTotal prometheus.Counter
369+
sampleAppendFailures *prometheus.CounterVec
374370
}
375371

376372
const (
@@ -379,8 +375,6 @@ const (
379375
outOfBounds = "out_of_bounds"
380376
outOfOrder = "out_of_order"
381377
tooOld = "too_old"
382-
successfulAppends = "successful_appends"
383-
oooAppends = "ooo_appends"
384378
)
385379

386380
func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
@@ -435,34 +429,18 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
435429
Name: "prometheus_tsdb_data_replay_duration_seconds",
436430
Help: "Time taken to replay the data on disk.",
437431
}),
438-
successfulSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
439-
Name: "prometheus_tsdb_head_successful_samples_appended_total",
440-
Help: "Total number of successful appended samples including out of order samples.",
441-
}, []string{"reason", "type"}),
442432
sampleAppendFailures: prometheus.NewCounterVec(prometheus.CounterOpts{
443-
Name: "prometheus_tsdb_head_samples_append_failures_total",
433+
Name: "prometheus_tsdb_head_append_failures_total",
444434
Help: "Total number of sample append failures with different reasons.",
445435
}, []string{"reason", "type"}),
446-
// samplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
447-
// Name: "prometheus_tsdb_head_samples_appended_total",
448-
// Help: "Total number of appended samples.",
449-
// }, []string{"type"}),
450-
// outOfOrderSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
451-
// Name: "prometheus_tsdb_head_out_of_order_samples_appended_total",
452-
// Help: "Total number of appended out of order samples.",
453-
// }, []string{"type"}),
454-
// outOfBoundSamples: prometheus.NewCounterVec(prometheus.CounterOpts{
455-
// Name: "prometheus_tsdb_out_of_bound_samples_total",
456-
// Help: "Total number of out of bound samples ingestion failed attempts with out of order support disabled.",
457-
// }, []string{"type"}),
458-
// outOfOrderSamples: prometheus.NewCounterVec(prometheus.CounterOpts{
459-
// Name: "prometheus_tsdb_out_of_order_samples_total",
460-
// Help: "Total number of out of order samples ingestion failed attempts due to out of order being disabled.",
461-
// }, []string{"type"}),
462-
// tooOldSamples: prometheus.NewCounterVec(prometheus.CounterOpts{
463-
// Name: "prometheus_tsdb_too_old_samples_total",
464-
// Help: "Total number of out of order samples ingestion failed attempts with out of support enabled, but sample outside of time window.",
465-
// }, []string{"type"}),
436+
samplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
437+
Name: "prometheus_tsdb_head_samples_appended_total",
438+
Help: "Total number of appended samples.",
439+
}, []string{"type"}),
440+
outOfOrderSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
441+
Name: "prometheus_tsdb_head_out_of_order_samples_appended_total",
442+
Help: "Total number of appended out of order samples.",
443+
}, []string{"type"}),
466444
headTruncateFail: prometheus.NewCounter(prometheus.CounterOpts{
467445
Name: "prometheus_tsdb_head_truncations_failed_total",
468446
Help: "Total number of head truncations that failed.",
@@ -531,13 +509,9 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
531509
m.walTruncateDuration,
532510
m.walCorruptionsTotal,
533511
m.dataTotalReplayDuration,
534-
// m.samplesAppended,
535-
m.successfulSamplesAppended,
536-
// m.outOfOrderSamplesAppended,
512+
m.samplesAppended,
513+
m.outOfOrderSamplesAppended,
537514
m.sampleAppendFailures,
538-
// m.outOfBoundSamples,
539-
// m.outOfOrderSamples,
540-
// m.tooOldSamples,
541515
m.headTruncateFail,
542516
m.headTruncateTotal,
543517
m.checkpointDeleteFail,

‎tsdb/head_append.go‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ func (a *headAppender) Append(ref storage.SeriesRef, lset labels.Labels, t int64
344344
// Otherwise a full check will be done later to decide if the sample is in-order or out-of-order.
345345
if a.oooTimeWindow == 0 && t < a.minValidTime {
346346
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfBounds, sampleMetricTypeFloat).Inc()
347-
// a.head.metrics.outOfBoundSamples.WithLabelValues(sampleMetricTypeFloat).Inc()
348347
return 0, storage.ErrOutOfBounds
349348
}
350349

@@ -379,7 +378,6 @@ func (a *headAppender) Append(ref storage.SeriesRef, lset labels.Labels, t int64
379378
if err == nil {
380379
if isOOO && a.hints != nil && a.hints.DiscardOutOfOrder {
381380
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfOrder, sampleMetricTypeFloat).Inc()
382-
// a.head.metrics.outOfOrderSamples.WithLabelValues(sampleMetricTypeFloat).Inc()
383381
return 0, storage.ErrOutOfOrderSample
384382
}
385383
s.pendingCommit = true
@@ -391,10 +389,8 @@ func (a *headAppender) Append(ref storage.SeriesRef, lset labels.Labels, t int64
391389
switch {
392390
case errors.Is(err, storage.ErrOutOfOrderSample):
393391
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfOrder, sampleMetricTypeFloat).Inc()
394-
// a.head.metrics.outOfOrderSamples.WithLabelValues(sampleMetricTypeFloat).Inc()
395392
case errors.Is(err, storage.ErrTooOldSample):
396393
a.head.metrics.sampleAppendFailures.WithLabelValues(tooOld, sampleMetricTypeFloat).Inc()
397-
// a.head.metrics.tooOldSamples.WithLabelValues(sampleMetricTypeFloat).Inc()
398394
}
399395
return 0, err
400396
}
@@ -660,7 +656,6 @@ func (a *headAppender) AppendHistogram(ref storage.SeriesRef, lset labels.Labels
660656
// Otherwise a full check will be done later to decide if the sample is in-order or out-of-order.
661657
if (a.oooTimeWindow == 0 || !a.head.opts.EnableOOONativeHistograms.Load()) && t < a.minValidTime {
662658
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfBounds, sampleMetricTypeHistogram).Inc()
663-
// a.head.metrics.outOfBoundSamples.WithLabelValues(sampleMetricTypeHistogram).Inc()
664659
return 0, storage.ErrOutOfBounds
665660
}
666661

@@ -713,10 +708,8 @@ func (a *headAppender) AppendHistogram(ref storage.SeriesRef, lset labels.Labels
713708
fallthrough
714709
case errors.Is(err, storage.ErrOOONativeHistogramsDisabled):
715710
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfOrder, sampleMetricTypeHistogram).Inc()
716-
// a.head.metrics.outOfOrderSamples.WithLabelValues(sampleMetricTypeHistogram).Inc()
717711
case errors.Is(err, storage.ErrTooOldSample):
718712
a.head.metrics.sampleAppendFailures.WithLabelValues(tooOld, sampleMetricTypeHistogram).Inc()
719-
// a.head.metrics.tooOldSamples.WithLabelValues(sampleMetricTypeHistogram).Inc()
720713
}
721714
return 0, err
722715
}
@@ -752,9 +745,7 @@ func (a *headAppender) AppendHistogram(ref storage.SeriesRef, lset labels.Labels
752745
fallthrough
753746
case errors.Is(err, storage.ErrOOONativeHistogramsDisabled):
754747
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfOrder, sampleMetricTypeHistogram).Inc()
755-
// a.head.metrics.outOfOrderSamples.WithLabelValues(sampleMetricTypeHistogram).Inc()
756748
case errors.Is(err, storage.ErrTooOldSample):
757-
// a.head.metrics.tooOldSamples.WithLabelValues(sampleMetricTypeHistogram).Inc()
758749
a.head.metrics.sampleAppendFailures.WithLabelValues(tooOld, sampleMetricTypeHistogram).Inc()
759750
}
760751
return 0, err
@@ -1500,22 +1491,14 @@ func (a *headAppender) Commit() (err error) {
15001491
a.commitFloatHistograms(acc)
15011492
a.commitMetadata()
15021493

1503-
// a.head.metrics.outOfOrderSamples.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatOOORejected))
1504-
// a.head.metrics.outOfOrderSamples.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.histoOOORejected))
15051494
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfOrder, sampleMetricTypeHistogram).Add(float64(acc.histoOOORejected))
15061495
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfOrder, sampleMetricTypeFloat).Add(float64(acc.floatOOORejected))
1507-
// a.head.metrics.outOfBoundSamples.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatOOBRejected))
15081496
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfBounds, sampleMetricTypeFloat).Add(float64(acc.floatOOBRejected))
1509-
// a.head.metrics.tooOldSamples.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatTooOldRejected))
15101497
a.head.metrics.sampleAppendFailures.WithLabelValues(tooOld, sampleMetricTypeFloat).Add(float64(acc.floatTooOldRejected))
1511-
a.head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
1512-
a.head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
1513-
// a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
1514-
// a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
1515-
a.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
1516-
a.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
1517-
// a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
1518-
// a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
1498+
a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
1499+
a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
1500+
a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
1501+
a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
15191502
a.head.updateMinMaxTime(acc.inOrderMint, acc.inOrderMaxt)
15201503
a.head.updateMinOOOMaxOOOTime(acc.oooMinT, acc.oooMaxT)
15211504

‎tsdb/head_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4379,7 +4379,7 @@ func TestHistogramMetrics(t *testing.T) {
43794379
}
43804380
}
43814381

4382-
require.Equal(t, float64(expHSamples), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram)))
4382+
require.Equal(t, float64(expHSamples), prom_testutil.ToFloat64(head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram)))
43834383

43844384
require.NoError(t, head.Close())
43854385
w, err := wlog.NewSize(nil, nil, head.wal.Dir(), 32768, wlog.CompressionNone)
@@ -4388,7 +4388,7 @@ func TestHistogramMetrics(t *testing.T) {
43884388
require.NoError(t, err)
43894389
require.NoError(t, head.Init(0))
43904390

4391-
require.Equal(t, float64(0), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram))) // Counter reset.
4391+
require.Equal(t, float64(0), prom_testutil.ToFloat64(head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram)))
43924392
}
43934393

43944394
func TestHistogramStaleSample(t *testing.T) {

‎tsdb/testutil.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ func requireEqualSeries(t *testing.T, expected, actual map[string][]chunks.Sampl
149149

150150
func requireEqualOOOSamples(t *testing.T, expectedSamples int, db *DB) {
151151
require.Equal(t, float64(expectedSamples),
152-
prom_testutil.ToFloat64(db.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat))+
153-
prom_testutil.ToFloat64(db.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram)),
152+
prom_testutil.ToFloat64(db.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeFloat))+
153+
prom_testutil.ToFloat64(db.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeHistogram)),
154154
"number of ooo appended samples mismatch")
155155
}
156156

0 commit comments

Comments
 (0)