forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd/swarm-smoke: inline metrics

Browse source
This commit is contained in:
Anton Evangelatov 2018-12-05 12:34:49 +01:00
parent de8a8afa22
commit 972e699479
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/swarm/swarm-smoke/feed_upload_and_sync.go
View file

@ -16,6 +16,7 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/swarm/storage/feed" "github.com/ethereum/go-ethereum/swarm/storage/feed"
colorable "github.com/mattn/go-colorable" colorable "github.com/mattn/go-colorable"
"github.com/pborman/uuid" "github.com/pborman/uuid"
@ -27,7 +28,7 @@ const (
) )
func cliFeedUploadAndSync(c *cli.Context) error { func cliFeedUploadAndSync(c *cli.Context) error {
feedUploadAndSyncCount.Inc(1) metrics.GetOrRegisterCounter("feed-and-sync", nil).Inc(1)
log.Root().SetHandler(log.CallerFileHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true))))) log.Root().SetHandler(log.CallerFileHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true)))))
errc := make(chan error) errc := make(chan error)
@ -38,11 +39,11 @@ func cliFeedUploadAndSync(c *cli.Context) error {
select { select {
case err := <-errc: case err := <-errc:
if err != nil { if err != nil {
feedUploadAndSyncFailCount.Inc(1) metrics.GetOrRegisterCounter("feed-and-sync.fail", nil).Inc(1)
} }
return err return err
case <-time.After(time.Duration(timeout) * time.Second): case <-time.After(time.Duration(timeout) * time.Second):
feedUploadAndSyncTimeout.Inc(1) metrics.GetOrRegisterCounter("feed-and-sync.timeout", nil).Inc(1)
return fmt.Errorf("timeout after %v sec", timeout) return fmt.Errorf("timeout after %v sec", timeout)
} }
} }

5
cmd/swarm/swarm-smoke/main.go
View file

@ -47,11 +47,6 @@ var (
verbosity int verbosity int
timeout int timeout int
) )
var (
feedUploadAndSyncCount = gethmetrics.NewRegisteredCounter("feed-and-sync", nil)
feedUploadAndSyncFailCount = gethmetrics.NewRegisteredCounter("feed-and-sync.fail", nil)
feedUploadAndSyncTimeout = gethmetrics.NewRegisteredCounter("feed-and-sync.timeout", nil)
)
func main() { func main() {