fix: replace owner_email with workspace_owner, change action to workspace_transition (#6337)

johnstcn · BrunoQuaresma · commit 1e80b51c5f52 · 2023-03-02T14:47:38.000Z
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -162,7 +162,7 @@ func NewMetrics(reg prometheus.Registerer) Metrics {
 				Subsystem: "", // Explicitly empty to make this a top-level metric.
 				Name:      "workspace_builds_total",
 				Help:      "The number of workspaces started, updated, or deleted.",
-			}, []string{"owner_email", "workspace_name", "template_name", "template_version", "action", "status"}),
+			}, []string{"workspace_owner", "workspace_name", "template_name", "template_version", "workspace_transition", "status"}),
 		},
 	}
 }
@@ -353,8 +353,8 @@ func (p *Server) acquireJob(ctx context.Context) {
 
 	if build := job.GetWorkspaceBuild(); build != nil {
 		fields = append(fields,
-			slog.F("action", build.Metadata.WorkspaceTransition.String()),
-			slog.F("owner_email", build.Metadata.WorkspaceOwnerEmail),
+			slog.F("workspace_transition", build.Metadata.WorkspaceTransition.String()),
+			slog.F("workspace_owner", build.Metadata.WorkspaceOwner),
 			slog.F("template_name", build.Metadata.TemplateName),
 			slog.F("template_version", build.Metadata.TemplateVersion),
 			slog.F("workspace_build_id", build.WorkspaceBuildId),
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -118,13 +118,13 @@ func New(
 	logger := opts.Logger.With(slog.F("job_id", job.JobId))
 	if build := job.GetWorkspaceBuild(); build != nil {
 		logger = logger.With(
-			slog.F("action", build.Metadata.WorkspaceTransition.String()),
-			slog.F("owner_email", build.Metadata.WorkspaceOwnerEmail),
 			slog.F("template_name", build.Metadata.TemplateName),
 			slog.F("template_version", build.Metadata.TemplateVersion),
 			slog.F("workspace_build_id", build.WorkspaceBuildId),
 			slog.F("workspace_id", build.Metadata.WorkspaceId),
 			slog.F("workspace_name", build.Metadata.WorkspaceName),
+			slog.F("workspace_owner", build.Metadata.WorkspaceOwner),
+			slog.F("workspace_transition", build.Metadata.WorkspaceTransition.String()),
 		)
 	}
 
@@ -178,7 +178,7 @@ func (r *Runner) Run() {
 		concurrentGauge.Dec()
 		if build := r.job.GetWorkspaceBuild(); build != nil {
 			r.metrics.WorkspaceBuilds.WithLabelValues(
-				build.Metadata.WorkspaceOwnerEmail,
+				build.Metadata.WorkspaceOwner,
 				build.Metadata.WorkspaceName,
 				build.Metadata.TemplateName,
 				build.Metadata.TemplateVersion,
