Skip to content

Commit e01a9b4

Browse files
adecaroadecaro
committed
refactor loggin
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent efa4590 commit e01a9b4

File tree

30 files changed

+63
-174
lines changed

30 files changed

+63
-174
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/gin-gonic/gin v1.10.0
1010
github.com/gobuffalo/packr/v2 v2.7.1
1111
github.com/hashicorp/go-uuid v1.0.3
12-
github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241212193429-55ffb2edb9d0
12+
github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241217063123-20183a4dcc38
1313
github.com/hyperledger-labs/orion-sdk-go v0.2.10
1414
github.com/hyperledger-labs/orion-server v0.2.10
1515
github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,8 +1070,8 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl
10701070
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
10711071
github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
10721072
github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
1073-
github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241212193429-55ffb2edb9d0 h1:rLwxWZo3ZlNukBcRUWcldDKNmg2+jiOe6JSZTfT1qnk=
1074-
github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241212193429-55ffb2edb9d0/go.mod h1:Fcz6IOEmwXihzi/Hn8fxuyAbyJxhe706+TJsQwLHRME=
1073+
github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241217063123-20183a4dcc38 h1:gB50qGuusNOxK+1JGVyWKAyUlURFaygQlVL07EwSJ7E=
1074+
github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241217063123-20183a4dcc38/go.mod h1:Fcz6IOEmwXihzi/Hn8fxuyAbyJxhe706+TJsQwLHRME=
10751075
github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s=
10761076
github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY=
10771077
github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw=

