Skip to content

cmd/swarm/swarm-smoke: use ResettingTimer instead of Counters for times #18479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nonsense merged 2 commits into from
Jan 18, 2019
Merged

cmd/swarm/swarm-smoke: use ResettingTimer instead of Counters for times #18479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b404b
cmd/swarm/swarm-smoke: use ResettingTimer instead of Counters for times
holisticode Jan 18, 2019
b0f150c
cmd/swarm/swarm-smoke: remove sleeping from fetch
holisticode Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions cmd/swarm/swarm-smoke/upload_and_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ func cliUploadAndSync(c *cli.Context) error {
func uploadAndSync(c *cli.Context) error {
defer func(now time.Time) {
totalTime := time.Since(now)

log.Info("total time", "time", totalTime, "kb", filesize)
metrics.GetOrRegisterCounter("upload-and-sync.total-time", nil).Inc(int64(totalTime))
metrics.GetOrRegisterResettingTimer("upload-and-sync.total-time", nil).Update(totalTime)
}(time.Now())

generateEndpoints(scheme, cluster, appName, from, to)
Expand All @@ -103,7 +102,7 @@ func uploadAndSync(c *cli.Context) error {
log.Error(err.Error())
return err
}
metrics.GetOrRegisterCounter("upload-and-sync.upload-time", nil).Inc(int64(time.Since(t1)))
metrics.GetOrRegisterResettingTimer("upload-and-sync.upload-time", nil).UpdateSince(t1)

fhash, err := digest(bytes.NewReader(randomBytes))
if err != nil {
Expand Down Expand Up @@ -164,8 +163,6 @@ func fetch(hash string, endpoint string, original []byte, ruid string) error {
ctx, sp := spancontext.StartSpan(context.Background(), "upload-and-sync.fetch")
defer sp.Finish()

log.Trace("sleeping", "ruid", ruid)
time.Sleep(3 * time.Second)
log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash)

var tn time.Time
Expand Down