Skip to content

Commit 9da2327

Browse files
alexandrosfiliosalexandrosfilios
committed
Adding events through logger
Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>
1 parent 43cfc3a commit 9da2327

File tree

15 files changed

+39
-130
lines changed

15 files changed

+39
-130
lines changed

‎token/core/common/backend.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package common
88

99
import (
10-
"encoding/base64"
11-
10+
logging2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1211
"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
1312
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
1413
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"
@@ -41,9 +40,8 @@ func (b *Backend) HasBeenSignedBy(id driver.Identity, verifier driver.Verifier)
4140
sigma := b.Sigs[b.Cursor]
4241
b.Cursor++
4342

44-
// if b.Logger.IsEnabledFor(zapcore.DebugLevel) {
45-
b.Logger.Infof("verify signature [%s][%s][%s]", id, base64.StdEncoding.EncodeToString(sigma), utils.Hashable(b.Message))
46-
// }
43+
b.Logger.Infof("verify signature [%s][%s][%s]", id, logging2.Base64(sigma), utils.Hashable(b.Message))
44+
4745
return sigma, verifier.Verify(b.Message, sigma)
4846
}
4947

‎token/services/db/sql/common/identity.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
2727
driver3 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/driver"
2828
"github.com/pkg/errors"
29-
"go.uber.org/zap/zapcore"
3029
)
3130

3231
type cache[T any] interface {
@@ -206,9 +205,7 @@ func (db *IdentityStore) StoreSignerInfo(ctx context.Context, id, info []byte) e
206205
Row(h, id, info).
207206
Format()
208207

209-
if logger.IsEnabledFor(zapcore.DebugLevel) {
210-
logger.Debugf("store signer info [%s]: [%s][%s]", query, h, hash.Hashable(info))
211-
}
208+
logger.Debug(query, h, hash.Hashable(info))
212209
_, err := db.writeDB.ExecContext(ctx, query, args...)
213210
if err != nil {
214211
if exists, err2 := db.SignerInfoExists(ctx, id); err2 == nil && exists {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
crypto2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/idemix/crypto"
1818
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/idemix/crypto/protos-go/config"
1919
"github.com/pkg/errors"
20-
"go.uber.org/zap/zapcore"
2120
)
2221

2322
const (
@@ -274,9 +273,7 @@ func (p *KeyManager) Identity(auditInfo []byte) (driver.Identity, []byte, error)
274273
[]byte(rh),
275274
},
276275
}
277-
if logger.IsEnabledFor(zapcore.DebugLevel) {
278-
logger.Debugf("new idemix identity generated with [%s:%s]", enrollmentID, hash.Hashable(auditInfo.Attributes[3]).String())
279-
}
276+
logger.Debugf("new idemix identity generated with [%s:%s]", enrollmentID, hash.Hashable(rh))
280277
infoRaw, err = auditInfo.Bytes()
281278
if err != nil {
282279
return nil, nil, errors.WithMessage(err, "failed to serialize auditInfo")

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import (
1515
"sync"
1616

1717
errors2 "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
18+
logging2 "github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1819
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
1920
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
2021
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
2122
"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
2223
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
2324
idriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/driver"
2425
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
25-
"go.uber.org/zap/zapcore"
2626
"gopkg.in/yaml.v2"
2727
)
2828

@@ -124,9 +124,7 @@ func (l *LocalMembership) GetIdentifier(id driver.Identity) (string, error) {
124124
l.logger.Debugf("get local identity by label [%s]", label)
125125
r := l.getLocalIdentity(label)
126126
if r == nil {
127-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
128-
l.logger.Debugf("local identity not found for label [%s][%v]", collections.Keys(l.localIdentitiesByName), label)
129-
}
127+
l.logger.Debugf("local identity not found for label [%s][%v]", logging2.Keys(l.localIdentitiesByName), label)
130128
continue
131129
}
132130
return r.Name, nil
@@ -145,9 +143,7 @@ func (l *LocalMembership) GetIdentityInfo(label string, auditInfo []byte) (idriv
145143
l.localIdentitiesMutex.RLock()
146144
defer l.localIdentitiesMutex.RUnlock()
147145

148-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
149-
l.logger.Debugf("get identity info by label [%s][%s]", label, hash.Hashable(label))
150-
}
146+
l.logger.Debugf("get identity info by label [%s][%s]", label, hash.Hashable(label))
151147
localIdentity := l.getLocalIdentity(label)
152148
if localIdentity == nil {
153149
return nil, errors2.Errorf("local identity not found for label [%s][%v]", hash.Hashable(label), l.localIdentitiesByName)
@@ -464,24 +460,18 @@ func (l *LocalMembership) addLocalIdentity(config *driver.IdentityConfiguration,
464460
}
465461

466462
func (l *LocalMembership) getLocalIdentity(label string) *LocalIdentity {
467-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
468-
l.logger.Debugf("get local identity by label [%s]", hash.Hashable(label))
469-
}
463+
l.logger.Debugf("get local identity by label [%s]", hash.Hashable(label))
470464
identities, ok := l.localIdentitiesByName[label]
471465
if ok {
472-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
473-
l.logger.Debugf("get local identity by name found with label [%s]", hash.Hashable(label))
474-
}
466+
l.logger.Debugf("get local identity by name found with label [%s]", hash.Hashable(label))
475467
return identities[0].Identity
476468
}
477469
identity, ok := l.localIdentitiesByIdentity[label]
478470
if ok {
479471
return identity
480472
}
481473

482-
if l.logger.IsEnabledFor(zapcore.DebugLevel) {
483-
l.logger.Debugf("local identity not found for label [%s][%v]", hash.Hashable(label), l.localIdentitiesByName)
484-
}
474+
l.logger.Debugf("local identity not found for label [%s][%v]", hash.Hashable(label), l.localIdentitiesByName)
485475
return nil
486476
}
487477

‎token/services/identity/wallet/service.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils"
1717
"github.com/hyperledger-labs/fabric-token-sdk/token/token"
1818
"github.com/pkg/errors"
19-
"go.uber.org/zap/zapcore"
2019
)
2120

