NotificationsYou must be signed in to change notification settings
Fork1k
Star11.1k

Commitf431b8f

committed

cleanup

1 parent30cfbe3 commitf431b8fCopy full SHA for f431b8f

File tree

3 files changed

+10

-14

lines changed

scaletest/workspaceupdates

3 files changed

+10

-14

lines changed

`‎scaletest/workspaceupdates/config.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`typeConfigstruct {`
`15`		`-// User is the configuration for the user to create or use.`
	`15`	`+// User is the configuration for the user to create.`
`16`	`16`	User createusers.Config`json:"user"`
`17`	`17`
`18`	`18`	`// Workspace is the configuration for the workspace to create. The workspace`

`‎scaletest/workspaceupdates/metrics.go‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package workspaceupdates`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"strconv"`
`5`		`-"sync/atomic"`
`6`	`5`	`"time"`
`7`	`6`
`8`	`7`	`"github.com/prometheus/client_golang/prometheus"`
`@@ -11,8 +10,6 @@ import (`
`11`	`10`	`typeMetricsstruct {`
`12`	`11`	`WorkspaceUpdatesLatencySeconds prometheus.HistogramVec`
`13`	`12`	`WorkspaceUpdatesErrorsTotal prometheus.CounterVec`
`14`		`-`
`15`		`-numErrors atomic.Int64`
`16`	`13`	`}`
`17`	`14`
`18`	`15`	`funcNewMetrics(reg prometheus.Registerer)*Metrics {`
`@@ -41,6 +38,5 @@ func (m *Metrics) RecordCompletion(elapsed time.Duration, username string, owned`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`func (m*Metrics)AddError(usernamestring,ownedWorkspacesint64,actionstring) {`
`44`		`-m.numErrors.Add(1)`
`45`	`41`	`m.WorkspaceUpdatesErrorsTotal.WithLabelValues(username,strconv.Itoa(int(ownedWorkspaces)),action).Inc()`
`46`	`42`	`}`

`‎scaletest/workspaceupdates/run.go‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,23 +71,23 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {`
`71`	`71`	`r.client.SetLogBodies(true)`
`72`	`72`
`73`	`73`	`r.createUserRunner=createusers.NewRunner(r.client,r.cfg.User)`
`74`		`-newUser,err:=r.createUserRunner.RunReturningUser(ctx,id,logs)`
	`74`	`+newUserAndToken,err:=r.createUserRunner.RunReturningUser(ctx,id,logs)`
`75`	`75`	`iferr!=nil {`
`76`	`76`	`returnxerrors.Errorf("create user: %w",err)`
`77`	`77`	`}`
`78`		`-user:=newUser.User`
`79`		`-client:=codersdk.New(r.client.URL,`
`80`		`-codersdk.WithSessionToken(newUser.SessionToken),`
	`78`	`+newUser:=newUserAndToken.User`
	`79`	`+newUserClient:=codersdk.New(r.client.URL,`
	`80`	`+codersdk.WithSessionToken(newUserAndToken.SessionToken),`
`81`	`81`	`codersdk.WithLogger(logger),`
`82`	`82`	`codersdk.WithLogBodies())`
`83`	`83`
`84`		`-logger.Info(ctx,fmt.Sprintf("user %q created",user.Username),slog.F("id",user.ID.String()))`
	`84`	`+logger.Info(ctx,fmt.Sprintf("user %q created",newUser.Username),slog.F("id",newUser.ID.String()))`
`85`	`85`
`86`	`86`	`dialCtx,cancel:=context.WithTimeout(ctx,r.cfg.DialTimeout)`
`87`	`87`	`defercancel()`
`88`	`88`
`89`	`89`	`logger.Info(ctx,"connecting to workspace updates stream")`
`90`		`-clients,err:=r.dialTailnet(dialCtx,client,user,logger)`
	`90`	`+clients,err:=r.dialTailnet(dialCtx,newUserClient,newUser,logger)`
`91`	`91`	`iferr!=nil {`
`92`	`92`	`returnxerrors.Errorf("tailnet dial failed: %w",err)`
`93`	`93`	`}`
`@@ -99,7 +99,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {`
`99`	`99`
`100`	`100`	`completionCh:=make(chanerror,1)`
`101`	`101`	`gofunc() {`
`102`		`-completionCh<-r.watchWorkspaceUpdates(watchCtx,clients,user,logger)`
	`102`	`+completionCh<-r.watchWorkspaceUpdates(watchCtx,clients,newUser,logger)`
`103`	`103`	`}()`
`104`	`104`
`105`	`105`	`reachedBarrier=true`
`@@ -114,10 +114,10 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {`
`114`	`114`	`}`
`115`	`115`	`workspaceBuildConfig:=r.cfg.Workspace`
`116`	`116`	`workspaceBuildConfig.OrganizationID=r.cfg.User.OrganizationID`
`117`		`-workspaceBuildConfig.UserID=user.ID.String()`
	`117`	`+workspaceBuildConfig.UserID=newUser.ID.String()`
`118`	`118`	`workspaceBuildConfig.Request.Name=workspaceName`
`119`	`119`
`120`		`-runner:=workspacebuild.NewRunner(client,workspaceBuildConfig)`
	`120`	`+runner:=workspacebuild.NewRunner(newUserClient,workspaceBuildConfig)`
`121`	`121`	`r.workspacebuildRunners=append(r.workspacebuildRunners,runner)`
`122`	`122`
`123`	`123`	`logger.Info(ctx,fmt.Sprintf("creating workspace %d/%d",i+1,r.cfg.WorkspaceCount))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf431b8f

File tree

3 files changed

3 files changed

`‎scaletest/workspaceupdates/config.go‎`

`‎scaletest/workspaceupdates/metrics.go‎`

`‎scaletest/workspaceupdates/run.go‎`

0 commit comments