universe: improve log messages

Author: ffranr

universe/federation.go

@@ -751,8 +751,8 @@ func (f *FederationEnvoy) SyncServers(serverAddrs []ServerAddr) error {
 	syncServer := func(ctx context.Context, serverAddr ServerAddr) error {
 		err := f.syncServerState(ctx, serverAddr, *syncConfigs)
 		if err != nil {
-			log.Warnf("encountered an error whilst syncing with "+
-				"server=%v: %v", spew.Sdump(serverAddr), err)
+			log.WarnS(ctx, "Error syncing with universe", err,
+				"server", serverAddr.HostStr())
 		}
 		return nil
 	}

universe/syncer.go

@@ -301,8 +301,8 @@ func (s *SimpleSyncer) syncRoot(ctx context.Context, remoteRoot Root,
 
 	// If the local root matches the remote root, then we're done here.
 	case err == nil && mssmt.IsEqualNode(localRoot, remoteRoot):
-		log.Debugf("Root for %v matches, no sync needed",
-			uniID.String())
+		log.DebugS(ctx, "Universe roots match, no sync needed",
+			"universe", uniID.StringForLog())
 
 		return nil