From c07033946741fc3c2bce53c4e3a0fa7f52ba28a7 Mon Sep 17 00:00:00 2001
From: oleg-ssvlabs <oleg.iar@ssvlabs.io>
Date: Tue, 3 Sep 2024 10:24:04 +0200
Subject: [PATCH] Refactor correctness measurement

---
 .../metrics/consensus/attestation.go          | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/internal/benchmark/metrics/consensus/attestation.go b/internal/benchmark/metrics/consensus/attestation.go
index 5491f7d..8ecb8f6 100644
--- a/internal/benchmark/metrics/consensus/attestation.go
+++ b/internal/benchmark/metrics/consensus/attestation.go
@@ -159,7 +159,10 @@ func (a *AttestationMetric) fetchAttestationBlockRoot(ctx context.Context, slot
 }
 
 func (a *AttestationMetric) AggregateResults() string {
-	var missedAttestations, freshAttestations, missedBlocks, receivedBlocks, unreadyBlocks, correctness float64
+	var (
+		latestCorrectnessMeasurement                                                                    time.Time
+		missedAttestations, freshAttestations, missedBlocks, receivedBlocks, unreadyBlocks, correctness float64
+	)
 
 	for _, point := range a.DataPoints {
 		missedAttestations += point.Values[MissedAttestationMeasurement]
@@ -167,9 +170,15 @@ func (a *AttestationMetric) AggregateResults() string {
 		freshAttestations += point.Values[FreshAttestationMeasurement]
 		receivedBlocks += point.Values[ReceivedBlockMeasurement]
 		unreadyBlocks += point.Values[UnreadyBlockMeasurement]
-	}
 
-	correctness = freshAttestations / receivedBlocks * 100
+		val, ok := point.Values[CorrectnessMeasurement]
+		if ok {
+			if latestCorrectnessMeasurement.Before(point.Timestamp) {
+				correctness = val
+				latestCorrectnessMeasurement = point.Timestamp
+			}
+		}
+	}
 
 	return fmt.Sprintf(
 		"missed_attestations=%.0f, unready_blocks_%d_ms=%.0f, missed_blocks=%.0f \n fresh_attestations=%.0f received_blocks=%.0f, correctness=%.2f %%",
@@ -184,23 +193,6 @@ func (a *AttestationMetric) AggregateResults() string {
 func (a *AttestationMetric) calculateMeasurements(slot phase0.Slot) {
 	eventBlockRoot, ok := a.eventBlockRoots.Load(slot)
 
-	var freshAttestations, receivedBlocks float64
-
-	for _, point := range a.DataPoints {
-		freshAttestations += point.Values[FreshAttestationMeasurement]
-		receivedBlocks += point.Values[ReceivedBlockMeasurement]
-	}
-
-	correctness := freshAttestations / receivedBlocks * 100
-
-	a.AddDataPoint(map[string]float64{
-		CorrectnessMeasurement: correctness,
-	})
-
-	logger.WriteMetric(metric.ConsensusGroup, a.Name, map[string]any{
-		CorrectnessMeasurement: correctness,
-	})
-
 	if !ok {
 		a.AddDataPoint(map[string]float64{
 			MissedBlockMeasurement: 1,
@@ -212,34 +204,55 @@ func (a *AttestationMetric) calculateMeasurements(slot phase0.Slot) {
 		return
 	}
 
-	a.AddDataPoint(map[string]float64{
-		ReceivedBlockMeasurement: 1,
-	})
-	logger.WriteMetric(metric.ConsensusGroup, a.Name, map[string]any{
-		ReceivedBlockMeasurement: 1,
-	})
-
 	attestationBlockRoot, ok := a.attestationBlockRoots.Load(slot)
 	if !ok {
 		a.AddDataPoint(map[string]float64{
 			MissedAttestationMeasurement: 1,
+			ReceivedBlockMeasurement:     1,
 		})
 
 		logger.WriteMetric(metric.ConsensusGroup, a.Name, map[string]any{
 			MissedAttestationMeasurement: 1,
+			ReceivedBlockMeasurement:     1,
 		})
+
+		a.calculateCorrectness()
+
 		return
 	}
 
 	if attestationBlockRoot == eventBlockRoot.(SlotData).RootBlock {
 		a.AddDataPoint(map[string]float64{
 			FreshAttestationMeasurement: 1,
+			ReceivedBlockMeasurement:    1,
 		})
 
 		logger.WriteMetric(metric.ConsensusGroup, a.Name, map[string]any{
 			FreshAttestationMeasurement: 1,
+			ReceivedBlockMeasurement:    1,
 		})
 	}
+
+	a.calculateCorrectness()
+}
+
+func (a *AttestationMetric) calculateCorrectness() {
+	var freshAttestations, receivedBlocks float64
+
+	for _, point := range a.DataPoints {
+		freshAttestations += point.Values[FreshAttestationMeasurement]
+		receivedBlocks += point.Values[ReceivedBlockMeasurement]
+	}
+
+	correctness := freshAttestations / receivedBlocks * 100
+
+	a.AddDataPoint(map[string]float64{
+		CorrectnessMeasurement: correctness,
+	})
+
+	logger.WriteMetric(metric.ConsensusGroup, a.Name, map[string]any{
+		CorrectnessMeasurement: correctness,
+	})
 }
 
 func slotTime(genesisTime time.Time, slot phase0.Slot) time.Time {