Merge pull request #4786 from onflow/leo/log-stop-height

[Execution] Log stop height

engine/execution/ingestion/stop/stop_control.go

@@ -622,10 +622,11 @@ func (s *StopControl) processNewVersionBeacons(
 		return
 	}
 
-	s.log.Info().
+	lg := s.log.With().
+		Str("node_version", s.nodeVersion.String()).
+		Str("beacon", vb.String()).
 		Uint64("vb_seal_height", vb.SealHeight).
-		Uint64("vb_sequence", vb.Sequence).
-		Msg("New version beacon found")
+		Uint64("vb_sequence", vb.Sequence).Logger()
 
 	// this is now the last handled version beacon
 	s.versionBeacon = vb
@@ -642,6 +643,10 @@ func (s *StopControl) processNewVersionBeacons(
 		return
 	}
 
+	lg.Info().
+		Uint64("stop_height", stopHeight).
+		Msg("New version beacon found")
+
 	var newStop = stopBoundary{
 		StopParameters: StopParameters{
 			StopBeforeHeight: stopHeight,
@@ -655,6 +660,7 @@ func (s *StopControl) processNewVersionBeacons(
 		// This is just informational and is expected to sometimes happen during
 		// normal operation. The causes for this are described here: validateStopChange.
 		s.log.Info().
+			Uint64("stop_height", stopHeight).
 			Err(err).
 			Msg("Cannot change stop boundary when detecting new version beacon")
 	}

engine/execution/ingestion/stop/stop_control_test.go

@@ -879,3 +879,8 @@ func Test_StopControlWorkers(t *testing.T) {
 		unittest.AssertClosesBefore(t, sc.Done(), 10*time.Second)
 	})
 }
+
+func TestPatchedVersion(t *testing.T) {
+	require.True(t, semver.New("0.31.20").LessThan(*semver.New("0.31.21")))
+	require.True(t, semver.New("0.31.20-patch.1").LessThan(*semver.New("0.31.20"))) // be careful with this one
+}

model/flow/version_beacon.go

@@ -1,6 +1,7 @@
 package flow
 
 import (
+	"bytes"
 	"fmt"
 
 	"github.com/coreos/go-semver/semver"
@@ -146,3 +147,11 @@ func (v *VersionBeacon) Validate() error {
 
 	return nil
 }
+
+func (v *VersionBeacon) String() string {
+	var buffer bytes.Buffer
+	for _, boundary := range v.VersionBoundaries {
+		buffer.WriteString(fmt.Sprintf("%d:%s ", boundary.BlockHeight, boundary.Version))
+	}
+	return buffer.String()
+}

model/flow/version_beacon_test.go

@@ -213,3 +213,14 @@ func TestValidate(t *testing.T) {
 		})
 	}
 }
+
+func TestVersionBeaconString(t *testing.T) {
+	vb := &flow.VersionBeacon{
+		VersionBoundaries: []flow.VersionBoundary{
+			{BlockHeight: 1, Version: "0.21.37"},
+			{BlockHeight: 200, Version: "0.21.37-patch.1"},
+		},
+		Sequence: 1,
+	}
+	require.Equal(t, "1:0.21.37 200:0.21.37-patch.1 ", vb.String())
+}