address PR comments

johnstcn · johnstcn · commit d54af33c10b0 · 2023-05-24T16:54:59.000+01:00
diff --git a/cli/scaletest.go b/cli/scaletest.go
@@ -1056,7 +1056,7 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
 			Flag:        "scaletest-prometheus-address",
 			Env:         "CODER_SCALETEST_PROMETHEUS_ADDRESS",
 			Default:     "0.0.0.0:21112",
-			Description: "Address on which to expose scaletest prometheus metrics.",
+			Description: "Address on which to expose scaletest Prometheus metrics.",
 			Value:       clibase.StringOf(&scaletestPrometheusAddress),
 		},
 	}
diff --git a/docs/cli/scaletest_workspace-traffic.md b/docs/cli/scaletest_workspace-traffic.md
@@ -90,7 +90,7 @@ Output format specs in the format "<format>[:<path>]". Not specifying a path wil
 | Environment | <code>$CODER_SCALETEST_PROMETHEUS_ADDRESS</code> |
 | Default     | <code>0.0.0.0:21112</code>                       |
 
-Address on which to expose scaletest prometheus metrics.
+Address on which to expose scaletest Prometheus metrics.
 
 ### --tick-interval
 
diff --git a/scaletest/workspacetraffic/metrics.go b/scaletest/workspacetraffic/metrics.go
@@ -3,12 +3,12 @@ package workspacetraffic
 import "github.com/prometheus/client_golang/prometheus"
 
 type Metrics struct {
-	BytesRead      prometheus.CounterVec
-	BytesWritten   prometheus.CounterVec
-	Errors         prometheus.CounterVec
-	ReadLatencyMS  prometheus.HistogramVec
-	WriteLatencyMS prometheus.HistogramVec
-	LabelNames     []string
+	BytesRead           prometheus.CounterVec
+	BytesWritten        prometheus.CounterVec
+	Errors              prometheus.CounterVec
+	ReadLatencySeconds  prometheus.HistogramVec
+	WriteLatencySeconds prometheus.HistogramVec
+	LabelNames          []string
 }
 
 func NewMetrics(reg prometheus.Registerer, labelNames ...string) *Metrics {
@@ -28,12 +28,12 @@ func NewMetrics(reg prometheus.Registerer, labelNames ...string) *Metrics {
 			Subsystem: "scaletest",
 			Name:      "errors",
 		}, labelNames),
-		ReadLatencyMS: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		ReadLatencySeconds: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: "coderd",
 			Subsystem: "scaletest",
 			Name:      "read_latency_seconds",
 		}, labelNames),
-		WriteLatencyMS: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		WriteLatencySeconds: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: "coderd",
 			Subsystem: "scaletest",
 			Name:      "write_latency_seconds",
@@ -43,7 +43,7 @@ func NewMetrics(reg prometheus.Registerer, labelNames ...string) *Metrics {
 	reg.MustRegister(m.BytesRead)
 	reg.MustRegister(m.BytesWritten)
 	reg.MustRegister(m.Errors)
-	reg.MustRegister(m.ReadLatencyMS)
-	reg.MustRegister(m.WriteLatencyMS)
+	reg.MustRegister(m.ReadLatencySeconds)
+	reg.MustRegister(m.WriteLatencySeconds)
 	return m
 }
diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go
@@ -195,7 +195,7 @@ type countReadWriter struct {
 func (w *countReadWriter) Read(p []byte) (int, error) {
 	start := time.Now()
 	n, err := w.ReadWriter.Read(p)
-	w.metrics.ReadLatencyMS.WithLabelValues(w.labels...).Observe(time.Since(start).Seconds())
+	w.metrics.ReadLatencySeconds.WithLabelValues(w.labels...).Observe(time.Since(start).Seconds())
 	if n > 0 {
 		w.bytesRead.Add(int64(n))
 		w.metrics.BytesRead.WithLabelValues(w.labels...).Add(float64(n))
@@ -206,7 +206,7 @@ func (w *countReadWriter) Read(p []byte) (int, error) {
 func (w *countReadWriter) Write(p []byte) (int, error) {
 	start := time.Now()
 	n, err := w.ReadWriter.Write(p)
-	w.metrics.WriteLatencyMS.WithLabelValues(w.labels...).Observe(time.Since(start).Seconds())
+	w.metrics.WriteLatencySeconds.WithLabelValues(w.labels...).Observe(time.Since(start).Seconds())
 	if n > 0 {
 		w.bytesWritten.Add(int64(n))
 		w.metrics.BytesWritten.WithLabelValues(w.labels...).Add(float64(n))

Original file line number	Diff line number	Diff line change
`@@ -1056,7 +1056,7 @@ func (r RootCmd) scaletestWorkspaceTraffic() clibase.Cmd {`
`1056`	`1056`	`Flag: "scaletest-prometheus-address",`
`1057`	`1057`	`Env: "CODER_SCALETEST_PROMETHEUS_ADDRESS",`
`1058`	`1058`	`Default: "0.0.0.0:21112",`
`1059`		`- Description: "Address on which to expose scaletest prometheus metrics.",`
	`1059`	`+ Description: "Address on which to expose scaletest Prometheus metrics.",`
`1060`	`1060`	`Value: clibase.StringOf(&scaletestPrometheusAddress),`
`1061`	`1061`	`},`
`1062`	`1062`	`}`