2221
var (
@@ -108,9 +107,7 @@ func (s *Service) RegisterRecipientIdentity(data *driver.RecipientData) error {
108107
return errors.Wrapf(err, "failed to register recipient identity")
109108
}
110109

111-
if s.Logger.IsEnabledFor(zapcore.DebugLevel) {
112-
s.Logger.Debugf("register recipient identity [%s] with audit info [%s]", data.Identity, utils.Hashable(data.AuditInfo))
113-
}
110+
s.Logger.Debugf("register recipient identity [%s] with audit info [%s]", data.Identity, utils.Hashable(data.AuditInfo))
114111

115112
// match identity and audit info
116113
err := s.Deserializer.MatchIdentity(data.Identity, data.AuditInfo)

‎token/services/interop/htlc/wallet_filter.go‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ package htlc
88

99
import (
1010
"bytes"
11-
"encoding/base64"
1211
"encoding/json"
1312
"time"
1413

14+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1515
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections/iterators"
1616
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1717
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
1818
"github.com/hyperledger-labs/fabric-token-sdk/token/token"
19-
"go.uber.org/zap/zapcore"
2019
)
2120

2221
// SelectFunction is the prototype of a function to select pairs (token,script)
@@ -41,16 +40,10 @@ func (f *PreImageSelector) Filter(tok *token.UnspentToken, script *Script) (bool
4140
h := hash.Sum(nil)
4241
h = []byte(script.HashInfo.HashEncoding.New().EncodeToString(h))
4342

44-
if logger.IsEnabledFor(zapcore.DebugLevel) {
45-
logger.Debugf("searching for script matching (pre-image, image) = (%s,%s)",
46-
base64.StdEncoding.EncodeToString(f.preImage),
47-
base64.StdEncoding.EncodeToString(h),
48-
)
49-
}
43+
logger.Debugf("searching for script matching (pre-image, image) = (%s,%s)", logging.Base64(f.preImage), logging.Base64(h))
5044

5145
// does the preimage match?
52-
logger.Debugf("token [%s,%s,%s,%s] does hashes match?", tok.Id, view.Identity(tok.Owner).UniqueID(), tok.Type, tok.Quantity,
53-
base64.StdEncoding.EncodeToString(h), base64.StdEncoding.EncodeToString(script.HashInfo.Hash))
46+
logger.Debugf("token [%s,%s,%s,%s] does hashes match?", tok.Id, view.Identity(tok.Owner), tok.Type, tok.Quantity, logging.Base64(h), logging.Base64(script.HashInfo.Hash))
5447

5548
return bytes.Equal(h, script.HashInfo.Hash), nil
5649
}

‎token/services/network/fabric/finality/deliveryqs.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
1818
events2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/events"
1919
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/finality"
20-
"go.uber.org/zap"
2120
)
2221

