post review refactoring

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

.golangci.yml

@@ -35,7 +35,7 @@ linters-settings:
   dupl:
     threshold: 150
   funlen:
-    Lines: 105
+    Lines: 100
     Statements: 50
   goconst:
     min-len: 2

pkg/networkservice/common/setlogoption/client.go

@@ -25,7 +25,6 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
 )
 
 type setLogOptionClient struct {
@@ -40,28 +39,11 @@ func NewClient(options map[string]string) networkservice.NetworkServiceClient {
 }
 
 func (s *setLogOptionClient) Request(ctx context.Context, request *networkservice.NetworkServiceRequest, opts ...grpc.CallOption) (*networkservice.Connection, error) {
-	ctx = s.withFields(ctx)
+	ctx = withFields(ctx, s.options)
 	return next.Client(ctx).Request(ctx, request, opts...)
 }
 
-func (s *setLogOptionClient) withFields(ctx context.Context) context.Context {
-	ctxFields := log.Fields(ctx)
-	fields := make(map[string]interface{})
-	for k, v := range ctxFields {
-		fields[k] = v
-	}
-
-	fields["type"] = networkService
-	for k, v := range s.options {
-		fields[k] = v
-	}
-	if len(fields) > 0 {
-		ctx = log.WithFields(ctx, fields)
-	}
-	return ctx
-}
-
 func (s *setLogOptionClient) Close(ctx context.Context, connection *networkservice.Connection, opts ...grpc.CallOption) (*empty.Empty, error) {
-	ctx = s.withFields(ctx)
+	ctx = withFields(ctx, s.options)
 	return next.Client(ctx).Close(ctx, connection, opts...)
 }

pkg/networkservice/common/setlogoption/common.go → pkg/networkservice/common/setlogoption/context.go

@@ -16,6 +16,20 @@
 
 package setlogoption
 
-const (
-	networkService = "NetworkService"
+import (
+	"context"
+
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
 )
+
+func withFields(ctx context.Context, options map[string]string) context.Context {
+	fields := make(map[string]interface{})
+	fields["type"] = "NetworkService"
+	for k, v := range options {
+		fields[k] = v
+	}
+
+	ctx = log.WithFields(ctx, fields)
+
+	return ctx
+}

pkg/networkservice/common/setlogoption/server.go

@@ -24,7 +24,6 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
 )
 
 type setLogOptionServer struct {
@@ -39,28 +38,11 @@ func NewServer(options map[string]string) networkservice.NetworkServiceServer {
 }
 
 func (s *setLogOptionServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	ctx = s.withFields(ctx)
+	ctx = withFields(ctx, s.options)
 	return next.Server(ctx).Request(ctx, request)
 }
 
-func (s *setLogOptionServer) withFields(ctx context.Context) context.Context {
-	ctxFields := log.Fields(ctx)
-	fields := make(map[string]interface{})
-	for k, v := range ctxFields {
-		fields[k] = v
-	}
-
-	fields["type"] = networkService
-	for k, v := range s.options {
-		fields[k] = v
-	}
-	if len(fields) > 0 {
-		ctx = log.WithFields(ctx, fields)
-	}
-	return ctx
-}
-
 func (s *setLogOptionServer) Close(ctx context.Context, connection *networkservice.Connection) (*empty.Empty, error) {
-	ctx = s.withFields(ctx)
+	ctx = withFields(ctx, s.options)
 	return next.Server(ctx).Close(ctx, connection)
 }

pkg/registry/common/heal/find_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/tools/sandbox"
 )
 
+//nolint:funlen
 func TestHealClient_FindTest(t *testing.T) {
 	t.Cleanup(func() { goleak.VerifyNone(t) })