Update to latest sdk version (#181)

Signed-off-by: Artem Glazychev <[email protected]>

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 v0.0.0-20210202152048-ec956057eb3a
-	github.com/networkservicemesh/sdk v0.0.0-20210208092844-64f6aa269f63
+	github.com/networkservicemesh/sdk v0.0.0-20210209072519-ac14b1d8f2ec
 	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

go.sum

@@ -306,8 +306,8 @@ github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRf
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/networkservicemesh/api v0.0.0-20210202152048-ec956057eb3a h1:26MmmU399gnahAC+f6OfWsP5MpnLdJ4UjvBa6fXYvNU=
 github.com/networkservicemesh/api v0.0.0-20210202152048-ec956057eb3a/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
-github.com/networkservicemesh/sdk v0.0.0-20210208092844-64f6aa269f63 h1:fDvXYI18q3+DIN2zuljZXavL7IILWun2zafTa4llUG8=
-github.com/networkservicemesh/sdk v0.0.0-20210208092844-64f6aa269f63/go.mod h1:gqv+RfDum4HBeZA0k+F96mT2m0rh9LZTUazjtsLJ0Bs=
+github.com/networkservicemesh/sdk v0.0.0-20210209072519-ac14b1d8f2ec h1:DjdZBDjKzXRCE+Bzk1wu20FlA7Cu8J0aPDfkv86/6sQ=
+github.com/networkservicemesh/sdk v0.0.0-20210209072519-ac14b1d8f2ec/go.mod h1:gqv+RfDum4HBeZA0k+F96mT2m0rh9LZTUazjtsLJ0Bs=
 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/nishanths/exhaustive v0.0.0-20200811152831-6cf413ae40e0/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c=

internal/imports/imports.go

@@ -31,9 +31,9 @@ import (
 	_ "github.com/networkservicemesh/sdk/pkg/tools/debug"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/jaeger"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/logger"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/logger/logruslogger"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/logger/tracelogger"
+	_ "github.com/networkservicemesh/sdk/pkg/tools/log"
+	_ "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
+	_ "github.com/networkservicemesh/sdk/pkg/tools/log/spanlogger"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/opentracing"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/signalctx"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"

internal/manager/manager.go

@@ -27,8 +27,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/networkservicemesh/sdk/pkg/tools/logger/tracelogger"
-
 	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgr"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
@@ -43,8 +41,9 @@ import (
 
 	"github.com/networkservicemesh/api/pkg/api/registry"
 
-	"github.com/networkservicemesh/sdk/pkg/tools/logger"
-	"github.com/networkservicemesh/sdk/pkg/tools/logger/logruslogger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
+	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log/spanlogger"
 	"github.com/networkservicemesh/sdk/pkg/tools/opentracing"
 	"github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
 
@@ -94,23 +93,22 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error {
 	m := &manager{
 		configuration: configuration,
 	}
-	logger.EnableTracing(true)
-	traceCtx, finish := tracelogger.WithLog(ctx, "start")
+	log.EnableTracing(true)
+	traceCtx, finish := withTraceLogger(ctx, "start")
 	defer finish()
 
 	// Context to use for all things started in main
 	m.ctx, m.cancelFunc = context.WithCancel(ctx)
-	m.ctx, _ = logruslogger.New(
-		logger.WithFields(ctx, map[string]interface{}{"cmd": "Nsmgr"}),
-	)
+	m.ctx = log.WithFields(m.ctx, map[string]interface{}{"cmd": "Nsmgr"})
+	m.ctx = log.WithLog(m.ctx, logruslogger.New(m.ctx))
 
 	if err := m.initSecurity(); err != nil {
-		logger.Log(traceCtx).Errorf("failed to create new spiffe TLS Peer %v", err)
+		log.FromContext(traceCtx).Errorf("failed to create new spiffe TLS Peer %v", err)
 		return err
 	}
 
 	if err := m.connectRegistry(); err != nil {
-		logger.Log(traceCtx).Errorf("failed to connect registry %v", err)
+		log.FromContext(traceCtx).Errorf("failed to connect registry %v", err)
 		return err
 	}
 
@@ -160,16 +158,25 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error {
 	// Create GRPC server
 	m.startServers(m.server)
 
-	logger.Log(m.ctx).Infof("Startup completed in %v", time.Since(starttime))
+	log.FromContext(m.ctx).Infof("Startup completed in %v", time.Since(starttime))
 	starttime = time.Now()
 	<-m.ctx.Done()
 
-	logger.Log(m.ctx).Infof("Exit requested. Uptime: %v", time.Since(starttime))
+	log.FromContext(m.ctx).Infof("Exit requested. Uptime: %v", time.Since(starttime))
 	// If we here we need to call Stop
 	m.Stop()
 	return nil
 }
 
+func withTraceLogger(ctx context.Context, operation string) (c context.Context, f func()) {
+	ctx, sLogger, span, sFinish := spanlogger.FromContext(ctx, operation)
+	ctx, lLogger, lFinish := logruslogger.FromSpan(ctx, span, operation)
+	return log.WithLog(ctx, sLogger, lLogger), func() {
+		sFinish()
+		lFinish()
+	}
+}
+
 func createListenFolders(configuration *config.Config) {
 	for i := 0; i < len(configuration.ListenOn); i++ {
 		u := &configuration.ListenOn[i]
@@ -186,7 +193,7 @@ func waitErrChan(ctx context.Context, errChan <-chan error, m *manager) {
 	case err := <-errChan:
 		// We need to cal cancel global context, since it could be multiple context of this kind
 		m.cancelFunc()
-		logger.Log(ctx).Warnf("failed to serve: %v", err)
+		log.FromContext(ctx).Warnf("failed to serve: %v", err)
 	}
 }
 
@@ -196,7 +203,7 @@ func (m *manager) connectRegistry() (err error) {
 		m.registryCC = nil
 		return nil
 	}
-	traceCtx, finish := tracelogger.WithLog(m.ctx, "dial-registry")
+	traceCtx, finish := withTraceLogger(m.ctx, "dial-registry")
 	defer finish()
 
 	creds := grpc.WithTransportCredentials(GrpcfdTransportCredentials(credentials.NewTLS(tlsconfig.MTLSClientConfig(m.source, m.source, tlsconfig.AuthorizeAny()))))
@@ -207,7 +214,7 @@ func (m *manager) connectRegistry() (err error) {
 	options := append(opentracing.WithTracingDial(), creds, grpc.WithDefaultCallOptions(grpc.WaitForReady(true)))
 	m.registryCC, err = grpc.DialContext(ctx, grpcutils.URLToTarget(&m.configuration.RegistryURL), options...)
 	if err != nil {
-		logger.Log(traceCtx).Errorf("failed to dial NSE NsmgrRegistry: %v", err)
+		log.FromContext(traceCtx).Errorf("failed to dial NSE NsmgrRegistry: %v", err)
 	}
 	return
 }

main.go

@@ -28,9 +28,9 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/tools/debug"
 	"github.com/networkservicemesh/sdk/pkg/tools/jaeger"
-	"github.com/networkservicemesh/sdk/pkg/tools/logger"
-	"github.com/networkservicemesh/sdk/pkg/tools/logger/logruslogger"
-	"github.com/networkservicemesh/sdk/pkg/tools/logger/tracelogger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
+	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log/spanlogger"
 	"github.com/networkservicemesh/sdk/pkg/tools/signalctx"
 
 	"github.com/networkservicemesh/cmd-nsmgr/internal/config"
@@ -42,25 +42,24 @@ func main() {
 	// Setup logging
 	ctx := signalctx.WithSignals(context.Background())
 	logrus.SetFormatter(&nested.Formatter{})
-	ctx, _ = logruslogger.New(
-		logger.WithFields(ctx, map[string]interface{}{"cmd": os.Args[:1]}),
-	)
+	ctx = log.WithFields(ctx, map[string]interface{}{"cmd": os.Args[:1]})
+	ctx = log.WithLog(ctx, logruslogger.New(ctx))
 
 	// ********************************************************************************
 	// Debug self if necessary
 	// ********************************************************************************
 	if err := debug.Self(); err != nil {
-		logger.Log(ctx).Infof("%s", err)
+		log.FromContext(ctx).Infof("%s", err)
 	}
 
 	// ********************************************************************************
 	// Configure open tracing
 	// ********************************************************************************
 	// Enable Jaeger
-	logger.EnableTracing(true)
-	jaegerCloser := jaeger.InitJaeger("nsmgr")
+	log.EnableTracing(true)
+	jaegerCloser := jaeger.InitJaeger(ctx, "nsmgr")
 	defer func() { _ = jaegerCloser.Close() }()
-	traceCtx, finish := tracelogger.WithLog(ctx, "nsmgr")
+	traceCtx, finish := withTraceLogger(ctx, "nsmgr")
 
 	// Get cfg from environment
 	cfg := &config.Config{}
@@ -81,3 +80,12 @@ func main() {
 		logrus.Fatalf("error executing rootCmd: %v", err)
 	}
 }
+
+func withTraceLogger(ctx context.Context, operation string) (c context.Context, f func()) {
+	ctx, sLogger, span, sFinish := spanlogger.FromContext(ctx, operation)
+	ctx, lLogger, lFinish := logruslogger.FromSpan(ctx, span, operation)
+	return log.WithLog(ctx, sLogger, lLogger), func() {
+		sFinish()
+		lFinish()
+	}
+}

test/mock/registry/server.go

@@ -23,7 +23,7 @@ import (
 	"os"
 
 	"github.com/networkservicemesh/sdk/pkg/registry/common/setid"
-	"github.com/networkservicemesh/sdk/pkg/tools/logger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
 
 	"github.com/edwarnicke/serialize"
 
@@ -96,7 +96,7 @@ func (s *serverImpl) Start(options ...grpc.ServerOption) error {
 	}
 
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	s.ctx = logger.WithFields(s.ctx, map[string]interface{}{"cmd": "NsmgrMockRegistry"})
+	s.ctx = log.WithFields(s.ctx, map[string]interface{}{"cmd": "NsmgrMockRegistry"})
 
 	s.errChan = grpcutils.ListenAndServe(s.ctx, s.listenOn, s.server)
 

test/suite_test.go

@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/networkservicemesh/sdk/pkg/tools/logger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
 
 	nested "github.com/antonfisher/nested-logrus-formatter"
 	"github.com/sirupsen/logrus"
@@ -45,7 +45,7 @@ type NsmgrTestSuite struct {
 
 func (f *NsmgrTestSuite) SetupSuite() {
 	logrus.SetFormatter(&nested.Formatter{})
-	logger.EnableTracing(true)
+	log.EnableTracing(true)
 	f.ctx, f.cancel = context.WithCancel(context.Background())
 
 	// Run spire

test/test_utils.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/networkservicemesh/sdk/pkg/tools/logger"
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
 
@@ -71,7 +71,7 @@ type testSetup struct {
 func (s *testSetup) init() {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
 
-	s.ctx = logger.WithFields(s.ctx, map[string]interface{}{"cmd": "NsmgrTestSetup"})
+	s.ctx = log.WithFields(s.ctx, map[string]interface{}{"cmd": "NsmgrTestSetup"})
 
 	s.baseDir = TempFolder()