graph is at the end now

Emyrk · Emyrk · commit c79f45e83583 · 2025-12-02T11:56:19.000-06:00
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -566,33 +566,6 @@ func (e *executor) apply(
 	}, nil
 }
 
-// stateResources must only be called while the lock is held.
-func (e *executor) stateResources(ctx, killCtx context.Context) (*State, error) {
-	ctx, span := e.server.startTrace(ctx, tracing.FuncName())
-	defer span.End()
-
-	state, err := e.state(ctx, killCtx)
-	if err != nil {
-		return nil, err
-	}
-	rawGraph, err := e.graph(ctx, killCtx)
-	if err != nil {
-		return nil, xerrors.Errorf("get terraform graph: %w", err)
-	}
-	converted := &State{}
-	if state.Values == nil {
-		return converted, nil
-	}
-
-	converted, err = ConvertState(ctx, []*tfjson.StateModule{
-		state.Values.RootModule,
-	}, rawGraph, e.server.logger)
-	if err != nil {
-		return nil, err
-	}
-	return converted, nil
-}
-
 // state must only be called while the lock is held.
 func (e *executor) state(ctx, killCtx context.Context) (*tfjson.State, error) {
 	ctx, span := e.server.startTrace(ctx, tracing.FuncName())
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -146,6 +146,7 @@ func (s *server) Init(
 	s.logger.Debug(ctx, "ran initialization")
 
 	return &proto.InitComplete{
+		Timings:         e.timings.aggregate(),
 		Modules:         modules,
 		ModuleFiles:     moduleFiles,
 		ModuleFilesHash: nil,
@@ -240,7 +241,9 @@ func (s *server) Graph(
 		return provisionersdk.GraphError("unknown graph source: %q", request.Source.String())
 	}
 
+	endStage := e.timings.startStage(database.ProvisionerJobTimingStageGraph)
 	rawGraph, err := e.graph(ctx, killCtx)
+	endStage(err)
 	if err != nil {
 		return provisionersdk.GraphError("generate graph: %s", err)
 	}
diff --git a/site/src/modules/workspaces/WorkspaceTiming/StagesChart.tsx b/site/src/modules/workspaces/WorkspaceTiming/StagesChart.tsx
@@ -246,31 +246,31 @@ export const provisioningStages: Stage[] = [
 		},
 	},
 	{
-		name: "graph",
-		label: "graph",
+		name: "apply",
+		label: "apply",
 		section: "provisioning",
 		tooltip: {
 			title: (
 				<>
-					<TooltipTitle>Terraform graph</TooltipTitle>
+					<TooltipTitle>Terraform apply</TooltipTitle>
 					<TooltipShortDescription>
-						List all resources in plan, used to update coderd database.
+						Execute Terraform plan to create/modify/delete resources into
+						desired states.
 					</TooltipShortDescription>
 				</>
 			),
 		},
 	},
 	{
-		name: "apply",
-		label: "apply",
+		name: "graph",
+		label: "graph",
 		section: "provisioning",
 		tooltip: {
 			title: (
 				<>
-					<TooltipTitle>Terraform apply</TooltipTitle>
+					<TooltipTitle>Terraform graph</TooltipTitle>
 					<TooltipShortDescription>
-						Execute Terraform plan to create/modify/delete resources into
-						desired states.
+						List all resources in plan, used to update coderd database.
 					</TooltipShortDescription>
 				</>
 			),
