Add commit to stress metric

crosbymichael · crosbymichael · commit 652e07807828 · 2017-12-12T14:14:39.000-05:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/cmd/containerd-stress/main.go b/cmd/containerd-stress/main.go
@@ -192,6 +192,10 @@ func test(c config) error {
 	if c.Exec {
 		args = oci.WithProcessArgs("sleep", "10")
 	}
+	v, err := client.Version(ctx)
+	if err != nil {
+		return err
+	}
 	// create the workers along with their spec
 	for i := 0; i < c.Concurrency; i++ {
 		wg.Add(1)
@@ -210,6 +214,7 @@ func test(c config) error {
 			image:  image,
 			client: client,
 			doExec: c.Exec,
+			commit: v.Revision,
 		}
 		workers = append(workers, w)
 	}
diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go
@@ -18,13 +18,13 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var ct metrics.Timer
+var ct metrics.LabeledTimer
 
 func init() {
 	ns := metrics.NewNamespace("stress", "", nil)
 	// if you want more fine grained metrics then you can drill down with the metrics in prom that
 	// containerd is outputing
-	ct = ns.NewTimer("run", "Run time of a full container during the test")
+	ct = ns.NewLabeledTimer("run", "Run time of a full container during the test", "commit")
 	metrics.Register(ns)
 }
 
@@ -38,6 +38,7 @@ type worker struct {
 	image  containerd.Image
 	spec   *specs.Spec
 	doExec bool
+	commit string
 }
 
 func (w *worker) run(ctx, tctx context.Context) {
@@ -66,7 +67,7 @@ func (w *worker) run(ctx, tctx context.Context) {
 			continue
 		}
 		// only log times are success so we don't scew the results from failures that go really fast
-		ct.UpdateSince(start)
+		ct.WithValues(w.commit).UpdateSince(start)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,10 @@ func test(c config) error {`
`192`	`192`	`if c.Exec {`
`193`	`193`	`args = oci.WithProcessArgs("sleep", "10")`
`194`	`194`	`}`
	`195`	`+ v, err := client.Version(ctx)`
	`196`	`+ if err != nil {`
	`197`	`+ return err`
	`198`	`+ }`
`195`	`199`	`// create the workers along with their spec`
`196`	`200`	`for i := 0; i < c.Concurrency; i++ {`
`197`	`201`	`wg.Add(1)`
`@@ -210,6 +214,7 @@ func test(c config) error {`
`210`	`214`	`image: image,`
`211`	`215`	`client: client,`
`212`	`216`	`doExec: c.Exec,`
	`217`	`+ commit: v.Revision,`
`213`	`218`	`}`
`214`	`219`	`workers = append(workers, w)`
`215`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@ import (`
`18`	`18`	`"github.com/sirupsen/logrus"`
`19`	`19`	`)`
`20`	`20`
`21`		`-var ct metrics.Timer`
	`21`	`+var ct metrics.LabeledTimer`
`22`	`22`
`23`	`23`	`func init() {`
`24`	`24`	`ns := metrics.NewNamespace("stress", "", nil)`
`25`	`25`	`// if you want more fine grained metrics then you can drill down with the metrics in prom that`
`26`	`26`	`// containerd is outputing`
`27`		`- ct = ns.NewTimer("run", "Run time of a full container during the test")`
	`27`	`+ ct = ns.NewLabeledTimer("run", "Run time of a full container during the test", "commit")`
`28`	`28`	`metrics.Register(ns)`
`29`	`29`	`}`
`30`	`30`
`@@ -38,6 +38,7 @@ type worker struct {`
`38`	`38`	`image containerd.Image`
`39`	`39`	`spec *specs.Spec`
`40`	`40`	`doExec bool`
	`41`	`+ commit string`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`func (w *worker) run(ctx, tctx context.Context) {`
`@@ -66,7 +67,7 @@ func (w *worker) run(ctx, tctx context.Context) {`
`66`	`67`	`continue`
`67`	`68`	`}`
`68`	`69`	`// only log times are success so we don't scew the results from failures that go really fast`
`69`		`- ct.UpdateSince(start)`
	`70`	`+ ct.WithValues(w.commit).UpdateSince(start)`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`