Commitd1df97b

authored and

committed

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

1 parent55f2e6e commitd1df97bCopy full SHA for d1df97b

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func NewMetrics(reg prometheus.Registerer) Metrics {`
`162`	`162`	`Subsystem:"",// Explicitly empty to make this a top-level metric.`
`163`	`163`	`Name:"workspace_builds_total",`
`164`	`164`	`Help:"The number of workspaces started, updated, or deleted.",`
`165`		`-}, []string{"owner_email","workspace_name","template_name","template_version","action","status"}),`
	`165`	`+}, []string{"workspace_owner","workspace_name","template_name","template_version","workspace_transition","status"}),`
`166`	`166`	`},`
`167`	`167`	`}`
`168`	`168`	`}`
`@@ -353,8 +353,8 @@ func (p *Server) acquireJob(ctx context.Context) {`
`353`	`353`
`354`	`354`	`ifbuild:=job.GetWorkspaceBuild();build!=nil {`
`355`	`355`	`fields=append(fields,`
`356`		`-slog.F("action",build.Metadata.WorkspaceTransition.String()),`
`357`		`-slog.F("owner_email",build.Metadata.WorkspaceOwnerEmail),`
	`356`	`+slog.F("workspace_transition",build.Metadata.WorkspaceTransition.String()),`
	`357`	`+slog.F("workspace_owner",build.Metadata.WorkspaceOwner),`
`358`	`358`	`slog.F("template_name",build.Metadata.TemplateName),`
`359`	`359`	`slog.F("template_version",build.Metadata.TemplateVersion),`
`360`	`360`	`slog.F("workspace_build_id",build.WorkspaceBuildId),`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,13 +118,13 @@ func New(`
`118`	`118`	`logger:=opts.Logger.With(slog.F("job_id",job.JobId))`
`119`	`119`	`ifbuild:=job.GetWorkspaceBuild();build!=nil {`
`120`	`120`	`logger=logger.With(`
`121`		`-slog.F("action",build.Metadata.WorkspaceTransition.String()),`
`122`		`-slog.F("owner_email",build.Metadata.WorkspaceOwnerEmail),`
`123`	`121`	`slog.F("template_name",build.Metadata.TemplateName),`
`124`	`122`	`slog.F("template_version",build.Metadata.TemplateVersion),`
`125`	`123`	`slog.F("workspace_build_id",build.WorkspaceBuildId),`
`126`	`124`	`slog.F("workspace_id",build.Metadata.WorkspaceId),`
`127`	`125`	`slog.F("workspace_name",build.Metadata.WorkspaceName),`
	`126`	`+slog.F("workspace_owner",build.Metadata.WorkspaceOwner),`
	`127`	`+slog.F("workspace_transition",build.Metadata.WorkspaceTransition.String()),`
`128`	`128`	`)`
`129`	`129`	`}`
`130`	`130`
`@@ -178,7 +178,7 @@ func (r *Runner) Run() {`
`178`	`178`	`concurrentGauge.Dec()`
`179`	`179`	`ifbuild:=r.job.GetWorkspaceBuild();build!=nil {`
`180`	`180`	`r.metrics.WorkspaceBuilds.WithLabelValues(`
`181`		`-build.Metadata.WorkspaceOwnerEmail,`
	`181`	`+build.Metadata.WorkspaceOwner,`
`182`	`182`	`build.Metadata.WorkspaceName,`
`183`	`183`	`build.Metadata.TemplateName,`
`184`	`184`	`build.Metadata.TemplateVersion,`

Comments

(0)