From 98614904e1180f9e7decfe840b9f854823f9390a Mon Sep 17 00:00:00 2001 From: Mikhail Avramenko Date: Thu, 16 Dec 2021 17:11:09 +0700 Subject: [PATCH] manual sdk update Signed-off-by: Mikhail Avramenko --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/prefixcollector/prefix_writer.go | 5 +++-- main.go | 3 +-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 4f99c5b..7e16227 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/fsnotify/fsnotify v1.4.9 github.com/ghodss/yaml v1.0.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b - github.com/networkservicemesh/sdk-k8s v0.0.0-20211202072319-42a95584fc60 + github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1 + github.com/networkservicemesh/sdk-k8s v0.0.0-20211214180617-38657ea11c25 github.com/onsi/gomega v1.10.1 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index e8c8a7e..2aa0911 100644 --- a/go.sum +++ b/go.sum @@ -458,10 +458,10 @@ 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-k8s v0.0.0-20211202072319-42a95584fc60 h1:WRHwQvKpeT2P+JrdkihhqC5VTp/H6cSzNkr7baAGHc0= -github.com/networkservicemesh/sdk-k8s v0.0.0-20211202072319-42a95584fc60/go.mod h1:plfYCfxj8JXSMDS9MWsN/T1LzjMMGPPtq3dHY21tH3Y= +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/networkservicemesh/sdk-k8s v0.0.0-20211214180617-38657ea11c25 h1:9JG+uvTeXwTxLzxvqxRaqcEdOZZGC7eVI8vhFYKSrzc= +github.com/networkservicemesh/sdk-k8s v0.0.0-20211214180617-38657ea11c25/go.mod h1:WLxvB2tIClgYNXDC2nbq8/V6M/OPYV17tiQg/kUeIeM= 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/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= diff --git a/internal/prefixcollector/prefix_writer.go b/internal/prefixcollector/prefix_writer.go index f9d8bb4..09895a5 100644 --- a/internal/prefixcollector/prefix_writer.go +++ b/internal/prefixcollector/prefix_writer.go @@ -28,6 +28,7 @@ import ( v1 "k8s.io/client-go/kubernetes/typed/core/v1" "github.com/networkservicemesh/sdk/pkg/tools/log" + "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" ) const ( @@ -89,10 +90,10 @@ func configMapWatchFunc(configMapName, configMapNamespace, configMapKey string) log.FromContext(ctx).Fatalf("Error watching config map: %v", err) } - ctx = log.WithFields(ctx, map[string]interface{}{ + ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{ "configmap-namespace": configMapNamespace, "configmap-name": configMapName, - }) + })) for { select { diff --git a/main.go b/main.go index adf91f0..c79bd79 100644 --- a/main.go +++ b/main.go @@ -55,8 +55,7 @@ func main() { closer := jaeger.InitJaeger(ctx, "prefix-service") defer func() { _ = closer.Close() }() - ctx = log.WithFields(ctx, map[string]interface{}{"cmd": os.Args[:1]}) - ctx = log.WithLog(ctx, logruslogger.New(ctx)) + ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"cmd": os.Args[:1]})) // Get clientSetConfig from environment config := &prefixcollector.Config{}