Update to new logger usage

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

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/antonfisher/nested-logrus-formatter v1.3.0
 	github.com/edwarnicke/exechelper v1.0.2
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/networkservicemesh/sdk v0.0.0-20210120064752-943735566550
+	github.com/networkservicemesh/sdk v0.0.0-20210122073256-a82c641be287
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2
 	github.com/stretchr/testify v1.6.1

go.sum

@@ -292,8 +292,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-20210112152104-45029fb10e27 h1:J0UPj3sYfEvXwMHyAOiQ++NU7a3cZGZST1s1ftyC0uQ=
 github.com/networkservicemesh/api v0.0.0-20210112152104-45029fb10e27/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
-github.com/networkservicemesh/sdk v0.0.0-20210120064752-943735566550 h1:2dfh+H5pqTJKcAodLk1wi5+fhu1y4AxoobPVGmgR0yM=
-github.com/networkservicemesh/sdk v0.0.0-20210120064752-943735566550/go.mod h1:LV9NIA44LDUs0moEnrfeeRKQPA3Qdu3JiBhSwzEbXSM=
+github.com/networkservicemesh/sdk v0.0.0-20210122073256-a82c641be287 h1:IWcNsCwTHgPEDh4J6P760Dw8x9bOzjph7AXvdH9cz5w=
+github.com/networkservicemesh/sdk v0.0.0-20210122073256-a82c641be287/go.mod h1:LV9NIA44LDUs0moEnrfeeRKQPA3Qdu3JiBhSwzEbXSM=
 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=

main.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/networkservicemesh/sdk/pkg/tools/spanhelper"
+	"github.com/networkservicemesh/sdk/pkg/tools/opentracing"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgrproxy"
 	"github.com/networkservicemesh/sdk/pkg/tools/jaeger"
@@ -38,7 +38,8 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/tools/debug"
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
+	"github.com/networkservicemesh/sdk/pkg/tools/logger"
+	"github.com/networkservicemesh/sdk/pkg/tools/logger/logruslogger"
 	"github.com/networkservicemesh/sdk/pkg/tools/signalctx"
 )
 
@@ -56,12 +57,13 @@ func main() {
 
 	// Setup logging
 	logrus.SetFormatter(&nested.Formatter{})
-	logrus.SetLevel(logrus.TraceLevel)
-	ctx = log.WithField(ctx, "cmd", os.Args[0])
+	ctx, _ = logruslogger.New(
+		logger.WithFields(ctx, map[string]interface{}{"cmd": os.Args[0]}),
+	)
 
 	// Debug self if necessary
 	if err := debug.Self(); err != nil {
-		log.Entry(ctx).Infof("%s", err)
+		logger.Log(ctx).Infof("%s", err)
 	}
 
 	startTime := time.Now()
@@ -71,6 +73,8 @@ func main() {
 	if err := envconfig.Usage("nsmgr-proxy", config); err != nil {
 		logrus.Fatal(err)
 	}
+
+	logger.EnableTracing(true)
 	closeJaeger := jaeger.InitJaeger(config.Name)
 	defer func() {
 		_ = closeJaeger.Close()
@@ -79,7 +83,7 @@ func main() {
 		logrus.Fatalf("error processing config from env: %+v", err)
 	}
 
-	log.Entry(ctx).Infof("Config: %#v", config)
+	logger.Log(ctx).Infof("Config: %#v", config)
 
 	// Get a X509Source
 	source, err := workloadapi.NewX509Source(ctx)
@@ -94,10 +98,10 @@ func main() {
 
 	tlsCreds := credentials.NewTLS(tlsconfig.MTLSServerConfig(source, source, tlsconfig.AuthorizeAny()))
 	// Create GRPC Server and register services
-	options := append(spanhelper.WithTracing(), grpc.Creds(tlsCreds))
+	options := append(opentracing.WithTracing(), grpc.Creds(tlsCreds))
 	server := grpc.NewServer(options...)
 
-	dialOptions := append(spanhelper.WithTracingDial(), grpc.WithBlock(), grpc.WithTransportCredentials(tlsCreds))
+	dialOptions := append(opentracing.WithTracingDial(), grpc.WithBlock(), grpc.WithTransportCredentials(tlsCreds))
 	nsmgrproxy.NewServer(
 		ctx,
 		config.Name,
@@ -110,21 +114,21 @@ func main() {
 		exitOnErr(ctx, cancel, srvErrCh)
 	}
 
-	log.Entry(ctx).Infof("Startup completed in %v", time.Since(startTime))
+	logger.Log(ctx).Infof("Startup completed in %v", time.Since(startTime))
 	<-ctx.Done()
 }
 
 func exitOnErr(ctx context.Context, cancel context.CancelFunc, errCh <-chan error) {
 	// If we already have an error, log it and exit
 	select {
 	case err := <-errCh:
-		log.Entry(ctx).Fatal(err)
+		logger.Log(ctx).Fatal(err)
 	default:
 	}
 	// Otherwise wait for an error in the background to log and cancel
 	go func(ctx context.Context, errCh <-chan error) {
 		err := <-errCh
-		log.Entry(ctx).Error(err)
+		logger.Log(ctx).Error(err)
 		cancel()
 	}(ctx, errCh)
 }

main_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -41,6 +41,7 @@ import (
 
 	main "github.com/networkservicemesh/cmd-nsmgr-proxy"
 
+	"github.com/networkservicemesh/sdk/pkg/tools/logger"
 	"github.com/networkservicemesh/sdk/pkg/tools/spire"
 )
 
@@ -57,7 +58,7 @@ type NetworkServiceManagerProxySuite struct {
 
 func (t *NetworkServiceManagerProxySuite) SetupSuite() {
 	logrus.SetFormatter(&nested.Formatter{})
-	logrus.SetLevel(logrus.TraceLevel)
+	logger.EnableTracing(true)
 	t.ctx, t.cancel = context.WithCancel(context.Background())
 
 	// Run spire

pkg/imports/imports.go

@@ -4,15 +4,19 @@ package imports
 import (
 	_ "context"
 	_ "fmt"
-	_ "net/url"
-	_ "os"
-	_ "path/filepath"
-	_ "testing"
-	_ "time"
-
 	_ "github.com/antonfisher/nested-logrus-formatter"
 	_ "github.com/edwarnicke/exechelper"
 	_ "github.com/kelseyhightower/envconfig"
+	_ "github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgrproxy"
+	_ "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/opentracing"
+	_ "github.com/networkservicemesh/sdk/pkg/tools/signalctx"
+	_ "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
+	_ "github.com/networkservicemesh/sdk/pkg/tools/spire"
 	_ "github.com/sirupsen/logrus"
 	_ "github.com/spiffe/go-spiffe/v2/bundle/x509bundle"
 	_ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig"
@@ -23,14 +27,9 @@ import (
 	_ "google.golang.org/grpc"
 	_ "google.golang.org/grpc/credentials"
 	_ "google.golang.org/grpc/health/grpc_health_v1"
-
-	_ "github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgrproxy"
-	_ "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/log"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/signalctx"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/spanhelper"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
-	_ "github.com/networkservicemesh/sdk/pkg/tools/spire"
+	_ "net/url"
+	_ "os"
+	_ "path/filepath"
+	_ "testing"
+	_ "time"
 )