[FAB-9131] wire zap based fabric logger

Replace go-logging with a zap based implementation. The implementation
is mostly compatible with the legacy format but differs in a two key
ways:

1. CRITICAL and NOTICE log levels no longer exist. Calls to Critical get
   mapped to error and NOTICE gets mapped to INFO. The methods
   associated with these levels will be removed in a future CR.
2. The log level constants are now sourced from the zap/zapcore packages.
   These values are incompatible wit the go-logging constants. Please be
   sure to use the appropriate constant when necessary.

The existing go-logging package is still used by the chaincode shim to
reduce the risk of negatively impacting legacy chaincode.

Change-Id: Iaf5fac807244883a8285892ccd350c5256959782
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

bccsp/pkcs11/impl_test.go

@@ -41,7 +41,6 @@ import (
 	"github.com/hyperledger/fabric/bccsp/signer"
 	"github.com/hyperledger/fabric/bccsp/sw"
 	"github.com/hyperledger/fabric/bccsp/utils"
-	"github.com/op/go-logging"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/crypto/sha3"
 )
@@ -59,9 +58,6 @@ type testConfig struct {
 }
 
 func TestMain(m *testing.M) {
-	// Activate DEBUG level to cover listAttrs function
-	logging.SetLevel(logging.DEBUG, "bccsp_p11")
-
 	ks, err := sw.NewFileBasedKeyStore(nil, os.TempDir(), false)
 	if err != nil {
 		fmt.Printf("Failed initiliazing KeyStore [%s]", err)

bccsp/pkcs11/pkcs11.go

@@ -17,7 +17,7 @@ import (
 	"sync"
 
 	"github.com/miekg/pkcs11"
-	"github.com/op/go-logging"
+	"go.uber.org/zap/zapcore"
 )
 
 func loadLib(lib, pin, label string) (*pkcs11.Ctx, uint, *pkcs11.SessionHandle, error) {
@@ -290,7 +290,7 @@ func (csp *impl) generateECKey(curve asn1.ObjectIdentifier, ephemeral bool) (ski
 
 	pubGoKey := &ecdsa.PublicKey{Curve: nistCurve, X: x, Y: y}
 
-	if logger.IsEnabledFor(logging.DEBUG) {
+	if logger.IsEnabledFor(zapcore.DebugLevel) {
 		listAttrs(p11lib, session, prv)
 		listAttrs(p11lib, session, pub)
 	}

common/capabilities/capabilities_test.go

@@ -11,14 +11,9 @@ import (
 
 	cb "github.com/hyperledger/fabric/protos/common"
 
-	"github.com/op/go-logging"
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	logging.SetLevel(logging.DEBUG, pkgLogID)
-}
-
 func TestSatisfied(t *testing.T) {
 	var capsMap map[string]*cb.Capability
 	for _, provider := range []*registry{

common/cauthdsl/cauthdsl.go

@@ -14,8 +14,7 @@ import (
 	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
 	mb "github.com/hyperledger/fabric/protos/msp"
-
-	"github.com/op/go-logging"
+	"go.uber.org/zap/zapcore"
 )
 
 var cauthdslLogger = flogging.MustGetLogger("cauthdsl")
@@ -93,7 +92,7 @@ func compile(policy *cb.SignaturePolicy, identities []*mb.MSPPrincipal, deserial
 					cauthdslLogger.Debugf("%p skipping identity %d because it has already been used", signedData, i)
 					continue
 				}
-				if cauthdslLogger.IsEnabledFor(logging.DEBUG) {
+				if cauthdslLogger.IsEnabledFor(zapcore.DebugLevel) {
 					// Unlike most places, this is a huge print statement, and worth checking log level before create garbage
 					cauthdslLogger.Debugf("%p processing identity %d with bytes of %x", signedData, i, sd.Identity)
 				}

common/cauthdsl/cauthdsl_test.go

@@ -14,17 +14,13 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric/common/flogging/floggingtest"
 	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
 	mb "github.com/hyperledger/fabric/protos/msp"
-	logging "github.com/op/go-logging"
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	logging.SetLevel(logging.DEBUG, "")
-}
-
 var invalidSignature = []byte("badsigned")
 
 type mockIdentity struct {
@@ -289,19 +285,17 @@ func TestDeserializeIdentityError(t *testing.T) {
 	spe, err := compile(policy.Rule, policy.Identities, &mockDeserializer{fail: errors.New("myError")})
 	assert.NoError(t, err)
 
-	// Let logger output to buf
-	var buf bytes.Buffer
-	backend := logging.NewLogBackend(&buf, "", 0)
-	cauthdslLogger.SetBackend(logging.AddModuleLevel(backend))
-	defer func() {
-		flogging.Reset()
-	}()
+	logger, recorder := floggingtest.NewTestLogger(t)
+	defer func(old *flogging.FabricLogger) {
+		cauthdslLogger = old
+	}(cauthdslLogger)
+	cauthdslLogger = logger
 
 	// Call
 	signedData, used := toSignedData([][]byte{nil}, [][]byte{nil}, [][]byte{nil})
 	ret := spe(signedData, used)
 
 	// Check result (ret and log)
 	assert.False(t, ret)
-	assert.Contains(t, buf.String(), "Principal deserialization failure (myError) for identity ")
+	assert.Contains(t, string(recorder.Buffer().Contents()), "Principal deserialization failure (myError) for identity")
 }

common/channelconfig/application_test.go

@@ -15,13 +15,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	. "github.com/onsi/gomega"
-	logging "github.com/op/go-logging"
 )
 
-func init() {
-	logging.SetLevel(logging.DEBUG, "")
-}
-
 func TestApplicationInterface(t *testing.T) {
 	_ = Application((*ApplicationConfig)(nil))
 }

common/channelconfig/applicationorg.go

@@ -12,7 +12,6 @@ import (
 	cb "github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 
-	logging "github.com/op/go-logging"
 	"github.com/pkg/errors"
 )
 
@@ -69,8 +68,6 @@ func (aog *ApplicationOrgConfig) AnchorPeers() []*pb.AnchorPeer {
 }
 
 func (aoc *ApplicationOrgConfig) Validate() error {
-	if logger.IsEnabledFor(logging.DEBUG) {
-		logger.Debugf("Anchor peers for org %s are %v", aoc.name, aoc.protos.AnchorPeers)
-	}
+	logger.Debugf("Anchor peers for org %s are %v", aoc.name, aoc.protos.AnchorPeers)
 	return aoc.OrganizationConfig.Validate()
 }

common/channelconfig/channel_test.go

@@ -15,14 +15,9 @@ import (
 	"github.com/hyperledger/fabric/common/util"
 	cb "github.com/hyperledger/fabric/protos/common"
 
-	logging "github.com/op/go-logging"
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	logging.SetLevel(logging.DEBUG, "")
-}
-
 func TestInterface(t *testing.T) {
 	_ = Channel(&ChannelConfig{})
 }

common/channelconfig/orderer_test.go

@@ -11,14 +11,9 @@ import (
 
 	ab "github.com/hyperledger/fabric/protos/orderer"
 
-	logging "github.com/op/go-logging"
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	logging.SetLevel(logging.DEBUG, "")
-}
-
 func TestBatchSize(t *testing.T) {
 	validMaxMessageCount := uint32(10)
 	validAbsoluteMaxBytes := uint32(1000)

common/configtx/configmap_test.go

@@ -11,14 +11,9 @@ import (
 
 	cb "github.com/hyperledger/fabric/protos/common"
 
-	logging "github.com/op/go-logging"
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	logging.SetLevel(logging.DEBUG, "")
-}
-
 func TestBadKey(t *testing.T) {
 	assert.Error(t, addToMap(comparable{key: "[Label]", path: []string{}}, make(map[string]comparable)),
 		"Should have errored on key with illegal characters")