Merge branch 'feat/add-selfstate-heartbeats' into feat/add-selfstate-…

…monitor

notifier/selfstate/heartbeat/notifier.go

@@ -3,7 +3,6 @@ package heartbeat
 import (
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/datatypes"
-	"github.com/moira-alert/moira/metrics"
 )
 
 // Verify that notifierHeartbeater matches the Heartbeater interface.
@@ -17,38 +16,31 @@ type NotifierHeartbeaterConfig struct {
 type notifierHeartbeater struct {
 	*heartbeaterBase
 
-	metrics *metrics.HeartBeatMetrics
-	cfg     NotifierHeartbeaterConfig
+	cfg NotifierHeartbeaterConfig
 }
 
 // NewNotifierHeartbeater is a function that creates a new notifierHeartbeater.
 func NewNotifierHeartbeater(
 	cfg NotifierHeartbeaterConfig,
 	base *heartbeaterBase,
-	metrics *metrics.HeartBeatMetrics,
 ) (*notifierHeartbeater, error) {
 	return &notifierHeartbeater{
 		cfg:             cfg,
 		heartbeaterBase: base,
-		metrics:         metrics,
 	}, nil
 }
 
 // Check is a function that returns the state of the notifier.
 func (heartbeater *notifierHeartbeater) Check() (State, error) {
 	notifierState, err := heartbeater.database.GetNotifierState()
 	if err != nil {
-		heartbeater.metrics.MarkNotifierIsAlive(false)
 		return StateError, err
 	}
 
 	if notifierState != moira.SelfStateOK {
-		heartbeater.metrics.MarkNotifierIsAlive(false)
 		return StateError, nil
 	}
 
-	heartbeater.metrics.MarkNotifierIsAlive(true)
-
 	return StateOK, nil
 }
 

notifier/selfstate/heartbeat/notifier_test.go

@@ -6,28 +6,23 @@ import (
 
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/datatypes"
-	"github.com/moira-alert/moira/metrics"
 
 	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestNewNotifierHeartbeater(t *testing.T) {
 	_, _, _, heartbeaterBase := heartbeaterHelper(t) //nolint:dogsled
 
-	dummyRegistry := metrics.NewDummyRegistry()
-	heartbeatMetrics := metrics.ConfigureHeartBeatMetrics(dummyRegistry)
-
 	Convey("Test NewNotifierHeartbeater", t, func() {
 		Convey("With correct local checker heartbeater config", func() {
 			cfg := NotifierHeartbeaterConfig{}
 
 			expected := &notifierHeartbeater{
 				heartbeaterBase: heartbeaterBase,
 				cfg:             cfg,
-				metrics:         heartbeatMetrics,
 			}
 
-			notifierHeartbeater, err := NewNotifierHeartbeater(cfg, heartbeaterBase, heartbeatMetrics)
+			notifierHeartbeater, err := NewNotifierHeartbeater(cfg, heartbeaterBase)
 			So(err, ShouldBeNil)
 			So(notifierHeartbeater, ShouldResemble, expected)
 		})
@@ -37,12 +32,9 @@ func TestNewNotifierHeartbeater(t *testing.T) {
 func TestNotifierHeartbeaterCheck(t *testing.T) {
 	database, _, _, heartbeaterBase := heartbeaterHelper(t)
 
-	dummyRegistry := metrics.NewDummyRegistry()
-	heartbeatMetrics := metrics.ConfigureHeartBeatMetrics(dummyRegistry)
-
 	cfg := NotifierHeartbeaterConfig{}
 
-	notifierHeartbeater, _ := NewNotifierHeartbeater(cfg, heartbeaterBase, heartbeatMetrics)
+	notifierHeartbeater, _ := NewNotifierHeartbeater(cfg, heartbeaterBase)
 
 	testErr := errors.New("test error")
 
@@ -76,13 +68,10 @@ func TestNotifierHeartbeaterCheck(t *testing.T) {
 func TestNotifierHeartbeaterType(t *testing.T) {
 	_, _, _, heartbeaterBase := heartbeaterHelper(t) //nolint:dogsled
 
-	dummyRegistry := metrics.NewDummyRegistry()
-	heartbeatMetrics := metrics.ConfigureHeartBeatMetrics(dummyRegistry)
-
 	Convey("Test notifierHeartbeater.Type", t, func() {
 		cfg := NotifierHeartbeaterConfig{}
 
-		notifierHeartbeater, err := NewNotifierHeartbeater(cfg, heartbeaterBase, heartbeatMetrics)
+		notifierHeartbeater, err := NewNotifierHeartbeater(cfg, heartbeaterBase)
 		So(err, ShouldBeNil)
 
 		notifierHeartbeaterType := notifierHeartbeater.Type()
@@ -93,9 +82,6 @@ func TestNotifierHeartbeaterType(t *testing.T) {
 func TestNotifierHeartbeaterAlertSettings(t *testing.T) {
 	_, _, _, heartbeaterBase := heartbeaterHelper(t) //nolint:dogsled
 
-	dummyRegistry := metrics.NewDummyRegistry()
-	heartbeatMetrics := metrics.ConfigureHeartBeatMetrics(dummyRegistry)
-
 	Convey("Test notifierHeartbeater.AlertSettings", t, func() {
 		alertCfg := AlertConfig{
 			Name: "test name",
@@ -108,7 +94,7 @@ func TestNotifierHeartbeaterAlertSettings(t *testing.T) {
 			},
 		}
 
-		notifierHeartbeater, err := NewNotifierHeartbeater(cfg, heartbeaterBase, heartbeatMetrics)
+		notifierHeartbeater, err := NewNotifierHeartbeater(cfg, heartbeaterBase)
 		So(err, ShouldBeNil)
 
 		alertSettings := notifierHeartbeater.AlertSettings()