Address PR comments

state/protocol/badger/mutator.go

@@ -571,6 +571,11 @@ func (m *FollowerState) Finalize(blockID flow.Identifier) error {
 
 	// FOURTH: metrics and events
 
+	if epochStatus.NextEpoch.SetupID != flow.ZeroID {
+		// true iff EpochSetup event for NEXT epoch was already included before
+		m.metrics.CommittedEpochFinalView(setup.FinalView)
+	}
+
 	m.metrics.FinalizedHeight(header.Height)
 	m.metrics.SealedHeight(sealed.Height)
 	m.metrics.BlockFinalized(block)
@@ -775,9 +780,6 @@ func (m *FollowerState) handleServiceEvents(block *flow.Block) ([]func(*transact
 					return nil, state.NewInvalidExtensionErrorf("invalid epoch commit: %s", err)
 				}
 
-				// update `committed_epoch_final_view` metric with new final view
-				m.metrics.CommittedEpochFinalView(setup.FinalView)
-
 				// prevents multiple setup events for same Epoch (including multiple setup events in payload of same block)
 				epochStatus.NextEpoch.CommitID = ev.ID()
 

state/protocol/badger/state.go

@@ -52,33 +52,6 @@ func Bootstrap(
 	}
 	state := newState(metrics, db, headers, seals, results, blocks, setups, commits, statuses)
 
-	phase, err := state.Final().Phase()
-	if err != nil {
-		return nil, fmt.Errorf("could not get epoch phase from state: %w", err)
-	}
-
-	// update metric based of epoch phase
-	switch phase {
-	case flow.EpochPhaseStaking, flow.EpochPhaseSetup:
-
-		// if we are in Staking or Setup phase, then set the metric value to the current epoch's final view
-		finalView, err := state.Final().Epochs().Current().FinalView()
-		if err != nil {
-			return nil, fmt.Errorf("could not get current epoch final view from state: %w", err)
-		}
-		state.metrics.CommittedEpochFinalView(finalView)
-	case flow.EpochPhaseCommitted:
-
-		// if we are in Committed phase, then set the metric value to the next epoch's final view
-		finalView, err := state.Final().Epochs().Next().FinalView()
-		if err != nil {
-			return nil, fmt.Errorf("could not get next epoch final view from state: %w", err)
-		}
-		state.metrics.CommittedEpochFinalView(finalView)
-	default:
-		return nil, fmt.Errorf("invalid phase: %s", phase)
-	}
-
 	if err := isValidRootSnapshot(root); err != nil {
 		return nil, fmt.Errorf("cannot bootstrap invalid root snapshot: %w", err)
 	}
@@ -416,6 +389,12 @@ func OpenState(
 	}
 	state := newState(metrics, db, headers, seals, results, blocks, setups, commits, statuses)
 
+	// update committed final view metric
+	err = updateCommittedEpochFinalView(state)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update committed epoch final view: %w", err)
+	}
+
 	return state, nil
 }
 
@@ -503,3 +482,39 @@ func IsBootstrapped(db *badger.DB) (bool, error) {
 	}
 	return true, nil
 }
+
+// updateCommittedEpochFinalView updates the `committed_epoch_final_view` metric based on
+// the current epoch phase. For example, suppose we have epochs N and N+1.
+// If we are in epoch N's Setup Phase, then epoch N's final view should be the value of the metric.
+// If we are in epoch N's Committed Phase, then epoch N+1's final view should be the value of the metric.
+func updateCommittedEpochFinalView(state *State) error {
+
+	phase, err := state.Final().Phase()
+	if err != nil {
+		return fmt.Errorf("could not get epoch phase from state: %w", err)
+	}
+
+	// update metric based of epoch phase
+	switch phase {
+	case flow.EpochPhaseStaking, flow.EpochPhaseSetup:
+
+		// if we are in Staking or Setup phase, then set the metric value to the current epoch's final view
+		finalView, err := state.Final().Epochs().Current().FinalView()
+		if err != nil {
+			return fmt.Errorf("could not get current epoch final view from state: %w", err)
+		}
+		state.metrics.CommittedEpochFinalView(finalView)
+	case flow.EpochPhaseCommitted:
+
+		// if we are in Committed phase, then set the metric value to the next epoch's final view
+		finalView, err := state.Final().Epochs().Next().FinalView()
+		if err != nil {
+			return fmt.Errorf("could not get next epoch final view from state: %w", err)
+		}
+		state.metrics.CommittedEpochFinalView(finalView)
+	default:
+		return fmt.Errorf("invalid phase: %s", phase)
+	}
+
+	return nil
+}

state/protocol/badger/state_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/metrics"
+	mock "github.com/onflow/flow-go/module/mock"
 	"github.com/onflow/flow-go/state/protocol"
 	bprotocol "github.com/onflow/flow-go/state/protocol/badger"
 	"github.com/onflow/flow-go/state/protocol/inmem"
@@ -33,10 +34,11 @@ func TestBootstrapAndOpen(t *testing.T) {
 
 	protoutil.RunWithBootstrapState(t, rootSnapshot, func(db *badger.DB, _ *bprotocol.State) {
 		// protocol state has been bootstrapped, now open a protocol state with the database
-		metrics := new(metrics.NoopCollector)
-		all := storagebadger.InitAll(metrics, db)
+		complianceMetrics := mock.ComplianceMetrics{}
+		noopMetrics := new(metrics.NoopCollector)
+		all := storagebadger.InitAll(noopMetrics, db)
 		state, err := bprotocol.OpenState(
-			metrics,
+			complianceMetrics,
 			db,
 			all.Headers,
 			all.Seals,