manual sdk update

Signed-off-by: Mikhail Avramenko <avramenkomihail15@gmail.com>
networkservicemesh · Dec 6, 2021 · c3e3b3f · c3e3b3f
1 parent fdacfff
commit c3e3b3f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	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.20211206072630-c6c78c35dd5f
 	github.com/networkservicemesh/sdk-k8s v0.0.0-20211201132700-45b6b3c1e9d5
 	github.com/networkservicemesh/sdk-sriov v0.0.0-20211126230449-b49c0afa1eee
 	github.com/networkservicemesh/sdk-vpp v0.0.0-20211202072305-fee5b16772b8

diff --git a/go.sum b/go.sum
@@ -349,8 +349,9 @@ github.com/nats-io/stan.go v0.10.0/go.mod h1:0jEuBXKauB1HHJswHM/lx05K48TJ1Yxj6VI
 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.20211126201711-e33b665d2e98/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
-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.20211206072630-c6c78c35dd5f h1:CbFyKbIgdtY6qifUH/0/Sh2rdij4kzw7isCGUa0YS7E=
+github.com/networkservicemesh/sdk v0.5.1-0.20211206072630-c6c78c35dd5f/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20211201132700-45b6b3c1e9d5 h1:HOwE3Sz/KAy42uccFDhVy+DGV4aTLRSOsRhc2KiKR4E=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20211201132700-45b6b3c1e9d5/go.mod h1:k0S/6GO9/CDM9lOCQ9bQE2bV5JstuUc91Rg6KtuqNG4=
 github.com/networkservicemesh/sdk-kernel v0.0.0-20211126201942-09e020e5f144/go.mod h1:O/kNXXA2sgAEaG7RL2qZVGNkgvELC3OJWaSwnTEHwMU=

diff --git a/internal/tests/suite_combinatronics_test.go b/internal/tests/suite_combinatronics_test.go
@@ -139,8 +139,7 @@ func (f *ForwarderTestSuite) TestCombinations() {
 							// Create ctx for test
 							ctx, cancel := context.WithTimeout(f.ctx, contextTimeout)
 							defer cancel()
-							ctx = log.WithFields(ctx, map[string]interface{}{"test": t.Name()})
-							ctx = log.WithLog(ctx, logruslogger.New(ctx))
+							ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"test": t.Name()}))
 							networkserviceName := "ns" + t.Name()
 
 							tmpDir, err := ioutil.TempDir("", "nse")

diff --git a/internal/tests/suite_healthcheck_test.go b/internal/tests/suite_healthcheck_test.go
@@ -21,6 +21,8 @@ package tests
 import (
 	"context"
 
+	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
@@ -30,7 +32,7 @@ import (
 func (f *ForwarderTestSuite) TestHealthCheck() {
 	ctx, cancel := context.WithTimeout(f.ctx, contextTimeout)
 	defer cancel()
-	ctx = log.WithFields(ctx, map[string]interface{}{"test": f.T().Name()})
+	ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"test": f.T().Name()}))
 	healthClient := grpc_health_v1.NewHealthClient(f.sutCC)
 	healthResponse, err := healthClient.Check(ctx,
 		&grpc_health_v1.HealthCheckRequest{

diff --git a/main.go b/main.go
@@ -80,8 +80,7 @@ func main() {
 	log.EnableTracing(true)
 	jaegerCloser := jaeger.InitJaeger(ctx, "cmd-forwarder-vpp")
 	defer func() { _ = jaegerCloser.Close() }()
-	ctx = log.WithFields(ctx, map[string]interface{}{"cmd": os.Args[0]})
-	ctx = log.WithLog(ctx, logruslogger.New(ctx))
+	ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"cmd": os.Args[0]}))
 
 	// ********************************************************************************
 	// Debug self if necessary