diff --git a/management/internals/controllers/network_map/controller/controller.go b/management/internals/controllers/network_map/controller/controller.go index 29bfc1241..5785004db 100644 --- a/management/internals/controllers/network_map/controller/controller.go +++ b/management/internals/controllers/network_map/controller/controller.go @@ -237,7 +237,12 @@ func (c *Controller) sendUpdateAccountPeers(ctx context.Context, accountID strin c.perAccountOrGlobalSupportedSyncMessageVersions(accountID), sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion)) - log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersion).Debug("common highest sync message version") + log.WithContext(ctx). + WithFields(log.Fields{ + "sync_message_version": commonSyncMessageVersion, + "server_sync_message_version": c.perAccountOrGlobalSupportedSyncMessageVersions(peer.AccountID), + "peer_sync_message_version": sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion), + }).Debug("common highest sync message version") if commonSyncMessageVersion == sharedgrpc.ComponentNetworkMap { components := account.GetPeerNetworkMapComponents( @@ -404,7 +409,12 @@ func (c *Controller) sendUpdateForAffectedPeers(ctx context.Context, accountID s c.perAccountOrGlobalSupportedSyncMessageVersions(accountID), sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion)) - log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersion).Debug("common highest sync message version") + log.WithContext(ctx). + WithFields(log.Fields{ + "sync_message_version": commonSyncMessageVersion, + "server_sync_message_version": c.perAccountOrGlobalSupportedSyncMessageVersions(peer.AccountID), + "peer_sync_message_version": sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion), + }).Debug("common highest sync message version") if commonSyncMessageVersion == sharedgrpc.ComponentNetworkMap { components := account.GetPeerNetworkMapComponents( @@ -540,7 +550,12 @@ func (c *Controller) UpdateAccountPeer(ctx context.Context, accountId string, pe c.perAccountOrGlobalSupportedSyncMessageVersions(accountId), sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion)) - log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersion).Debug("common highest sync message version") + log.WithContext(ctx). + WithFields(log.Fields{ + "sync_message_version": commonSyncMessageVersion, + "server_sync_message_version": c.perAccountOrGlobalSupportedSyncMessageVersions(peer.AccountID), + "peer_sync_message_version": sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion), + }).Debug("common highest sync message version") if commonSyncMessageVersion == sharedgrpc.ComponentNetworkMap { components := account.GetPeerNetworkMapComponents( diff --git a/management/internals/shared/grpc/server.go b/management/internals/shared/grpc/server.go index 99a55599d..69a065892 100644 --- a/management/internals/shared/grpc/server.go +++ b/management/internals/shared/grpc/server.go @@ -25,6 +25,7 @@ import ( "google.golang.org/grpc/status" "github.com/netbirdio/netbird/shared/management/client/common" + "github.com/netbirdio/netbird/shared/management/grpc" "github.com/netbirdio/netbird/management/internals/controllers/network_map" rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" @@ -1027,7 +1028,12 @@ func (s *Server) sendInitialSync(ctx context.Context, peerKey wgtypes.Key, peer s.perAccountOrGlobalSyncMessageVersions(peer.AccountID), sharedgrpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion)) - log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersion).Debug("common highest sync message version") + log.WithContext(ctx). + WithFields(log.Fields{ + "sync_message_version": commonSyncMessageVersion, + "server_sync_message_version": s.perAccountOrGlobalSyncMessageVersions(peer.AccountID), + "peer_sync_message_version": grpc.SyncMessageVersionFromConfig(&peer.Meta.SyncMessageVersion), + }).Debug("common highest sync message version") if commonSyncMessageVersion == sharedgrpc.ComponentNetworkMap { // Capable peer: discard the legacy NetworkMap that SyncAndMarkPeer