diff --git a/management/server/account.go b/management/server/account.go index 0aecbd586..f5a5c7b7a 100644 --- a/management/server/account.go +++ b/management/server/account.go @@ -1672,11 +1672,6 @@ func (am *DefaultAccountManager) AllowSync(wgPubKey string, metahash uint64) boo } func (am *DefaultAccountManager) SyncAndMarkPeer(ctx context.Context, accountID string, peerPubKey string, meta nbpeer.PeerSystemMeta, realIP net.IP) (*nbpeer.Peer, *types.NetworkMap, []*posture.Checks, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("SyncAndMarkPeer: took %v", time.Since(start)) - }() - peer, netMap, postureChecks, err := am.SyncPeer(ctx, types.PeerSync{WireGuardPubKey: peerPubKey, Meta: meta}, accountID) if err != nil { return nil, nil, nil, fmt.Errorf("error syncing peer: %w", err) diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go index 0a5236cb3..d3d94443a 100644 --- a/management/server/grpcserver.go +++ b/management/server/grpcserver.go @@ -775,11 +775,6 @@ func toPeerConfig(peer *nbpeer.Peer, network *types.Network, dnsName string, set } func toSyncResponse(ctx context.Context, config *nbconfig.Config, peer *nbpeer.Peer, turnCredentials *Token, relayCredentials *Token, networkMap *types.NetworkMap, dnsName string, checks []*posture.Checks, dnsCache *DNSConfigCache, settings *types.Settings, extraSettings *types.ExtraSettings, peerGroups []string, dnsFwdPort int64) *proto.SyncResponse { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("toSyncResponse: took %s", time.Since(start)) - }() - response := &proto.SyncResponse{ PeerConfig: toPeerConfig(peer, networkMap.Network, dnsName, settings), NetworkMap: &proto.NetworkMap{ @@ -844,11 +839,6 @@ func (s *GRPCServer) IsHealthy(ctx context.Context, req *proto.Empty) (*proto.Em // sendInitialSync sends initial proto.SyncResponse to the peer requesting synchronization func (s *GRPCServer) sendInitialSync(ctx context.Context, peerKey wgtypes.Key, peer *nbpeer.Peer, networkMap *types.NetworkMap, postureChecks []*posture.Checks, srv proto.ManagementService_SyncServer) error { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("sendInitialSync: took %s", time.Since(start)) - }() - var err error var turnToken *Token diff --git a/management/server/peer.go b/management/server/peer.go index 80ab7fc69..4c605b5eb 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -106,11 +106,6 @@ func (am *DefaultAccountManager) getUserAccessiblePeers(ctx context.Context, acc // MarkPeerConnected marks peer as connected (true) or disconnected (false) func (am *DefaultAccountManager) MarkPeerConnected(ctx context.Context, peerPubKey string, connected bool, realIP net.IP, accountID string) error { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("MarkPeerConnected: took %v", time.Since(start)) - }() - var peer *nbpeer.Peer var settings *types.Settings var expired bool @@ -744,11 +739,6 @@ func getPeerIPDNSLabel(ip net.IP, peerHostName string) (string, error) { // SyncPeer checks whether peer is eligible for receiving NetworkMap (authenticated) and returns its NetworkMap if eligible func (am *DefaultAccountManager) SyncPeer(ctx context.Context, sync types.PeerSync, accountID string) (*nbpeer.Peer, *types.NetworkMap, []*posture.Checks, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("SyncPeer: took %v", time.Since(start)) - }() - var peer *nbpeer.Peer var peerNotValid bool var isStatusChanged bool @@ -822,10 +812,6 @@ func (am *DefaultAccountManager) SyncPeer(ctx context.Context, sync types.PeerSy } func (am *DefaultAccountManager) handlePeerLoginNotFound(ctx context.Context, login types.PeerLogin, err error) (*nbpeer.Peer, *types.NetworkMap, []*posture.Checks, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("handlePeerNotFound: took %s", time.Since(start)) - }() if errStatus, ok := status.FromError(err); ok && errStatus.Type() == status.NotFound { // we couldn't find this peer by its public key which can mean that peer hasn't been registered yet. // Try registering it. @@ -847,11 +833,6 @@ func (am *DefaultAccountManager) handlePeerLoginNotFound(ctx context.Context, lo // LoginPeer logs in or registers a peer. // If peer doesn't exist the function checks whether a setup key or a user is present and registers a new peer if so. func (am *DefaultAccountManager) LoginPeer(ctx context.Context, login types.PeerLogin) (*nbpeer.Peer, *types.NetworkMap, []*posture.Checks, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("LoginPeer: took %s", time.Since(start)) - }() - accountID, err := am.Store.GetAccountIDByPeerPubKey(ctx, login.WireGuardPubKey) if err != nil { return am.handlePeerLoginNotFound(ctx, login, err) @@ -965,11 +946,6 @@ func (am *DefaultAccountManager) LoginPeer(ctx context.Context, login types.Peer // getPeerPostureChecks returns the posture checks for the peer. func getPeerPostureChecks(ctx context.Context, transaction store.Store, accountID, peerID string) ([]*posture.Checks, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("getPostureChecks: took %s", time.Since(start)) - }() - policies, err := transaction.GetAccountPolicies(ctx, store.LockingStrengthNone, accountID) if err != nil { return nil, err @@ -1058,11 +1034,6 @@ func (am *DefaultAccountManager) checkIFPeerNeedsLoginWithoutLock(ctx context.Co } func (am *DefaultAccountManager) getValidatedPeerWithMap(ctx context.Context, isRequiresApproval bool, accountID string, peer *nbpeer.Peer) (*nbpeer.Peer, *types.NetworkMap, []*posture.Checks, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("getValidatedPeerWithMap: took %s", time.Since(start)) - }() - if isRequiresApproval { network, err := am.Store.GetAccountNetwork(ctx, store.LockingStrengthNone, accountID) if err != nil { @@ -1611,10 +1582,6 @@ func (am *DefaultAccountManager) GetPeerGroups(ctx context.Context, accountID, p // getPeerGroupIDs returns the IDs of the groups that the peer is part of. func getPeerGroupIDs(ctx context.Context, transaction store.Store, accountID string, peerID string) ([]string, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("getPeerGroupIDs: took %s", time.Since(start)) - }() return transaction.GetPeerGroupIDs(ctx, store.LockingStrengthNone, accountID, peerID) } diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go index 3146254a3..75f2c3ae7 100644 --- a/management/server/store/sql_store.go +++ b/management/server/store/sql_store.go @@ -311,10 +311,6 @@ func (s *SqlStore) GetInstallationID() string { } func (s *SqlStore) SavePeer(ctx context.Context, accountID string, peer *nbpeer.Peer) error { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("SavePeer: took %s", time.Since(start)) - }() // To maintain data integrity, we create a copy of the peer's to prevent unintended updates to other fields. peerCopy := peer.Copy() peerCopy.AccountID = accountID @@ -2156,10 +2152,6 @@ func (s *SqlStore) GetPeerLabelsInAccount(ctx context.Context, lockStrength Lock } func (s *SqlStore) GetAccountNetwork(ctx context.Context, lockStrength LockingStrength, accountID string) (*types.Network, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("GetAccountNetwork: took %s", time.Since(start)) - }() ctx, cancel := getDebuggingCtx(ctx) defer cancel() @@ -2201,11 +2193,6 @@ func (s *SqlStore) GetPeerByPeerPubKey(ctx context.Context, lockStrength Locking } func (s *SqlStore) GetAccountSettings(ctx context.Context, lockStrength LockingStrength, accountID string) (*types.Settings, error) { - start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("getAccountSettings: took %s", time.Since(start)) - }() - tx := s.db if lockStrength != LockingStrengthNone { tx = tx.Clauses(clause.Locking{Strength: string(lockStrength)}) diff --git a/management/server/types/account.go b/management/server/types/account.go index 3818a84ce..8797e1fa3 100644 --- a/management/server/types/account.go +++ b/management/server/types/account.go @@ -265,10 +265,6 @@ func (a *Account) GetPeerNetworkMap( metrics *telemetry.AccountManagerMetrics, ) *NetworkMap { start := time.Now() - defer func() { - log.WithContext(ctx).Debugf("GetPeerNetworkMap: took %s", time.Since(start)) - }() - peer := a.Peers[peerID] if peer == nil { return &NetworkMap{