‎integration/nwo/runner/nwo/executor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func NewSuiteExecutor(nw *integration.Infrastructure, auditor, issuer model.User
4848
Otpl: tracing.OtplConfig{Address: fmt.Sprintf(":%d", optl.JaegerCollectorPort)},
4949
})
5050
}),
51-
s.C.Provide(func(nw *integration.Infrastructure, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.ILogger) (*runner2.ViewUserProvider, error) {
51+
s.C.Provide(func(nw *integration.Infrastructure, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.Logger) (*runner2.ViewUserProvider, error) {
5252
return newUserProvider(nw, metrics, tracerProvider, logger, auditor)
5353
}),
5454
)
@@ -58,7 +58,7 @@ func NewSuiteExecutor(nw *integration.Infrastructure, auditor, issuer model.User
5858

5959
err = errors.Join(
6060
s.C.Decorate(func(_ user.Provider, p *runner2.ViewUserProvider) user.Provider { return p }),
61-
s.C.Decorate(func(_ runner.SuiteRunner, runner *runner.BaseRunner, userProvider *runner2.ViewUserProvider, logger logging.ILogger) runner.SuiteRunner {
61+
s.C.Decorate(func(_ runner.SuiteRunner, runner *runner.BaseRunner, userProvider *runner2.ViewUserProvider, logger logging.Logger) runner.SuiteRunner {
6262
return runner2.NewViewRunner(runner, userProvider, logger, auditor, issuer)
6363
}),
6464
)

‎integration/nwo/runner/nwo/user_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"go.opentelemetry.io/otel/trace"
2424
)
2525

26-
func newUserProvider(nw *integration.Infrastructure, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.ILogger, auditor model.Username) (*runner2.ViewUserProvider, error) {
26+
func newUserProvider(nw *integration.Infrastructure, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.Logger, auditor model.Username) (*runner2.ViewUserProvider, error) {
2727
fscTopology, err := getFscTopology(nw.Topologies)
2828
if err != nil {
2929
return nil, err

‎integration/nwo/runner/rpc/executor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func NewSuiteExecutor(config UserProviderConfig) (*SuiteExecutor, error) {
5555
return &operations.Options{Metrics: operations.MetricsOptions{Provider: config.Monitoring.MetricsProviderType}}
5656
}),
5757
s.C.Provide(web.NewOperationsLogger),
58-
s.C.Provide(func(logger logging.ILogger) *web2.Server {
58+
s.C.Provide(func(logger logging.Logger) *web2.Server {
5959
return web2.NewServer(web2.Options{ListenAddress: config.Monitoring.MetricsEndpoint, Logger: logger})
6060
}),
6161
s.C.Provide(digutils.Identity[*web2.Server](), dig.As(new(operations.Server))),
@@ -82,7 +82,7 @@ func NewSuiteExecutor(config UserProviderConfig) (*SuiteExecutor, error) {
8282

8383
err = errors.Join(
8484
s.C.Decorate(func(_ user.Provider, p *runner2.ViewUserProvider) user.Provider { return p }),
85-
s.C.Decorate(func(_ runner3.SuiteRunner, runner *runner3.RestRunner, userProvider *runner2.ViewUserProvider, logger logging.ILogger) runner3.SuiteRunner {
85+
s.C.Decorate(func(_ runner3.SuiteRunner, runner *runner3.RestRunner, userProvider *runner2.ViewUserProvider, logger logging.Logger) runner3.SuiteRunner {
8686
return runner2.NewViewRunner(runner, userProvider, logger, config.Auditors[0].Name, config.Issuers[0].Name)
8787
}),
8888
s.C.Decorate(func(_ metrics2.Provider, mp metrics.Provider) metrics2.Provider {

‎integration/nwo/runner/rpc/user_provider.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const (
7272
GRPC ConnectionType = "GRPC"
7373
)
7474

75-
func newUserProvider(c UserProviderConfig, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.ILogger) (*runner2.ViewUserProvider, error) {
75+
func newUserProvider(c UserProviderConfig, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.Logger) (*runner2.ViewUserProvider, error) {
7676
users := make(map[model.UserAlias][]user.User, len(c.Users))
7777
for _, uc := range append(append(c.Users, c.Auditors...), c.Issuers...) {
7878
u, err := newUser(uc.CorePath, uc.Host, c.ConnectionType, metrics, tracerProvider, logger, c.Auditors[0].Name)
@@ -84,7 +84,7 @@ func newUserProvider(c UserProviderConfig, metrics *metrics.Metrics, tracerProvi
8484
return runner2.NewViewUserProvider(users), nil
8585
}
8686

87-
func newUser(corePath string, host string, connType ConnectionType, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.ILogger, auditor model.Username) (user.User, error) {
87+
func newUser(corePath string, host string, connType ConnectionType, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.Logger, auditor model.Username) (user.User, error) {
8888
cfg, cli, err := newClient(corePath, host, connType)
8989
if err != nil {
9090
return nil, err

‎integration/nwo/runner/view_runner.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
type viewRunner struct {
2121
runner.SuiteRunner
2222
viewUserProvider *ViewUserProvider
23-
logger logging.ILogger
23+
logger logging.Logger
2424
auditorId model.Username
2525
issuerIds []model.Username
2626
}
2727

28-
func NewViewRunner(runner runner.SuiteRunner, userProvider *ViewUserProvider, logger logging.ILogger, auditorId model.Username, issuerIds ...model.Username) *viewRunner {
28+
func NewViewRunner(runner runner.SuiteRunner, userProvider *ViewUserProvider, logger logging.Logger, auditorId model.Username, issuerIds ...model.Username) *viewRunner {
2929
return &viewRunner{
3030
SuiteRunner: runner,
3131
viewUserProvider: userProvider,

‎integration/nwo/runner/view_user.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type idResolver interface {
5959
Identity(model.Username) view.Identity
6060
}
6161

62-
func NewViewUser(username model.Username, auditor model.Username, client api2.ViewClient, idResolver idResolver, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.ILogger) *viewUser {
62+
func NewViewUser(username model.Username, auditor model.Username, client api2.ViewClient, idResolver idResolver, metrics *metrics.Metrics, tracerProvider trace.TracerProvider, logger logging.Logger) *viewUser {
6363
return &viewUser{
6464
username: username,
6565
anonymous: false,
@@ -82,7 +82,7 @@ type viewUser struct {
8282
client api2.ViewClient
8383
idResolver idResolver
8484
metrics *metrics.Metrics
85-
logger logging.ILogger
85+
logger logging.Logger
8686
tracer trace.Tracer
8787
}
8888

‎integration/nwo/token/common/utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"os"
1111
"path"
1212

13-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
13+
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
1414
)
1515

16-
var logger = flogging.MustGetLogger("token-sdk.integration.token.common")
16+
var logger = logging.MustGetLogger("token-sdk.integration.token.common")
1717

1818
const (
1919
FabricBinsPathEnvKey = "FAB_BINS"

‎integration/nwo/token/fabric/cc/tcc.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919

2020
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/packager"
2121
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric/topology"
22-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
2322
pp2 "github.com/hyperledger-labs/fabric-token-sdk/cmd/tokengen/cobra/pp/cc"
2423
common2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/common"
2524
topology3 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
25+
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
2626
. "github.com/onsi/gomega"
2727
)
2828

@@ -31,7 +31,7 @@ const (
3131
DefaultTokenChaincodeParamsReplaceSuffix = "/token/services/network/fabric/tcc/params.go"
3232
)
3333

34-
var logger = flogging.MustGetLogger("token-sdk.integration.token.fabric.cc")
34+
var logger = logging.MustGetLogger("token-sdk.integration.token.fabric.cc")
3535

3636
type fabricPlatform interface {
3737
Topology() *topology.Topology

0 commit comments

Comments
 (0)