From cf3106f636245f52be2e63f4897b5f2ee390677d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= Date: Mon, 21 Feb 2022 18:08:16 +0300 Subject: [PATCH] Silence the logging that comes from Basenine and protocol dissectors (#835) --- Dockerfile | 4 ++-- agent/go.mod | 2 +- agent/go.sum | 4 ++-- agent/pkg/app/main.go | 4 ---- tap/extensions/amqp/main.go | 4 ---- tap/extensions/http/main.go | 4 ---- tap/extensions/kafka/main.go | 4 ---- tap/extensions/redis/main.go | 4 ---- 8 files changed, 5 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d8572707..d0910196e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,8 +78,8 @@ RUN go build -ldflags="-extldflags=-static -s -w \ -X 'github.com/up9inc/mizu/agent/pkg/version.Ver=${VER}'" -o mizuagent . # Download Basenine executable, verify the sha1sum -ADD https://github.com/up9inc/basenine/releases/download/v0.4.16/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH} -ADD https://github.com/up9inc/basenine/releases/download/v0.4.16/basenine_linux_${GOARCH}.sha256 ./basenine_linux_${GOARCH}.sha256 +ADD https://github.com/up9inc/basenine/releases/download/v0.4.17/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH} +ADD https://github.com/up9inc/basenine/releases/download/v0.4.17/basenine_linux_${GOARCH}.sha256 ./basenine_linux_${GOARCH}.sha256 RUN shasum -a 256 -c basenine_linux_${GOARCH}.sha256 RUN chmod +x ./basenine_linux_${GOARCH} RUN mv ./basenine_linux_${GOARCH} ./basenine diff --git a/agent/go.mod b/agent/go.mod index 6731cb356..25387613d 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -22,7 +22,7 @@ require ( github.com/ory/kratos-client-go v0.8.2-alpha.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.7.0 - github.com/up9inc/basenine/client/go v0.0.0-20220125035757-926e42208705 + github.com/up9inc/basenine/client/go v0.0.0-20220220204122-0ef8cb24fab1 github.com/up9inc/mizu/shared v0.0.0 github.com/up9inc/mizu/tap v0.0.0 github.com/up9inc/mizu/tap/api v0.0.0 diff --git a/agent/go.sum b/agent/go.sum index 7e92431ba..deac6cd20 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -853,8 +853,8 @@ github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ= github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw= -github.com/up9inc/basenine/client/go v0.0.0-20220125035757-926e42208705 h1:5LLhzv0cjb/F+dU0z3j8teVGjQInMYAocTyAZohKUwY= -github.com/up9inc/basenine/client/go v0.0.0-20220125035757-926e42208705/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI= +github.com/up9inc/basenine/client/go v0.0.0-20220220204122-0ef8cb24fab1 h1:0XN8s3HtwUBr9hbWRAFulFMsu1f2cabfJbwpz/sOoLA= +github.com/up9inc/basenine/client/go v0.0.0-20220220204122-0ef8cb24fab1/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg= github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= diff --git a/agent/pkg/app/main.go b/agent/pkg/app/main.go index 791f12e0b..1e7a9d0dd 100644 --- a/agent/pkg/app/main.go +++ b/agent/pkg/app/main.go @@ -60,10 +60,6 @@ func LoadExtensions() { return Extensions[i].Protocol.Priority < Extensions[j].Protocol.Priority }) - for _, extension := range Extensions { - logger.Log.Infof("Extension Properties: %+v", extension) - } - controllers.InitExtensionsMap(ExtensionsMap) } diff --git a/tap/extensions/amqp/main.go b/tap/extensions/amqp/main.go index 926be7262..804d32338 100644 --- a/tap/extensions/amqp/main.go +++ b/tap/extensions/amqp/main.go @@ -27,10 +27,6 @@ var protocol api.Protocol = api.Protocol{ Priority: 1, } -func init() { - log.Println("Initializing AMQP extension...") -} - type dissecting string func (d dissecting) Register(extension *api.Extension) { diff --git a/tap/extensions/http/main.go b/tap/extensions/http/main.go index 2b3d781f1..e1cb5e773 100644 --- a/tap/extensions/http/main.go +++ b/tap/extensions/http/main.go @@ -76,10 +76,6 @@ const ( TypeHttpResponse ) -func init() { - log.Println("Initializing HTTP extension...") -} - type dissecting string func (d dissecting) Register(extension *api.Extension) { diff --git a/tap/extensions/kafka/main.go b/tap/extensions/kafka/main.go index 0be1ccdbf..190db217e 100644 --- a/tap/extensions/kafka/main.go +++ b/tap/extensions/kafka/main.go @@ -25,10 +25,6 @@ var _protocol api.Protocol = api.Protocol{ Priority: 2, } -func init() { - log.Println("Initializing Kafka extension...") -} - type dissecting string func (d dissecting) Register(extension *api.Extension) { diff --git a/tap/extensions/redis/main.go b/tap/extensions/redis/main.go index db7480a7b..4fd20f510 100644 --- a/tap/extensions/redis/main.go +++ b/tap/extensions/redis/main.go @@ -24,10 +24,6 @@ var protocol api.Protocol = api.Protocol{ Priority: 3, } -func init() { - log.Println("Initializing Redis extension...") -} - type dissecting string func (d dissecting) Register(extension *api.Extension) {