Skip to content

Commit 31a2d04

Browse files
SaidAltury-ibmSaidAltury-ibm
committed
Remove redundant logger.IsEnabledFor(zapcore.DebugLevel)
Signed-off-by: Said Altury <[email protected]>
1 parent d920746 commit 31a2d04

File tree

23 files changed

+119
-283
lines changed

23 files changed

+119
-283
lines changed

‎token/services/identity/deserializer/typed.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
1616
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
1717
"github.com/pkg/errors"
18-
"go.uber.org/zap/zapcore"
1918
)
2019

2120
var logger = logging.MustGetLogger("token-sdk.services.identity.deserializer")
@@ -58,9 +57,7 @@ func (v *TypedVerifierDeserializerMultiplex) DeserializeVerifier(id driver.Ident
5857
if !ok {
5958
return nil, errors.Errorf("no deserializer found for [%s]", si.Type)
6059
}
61-
if logger.IsEnabledFor(zapcore.DebugLevel) {
62-
logger.Debugf("Deserializing [%s] with type [%s]", id, si.Type)
63-
}
60+
logger.Debugf("Deserializing [%s] with type [%s]", id, si.Type)
6461
var errs []error
6562
for _, deserializer := range dess {
6663
verifier, err := deserializer.DeserializeVerifier(si.Type, si.Identity)

‎token/services/identity/idemix/cache/cache.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ func (c *IdentityCache) Identity(auditInfo []byte) (driver.Identity, []byte, err
5656
}
5757
})
5858

59-
if logger.IsEnabledFor(zapcore.DebugLevel) {
60-
logger.Debugf("fetching identity from cache...")
61-
}
59+
logger.Debugf("fetching identity from cache...")
6260

6361
return c.fetchIdentityFromCache()
6462
}
@@ -100,16 +98,12 @@ func (c *IdentityCache) fetchIdentityFromCache() (driver.Identity, []byte, error
10098
}
10199

102100
func (c *IdentityCache) fetchIdentityFromBackend(auditInfo []byte) (driver.Identity, []byte, error) {
103-
if logger.IsEnabledFor(zapcore.DebugLevel) {
104-
logger.Debugf("fetching identity from backend")
105-
}
101+
logger.Debugf("fetching identity from backend")
106102
id, audit, err := c.backed(auditInfo)
107103
if err != nil {
108104
return nil, nil, err
109105
}
110-
if logger.IsEnabledFor(zapcore.DebugLevel) {
111-
logger.Debugf("fetch identity from backend done [%s][%d]", id, len(audit))
112-
}
106+
logger.Debugf("fetch identity from backend done [%s][%d]", id, len(audit))
113107

114108
return id, audit, nil
115109
}
@@ -122,9 +116,7 @@ func (c *IdentityCache) provisionIdentities() {
122116
logger.Errorf("failed to provision identity [%s]", err)
123117
continue
124118
}
125-
if logger.IsEnabledFor(zapcore.DebugLevel) {
126-
logger.Debugf("generated new idemix identity [%d]", count)
127-
}
119+
logger.Debugf("generated new idemix identity [%d]", count)
128120
c.cache <- identityCacheEntry{Identity: id, Audit: audit}
129121
}
130122
}

