mirror of
https://github.com/prometheus/prometheus.git
synced 2025-03-05 20:59:13 -08:00
fixed CI Erros
Signed-off-by: amanycodes <amanycodes@gmail.com>
This commit is contained in:
amanycodes
parent
66d7d2ffdd
commit
011ad4f3d3
|
|
@ -738,7 +738,7 @@ func createHeadWithOOOSamples(tb testing.TB, w *wlog.WL, series []storage.Series
|
|||
require.NoError(tb, app.Commit())
|
||||
|
||||
oooSamplesAppended := 0
|
||||
require.Equal(tb, float64(0), prom_testutil.ToFloat64(head.metrics.successulSamplesAppended.WithLabelValues(oooAppends)))
|
||||
require.Equal(tb, float64(0), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends)))
|
||||
|
||||
app = head.Appender(context.Background())
|
||||
for i, lset := range oooSampleLabels {
|
||||
|
|
@ -751,11 +751,11 @@ func createHeadWithOOOSamples(tb testing.TB, w *wlog.WL, series []storage.Series
|
|||
}
|
||||
require.NoError(tb, app.Commit())
|
||||
|
||||
actOOOAppended := prom_testutil.ToFloat64(head.metrics.successulSamplesAppended.WithLabelValues(oooAppends))
|
||||
actOOOAppended := prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends))
|
||||
require.GreaterOrEqual(tb, actOOOAppended, float64(oooSamplesAppended-len(series)))
|
||||
require.LessOrEqual(tb, actOOOAppended, float64(oooSamplesAppended))
|
||||
|
||||
require.Equal(tb, float64(totalSamples), prom_testutil.ToFloat64(head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends)))
|
||||
require.Equal(tb, float64(totalSamples), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends)))
|
||||
|
||||
return head
|
||||
}
|
||||
|
|
|
|||
26
tsdb/head.go
26
tsdb/head.go
|
|
@ -342,16 +342,16 @@ func (h *Head) resetInMemoryState() error {
|
|||
}
|
||||
|
||||
type headMetrics struct {
|
||||
activeAppenders prometheus.Gauge
|
||||
series prometheus.GaugeFunc
|
||||
seriesCreated prometheus.Counter
|
||||
seriesRemoved prometheus.Counter
|
||||
seriesNotFound prometheus.Counter
|
||||
chunks prometheus.Gauge
|
||||
chunksCreated prometheus.Counter
|
||||
chunksRemoved prometheus.Counter
|
||||
gcDuration prometheus.Summary
|
||||
successulSamplesAppended *prometheus.CounterVec
|
||||
activeAppenders prometheus.Gauge
|
||||
series prometheus.GaugeFunc
|
||||
seriesCreated prometheus.Counter
|
||||
seriesRemoved prometheus.Counter
|
||||
seriesNotFound prometheus.Counter
|
||||
chunks prometheus.Gauge
|
||||
chunksCreated prometheus.Counter
|
||||
chunksRemoved prometheus.Counter
|
||||
gcDuration prometheus.Summary
|
||||
successfulSamplesAppended *prometheus.CounterVec
|
||||
// samplesAppended *prometheus.CounterVec
|
||||
// outOfOrderSamplesAppended *prometheus.CounterVec
|
||||
// outOfBoundSamples *prometheus.CounterVec
|
||||
|
|
@ -435,8 +435,8 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
|
|||
Name: "prometheus_tsdb_data_replay_duration_seconds",
|
||||
Help: "Time taken to replay the data on disk.",
|
||||
}),
|
||||
successulSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
|
||||
Name: "prometheus_tsdb_head_sucessful_samples_appended_total",
|
||||
successfulSamplesAppended: prometheus.NewCounterVec(prometheus.CounterOpts{
|
||||
Name: "prometheus_tsdb_head_successful_samples_appended_total",
|
||||
Help: "Total number of successful appended samples including out of order samples.",
|
||||
}, []string{"reason", "type"}),
|
||||
sampleAppendFailures: prometheus.NewCounterVec(prometheus.CounterOpts{
|
||||
|
|
@ -532,7 +532,7 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics {
|
|||
m.walCorruptionsTotal,
|
||||
m.dataTotalReplayDuration,
|
||||
// m.samplesAppended,
|
||||
m.successulSamplesAppended,
|
||||
m.successfulSamplesAppended,
|
||||
// m.outOfOrderSamplesAppended,
|
||||
m.sampleAppendFailures,
|
||||
// m.outOfBoundSamples,
|
||||
|
|
|
|||
|
|
@ -1508,12 +1508,12 @@ func (a *headAppender) Commit() (err error) {
|
|||
a.head.metrics.sampleAppendFailures.WithLabelValues(outOfBounds, sampleMetricTypeFloat).Add(float64(acc.floatOOBRejected))
|
||||
// a.head.metrics.tooOldSamples.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatTooOldRejected))
|
||||
a.head.metrics.sampleAppendFailures.WithLabelValues(tooOld, sampleMetricTypeFloat).Add(float64(acc.floatTooOldRejected))
|
||||
a.head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
|
||||
a.head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram).Add(float64(acc.floatsAppended))
|
||||
a.head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
|
||||
a.head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
|
||||
// a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.floatsAppended))
|
||||
// a.head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.histogramsAppended))
|
||||
a.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
|
||||
a.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
|
||||
a.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
|
||||
a.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
|
||||
// a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeFloat).Add(float64(acc.oooFloatsAccepted))
|
||||
// a.head.metrics.outOfOrderSamplesAppended.WithLabelValues(sampleMetricTypeHistogram).Add(float64(acc.oooHistogramAccepted))
|
||||
a.head.updateMinMaxTime(acc.inOrderMint, acc.inOrderMaxt)
|
||||
|
|
|
|||
|
|
@ -4379,7 +4379,7 @@ func TestHistogramMetrics(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
require.Equal(t, float64(expHSamples), prom_testutil.ToFloat64(head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram)))
|
||||
require.Equal(t, float64(expHSamples), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram)))
|
||||
|
||||
require.NoError(t, head.Close())
|
||||
w, err := wlog.NewSize(nil, nil, head.wal.Dir(), 32768, wlog.CompressionNone)
|
||||
|
|
@ -4388,7 +4388,7 @@ func TestHistogramMetrics(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.NoError(t, head.Init(0))
|
||||
|
||||
require.Equal(t, float64(0), prom_testutil.ToFloat64(head.metrics.successulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram))) // Counter reset.
|
||||
require.Equal(t, float64(0), prom_testutil.ToFloat64(head.metrics.successfulSamplesAppended.WithLabelValues(successfulAppends, sampleMetricTypeHistogram))) // Counter reset.
|
||||
}
|
||||
|
||||
func TestHistogramStaleSample(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -149,8 +149,8 @@ func requireEqualSeries(t *testing.T, expected, actual map[string][]chunks.Sampl
|
|||
|
||||
func requireEqualOOOSamples(t *testing.T, expectedSamples int, db *DB) {
|
||||
require.Equal(t, float64(expectedSamples),
|
||||
prom_testutil.ToFloat64(db.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat))+
|
||||
prom_testutil.ToFloat64(db.head.metrics.successulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram)),
|
||||
prom_testutil.ToFloat64(db.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeFloat))+
|
||||
prom_testutil.ToFloat64(db.head.metrics.successfulSamplesAppended.WithLabelValues(oooAppends, sampleMetricTypeHistogram)),
|
||||
"number of ooo appended samples mismatch")
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue