Commit7adf582

committed

disable report on close when reporting telemetry disabled

1 parent9455ca5 commit7adf582Copy full SHA for 7adf582

File tree

+16

-12

lines changed

+16

-12

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -822,10 +822,11 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`822`	`822`
`823`	`823`	`if!vals.Telemetry.Enable.Value() {`
`824`	`824`	`reporter,err:=telemetry.New(telemetry.Options{`
`825`		`-DeploymentID:deploymentID,`
`826`		`-Database:options.Database,`
`827`		`-Logger:logger.Named("telemetry"),`
`828`		`-URL:vals.Telemetry.URL.Value(),`
	`825`	`+DeploymentID:deploymentID,`
	`826`	`+Database:options.Database,`
	`827`	`+Logger:logger.Named("telemetry"),`
	`828`	`+URL:vals.Telemetry.URL.Value(),`
	`829`	`+DisableReportOnClose:true,`
`829`	`830`	`})`
`830`	`831`	`iferr!=nil {`
`831`	`832`	`logger.Debug(ctx,"create telemetry reporter (disabled)",slog.Error(err))`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,11 @@ type Options struct {`
`47`	`47`	`// URL is an endpoint to direct telemetry towards!`
`48`	`48`	`URL*url.URL`
`49`	`49`
`50`		`-DeploymentIDstring`
`51`		`-DeploymentConfig*codersdk.DeploymentValues`
`52`		`-BuiltinPostgresbool`
`53`		`-Tunnelbool`
	`50`	`+DeploymentIDstring`
	`51`	`+DeploymentConfig*codersdk.DeploymentValues`
	`52`	`+BuiltinPostgresbool`
	`53`	`+Tunnelbool`
	`54`	`+DisableReportOnClosebool`
`54`	`55`
`55`	`56`	`SnapshotFrequency time.Duration`
`56`	`57`	`ParseLicenseJWTfunc(lic*License)error`
`@@ -175,10 +176,12 @@ func (r *remoteReporter) Close() {`
`175`	`176`	`close(r.closed)`
`176`	`177`	`now:=dbtime.Now()`
`177`	`178`	`r.shutdownAt=&now`
`178`		`-// Report a final collection of telemetry prior to close!`
`179`		`-// This could indicate final actions a user has taken, and`
`180`		`-// the time the deployment was shutdown.`
`181`		`-r.reportWithDeployment()`
	`179`	`+if!r.options.DisableReportOnClose {`
	`180`	`+// Report a final collection of telemetry prior to close!`
	`181`	`+// This could indicate final actions a user has taken, and`
	`182`	`+// the time the deployment was shutdown.`
	`183`	`+r.reportWithDeployment()`
	`184`	`+}`
`182`	`185`	`r.closeFunc()`
`183`	`186`	`}`
`184`	`187`

Comments

(0)