‎token/services/identity/membership/lm.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ func (l *LocalMembership) GetIdentifier(id driver.Identity) (string, error) {
120120
defer l.localIdentitiesMutex.RUnlock()
121121

122122
for _, label := range []string{string(id), id.String()} {
123-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
124-
l.logger.Debugf("get local identity by label [%s]", label)
125-
}
123+
l.logger.Debugf("get local identity by label [%s]", label)
126124
r := l.getLocalIdentity(label)
127125
if r == nil {
128126
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
@@ -451,9 +449,7 @@ func (l *LocalMembership) addLocalIdentity(config *driver.IdentityConfiguration,
451449

452450
// if the keyManager is not anonymous
453451
if !keyManager.Anonymous() {
454-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
455-
l.logger.Debugf("adding identity mapping for [%s]", identity)
456-
}
452+
l.logger.Debugf("adding identity mapping for [%s]", identity)
457453
l.localIdentitiesByIdentity[identity.String()] = localIdentity
458454
if l.binderService != nil {
459455
if err := l.binderService.Bind(l.defaultNetworkIdentity, identity, false); err != nil {

‎token/services/identity/provider.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ func (p *Provider) IsMe(identity driver.Identity) bool {
140140
}
141141

142142
func (p *Provider) RegisterRecipientIdentity(id driver.Identity) error {
143-
if p.Logger.IsEnabledFor(zapcore.DebugLevel) {
144-
p.Logger.Debugf("Registering identity [%s]", id)
145-
}
143+
p.Logger.Debugf("Registering identity [%s]", id)
146144
p.isMeCacheLock.Lock()
147145
p.isMeCache[id.String()] = false
148146
p.isMeCacheLock.Unlock()
@@ -179,9 +177,7 @@ func (p *Provider) GetRevocationHandler(identity driver.Identity, auditInfo []by
179177

180178
func (p *Provider) Bind(longTerm driver.Identity, ephemeral driver.Identity, copyAll bool) error {
181179
if copyAll {
182-
if p.Logger.IsEnabledFor(zapcore.DebugLevel) {
183-
p.Logger.Debugf("Binding ephemeral identity [%s] longTerm identity [%s]", ephemeral, longTerm)
184-
}
180+
p.Logger.Debugf("Binding ephemeral identity [%s] longTerm identity [%s]", ephemeral, longTerm)
185181
setSV := true
186182
signer, err := p.GetSigner(longTerm)
187183
if err != nil {
@@ -201,9 +197,7 @@ func (p *Provider) Bind(longTerm driver.Identity, ephemeral driver.Identity, cop
201197
setAI := true
202198
auditInfo, err := p.GetAuditInfo(longTerm)
203199
if err != nil {
204-
if p.Logger.IsEnabledFor(zapcore.DebugLevel) {
205-
p.Logger.Debugf("failed getting audit info for [%s][%s]", longTerm, err)
206-
}
200+
p.Logger.Debugf("failed getting audit info for [%s][%s]", longTerm, err)
207201
setAI = false
208202
}
209203

‎token/services/identity/sig/deserializer.go

+3-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
1313
idriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/driver"
1414
"github.com/pkg/errors"
15-
"go.uber.org/zap/zapcore"
1615
)
1716

1817
type MultiplexDeserializer struct {
@@ -63,20 +62,14 @@ func deserialize[V any](copyDeserial []idriver.Deserializer, extractor func(idri
6362
var errs []error
6463

6564
for _, des := range copyDeserial {
66-
if logger.IsEnabledFor(zapcore.DebugLevel) {
67-
logger.Debugf("trying signer deserialization with [%s]", des)
68-
}
65+
logger.Debugf("trying signer deserialization with [%s]", des)
6966
v, err := extractor(des)
7067
if err == nil {
71-
if logger.IsEnabledFor(zapcore.DebugLevel) {
72-
logger.Debugf("trying signer deserialization with [%s] succeeded", des)
73-
}
68+
logger.Debugf("trying signer deserialization with [%s] succeeded", des)
7469
return v, nil
7570
}
7671

77-
if logger.IsEnabledFor(zapcore.DebugLevel) {
78-
logger.Debugf("trying signer deserialization with [%s] failed [%s]", des, err)
79-
}
72+
logger.Debugf("trying signer deserialization with [%s] failed [%s]", des, err)
8073
errs = append(errs, err)
8174
}
8275

‎token/services/identity/sig/sigservice.go

+6-18
Original file line numberDiff line numberDiff line change
@@ -193,35 +193,27 @@ func (o *Service) AreMe(identities ...driver.Identity) []string {
193193
}
194194

195195
func (o *Service) IsMe(identity driver.Identity) bool {
196-
if logger.IsEnabledFor(zapcore.DebugLevel) {
197-
logger.Debugf("is me [%s]?", identity)
198-
}
196+
logger.Debugf("is me [%s]?", identity)
199197
idHash := identity.UniqueID()
200198

201199
// check local cache
202200
o.sync.RLock()
203201
_, ok := o.signers[idHash]
204202
o.sync.RUnlock()
205203
if ok {
206-
if logger.IsEnabledFor(zapcore.DebugLevel) {
207-
logger.Debugf("is me [%s]? yes, from cache", identity)
208-
}
204+
logger.Debugf("is me [%s]? yes, from cache", identity)
209205
return true
210206
}
211207

212208
// check storage
213209
if o.storage != nil {
214-
if logger.IsEnabledFor(zapcore.DebugLevel) {
215-
logger.Debugf("is me [%s]? ask the storage", identity)
216-
}
210+
logger.Debugf("is me [%s]? ask the storage", identity)
217211
exists, err := o.storage.SignerInfoExists(identity)
218212
if err != nil {
219213
logger.Errorf("failed checking if a signer exists [%s]", err)
220214
}
221215
if exists {
222-
if logger.IsEnabledFor(zapcore.DebugLevel) {
223-
logger.Debugf("is me [%s]? yes, from storage", identity)
224-
}
216+
logger.Debugf("is me [%s]? yes, from storage", identity)
225217
return true
226218
}
227219
}
@@ -231,9 +223,7 @@ func (o *Service) IsMe(identity driver.Identity) bool {
231223

232224
func (o *Service) GetSigner(identity driver.Identity) (driver.Signer, error) {
233225
idHash := identity.UniqueID()
234-
if logger.IsEnabledFor(zapcore.DebugLevel) {
235-
logger.Debugf("get signer for [%s]", idHash)
236-
}
226+
logger.Debugf("get signer for [%s]", idHash)
237227
// check the cache
238228
o.sync.RLock()
239229
entry, ok := o.signers[idHash]
@@ -256,9 +246,7 @@ func (o *Service) getSigner(identity driver.Identity, idHash string) (driver.Sig
256246
return entry.Signer, nil
257247
}
258248

259-
if logger.IsEnabledFor(zapcore.DebugLevel) {
260-
logger.Debugf("signer for [%s] not found, try to deserialize", idHash)
261-
}
249+
logger.Debugf("signer for [%s] not found, try to deserialize", idHash)
262250
// ask the deserializer
263251
signer, err := o.deserializeSigner(identity)
264252
if err != nil {

‎token/services/identity/wallet/db/registry.go

+4-13
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
idriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/driver"
1818
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
1919
"github.com/pkg/errors"
20-
"go.uber.org/zap/zapcore"
2120
)
2221

2322
// WalletRegistry manages wallets whose long-term identities have a given role.
@@ -75,9 +74,7 @@ func (r *WalletRegistry) Lookup(id driver.WalletLookupID) (driver.Wallet, idrive
7574
return nil, nil, "", errors.WithMessagef(err, "failed to lookup wallet [%s]", id)
7675
}
7776
}
78-
if r.Logger.IsEnabledFor(zapcore.DebugLevel) {
79-
r.Logger.Debugf("looked-up identifier [%s:%s]", identity, toString(walletID))
80-
}
77+
r.Logger.Debugf("looked-up identifier [%s:%s]", identity, logging.WalletID(walletID))
8178
wID := walletID
8279
walletEntry, ok := r.Wallets[wID]
8380
if ok {
@@ -103,9 +100,7 @@ func (r *WalletRegistry) Lookup(id driver.WalletLookupID) (driver.Wallet, idrive
103100
walletIdentifiers = append(walletIdentifiers, passedWalletID)
104101
}
105102

106-
if r.Logger.IsEnabledFor(zapcore.DebugLevel) {
107-
r.Logger.Debugf("no wallet found for [%s] at [%s]", passedIdentity, toString(wID))
108-
}
103+
r.Logger.Debugf("no wallet found for [%s] at [%s]", passedIdentity, logging.WalletID(wID))
109104
if len(identity) != 0 {
110105
identityWID, err := r.GetWalletID(identity)
111106
r.Logger.Debugf("wallet for identity [%s] -> [%s:%s]", identity, identityWID, err)
@@ -127,14 +122,10 @@ func (r *WalletRegistry) Lookup(id driver.WalletLookupID) (driver.Wallet, idrive
127122
var idInfo idriver.IdentityInfo
128123
idInfo, err = r.Role.GetIdentityInfo(id)
129124
if err == nil {
130-
if r.Logger.IsEnabledFor(zapcore.DebugLevel) {
131-
r.Logger.Debugf("identity info found at [%s]", toString(id))
132-
}
125+
r.Logger.Debugf("identity info found at [%s]", logging.WalletID(id))
133126
return nil, idInfo, id, nil
134127
} else {
135-
if r.Logger.IsEnabledFor(zapcore.DebugLevel) {
136-
r.Logger.Debugf("identity info not found at [%s]", toString(id))
137-
}
128+
r.Logger.Debugf("identity info not found at [%s]", logging.WalletID(id))
138129
}
139130
}
140131
return nil, nil, "", errors.Errorf("failed to get wallet info for [%s:%v]", toString(walletID), walletIdentifiers)

‎token/services/logging/types.go

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
package logging
7+
8+
import (
9+
"fmt"
10+
"strings"
11+
12+
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
13+
)
14+
15+
func WalletID(id string) fmt.Stringer {
16+
return walletID(id)
17+
}
18+
19+
type walletID string
20+
21+
func (w walletID) String() string {
22+
s := string(w)
23+
if len(s) <= 20 {
24+
return strings.ToValidUTF8(s, "X")
25+
}
26+
return fmt.Sprintf("%s~%s", strings.ToValidUTF8(s[:20], "X"), hash.Hashable(s).String())
27+
}

‎token/services/network/orion/broadcast.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (r *BroadcastResponderView) broadcast(context view.Context, sm *SessionMana
187187
return nil, "", errors.Wrap(err, "failed to unmarshal envelope")
188188
}
189189
if logger.IsEnabledFor(zapcore.DebugLevel) {
190-
logger.Debugf("commit envelope... [%s][%s]", env.TxID(), env.String())
190+
logger.Debugf("commit envelope... [%s][%s]", env.TxID(), env)
191191
}
192192
if err := sm.Orion.TransactionManager().CommitEnvelope(oSession, env); err != nil {
193193
return nil, env.TxID(), err

‎token/services/network/orion/processor.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,16 @@ func (r *RWSetProcessor) tokenRequest(ctx context.Context, tx orion.ProcessTrans
8080
}
8181
trRaw, err := r.GetTokenRequest(tms, txID)
8282
if err != nil {
83-
if logger.IsEnabledFor(zapcore.DebugLevel) {
84-
logger.Debugf("transaction [%s], failed getting token request [%s]", txID, err)
85-
}
83+
logger.Debugf("transaction [%s], failed getting token request [%s]", txID, err)
8684
return errors.WithMessagef(err, "failed to get token request for [%s]", txID)
8785
}
8886
if len(trRaw) == 0 {
89-
if logger.IsEnabledFor(zapcore.DebugLevel) {
90-
logger.Debugf("transaction [%s], no token request found, skip it", txID)
91-
}
87+
logger.Debugf("transaction [%s], no token request found, skip it", txID)
9288
return nil
9389
}
9490
request, err := tms.NewFullRequestFromBytes(trRaw)
9591
if err != nil {
96-
if logger.IsEnabledFor(zapcore.DebugLevel) {
97-
logger.Debugf("transaction [%s], failed getting zkat state from transient map [%s]", txID, err)
98-
}
92+
logger.Debugf("transaction [%s], failed getting zkat state from transient map [%s]", txID, err)
9993
return err
10094
}
10195
if request.Metadata == nil {

‎token/services/nfttx/transaction.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
1717
token2 "github.com/hyperledger-labs/fabric-token-sdk/token/token"
1818
"github.com/pkg/errors"
19-
"go.uber.org/zap/zapcore"
2019
)
2120

2221
var logger = logging.MustGetLogger("token-sdk.nfttx")
@@ -53,9 +52,7 @@ func Wrap(tx *ttx.Transaction) *Transaction {
5352
}
5453

5554
func ReceiveTransaction(context view.Context) (*Transaction, error) {
56-
if logger.IsEnabledFor(zapcore.DebugLevel) {
57-
logger.Debugf("receive a new transaction...")
58-
}
55+
logger.Debugf("receive a new transaction...")
5956

6057
txBoxed, err := context.RunView(ttx.NewReceiveTransactionView(), view.WithSameContext())
6158
if err != nil {
@@ -66,9 +63,7 @@ func ReceiveTransaction(context view.Context) (*Transaction, error) {
6663
if !ok {
6764
return nil, errors.Errorf("received transaction of wrong type [%T]", cctx)
6865
}
69-
if logger.IsEnabledFor(zapcore.DebugLevel) {
70-
logger.Debugf("received transaction with id [%s]", cctx.ID())
71-
}
66+
logger.Debugf("received transaction with id [%s]", cctx.ID())
7267
// Check that the transaction is valid
7368
if err := cctx.IsValid(); err != nil {
7469
return nil, errors.WithMessagef(err, "invalid transaction %s", cctx.ID())

0 commit comments

Comments
 (0)