cleanup + lint/fmt

cstyan · cstyan · commit 1aca85ae3acc · 2025-12-16T00:29:00.000Z
Signed-off-by: Callum Styan &lt;callumstyan@gmail.com&gt;
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1862,7 +1862,6 @@ type API struct {
 
 	metricsCache                   *metricscache.Cache
 	workspaceCreationAttemptsTotal *prometheus.CounterVec
-	workspaceCreationOutcomesTotal *prometheus.CounterVec
 	updateChecker                  *updatecheck.Checker
 	WorkspaceAppsProvider          workspaceapps.SignedTokenProvider
 	workspaceAppServer             *workspaceapps.Server
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sqlc-dev/pqtype"
 	semconv "go.opentelemetry.io/otel/semconv/v1.14.0"
 	"go.opentelemetry.io/otel/trace"
@@ -97,14 +96,12 @@ func (s *server) incrementWorkspaceCreationOutcomesMetric(ctx context.Context, w
 			}
 		}
 
-		if s.workspaceCreationOutcomesTotal != nil {
-			s.workspaceCreationOutcomesTotal.WithLabelValues(
-				workspace.OrganizationName,
-				workspace.TemplateName,
-				presetName,
-				status,
-			).Inc()
-		}
+		s.metrics.workspaceCreationOutcomesTotal.WithLabelValues(
+			workspace.OrganizationName,
+			workspace.TemplateName,
+			presetName,
+			status,
+		).Inc()
 	}
 }
 
@@ -157,8 +154,6 @@ type server struct {
 	UsageInserter               *atomic.Pointer[usage.Inserter]
 	Experiments                 codersdk.Experiments
 
-	workspaceCreationOutcomesTotal *prometheus.CounterVec
-
 	OIDCConfig promoauth.OAuth2Config
 
 	Clock quartz.Clock
@@ -294,11 +289,6 @@ func NewServer(
 		Experiments:                 experiments,
 	}
 
-	// Set workspace creation outcomes metric from metrics struct if available.
-	if metrics != nil {
-		s.workspaceCreationOutcomesTotal = metrics.workspaceCreationOutcomesTotal
-	}
-
 	if s.heartbeatFn == nil {
 		s.heartbeatFn = s.defaultHeartbeat
 	}
@@ -2332,7 +2322,9 @@ func (s *server) completeWorkspaceBuildJob(ctx context.Context, job database.Pro
 
 	// Increment workspace creation outcomes metric for first 'start' builds.
 	// This counts regular (non-prebuilt) workspace creation outcomes (success/failure).
-	s.incrementWorkspaceCreationOutcomesMetric(ctx, workspace, workspaceBuild, job)
+	if s.metrics != nil {
+		s.incrementWorkspaceCreationOutcomesMetric(ctx, workspace, workspaceBuild, job)
+	}
 
 	// Post-transaction operations (operations that do not require transactions or
 	// are external to the database, like audit logging, notifications, etc.)
diff --git a/coderd/provisionerdserver/provisionerdserver_metrics_internal_test.go b/coderd/provisionerdserver/provisionerdserver_metrics_internal_test.go
@@ -181,16 +181,17 @@ func TestWorkspaceCreationOutcomesMetricLogic(t *testing.T) {
 			))
 
 			// Create a test server instance with the test metrics.
+
 			testServer := &server{
-				Database:                       db,
-				workspaceCreationOutcomesTotal: testMetrics.workspaceCreationOutcomesTotal,
+				Database: db,
+				metrics:  testMetrics,
 			}
 
 			// Call the actual metric increment function.
 			testServer.incrementWorkspaceCreationOutcomesMetric(ctx, workspace, workspaceBuild, job)
 
 			// Verify the metric.
-			newValue := promtest.ToFloat64(testMetrics.workspaceCreationOutcomesTotal.WithLabelValues(
+			newValue := promtest.ToFloat64(testServer.metrics.workspaceCreationOutcomesTotal.WithLabelValues(
 				orgName,
 				templateName,
 				expectedPresetName,
diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go
@@ -2940,9 +2940,7 @@ func TestWorkspaceProvisionerdServerMetrics(t *testing.T) {
 	db, pb := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
 	logger := testutil.Logger(t)
 	reg := prometheus.NewRegistry()
-	provisionerdserverMetrics := provisionerdserver.NewMetrics(logger)
-	err := provisionerdserverMetrics.Register(reg)
-	require.NoError(t, err)
+	provisionerdserverMetrics := provisionerdserver.NewMetrics(logger, reg)
 	client, _, api, owner := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
 			Database:                  db,
