use atomic add for total bytes value

cstyan · cstyan · commit 236ce5104861 · 2025-05-12T21:36:12.000Z
Signed-off-by: Callum Styan &lt;callumstyan@gmail.com&gt;
diff --git a/scaletest/workspacetraffic/metrics.go b/scaletest/workspacetraffic/metrics.go
@@ -1,6 +1,10 @@
 package workspacetraffic
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"sync/atomic"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
 
 type Metrics struct {
 	BytesReadTotal      prometheus.CounterVec
@@ -75,7 +79,7 @@ type ConnMetrics interface {
 	AddError(float64)
 	ObserveLatency(float64)
 	AddTotal(float64)
-	GetTotal() int64
+	GetTotalBytes() int64
 }
 
 type connMetrics struct {
@@ -94,10 +98,10 @@ func (c *connMetrics) ObserveLatency(f float64) {
 }
 
 func (c *connMetrics) AddTotal(f float64) {
-	c.total += int64(f)
+	atomic.AddInt64(&c.total, int64(f))
 	c.addTotal(f)
 }
 
-func (c *connMetrics) GetTotal() int64 {
+func (c *connMetrics) GetTotalBytes() int64 {
 	return c.total
 }
diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go
@@ -211,8 +211,8 @@ func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) (err error)
 }
 
 func (r *Runner) GetBytesTransferred() (bytesRead, bytesWritten int64) {
-	bytesRead = r.cfg.ReadMetrics.GetTotal()
-	bytesWritten = r.cfg.WriteMetrics.GetTotal()
+	bytesRead = r.cfg.ReadMetrics.GetTotalBytes()
+	bytesWritten = r.cfg.WriteMetrics.GetTotalBytes()
 	return bytesRead, bytesWritten
 }
 
diff --git a/scaletest/workspacetraffic/run_test.go b/scaletest/workspacetraffic/run_test.go
@@ -423,6 +423,6 @@ func (m *testMetrics) Latencies() []float64 {
 	return m.latencies
 }
 
-func (m *testMetrics) GetTotal() int64 {
+func (m *testMetrics) GetTotalBytes() int64 {
 	return int64(m.total)
 }

Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,8 @@ func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) (err error)`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`func (r *Runner) GetBytesTransferred() (bytesRead, bytesWritten int64) {`
`214`		`- bytesRead = r.cfg.ReadMetrics.GetTotal()`
`215`		`- bytesWritten = r.cfg.WriteMetrics.GetTotal()`
	`214`	`+ bytesRead = r.cfg.ReadMetrics.GetTotalBytes()`
	`215`	`+ bytesWritten = r.cfg.WriteMetrics.GetTotalBytes()`
`216`	`216`	`return bytesRead, bytesWritten`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,6 @@ func (m *testMetrics) Latencies() []float64 {`
`423`	`423`	`return m.latencies`
`424`	`424`	`}`
`425`	`425`
`426`		`-func (m *testMetrics) GetTotal() int64 {`
	`426`	`+func (m *testMetrics) GetTotalBytes() int64 {`
`427`	`427`	`return int64(m.total)`
`428`	`428`	`}`