From cfb534af8ff66f19b8a525f0b4d448b9ce8eb8b4 Mon Sep 17 00:00:00 2001 From: Dmitri Dolguikh Date: Wed, 15 Jul 2026 17:01:20 +0200 Subject: [PATCH] use current context when logging sync message version Signed-off-by: Dmitri Dolguikh --- .../network_map/controller/controller.go | 18 +++--------------- management/internals/shared/grpc/server.go | 6 +----- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/management/internals/controllers/network_map/controller/controller.go b/management/internals/controllers/network_map/controller/controller.go index ccd84884e..7dd0d3bd8 100644 --- a/management/internals/controllers/network_map/controller/controller.go +++ b/management/internals/controllers/network_map/controller/controller.go @@ -236,11 +236,7 @@ func (c *Controller) sendUpdateAccountPeers(ctx context.Context, accountID strin c.perAccountOrGlobalSupportedSyncMessageVersions(accountID), grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities)) - log.WithFields( - log.Fields{ - "sync_message_version": commonSyncMessageVersions[0], - "peer_id": peer.ID, - }).Debug("common highest sync message version") + log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version") if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap { components := account.GetPeerNetworkMapComponents( @@ -407,11 +403,7 @@ func (c *Controller) sendUpdateForAffectedPeers(ctx context.Context, accountID s c.perAccountOrGlobalSupportedSyncMessageVersions(accountID), grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities)) - log.WithFields( - log.Fields{ - "sync_message_version": commonSyncMessageVersions[0], - "peer_id": peer.ID, - }).Debug("common highest sync message version") + log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version") if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap { components := account.GetPeerNetworkMapComponents( @@ -547,11 +539,7 @@ func (c *Controller) UpdateAccountPeer(ctx context.Context, accountId string, pe c.perAccountOrGlobalSupportedSyncMessageVersions(accountId), grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities)) - log.WithFields( - log.Fields{ - "sync_message_version": commonSyncMessageVersions[0], - "peer_id": peer.ID, - }).Debug("common highest sync message version") + log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version") if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap { components := account.GetPeerNetworkMapComponents( diff --git a/management/internals/shared/grpc/server.go b/management/internals/shared/grpc/server.go index 7b32a726b..cd3198eac 100644 --- a/management/internals/shared/grpc/server.go +++ b/management/internals/shared/grpc/server.go @@ -1025,11 +1025,7 @@ func (s *Server) sendInitialSync(ctx context.Context, peerKey wgtypes.Key, peer SyncMessageVersionsFromString(s.perAccountOrGlobalSyncMessageVersions(peer.AccountID)), SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities)) - log.WithFields( - log.Fields{ - "sync_message_version": commonSyncMessageVersions[0], - "peer_id": peer.ID, - }).Debug("common highest sync message version") + log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version") if commonSyncMessageVersions[0] == ComponentNetworkMap { // Capable peer: discard the legacy NetworkMap that SyncAndMarkPeer