Skip to content

Commit 011ad4f

Browse files
amanycodesamanycodes
committed
fixed CI Erros
Signed-off-by: amanycodes <amanycodes@gmail.com>
1 parent 66d7d2f commit 011ad4f

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
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.successulSamplesAppended.WithLabelValues(oooAppends)))
741+
require.Equal(tb, float64(0), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends)))
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.successulSamplesAppended.WithLabelValues(oooAppends))
754+
actOOOAppended := prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends))
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.successulSamplesAppended.WithLabelValues(successfulAppends)))
758+
require.Equal(tb, float64(totalSamples), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends)))
759759

760760
return head
761761
}

‎tsdb/head.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -342,16 +342,16 @@ func (h *Head) resetInMemoryState() error {
342342
}
343343

344344
type headMetrics struct {
345-
activeAppenders prometheus.Gauge
346-
series prometheus.GaugeFunc
347-
seriesCreated prometheus.Counter
348-
seriesRemoved prometheus.Counter
349-
seriesNotFound prometheus.Counter
350-
chunks prometheus.Gauge
351-
chunksCreated prometheus.Counter
352-
chunksRemoved prometheus.Counter
353-
gcDuration prometheus.Summary
354-
successulSamplesAppended *prometheus.CounterVec
345+
activeAppenders prometheus.Gauge
346+
series prometheus.GaugeFunc
347+
seriesCreated prometheus.Counter
348+
seriesRemoved prometheus.Counter
349+
seriesNotFound prometheus.Counter
350+
chunks prometheus.Gauge
351+
chunksCreated prometheus.Counter
352+
chunksRemoved prometheus.Counter
353+
gcDuration prometheus.Summary
354+
successfulSamplesAppended *prometheus.CounterVec
355355
// samplesAppended *prometheus.CounterVec
356356
// outOfOrderSamplesAppended *prometheus.CounterVec
357357
// outOfBoundSamples *prometheus.CounterVec
@@ -435,8 +435,8 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
435435
Name: "prometheus_tsdb_data_replay_duration_seconds",
436436
Help: "Time taken to replay the data on disk.",
437437
}),
438-
successulSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
439-
Name: "prometheus_tsdb_head_sucessful_samples_appended_total",
438+
successfulSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
439+
Name: "prometheus_tsdb_head_successful_samples_appended_total",
440440
Help: "Total number of successful appended samples including out of order samples.",
441441
}, []string{"reason", "type"}),
442442
sampleAppendFailures: prometheus.NewCounterVec(prometheus.CounterOpts{
@@ -532,7 +532,7 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
532532
m.walCorruptionsTotal,
533533
m.dataTotalReplayDuration,
534534
// m.samplesAppended,
535-
m.successulSamplesAppended,
535+
m.successfulSamplesAppended,
536536
// m.outOfOrderSamplesAppended,
537537
m.sampleAppendFailures,
538538
// m.outOfBoundSamples,

‎tsdb/head_append.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,12 +1508,12 @@ func (a *headAppender) Commit() (err error) {
15081508
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfBounds, sampleMetricTypeFloat).Add(float64(acc.floatOOBRejected))
15091509
// a.head.metrics.tooOldSamples.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatTooOldRejected))
15101510
a.head.metrics.sampleAppendFailures.WithLabelValues(tooOld, sampleMetricTypeFloat).Add(float64(acc.floatTooOldRejected))
1511-
a.head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
1512-
a.head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram).Add(float64(acc.floatsAppended))
1511+
a.head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
1512+
a.head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
15131513
// a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
15141514
// a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
1515-
a.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
1516-
a.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
1515+
a.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
1516+
a.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
15171517
// a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
15181518
// a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
15191519
a.head.updateMinMaxTime(acc.inOrderMint, acc.inOrderMaxt)

‎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.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram)))
4382+
require.Equal(t, float64(expHSamples), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, 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.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram))) // Counter reset.
4391+
require.Equal(t, float64(0), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram))) // Counter reset.
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.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat))+
153-
prom_testutil.ToFloat64(db.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram)),
152+
prom_testutil.ToFloat64(db.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat))+
153+
prom_testutil.ToFloat64(db.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram)),
154154
"number of ooo appended samples mismatch")
155155
}
156156

0 commit comments

Comments
 (0)