From ea987e48c118745748df54a56ea4bbb499ac4a6e Mon Sep 17 00:00:00 2001
From: Elad Nachmias <theman@elad.im>
Date: Tue, 4 Dec 2018 14:57:03 +0530
Subject: [PATCH] add metrics to upload and sync test

---
 cmd/swarm/swarm-smoke/main.go            | 6 ++++++
 cmd/swarm/swarm-smoke/upload_and_sync.go | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go
index 48b762c076..e14d3a20f9 100644
--- a/cmd/swarm/swarm-smoke/main.go
+++ b/cmd/swarm/swarm-smoke/main.go
@@ -44,6 +44,12 @@ var (
 	verbosity        int
 	timeout          int
 )
+var (
+	smokeUploadAndSyncCount     = gethmetrics.NewRegisteredCounter("swarm-smoke.upload-and-sync.count", nil)
+	smokeUploadAndSyncFailCount = gethmetrics.NewRegisteredCounter("swarm-smoke.upload-and-sync.fail.count", nil)
+	smokeUploadAndSyncRunTime   = gethmetrics.NewRegisteredCounter("swarm-smoke.upload-and-sync.time", nil)
+	smokeUploadAndSyncTimeout   = gethmetrics.NewRegisteredCounter("swarm-smoke.upload-and-sync.timeout", nil)
+)
 
 func main() {
 
diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go
index 21be544fe3..4b7de7cbe2 100644
--- a/cmd/swarm/swarm-smoke/upload_and_sync.go
+++ b/cmd/swarm/swarm-smoke/upload_and_sync.go
@@ -55,6 +55,7 @@ func generateEndpoints(scheme string, cluster string, app string, from int, to i
 }
 
 func cliUploadAndSync(c *cli.Context) error {
+	smokeUploadAndSyncCount.Inc(1)
 	log.PrintOrigins(true)
 	log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(os.Stdout, log.TerminalFormat(true))))
 
@@ -65,15 +66,21 @@ func cliUploadAndSync(c *cli.Context) error {
 
 	select {
 	case err := <-errc:
+		if err != nil {
+			smokeUploadAndSyncFailCount.Inc(1)
+		}
 		return err
 	case <-time.After(time.Duration(timeout) * time.Second):
+		smokeUploadAndSyncTimeout.Inc(1)
 		return fmt.Errorf("timeout after %v sec", timeout)
 	}
 
 }
 
 func uploadAndSync(c *cli.Context) error {
-	defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "kb", filesize) }(time.Now())
+	defer func(now time.Time) {
+		log.Info("total time", "time", time.Since(now), "kb", filesize)
+	}(time.Now())
 
 	generateEndpoints(scheme, cluster, appName, from, to)