WAL Watcher needs to take in and pass a Registerer to LiveReader.

Signed-off-by: Callum Styan <[email protected]>

Author: cstyan

wal/wal_watcher.go

@@ -105,6 +105,7 @@ type WALWatcher struct {
 	logger         log.Logger
 	walDir         string
 	lastCheckpoint string
+	reg            prometheus.Registerer
 
 	startTime int64
 
@@ -121,12 +122,21 @@ type WALWatcher struct {
 }
 
 // NewWALWatcher creates a new WAL watcher for a given WriteTo.
-func NewWALWatcher(logger log.Logger, name string, writer writeTo, walDir string) *WALWatcher {
+func NewWALWatcher(logger log.Logger, reg prometheus.Registerer, name string, writer writeTo, walDir string) *WALWatcher {
 	if logger == nil {
 		logger = log.NewNopLogger()
 	}
+	if reg != nil {
+		// We can't use MustRegister because WALWatcher's are recreated on config changes within Prometheus.
+		reg.Register(watcherRecordsRead)
+		reg.Register(watcherRecordDecodeFails)
+		reg.Register(watcherSamplesSentPreTailing)
+		reg.Register(watcherCurrentSegment)
+	}
+
 	return &WALWatcher{
 		logger: logger,
+		reg:    reg,
 		writer: writer,
 		walDir: path.Join(walDir, "wal"),
 		name:   name,
@@ -298,7 +308,11 @@ func (w *WALWatcher) watch(segmentNum int, tail bool) error {
 	}
 	defer segment.Close()
 
+<<<<<<< HEAD
 	reader := NewLiveReader(w.logger, prometheus.DefaultRegisterer, segment)
+=======
+	reader := NewLiveReader(w.logger, w.reg, segment)
+>>>>>>> WAL Watcher needs to take in and pass a Registerer to LiveReader.
 
 	readTicker := time.NewTicker(readPeriod)
 	defer readTicker.Stop()
@@ -513,7 +527,11 @@ func (w *WALWatcher) readCheckpoint(checkpointDir string) error {
 		}
 		defer sr.Close()
 
+<<<<<<< HEAD
 		r := NewLiveReader(w.logger, prometheus.DefaultRegisterer, sr)
+=======
+		r := NewLiveReader(w.logger, w.reg, sr)
+>>>>>>> WAL Watcher needs to take in and pass a Registerer to LiveReader.
 		if err := w.readSegment(r, index, false); err != io.EOF && err != nil {
 			return errors.Wrap(err, "readSegment")
 		}

wal/wal_watcher_test.go

@@ -135,7 +135,7 @@ func TestTailSamples(t *testing.T) {
 	testutil.Ok(t, err)
 
 	wt := newWriteToMock()
-	watcher := NewWALWatcher(nil, "", wt, dir)
+	watcher := NewWALWatcher(nil, nil, "", wt, dir)
 	watcher.startTime = now.UnixNano()
 
 	// Set the Watcher's metrics so they're not nil pointers.
@@ -145,7 +145,7 @@ func TestTailSamples(t *testing.T) {
 		testutil.Ok(t, err)
 		defer segment.Close()
 
-		reader := NewLiveReader(nil, prometheus.DefaultRegisterer, segment)
+		reader := NewLiveReader(nil, nil, segment)
 		// Use tail true so we can ensure we got the right number of samples.
 		watcher.readSegment(reader, i, true)
 	}
@@ -210,7 +210,7 @@ func TestReadToEndNoCheckpoint(t *testing.T) {
 	testutil.Ok(t, err)
 
 	wt := newWriteToMock()
-	watcher := NewWALWatcher(nil, "", wt, dir)
+	watcher := NewWALWatcher(nil, nil, "", wt, dir)
 	go watcher.Start()
 
 	expected := seriesCount
@@ -292,7 +292,7 @@ func TestReadToEndWithCheckpoint(t *testing.T) {
 	_, _, err = w.Segments()
 	testutil.Ok(t, err)
 	wt := newWriteToMock()
-	watcher := NewWALWatcher(nil, "", wt, dir)
+	watcher := NewWALWatcher(nil, nil, "", wt, dir)
 	go watcher.Start()
 
 	expected := seriesCount * 2
@@ -353,7 +353,7 @@ func TestReadCheckpoint(t *testing.T) {
 	testutil.Ok(t, err)
 
 	wt := newWriteToMock()
-	watcher := NewWALWatcher(nil, "", wt, dir)
+	watcher := NewWALWatcher(nil, nil, "", wt, dir)
 	// watcher.
 	go watcher.Start()
 
@@ -420,7 +420,7 @@ func TestReadCheckpointMultipleSegments(t *testing.T) {
 	}
 
 	wt := newWriteToMock()
-	watcher := NewWALWatcher(nil, "", wt, dir)
+	watcher := NewWALWatcher(nil, nil, "", wt, dir)
 	watcher.maxSegment = -1
 
 	// Set the Watcher's metrics so they're not nil pointers.
@@ -480,7 +480,7 @@ func TestCheckpointSeriesReset(t *testing.T) {
 	testutil.Ok(t, err)
 
 	wt := newWriteToMock()
-	watcher := NewWALWatcher(nil, "", wt, dir)
+	watcher := NewWALWatcher(nil, nil, "", wt, dir)
 	watcher.maxSegment = -1
 	go watcher.Start()