manual update

Signed-off-by: Mikhail Avramenko <[email protected]>
networkservicemesh · Dec 16, 2021 · c499538 · c499538
1 parent 5dcafa6
commit c499538
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/edwarnicke/serialize v1.0.7
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a
-	github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b
+	github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2

diff --git a/go.sum b/go.sum
@@ -131,8 +131,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
 github.com/nats-io/stan.go v0.10.0/go.mod h1:0jEuBXKauB1HHJswHM/lx05K48TJ1Yxj6VIfM4k+aB4=
 github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a h1:gSujYHmGiOpJyzPGZdW2ymMpmDHCMBdbUMXCVzOtrh8=
 github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
-github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b h1:g0t17i2/Go2vtRrCBQoiwxskyn9QPCbvhtn9pYsVPi8=
-github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
+github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1 h1:1m4QBtmYdWv3eINiCoxKHaXk0lk6rQWcefAxNOdpgiE=
+github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=

diff --git a/internal/manager/manager.go b/internal/manager/manager.go
@@ -91,7 +91,7 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error {
 
 	_, sLogger, span, sFinish := spanlogger.FromContext(ctx, "cmd-nsmgr")
 	defer sFinish()
-	_, lLogger, lFinish := logruslogger.FromSpan(ctx, span, "cmd-nsmgr")
+	_, lLogger, lFinish := logruslogger.FromSpan(ctx, span, "cmd-nsmgr", map[string]interface{}{})
 	defer lFinish()
 	logger := log.Combine(sLogger, lLogger)
 

diff --git a/main.go b/main.go
@@ -51,7 +51,7 @@ func main() {
 
 	_, sLogger, span, sFinish := spanlogger.FromContext(ctx, "cmd-nsmgr")
 	defer sFinish()
-	_, lLogger, lFinish := logruslogger.FromSpan(ctx, span, "cmd-nsmgr")
+	_, lLogger, lFinish := logruslogger.FromSpan(ctx, span, "cmd-nsmgr", map[string]interface{}{})
 	defer lFinish()
 	logger := log.Combine(sLogger, lLogger)
 

diff --git a/test/mock/registry/server.go b/test/mock/registry/server.go
@@ -27,6 +27,7 @@ import (
 	"github.com/edwarnicke/serialize"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
+	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
 
 	"github.com/sirupsen/logrus"
 
@@ -95,7 +96,7 @@ func (s *serverImpl) Start(options ...grpc.ServerOption) error {
 	}
 
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	s.ctx = log.WithFields(s.ctx, map[string]interface{}{"cmd": "NsmgrMockRegistry"})
+	s.ctx = log.WithLog(s.ctx, logruslogger.New(s.ctx, map[string]interface{}{"cmd": "NsmgrMockRegistry"}))
 
 	s.errChan = grpcutils.ListenAndServe(s.ctx, s.listenOn, s.server)
 

diff --git a/test/test_utils.go b/test/test_utils.go
@@ -29,6 +29,7 @@ import (
 	"github.com/edwarnicke/grpcfd"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/log"
+	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
 	"github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
 	"github.com/networkservicemesh/sdk/pkg/tools/token"
 
@@ -76,7 +77,7 @@ type testSetup struct {
 func (s *testSetup) init() {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
 
-	s.ctx = log.WithFields(s.ctx, map[string]interface{}{"cmd": "NsmgrTestSetup"})
+	s.ctx = log.WithLog(s.ctx, logruslogger.New(s.ctx, map[string]interface{}{"cmd": "NsmgrTestSetup"}))
 
 	s.baseDir = TempFolder()