2322
const (
@@ -83,9 +82,7 @@ func (q *DeliveryScanQueryByID) queryByID(ctx context.Context, keys []driver.TxI
8382

8483
startingBlock := finality.MaxUint64(FirstBlock, lastBlock-NumberPastBlocks)
8584
// startingBlock := uint64(0)
86-
if logger.IsEnabledFor(zap.DebugLevel) {
87-
logger.Debugf("start scanning blocks starting from [%d], looking for remaining keys [%v]", startingBlock, keySet.ToSlice())
88-
}
85+
logger.Debugf("start scanning blocks starting from [%d], looking for remaining keys [%s]", startingBlock, keySet)
8986

9087
// start delivery for the future
9188
err := q.Delivery.ScanFromBlock(

‎token/services/network/fabric/lookup/channelllm.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ package lookup
88

99
import (
1010
"context"
11-
"encoding/base64"
1211
"slices"
1312
"sync"
1413
"time"
1514

1615
"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
1716
"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
17+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1818
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
1919
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
2020
"go.opentelemetry.io/otel/trace"
21-
"go.uber.org/zap/zapcore"
2221
)
2322

2423
type ChannelListenerManagerConfig struct {
@@ -174,12 +173,8 @@ func (s *Scanner) Scan() {
174173
return
175174
}
176175

177-
if logger.IsEnabledFor(zapcore.DebugLevel) {
178-
logger.Debugf("scanning for key [%s] found [%s]",
179-
s.key,
180-
base64.StdEncoding.EncodeToString(keyValue),
181-
)
182-
}
176+
logger.Debugf("scanning for key [%s] found [%s]", s.key, logging.Base64(keyValue))
177+
183178
s.listener.OnStatus(s.context, s.key, keyValue)
184179
}
185180

‎token/services/network/fabric/lookup/deliveryqs.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/finality"
1919
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric/tcc"
2020
slices2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/slices"
21-
"go.uber.org/zap"
2221
)
2322

2423
const (
@@ -108,9 +107,7 @@ func (q *DeliveryScanQueryByID) queryByID(ctx context.Context, keys []driver.PKe
108107

109108
startingBlock := finality.MaxUint64(FirstBlock, lastBlock-NumberPastBlocks)
110109
// startingBlock := uint64(0)
111-
if logger.IsEnabledFor(zap.DebugLevel) {
112-
logger.Debugf("start scanning blocks starting from [%d], looking for remaining keys [%v]", startingBlock, keySet.ToSlice())
113-
}
110+
logger.Debugf("start scanning blocks starting from [%d], looking for remaining keys [%s]", startingBlock, keySet)
114111

115112
// start delivery for the future
116113
v := q.Channel.Vault()

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common/rws/translator"
1616
"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
1717
"github.com/pkg/errors"
18-
"go.uber.org/zap/zapcore"
1918
)
2019

2120
type GetTokensFunc = func() (*tokens.Service, error)
@@ -81,9 +80,7 @@ func (r *RWSetProcessor) init(ctx context.Context, tx fabric.ProcessTransaction,
8180
return err
8281
}
8382
if key == setUpKey {
84-
if logger.IsEnabledFor(zapcore.DebugLevel) {
85-
logger.Debugf("Parsing write key [%s] with hash value [%s]", key, hash.Hashable(val))
86-
}
83+
logger.Debugf("Parsing write key [%s] with hash value [%s]", key, hash.Hashable(val))
8784
if err := tsmProvider.Update(token.TMSID{
8885
Network: tx.Network(),
8986
Channel: tx.Channel(),

0 commit comments

Comments
 (0)