Add DBSize metric

packages/gossip/manager_test.go

@@ -63,8 +63,8 @@ func TestClosedConnection(t *testing.T) {
 	// wait for the connections to establish
 	wg.Wait()
 
-	mgrA.On("neighborRemoved", peerB).Once()
-	mgrB.On("neighborRemoved", peerA).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrB.On("neighborRemoved", mock.Anything).Once()
 
 	// A drops B
 	err := mgrA.DropNeighbor(peerB.ID())
@@ -111,8 +111,8 @@ func TestP2PSend(t *testing.T) {
 	mgrA.SendMessage(testMessageData)
 	time.Sleep(graceTime)
 
-	mgrA.On("neighborRemoved", peerB).Once()
-	mgrB.On("neighborRemoved", peerA).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrB.On("neighborRemoved", mock.Anything).Once()
 
 	closeA()
 	closeB()
@@ -160,8 +160,8 @@ func TestP2PSendTwice(t *testing.T) {
 	mgrA.SendMessage(testMessageData)
 	time.Sleep(graceTime)
 
-	mgrA.On("neighborRemoved", peerB).Once()
-	mgrB.On("neighborRemoved", peerA).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrB.On("neighborRemoved", mock.Anything).Once()
 
 	closeA()
 	closeB()
@@ -218,10 +218,10 @@ func TestBroadcast(t *testing.T) {
 	mgrA.SendMessage(testMessageData)
 	time.Sleep(graceTime)
 
-	mgrA.On("neighborRemoved", peerB).Once()
-	mgrA.On("neighborRemoved", peerC).Once()
-	mgrB.On("neighborRemoved", peerA).Once()
-	mgrC.On("neighborRemoved", peerA).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrB.On("neighborRemoved", mock.Anything).Once()
+	mgrC.On("neighborRemoved", mock.Anything).Once()
 
 	closeA()
 	closeB()
@@ -279,10 +279,10 @@ func TestSingleSend(t *testing.T) {
 	mgrA.SendMessage(testMessageData, peerB.ID())
 	time.Sleep(graceTime)
 
-	mgrA.On("neighborRemoved", peerB).Once()
-	mgrA.On("neighborRemoved", peerC).Once()
-	mgrB.On("neighborRemoved", peerA).Once()
-	mgrC.On("neighborRemoved", peerA).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrB.On("neighborRemoved", mock.Anything).Once()
+	mgrC.On("neighborRemoved", mock.Anything).Once()
 
 	closeA()
 	closeB()
@@ -346,8 +346,8 @@ func TestMessageRequest(t *testing.T) {
 	mgrA.RequestMessage(b)
 	time.Sleep(graceTime)
 
-	mgrA.On("neighborRemoved", peerB).Once()
-	mgrB.On("neighborRemoved", peerA).Once()
+	mgrA.On("neighborRemoved", mock.Anything).Once()
+	mgrB.On("neighborRemoved", mock.Anything).Once()
 
 	closeA()
 	closeB()
@@ -383,7 +383,7 @@ func TestDropNeighbor(t *testing.T) {
 	// close connection
 	disconnect := func() {
 		var wg sync.WaitGroup
-		signal := events.NewClosure(func(_ *peer.Peer) { wg.Done() })
+		signal := events.NewClosure(func(_ *Neighbor) { wg.Done() })
 		// we are expecting two signals
 		wg.Add(2)
 
@@ -476,5 +476,5 @@ type mockedManager struct {
 
 func (e *mockedManager) connectionFailed(p *peer.Peer, err error) { e.Called(p, err) }
 func (e *mockedManager) neighborAdded(n *Neighbor)                { e.Called(n) }
-func (e *mockedManager) neighborRemoved(p *peer.Peer)             { e.Called(p) }
+func (e *mockedManager) neighborRemoved(n *Neighbor)              { e.Called(n) }
 func (e *mockedManager) messageReceived(ev *MessageReceivedEvent) { e.Called(ev) }

plugins/gossip/plugin.go

@@ -77,8 +77,8 @@ func configureAutopeering() {
 	mgr.Events().ConnectionFailed.Attach(events.NewClosure(func(p *peer.Peer, _ error) {
 		peerSel.RemoveNeighbor(p.ID())
 	}))
-	mgr.Events().NeighborRemoved.Attach(events.NewClosure(func(p *peer.Peer) {
-		peerSel.RemoveNeighbor(p.ID())
+	mgr.Events().NeighborRemoved.Attach(events.NewClosure(func(n *gossip.Neighbor) {
+		peerSel.RemoveNeighbor(n.ID())
 	}))
 }
 
@@ -93,8 +93,8 @@ func configureLogging() {
 	mgr.Events().NeighborAdded.Attach(events.NewClosure(func(n *gossip.Neighbor) {
 		log.Infof("Neighbor added: %s / %s", gossip.GetAddress(n.Peer), n.ID())
 	}))
-	mgr.Events().NeighborRemoved.Attach(events.NewClosure(func(p *peer.Peer) {
-		log.Infof("Neighbor removed: %s / %s", gossip.GetAddress(p), p.ID())
+	mgr.Events().NeighborRemoved.Attach(events.NewClosure(func(n *gossip.Neighbor) {
+		log.Infof("Neighbor removed: %s / %s", gossip.GetAddress(n.Peer), n.ID())
 	}))
 }
 

plugins/metrics/db.go

@@ -4,15 +4,27 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/iotaledger/goshimmer/packages/metrics"
 	"github.com/iotaledger/goshimmer/plugins/config"
 	"github.com/iotaledger/goshimmer/plugins/database"
+	"github.com/iotaledger/hive.go/syncutils"
 )
 
-func colectData() {
+var (
+	_dbSize    uint64
+	dbSizeLock syncutils.RWMutex
+)
+
+func DBSize() uint64 {
+	dbSizeLock.RLock()
+	defer dbSizeLock.RUnlock()
+	return _dbSize
+}
 
+func colectDBSize() {
 	dbSize, err := directorySize(config.Node.GetString(database.CfgDatabaseDir))
 	if err == nil {
-		dataSizes.WithLabelValues("database").Set(float64(dbSize))
+		metrics.Events().DBSize.Trigger(uint64(dbSize))
 	}
 }
 

plugins/metrics/plugin.go

@@ -53,6 +53,11 @@ func configure(_ *node.Plugin) {
 		defer syncLock.Unlock()
 		isSynced = synced
 	}))
+	metrics.Events().DBSize.Attach(events.NewClosure(func(dbSize uint64) {
+		dbSizeLock.Lock()
+		defer dbSizeLock.Unlock()
+		_dbSize = dbSize
+	}))
 }
 
 func run(_ *node.Plugin) {

plugins/sync/plugin.go

@@ -6,12 +6,12 @@ import (
 
 	"github.com/iotaledger/goshimmer/packages/binary/messagelayer/message"
 	"github.com/iotaledger/goshimmer/packages/binary/messagelayer/tangle"
+	gossipPkg "github.com/iotaledger/goshimmer/packages/gossip"
 	"github.com/iotaledger/goshimmer/packages/shutdown"
 	"github.com/iotaledger/goshimmer/plugins/autopeering/local"
 	"github.com/iotaledger/goshimmer/plugins/config"
 	"github.com/iotaledger/goshimmer/plugins/gossip"
 	"github.com/iotaledger/goshimmer/plugins/messagelayer"
-	"github.com/iotaledger/hive.go/autopeering/peer"
 	"github.com/iotaledger/hive.go/daemon"
 	"github.com/iotaledger/hive.go/events"
 	"github.com/iotaledger/hive.go/logger"
@@ -105,7 +105,7 @@ func monitorForDesynchronization() {
 
 	// monitors the peer count of the manager and sets the node as desynced if it has no more peers.
 	noPeers := make(chan types.Empty)
-	monitorPeerCountClosure := events.NewClosure(func(_ *peer.Peer) {
+	monitorPeerCountClosure := events.NewClosure(func(_ *gossipPkg.Neighbor) {
 		anyPeers := len(gossip.Manager().AllNeighbors()) > 0
 		if anyPeers {
 			return