Update head slot metric after compute head (#4754)

* Update head slot after compute head
* Merge branch 'master' into properly-update-head-metric
* Merge refs/heads/master into properly-update-head-metric

beacon-chain/blockchain/receive_block.go

@@ -112,12 +112,6 @@ func (s *Service) ReceiveBlockNoPubsub(ctx context.Context, block *ethpb.SignedB
 		s.exitPool.MarkIncluded(exit)
 	}
 
-	// Reports on block and fork choice metrics.
-	metrics.ReportSlotMetrics(blockCopy.Block.Slot, s.headSlot, s.headState)
-
-	// Log state transition data.
-	logStateTransitionData(blockCopy.Block)
-
 	s.epochParticipationLock.Lock()
 	defer s.epochParticipationLock.Unlock()
 	s.epochParticipation[helpers.SlotToEpoch(blockCopy.Block.Slot)] = precompute.Balances
@@ -173,6 +167,12 @@ func (s *Service) ReceiveBlockNoPubsub(ctx context.Context, block *ethpb.SignedB
 		}
 	}
 
+	// Reports on block and fork choice metrics.
+	metrics.ReportSlotMetrics(blockCopy.Block.Slot, s.headSlot, s.headState)
+
+	// Log state transition data.
+	logStateTransitionData(blockCopy.Block)
+
 	return nil
 }