From f9eb54661a6d54b8d60f753bc6e7975202bbac5c Mon Sep 17 00:00:00 2001
From: Nishant Das <nishdas93@gmail.com>
Date: Fri, 24 Apr 2020 12:10:53 +0800
Subject: [PATCH] Less Noisy P2P Logs (#5607)

* fix logging issues
* change again
* fix errors
* Merge refs/heads/master into lessNoisy
* gaz
* Merge branch 'lessNoisy' of https://github.com/prysmaticlabs/geth-sharding into lessNoisy
---
 beacon-chain/p2p/encoder/BUILD.bazel |  1 -
 beacon-chain/p2p/encoder/ssz.go      | 12 +++++-------
 beacon-chain/p2p/handshake.go        |  2 +-
 beacon-chain/sync/rpc.go             |  6 ++++++
 beacon-chain/sync/rpc_status.go      |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/beacon-chain/p2p/encoder/BUILD.bazel b/beacon-chain/p2p/encoder/BUILD.bazel
index bb1d9a90d1bd..cd6f5a5fffef 100644
--- a/beacon-chain/p2p/encoder/BUILD.bazel
+++ b/beacon-chain/p2p/encoder/BUILD.bazel
@@ -18,7 +18,6 @@ go_library(
         "@com_github_golang_snappy//:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_prysmaticlabs_go_ssz//:go_default_library",
-        "@com_github_sirupsen_logrus//:go_default_library",
     ],
 )
 
diff --git a/beacon-chain/p2p/encoder/ssz.go b/beacon-chain/p2p/encoder/ssz.go
index 0ece15056a6f..ee468779a07c 100644
--- a/beacon-chain/p2p/encoder/ssz.go
+++ b/beacon-chain/p2p/encoder/ssz.go
@@ -10,7 +10,6 @@ import (
 	errors "github.com/pkg/errors"
 	"github.com/prysmaticlabs/go-ssz"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 )
 
 var _ = NetworkEncoding(&SszNetworkEncoder{})
@@ -192,10 +191,9 @@ func (e SszNetworkEncoder) MaxLength(length int) int {
 // Writes a bytes value through a snappy buffered writer.
 func writeSnappyBuffer(w io.Writer, b []byte) (int, error) {
 	bufWriter := snappy.NewBufferedWriter(w)
-	defer func() {
-		if err := bufWriter.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close snappy buffered writer")
-		}
-	}()
-	return bufWriter.Write(b)
+	num, err := bufWriter.Write(b)
+	if err != nil {
+		return 0, err
+	}
+	return num, bufWriter.Close()
 }
diff --git a/beacon-chain/p2p/handshake.go b/beacon-chain/p2p/handshake.go
index 685d8c18ef49..57ea7b4307e0 100644
--- a/beacon-chain/p2p/handshake.go
+++ b/beacon-chain/p2p/handshake.go
@@ -31,7 +31,7 @@ func (s *Service) AddConnectionHandler(reqFunc func(ctx context.Context, id peer
 				go func() {
 					log.WithField("reason", "at peer limit").Trace("Ignoring connection request")
 					if err := goodbyeFunc(context.Background(), conn.RemotePeer()); err != nil {
-						log.WithError(err).Error("Unable to send goodbye message to peer")
+						log.WithError(err).Trace("Unable to send goodbye message to peer")
 					}
 					if err := s.Disconnect(conn.RemotePeer()); err != nil {
 						log.WithError(err).Error("Unable to disconnect from peer")
diff --git a/beacon-chain/sync/rpc.go b/beacon-chain/sync/rpc.go
index 22d365e27634..c677d219d222 100644
--- a/beacon-chain/sync/rpc.go
+++ b/beacon-chain/sync/rpc.go
@@ -110,6 +110,12 @@ func (r *Service) registerRPC(topic string, base interface{}, handle rpcHandler)
 		if t.Kind() == reflect.Ptr {
 			msg := reflect.New(t.Elem())
 			if err := r.p2p.Encoding().DecodeWithLength(stream, msg.Interface()); err != nil {
+				// Debug logs for goodbye/status errors
+				if strings.Contains(topic, p2p.RPCGoodByeTopic) || strings.Contains(topic, p2p.RPCStatusTopic) {
+					log.WithError(err).Debug("Failed to decode goodbye stream message")
+					traceutil.AnnotateError(span, err)
+					return
+				}
 				log.WithError(err).Warn("Failed to decode stream message")
 				traceutil.AnnotateError(span, err)
 				return
diff --git a/beacon-chain/sync/rpc_status.go b/beacon-chain/sync/rpc_status.go
index 6d9253d44984..7d24b6d66164 100644
--- a/beacon-chain/sync/rpc_status.go
+++ b/beacon-chain/sync/rpc_status.go
@@ -34,7 +34,7 @@ func (r *Service) maintainPeerStatuses() {
 				}
 				if roughtime.Now().After(lastUpdated.Add(interval)) {
 					if err := r.reValidatePeer(r.ctx, id); err != nil {
-						log.WithField("peer", id).WithError(err).Error("Failed to reValidate peer")
+						log.WithField("peer", id).WithError(err).Error("Failed to revalidate peer")
 					}
 				}
 			}(pid)