removed usage of setlogoption chain element

Signed-off-by: Mikhail Avramenko <[email protected]>

pkg/networkservice/chains/client/client.go

@@ -32,9 +32,7 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/dial"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/null"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/refresh"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/common/setlogoption"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/updatepath"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 )
@@ -55,7 +53,6 @@ func NewClient(ctx context.Context, clientOpts ...Option) networkservice.Network
 	return chain.NewNetworkServiceClient(
 		append(
 			[]networkservice.NetworkServiceClient{
-				adapters.NewServerToClient(setlogoption.NewServer(map[string]string{"name": opts.name})),
 				updatepath.NewClient(opts.name),
 				begin.NewClient(),
 				metadata.NewClient(),

pkg/networkservice/chains/endpoint/server.go

@@ -36,7 +36,6 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/monitor"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/common/setlogoption"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/timeout"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/updatepath"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/updatetoken"
@@ -106,7 +105,6 @@ func NewServer(ctx context.Context, tokenGenerator token.GeneratorFunc, options
 	rv := &endpoint{}
 	rv.NetworkServiceServer = chain.NewNetworkServiceServer(
 		append([]networkservice.NetworkServiceServer{
-			setlogoption.NewServer(map[string]string{"name": opts.name}),
 			updatepath.NewServer(opts.name),
 			begin.NewServer(),
 			updatetoken.NewServer(tokenGenerator),

pkg/networkservice/chains/nsmgr/server.go

@@ -21,7 +21,6 @@ package nsmgr
 
 import (
 	"context"
-	"fmt"
 	"net/url"
 	"time"
 
@@ -53,7 +52,6 @@ import (
 	registrysendfd "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
 
 	registryserialize "github.com/networkservicemesh/sdk/pkg/registry/common/serialize"
-	"github.com/networkservicemesh/sdk/pkg/registry/common/setlogoption"
 	registryadapter "github.com/networkservicemesh/sdk/pkg/registry/core/adapters"
 	registrychain "github.com/networkservicemesh/sdk/pkg/registry/core/chain"
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
@@ -169,14 +167,12 @@ func NewServer(ctx context.Context, tokenGenerator token.GeneratorFunc, options
 
 	nsRegistry = registrychain.NewNetworkServiceRegistryServer(
 		registryserialize.NewNetworkServiceRegistryServer(),
-		setlogoption.NewNetworkServiceRegistryServer(map[string]string{"name": "NetworkServiceRegistryServer." + opts.name}),
 		nsRegistry,
 	)
 
 	var nseInMemoryRegistry = memory.NewNetworkServiceEndpointRegistryServer()
 
 	var nseRegistry = registrychain.NewNetworkServiceEndpointRegistryServer(
-		setlogoption.NewNetworkServiceEndpointRegistryServer(map[string]string{"name": fmt.Sprintf("NetworkServiceRegistryServer.%v", opts.name)}),
 		registryclientinfo.NewNetworkServiceEndpointRegistryServer(),
 		registryserialize.NewNetworkServiceEndpointRegistryServer(),
 		expire.NewNetworkServiceEndpointRegistryServer(ctx, time.Minute),

pkg/networkservice/chains/nsmgr/suite_test.go

@@ -265,7 +265,6 @@ func (s *nsmgrSuite) Test_Remote_BusyEndpointsUsecase() {
 
 func (s *nsmgrSuite) Test_RemoteUsecase() {
 	t := s.T()
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 

pkg/networkservice/core/trace/client.go

@@ -27,7 +27,6 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
 	"github.com/networkservicemesh/sdk/pkg/tools/typeutils"
 )
 
@@ -46,11 +45,9 @@ func NewNetworkServiceClient(traced networkservice.NetworkServiceClient) network
 }
 
 func (t *beginTraceClient) Request(ctx context.Context, request *networkservice.NetworkServiceRequest, opts ...grpc.CallOption) (*networkservice.Connection, error) {
-	log.Fields(ctx)["id"] = request.GetConnection().GetId()
-
 	// Create a new logger
 	operation := typeutils.GetFuncName(t.traced, "Request")
-	ctx, finish := withLog(ctx, operation)
+	ctx, finish := withLog(ctx, operation, request.GetConnection().GetId())
 	defer finish()
 
 	logRequest(ctx, request, "request")
@@ -64,11 +61,9 @@ func (t *beginTraceClient) Request(ctx context.Context, request *networkservice.
 }
 
 func (t *beginTraceClient) Close(ctx context.Context, conn *networkservice.Connection, opts ...grpc.CallOption) (*empty.Empty, error) {
-	log.Fields(ctx)["id"] = conn.GetId()
-
 	// Create a new logger
 	operation := typeutils.GetFuncName(t.traced, "Close")
-	ctx, finish := withLog(ctx, operation)
+	ctx, finish := withLog(ctx, operation, conn.GetId())
 	defer finish()
 
 	logRequest(ctx, conn, "close")

pkg/networkservice/core/trace/context.go

@@ -34,6 +34,7 @@ type contextKeyType string
 
 const (
 	traceInfoKey contextKeyType = "ConnectionInfo"
+	loggedType   string         = "networkService"
 )
 
 // ConnectionInfo - struct, containing string representations of request and response, used for tracing.
@@ -45,7 +46,7 @@ type traceInfo struct {
 }
 
 // withLog - provides corresponding logger in context
-func withLog(parent context.Context, operation string) (c context.Context, f func()) {
+func withLog(parent context.Context, operation, connectionID string) (c context.Context, f func()) {
 	if parent == nil {
 		panic("cannot create context from nil parent")
 	}
@@ -56,7 +57,7 @@ func withLog(parent context.Context, operation string) (c context.Context, f fun
 	if grpcTraceState := grpcutils.TraceFromContext(parent); (grpcTraceState == grpcutils.TraceOn) ||
 		(grpcTraceState == grpcutils.TraceUndefined && log.IsTracingEnabled()) {
 		ctx, sLogger, span, sFinish := spanlogger.FromContext(parent, operation)
-		ctx, lLogger, lFinish := logruslogger.FromSpan(ctx, span, operation)
+		ctx, lLogger, lFinish := logruslogger.FromSpan(ctx, span, operation, map[string]interface{}{"type": loggedType, "id": connectionID})
 		return withTrace(log.WithLog(ctx, sLogger, lLogger)), func() {
 			sFinish()
 			lFinish()

pkg/networkservice/core/trace/server.go

@@ -26,7 +26,6 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
 	"github.com/networkservicemesh/sdk/pkg/tools/typeutils"
 )
 
@@ -45,11 +44,9 @@ func NewNetworkServiceServer(traced networkservice.NetworkServiceServer) network
 }
 
 func (t *beginTraceServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	log.Fields(ctx)["id"] = request.GetConnection().GetId()
-
 	// Create a new logger
 	operation := typeutils.GetFuncName(t.traced, "Request")
-	ctx, finish := withLog(ctx, operation)
+	ctx, finish := withLog(ctx, operation, request.GetConnection().GetId())
 	defer finish()
 
 	logRequest(ctx, request, "request")
@@ -63,11 +60,9 @@ func (t *beginTraceServer) Request(ctx context.Context, request *networkservice.
 }
 
 func (t *beginTraceServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
-	log.Fields(ctx)["id"] = conn.GetId()
-
 	// Create a new logger
 	operation := typeutils.GetFuncName(t.traced, "Close")
-	ctx, finish := withLog(ctx, operation)
+	ctx, finish := withLog(ctx, operation, conn.GetId())
 	defer finish()
 
 	logRequest(ctx, conn, "close")

pkg/registry/chains/client/ns_client.go

@@ -24,8 +24,6 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/registry/common/connect"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/heal"
-	"github.com/networkservicemesh/sdk/pkg/registry/common/setlogoption"
-	"github.com/networkservicemesh/sdk/pkg/registry/core/adapters"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/chain"
 )
 
@@ -38,7 +36,6 @@ func NewNetworkServiceRegistryClient(ctx context.Context, connectTo *url.URL, op
 
 	c := new(registry.NetworkServiceRegistryClient)
 	*c = chain.NewNetworkServiceRegistryClient(
-		adapters.NetworkServiceServerToClient(setlogoption.NewNetworkServiceRegistryServer(map[string]string{})),
 		connect.NewNetworkServiceRegistryClient(ctx, connectTo,
 			connect.WithNSAdditionalFunctionality(
 				append(

pkg/registry/chains/client/nse_client.go

@@ -28,8 +28,6 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/registry/common/refresh"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/serialize"
-	"github.com/networkservicemesh/sdk/pkg/registry/common/setlogoption"
-	"github.com/networkservicemesh/sdk/pkg/registry/core/adapters"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/chain"
 )
 
@@ -42,7 +40,6 @@ func NewNetworkServiceEndpointRegistryClient(ctx context.Context, connectTo *url
 
 	c := new(registry.NetworkServiceEndpointRegistryClient)
 	*c = chain.NewNetworkServiceEndpointRegistryClient(
-		adapters.NetworkServiceEndpointServerToClient(setlogoption.NewNetworkServiceEndpointRegistryServer(map[string]string{})),
 		serialize.NewNetworkServiceEndpointRegistryClient(),
 		refresh.NewNetworkServiceEndpointRegistryClient(ctx),
 		connect.NewNetworkServiceEndpointRegistryClient(ctx, connectTo,

pkg/registry/chains/memory/server.go

@@ -30,7 +30,6 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/registry/common/memory"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/proxy"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/serialize"
-	"github.com/networkservicemesh/sdk/pkg/registry/common/setlogoption"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/setpayload"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/setregistrationtime"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/chain"
@@ -39,7 +38,6 @@ import (
 // NewServer creates new registry server based on memory storage
 func NewServer(ctx context.Context, expiryDuration time.Duration, proxyRegistryURL *url.URL, dialOptions ...grpc.DialOption) registryserver.Registry {
 	nseChain := chain.NewNetworkServiceEndpointRegistryServer(
-		setlogoption.NewNetworkServiceEndpointRegistryServer(map[string]string{}),
 		serialize.NewNetworkServiceEndpointRegistryServer(),
 		setregistrationtime.NewNetworkServiceEndpointRegistryServer(),
 		expire.NewNetworkServiceEndpointRegistryServer(ctx, expiryDuration),
@@ -48,7 +46,6 @@ func NewServer(ctx context.Context, expiryDuration time.Duration, proxyRegistryU
 		connect.NewNetworkServiceEndpointRegistryServer(ctx, connect.WithDialOptions(dialOptions...)),
 	)
 	nsChain := chain.NewNetworkServiceRegistryServer(
-		setlogoption.NewNetworkServiceRegistryServer(map[string]string{}),
 		serialize.NewNetworkServiceRegistryServer(),
 		setpayload.NewNetworkServiceRegistryServer(),
 		memory.NewNetworkServiceRegistryServer(),

pkg/registry/chains/proxydns/server.go

@@ -25,18 +25,15 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/registry"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/connect"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/dnsresolve"
-	"github.com/networkservicemesh/sdk/pkg/registry/common/setlogoption"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/chain"
 )
 
 // NewServer creates new stateless registry server that proxies queries to the second registries by DNS domains
 func NewServer(ctx context.Context, dnsResolver dnsresolve.Resolver, dialOptions ...grpc.DialOption) registry.Registry {
 	nseChain := chain.NewNetworkServiceEndpointRegistryServer(
-		setlogoption.NewNetworkServiceEndpointRegistryServer(map[string]string{}),
 		dnsresolve.NewNetworkServiceEndpointRegistryServer(dnsresolve.WithResolver(dnsResolver)),
 		connect.NewNetworkServiceEndpointRegistryServer(ctx, connect.WithDialOptions(dialOptions...)))
 	nsChain := chain.NewNetworkServiceRegistryServer(
-		setlogoption.NewNetworkServiceRegistryServer(map[string]string{}),
 		dnsresolve.NewNetworkServiceRegistryServer(dnsresolve.WithResolver(dnsResolver)),
 		connect.NewNetworkServiceRegistryServer(ctx, connect.WithDialOptions(dialOptions...)))
 	return registry.NewServer(nsChain, nseChain)

pkg/registry/common/heal/ns_client.go

@@ -152,7 +152,6 @@ func (c *healNSClient) startMonitor(ctx context.Context, opts []grpc.CallOption)
 
 	findCtx, findCancel := context.WithCancel(c.ctx)
 	findCtx = extend.WithValuesFromContext(findCtx, ctx)
-	findCtx = log.WithFields(findCtx, map[string]interface{}{})
 
 	query := &registry.NetworkServiceQuery{
 		NetworkService: new(registry.NetworkService),

pkg/registry/common/heal/nse_client.go

@@ -152,7 +152,6 @@ func (c *healNSEClient) startMonitor(ctx context.Context, opts []grpc.CallOption
 
 	findCtx, findCancel := context.WithCancel(c.ctx)
 	findCtx = extend.WithValuesFromContext(findCtx, ctx)
-	findCtx = log.WithFields(findCtx, map[string]interface{}{})
 
 	query := &registry.NetworkServiceEndpointQuery{
 		NetworkServiceEndpoint: new(registry.NetworkServiceEndpoint),