linting/fmt/naming

coder · Emyrk · Dec 13, 2023 · Dec 8, 2023 · Dec 11, 2023 · Dec 11, 2023
commit 753f1a658baaf58bd48015c75774e58a35cc2db2
diff --git a/agent/agent.go b/agent/agent.go
@@ -767,17 +767,11 @@ func (a *agent) run(ctx context.Context) error {
 			}
 
 			dur := time.Since(start).Seconds()
-			// If something really look 0 ns, just set it to 1 to indicate that it ran.
-			// Otherwise, 0 looks like the startup script has not run yet. I don't think
-			// this will ever be 1ns
-			if dur == 0 {
-				dur = 1
-			}
 			label := "false"
 			if err == nil {
 				label = "true"
 			}
-			a.metrics.startScriptNs.WithLabelValues(label).Set(float64(dur))
+			a.metrics.startScriptSeconds.WithLabelValues(label).Set(dur)
 			a.scriptRunner.StartCron()
 		})
 		if err != nil {

diff --git a/agent/metrics.go b/agent/metrics.go
@@ -14,15 +14,12 @@ import (
 	"github.com/coder/coder/v2/codersdk/agentsdk"
 )
 
-
-
 type agentMetrics struct {
 	connectionsTotal      prometheus.Counter
 	reconnectingPTYErrors *prometheus.CounterVec
-	// startScriptNs is the time in nanoseconds that the start script(s)
-	// took to run. This is reported once per agent, and is collected into a
-	// histogram by Coder.
-	startScriptNs *prometheus.GaugeVec
+	// startScriptSeconds is the time in seconds that the start script(s)
+	// took to run. This is reported once per agent.
+	startScriptSeconds *prometheus.GaugeVec
 }
 
 func newAgentMetrics(registerer prometheus.Registerer) *agentMetrics {
@@ -41,18 +38,18 @@ func newAgentMetrics(registerer prometheus.Registerer) *agentMetrics {
 	)
 	registerer.MustRegister(reconnectingPTYErrors)
 
-	startScriptNs := prometheus.NewGaugeVec(prometheus.GaugeOpts{
+	startScriptSeconds := prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Namespace: "coderd",
 		Subsystem: "agentstats",
 		Name:      "startup_script_s",
 		Help:      "Amount of time taken to run the startup script in seconds.",
 	}, []string{"success"})
-	registerer.MustRegister(startScriptNs)
+	registerer.MustRegister(startScriptSeconds)
 
 	return &agentMetrics{
 		connectionsTotal:      connectionsTotal,
 		reconnectingPTYErrors: reconnectingPTYErrors,
-		startScriptNs:         startScriptNs,
+		startScriptSeconds:    startScriptSeconds,
 	}
 }
 

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
@@ -19,9 +19,8 @@ import (
 	"tailscale.com/tailcfg"
 
 	"cdr.dev/slog"
-	"github.com/coder/retry"
-
 	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/retry"
 )
 
 // ExternalLogSourceID is the statically-defined ID of a log-source that