add logs to all Send methods

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
networkservicemesh · Jun 16, 2022 · 00ba8b4 · 00ba8b4
1 parent 034c54b
commit 00ba8b4
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 0 deletions.
diff --git a/pkg/networkservice/chains/endpoint/combine_monitor_server.go b/pkg/networkservice/chains/endpoint/combine_monitor_server.go
@@ -22,6 +22,7 @@ import (
 	"sync/atomic"
 
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 )
@@ -121,6 +122,9 @@ type combineMonitorConnectionsServer struct {
 }
 
 func (m *combineMonitorConnectionsServer) Send(event *networkservice.ConnectionEvent) error {
+	logrus.Info("MY_INFO combineMonitorConnectionsServer Send Begin")
+	defer logrus.Info("MY_INFO combineMonitorConnectionsServer Send End")
+
 	switch event.Type {
 	case networkservice.ConnectionEventType_INITIAL_STATE_TRANSFER:
 		err := errors.New("double sending initial state transfer")

diff --git a/pkg/networkservice/common/monitor/filter.go b/pkg/networkservice/common/monitor/filter.go
@@ -21,6 +21,7 @@ package monitor
 import (
 	"github.com/edwarnicke/serialize"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
+	"github.com/sirupsen/logrus"
 )
 
 type monitorFilter struct {
@@ -39,6 +40,9 @@ func newMonitorFilter(selector *networkservice.MonitorScopeSelector, srv network
 
 // Send - Filter connections based on event passed and selector for this filter
 func (m *monitorFilter) Send(event *networkservice.ConnectionEvent) error {
+	logrus.Info("MY_INFO monitorFilter Send Begin")
+	defer logrus.Info("MY_INFO monitorFilter Send End")
+
 	rv := &networkservice.ConnectionEvent{
 		Type:        event.Type,
 		Connections: networkservice.FilterMapOnManagerScopeSelector(event.GetConnections(), m.selector),

diff --git a/pkg/networkservice/common/monitor/monitor_connection_server.go b/pkg/networkservice/common/monitor/monitor_connection_server.go
@@ -22,6 +22,7 @@ import (
 	"github.com/edwarnicke/serialize"
 	"github.com/google/uuid"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
+	"github.com/sirupsen/logrus"
 )
 
 type monitorConnectionServer struct {
@@ -66,6 +67,8 @@ func (m *monitorConnectionServer) MonitorConnections(selector *networkservice.Mo
 var _ networkservice.MonitorConnectionServer = &monitorConnectionServer{}
 
 func (m *monitorConnectionServer) Send(event *networkservice.ConnectionEvent) (_ error) {
+	logrus.Info("MY_INFO monitorConnectionServer Send Begin")
+	defer logrus.Info("MY_INFO monitorConnectionServer Send End")
 	m.executor.AsyncExec(func() {
 		if event.Type == networkservice.ConnectionEventType_UPDATE {
 			for _, conn := range event.GetConnections() {

diff --git a/pkg/networkservice/core/eventchannel/monitor_connection_server.go b/pkg/networkservice/core/eventchannel/monitor_connection_server.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/metadata"
 )
 
@@ -43,6 +44,9 @@ func NewMonitorConnectionMonitorConnectionsServer(ctx context.Context, eventCh c
 }
 
 func (m *monitorConnectionMonitorConnectionsServer) Send(event *networkservice.ConnectionEvent) error {
+	logrus.Info("MY_INFO monitorConnectionMonitorConnectionsServer Send Begin")
+	defer logrus.Info("MY_INFO monitorConnectionMonitorConnectionsServer Send End")
+
 	select {
 	case <-m.ctx.Done():
 		return m.ctx.Err()

diff --git a/pkg/registry/common/dnsresolve/ns_server.go b/pkg/registry/common/dnsresolve/ns_server.go
@@ -22,6 +22,7 @@ import (
 	"net"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/interdomain"
 
@@ -80,6 +81,8 @@ type dnsFindNSServer struct {
 }
 
 func (s *dnsFindNSServer) Send(nseResp *registry.NetworkServiceResponse) error {
+	logrus.Info("MY_INFO dnsFindNSServer Send Begin")
+	defer logrus.Info("MY_INFO dnsFindNSServer Send End")
 	nseResp.NetworkService.Name = interdomain.Join(nseResp.NetworkService.Name, s.domain)
 	return s.NetworkServiceRegistry_FindServer.Send(nseResp)
 }

diff --git a/pkg/registry/common/dnsresolve/nse_server.go b/pkg/registry/common/dnsresolve/nse_server.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
 	"github.com/networkservicemesh/sdk/pkg/tools/log"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/interdomain"
 
@@ -133,6 +134,8 @@ type dnsFindNSEServer struct {
 }
 
 func (s *dnsFindNSEServer) Send(nseResp *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO dnsFindNSEServer Send Begin")
+	defer logrus.Info("MY_INFO dnsFindNSEServer Send End")
 	translateNSE(nseResp.NetworkServiceEndpoint, func(str string) string {
 		return interdomain.Join(str, s.domain)
 	})

diff --git a/pkg/registry/common/interdomainbypass/server.go b/pkg/registry/common/interdomainbypass/server.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/registry"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/sdk/pkg/registry/core/next"
 	"github.com/networkservicemesh/sdk/pkg/tools/stringurl"
@@ -86,6 +87,8 @@ func NewNetworkServiceEndpointRegistryServer(m *stringurl.Map, u *url.URL) regis
 }
 
 func (s *interdomainBypassNSEFindServer) Send(nseResp *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO interdomainBypassNSEFindServer Send Begin")
+	defer logrus.Info("MY_INFO interdomainBypassNSEFindServer Send End")
 	u, err := url.Parse(nseResp.GetNetworkServiceEndpoint().GetUrl())
 	if err != nil {
 		return err

diff --git a/pkg/registry/common/localbypass/server.go b/pkg/registry/common/localbypass/server.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/api/pkg/api/registry"
 
@@ -37,6 +38,8 @@ type localBypassNSEFindServer struct {
 }
 
 func (s *localBypassNSEFindServer) Send(nseResp *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO localBypassNSEFindServer Send Begin")
+	defer logrus.Info("MY_INFO localBypassNSEFindServer Send End")
 	if u, ok := s.nseURLs.Load(nseResp.NetworkServiceEndpoint.Name); ok {
 		nseResp.NetworkServiceEndpoint.Url = u.String()
 	}

diff --git a/pkg/registry/common/sendfd/server_linux.go b/pkg/registry/common/sendfd/server_linux.go
@@ -27,6 +27,7 @@ import (
 	"github.com/edwarnicke/grpcfd"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/registry"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/sdk/pkg/registry/core/next"
 )
@@ -66,6 +67,8 @@ type sendfdNSEFindServer struct {
 }
 
 func (s *sendfdNSEFindServer) Send(nseResp *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO sendfdNSEFindServer Send Begin")
+	defer logrus.Info("MY_INFO sendfdNSEFindServer Send End")
 	var inodeURLToFileURLMap = make(map[string]string)
 	if err := sendFDAndSwapFileToInode(s.transceiver, nseResp.GetNetworkServiceEndpoint(), inodeURLToFileURLMap); err != nil {
 		return err

diff --git a/pkg/registry/common/swapip/nse_registry.go b/pkg/registry/common/swapip/nse_registry.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/registry"
+	"github.com/sirupsen/logrus"
 
 	"github.com/networkservicemesh/sdk/pkg/registry/core/next"
 	"github.com/networkservicemesh/sdk/pkg/tools/log"
@@ -37,6 +38,8 @@ type swapIPFindNSEServer struct {
 }
 
 func (s *swapIPFindNSEServer) Send(nseResp *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO swapIPFindNSEServer Send Begin")
+	defer logrus.Info("MY_INFO swapIPFindNSEServer Send End")
 	trySwapIP(s.ctx, nseResp.NetworkServiceEndpoint, s.m)
 	return s.NetworkServiceEndpointRegistry_FindServer.Send(nseResp)
 }

diff --git a/pkg/registry/core/adapters/ns_registry_test.go b/pkg/registry/core/adapters/ns_registry_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/registry/core/next"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/streamcontext"
 	"github.com/networkservicemesh/sdk/pkg/registry/utils/checks/checkcontext"
+	"github.com/sirupsen/logrus"
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/registry"
@@ -74,6 +75,8 @@ type ignoreNSFindServer struct {
 }
 
 func (*ignoreNSFindServer) Send(_ *registry.NetworkServiceResponse) error {
+	logrus.Info("MY_INFO ignoreNSFindServer Send Begin")
+	defer logrus.Info("MY_INFO ignoreNSFindServer Send End")
 	return nil
 }
 

diff --git a/pkg/registry/core/adapters/nse_registry_test.go b/pkg/registry/core/adapters/nse_registry_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/registry/core/next"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/streamcontext"
 	"github.com/networkservicemesh/sdk/pkg/registry/utils/checks/checkcontext"
+	"github.com/sirupsen/logrus"
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/registry"
@@ -74,6 +75,8 @@ type ignoreNSEFindServer struct {
 }
 
 func (*ignoreNSEFindServer) Send(_ *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO ignoreNSEFindServer Send Begin")
+	defer logrus.Info("MY_INFO ignoreNSEFindServer Send End")
 	return nil
 }
 

diff --git a/pkg/registry/core/streamchannel/ns_registry_stream_channel.go b/pkg/registry/core/streamchannel/ns_registry_stream_channel.go
@@ -77,6 +77,8 @@ type networkServiceRegistryFindServer struct {
 }
 
 func (s *networkServiceRegistryFindServer) Send(nsResp *registry.NetworkServiceResponse) error {
+	logrus.Info("MY_INFO networkServiceRegistryFindServer Send Begin")
+	defer logrus.Info("MY_INFO networkServiceRegistryFindServer Send End")
 	select {
 	case <-s.ctx.Done():
 		return s.ctx.Err()

diff --git a/pkg/registry/core/streamchannel/nse_registry_stream_channel.go b/pkg/registry/core/streamchannel/nse_registry_stream_channel.go
@@ -78,6 +78,8 @@ type networkServiceEndpointRegistryFindServer struct {
 }
 
 func (s *networkServiceEndpointRegistryFindServer) Send(nseResp *registry.NetworkServiceEndpointResponse) error {
+	logrus.Info("MY_INFO networkServiceEndpointRegistryFindServer Send Begin")
+	defer logrus.Info("MY_INFO networkServiceEndpointRegistryFindServer Send End")
 	select {
 	case <-s.ctx.Done():
 		return s.ctx.Err()