etcdserver/api: remove capnslog (etcd-io#11606)

* etcdserver/api/rafthttp: remove capnslog * etcdserver/api/membership: remove capnslog * etcdserver/api/v2auth: remove capnslog * etcdserver/api/v2discovery: remove capnslog * etdserver/api/v2stats: remove capnslog * etcdserver/api/v2http: remove capnslog * etcdserver/api/v3rpc: remove capnslog * etcdserver/api: remove capnslog Remove capnslog from etcdserver/api. Note that capnslog was already removed in some packages under etcdserver/api in previous commits.
maor-lb · Feb 11, 2020 · 61f2794 · 61f2794
1 parent 0a05f1a
commit 61f2794
Show file tree

Hide file tree

Showing 48 changed files with 734 additions and 1,318 deletions.
diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go
@@ -299,7 +299,7 @@ func (rc *raftNode) startRaft() {
 		ClusterID:   0x1000,
 		Raft:        rc,
 		ServerStats: stats.NewServerStats("", ""),
-		LeaderStats: stats.NewLeaderStats(strconv.Itoa(rc.id)),
+		LeaderStats: stats.NewLeaderStats(zap.NewExample(), strconv.Itoa(rc.id)),
 		ErrorC:      make(chan error),
 	}
 

diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go
@@ -21,7 +21,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/coreos/go-semver/semver"
-	"github.com/coreos/pkg/capnslog"
 )
 
 type Capability string
@@ -32,8 +31,6 @@ const (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api")
-
 	// capabilityMaps is a static map of version to capability map.
 	capabilityMaps = map[string]map[Capability]bool{
 		"3.0.0": {AuthCapability: true, V3rpcCapability: true},
@@ -78,8 +75,6 @@ func UpdateCapability(lg *zap.Logger, v *semver.Version) {
 			"enabled capabilities for version",
 			zap.String("cluster-version", version.Cluster(v.String())),
 		)
-	} else {
-		plog.Infof("enabled capabilities for version %s", version.Cluster(v.String()))
 	}
 }
 

diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go
@@ -19,24 +19,16 @@ import (
 	"expvar"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"go.etcd.io/etcd/etcdserver"
 	"go.etcd.io/etcd/etcdserver/api"
 	"go.etcd.io/etcd/etcdserver/api/v2error"
 	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
-	"go.etcd.io/etcd/pkg/logutil"
 	"go.etcd.io/etcd/version"
 
-	"github.com/coreos/pkg/capnslog"
 	"go.uber.org/zap"
 )
 
