FIx avgSolidificationTime metrics

plugins/metrics/message.go

@@ -97,6 +97,8 @@ func MessageTotalCountDB() uint64 {
 
 // AvgSolidificationTime returns the average time it takes for a message to become solid. [milliseconds]
 func AvgSolidificationTime() float64 {
+	solidTimeMutex.RLock()
+	defer solidTimeMutex.RUnlock()
 	return (initialSumSolidificationTime + float64(sumSolidificationTime.Milliseconds())) / float64(MessageSolidCountDB())
 }
 
@@ -150,5 +152,5 @@ func measureInitialDBStats() {
 	initialMessageSolidCountDB.Store(uint64(solid))
 	initialMessageTotalCountDB.Store(uint64(total))
 	initialAvgSolidificationTime.Store(avgSolidTime)
-	initialSumSolidificationTime = avgSolidTime * float64(total)
+	initialSumSolidificationTime = avgSolidTime * float64(solid)
 }

plugins/metrics/plugin.go

@@ -111,13 +111,15 @@ func registerLocalMetrics() {
 	// messages can only become solid once, then they stay like that, hence no .Dec() part
 	messagelayer.Tangle().Events.MessageSolid.Attach(events.NewClosure(func(cachedMessage *message.CachedMessage, cachedMessageMetadata *tangle.CachedMessageMetadata) {
 		cachedMessage.Release()
-		messageSolidCountDBInc.Inc()
 		solidTimeMutex.Lock()
 		defer solidTimeMutex.Unlock()
 		// Consume should release cachedMessageMetadata
 		cachedMessageMetadata.Consume(func(object objectstorage.StorableObject) {
 			msgMetaData := object.(*tangle.MessageMetadata)
-			sumSolidificationTime += msgMetaData.SolidificationTime().Sub(msgMetaData.ReceivedTime())
+			if msgMetaData.IsSolid() {
+				messageSolidCountDBInc.Inc()
+				sumSolidificationTime += msgMetaData.SolidificationTime().Sub(msgMetaData.ReceivedTime())
+			}
 		})
 	}))