Improve GPBFT Logging (#566)

* Update round after logging

Otherwise, it looks like we were in the last phase of the wrong round.

* Fix logging skip

Author: Stebalien

gpbft/gpbft.go

@@ -754,8 +754,8 @@ func (i *instance) getRound(r uint64) *roundState {
 }
 
 func (i *instance) beginNextRound() {
+	i.log("moving to round %d with %s", i.round+1, i.proposal.String())
 	i.round += 1
-	i.log("moving to round %d with %s", i.round, i.proposal.String())
 	metrics.currentRound.Record(context.TODO(), int64(i.round))
 
 	prevRound := i.getRound(i.round - 1)

logging.go

@@ -6,7 +6,7 @@ import (
 )
 
 var log = logging.Logger("f3")
-var tracer gpbft.Tracer = (*gpbftTracer)(logging.WithSkip(logging.Logger("f3/gpbft"), 1))
+var tracer gpbft.Tracer = (*gpbftTracer)(logging.WithSkip(logging.Logger("f3/gpbft"), 2))
 
 // Tracer used by GPBFT, backed by a Zap logger.
 type gpbftTracer logging.ZapEventLogger