-var (
-	plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "etcdserver/api/etcdhttp")
-	mlog = logutil.NewMergeLogger(plog)
-)
-
 const (
 	configPath  = "/config"
 	varsPath    = "/debug/vars"
@@ -48,9 +40,6 @@ const (
 func HandleBasic(mux *http.ServeMux, server etcdserver.ServerPeer) {
 	mux.HandleFunc(varsPath, serveVars)
 
-	// TODO: deprecate '/config/local/log' in v3.5
-	mux.HandleFunc(configPath+"/local/log", logHandleFunc)
-
 	HandleMetricsHealth(mux, server)
 	mux.HandleFunc(versionPath, versionHandler(server.Cluster(), serveVersion))
 }
@@ -78,36 +67,11 @@ func serveVersion(w http.ResponseWriter, r *http.Request, clusterV string) {
 	w.Header().Set("Content-Type", "application/json")
 	b, err := json.Marshal(&vs)
 	if err != nil {
-		plog.Panicf("cannot marshal versions to json (%v)", err)
+		panic(fmt.Sprintf("cannot marshal versions to json (%v)", err))
 	}
 	w.Write(b)
 }
 
-// TODO: deprecate '/config/local/log' in v3.5
-func logHandleFunc(w http.ResponseWriter, r *http.Request) {
-	if !allowMethod(w, r, "PUT") {
-		return
-	}
-
-	in := struct{ Level string }{}
-
-	d := json.NewDecoder(r.Body)
-	if err := d.Decode(&in); err != nil {
-		WriteError(nil, w, r, httptypes.NewHTTPError(http.StatusBadRequest, "Invalid json body"))
-		return
-	}
-
-	logl, err := capnslog.ParseLevel(strings.ToUpper(in.Level))
-	if err != nil {
-		WriteError(nil, w, r, httptypes.NewHTTPError(http.StatusBadRequest, "Invalid log level "+in.Level))
-		return
-	}
-
-	plog.Noticef("globalLogLevel set to %q", logl.String())
-	capnslog.SetGlobalLogLevel(logl)
-	w.WriteHeader(http.StatusNoContent)
-}
-
 func serveVars(w http.ResponseWriter, r *http.Request) {
 	if !allowMethod(w, r, "GET") {
 		return
@@ -155,8 +119,6 @@ func WriteError(lg *zap.Logger, w http.ResponseWriter, r *http.Request, err erro
 					zap.String("internal-server-error", e.Error()),
 					zap.Error(et),
 				)
-			} else {
-				plog.Debugf("error writing HTTPError (%v) to %s", et, r.RemoteAddr)
 			}
 		}
 
@@ -170,8 +132,6 @@ func WriteError(lg *zap.Logger, w http.ResponseWriter, r *http.Request, err erro
 					zap.String("remote-addr", r.RemoteAddr),
 					zap.String("internal-server-error", err.Error()),
 				)
-			} else {
-				mlog.MergeError(err)
 			}
 
 		default:
@@ -181,8 +141,6 @@ func WriteError(lg *zap.Logger, w http.ResponseWriter, r *http.Request, err erro
 					zap.String("remote-addr", r.RemoteAddr),
 					zap.String("internal-server-error", err.Error()),
 				)
-			} else {
-				mlog.MergeErrorf("got unexpected response error (%v)", err)
 			}
 		}
 
@@ -195,8 +153,6 @@ func WriteError(lg *zap.Logger, w http.ResponseWriter, r *http.Request, err erro
 					zap.String("internal-server-error", err.Error()),
 					zap.Error(et),
 				)
-			} else {
-				plog.Debugf("error writing HTTPError (%v) to %s", et, r.RemoteAddr)
 			}
 		}
 	}

diff --git a/etcdserver/api/etcdhttp/peer.go b/etcdserver/api/etcdhttp/peer.go
@@ -42,6 +42,9 @@ func NewPeerHandler(lg *zap.Logger, s etcdserver.ServerPeer) http.Handler {
 }
 
 func newPeerHandler(lg *zap.Logger, s etcdserver.Server, raftHandler http.Handler, leaseHandler http.Handler) http.Handler {
+	if lg == nil {
+		lg = zap.NewNop()
+	}
 	peerMembersHandler := newPeerMembersHandler(lg, s.Cluster())
 	peerMemberPromoteHandler := newPeerMemberPromoteHandler(lg, s)
 
@@ -98,11 +101,7 @@ func (h *peerMembersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ms := h.cluster.Members()
 	w.Header().Set("Content-Type", "application/json")
 	if err := json.NewEncoder(w).Encode(ms); err != nil {
-		if h.lg != nil {
-			h.lg.Warn("failed to encode membership members", zap.Error(err))
-		} else {
-			plog.Warningf("failed to encode members response (%v)", err)
-		}
+		h.lg.Warn("failed to encode membership members", zap.Error(err))
 	}
 }
 
@@ -135,25 +134,17 @@ func (h *peerMemberPromoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		default:
 			WriteError(h.lg, w, r, err)
 		}
-		if h.lg != nil {
-			h.lg.Warn(
-				"failed to promote a member",
-				zap.String("member-id", types.ID(id).String()),
-				zap.Error(err),
-			)
-		} else {
-			plog.Errorf("error promoting member %s (%v)", types.ID(id).String(), err)
-		}
+		h.lg.Warn(
+			"failed to promote a member",
+			zap.String("member-id", types.ID(id).String()),
+			zap.Error(err),
+		)
 		return
 	}
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(w).Encode(resp); err != nil {
-		if h.lg != nil {
-			h.lg.Warn("failed to encode members response", zap.Error(err))
-		} else {
-			plog.Warningf("failed to encode members response (%v)", err)
-		}
+		h.lg.Warn("failed to encode members response", zap.Error(err))
 	}
 }