Commitadba421

authored

refactor(coderd/telemetry): move CLI telemetry to cli/telemetry (#9517)

This change removes an indirect import of `coderd/database` from theslim binary.No size change (yet).Ref:#9380

1 parentb240799 commitadba421Copy full SHA for adba421

File tree

+24

-19

lines changed

+24

-19

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`	`"github.com/coder/coder/v2/cli/cliui"`
`37`	`37`	`"github.com/coder/coder/v2/cli/config"`
`38`	`38`	`"github.com/coder/coder/v2/cli/gitauth"`
`39`		`-"github.com/coder/coder/v2/coderd/telemetry"`
	`39`	`+"github.com/coder/coder/v2/cli/telemetry"`
`40`	`40`	`"github.com/coder/coder/v2/codersdk"`
`41`	`41`	`"github.com/coder/coder/v2/codersdk/agentsdk"`
`42`	`42`	`)`
`@@ -467,17 +467,17 @@ func addTelemetryHeader(client codersdk.Client, inv clibase.Invocation) {`
`467`	`467`	`client.HTTPClient.Transport=transport`
`468`	`468`	`}`
`469`	`469`
`470`		`-vartopts []telemetry.CLIOption`
	`470`	`+vartopts []telemetry.Option`
`471`	`471`	`for_,opt:=rangeinv.Command.FullOptions() {`
`472`	`472`	`ifopt.ValueSource==clibase.ValueSourceNone\|\|opt.ValueSource==clibase.ValueSourceDefault {`
`473`	`473`	`continue`
`474`	`474`	`}`
`475`		`-topts=append(topts, telemetry.CLIOption{`
	`475`	`+topts=append(topts, telemetry.Option{`
`476`	`476`	`Name:opt.Name,`
`477`	`477`	`ValueSource:string(opt.ValueSource),`
`478`	`478`	`})`
`479`	`479`	`}`
`480`		`-ti:= telemetry.CLIInvocation{`
	`480`	`+ti:= telemetry.Invocation{`
`481`	`481`	`Command:inv.Command.FullName(),`
`482`	`482`	`Options:topts,`
`483`	`483`	`InvokedAt:time.Now(),`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,15 @@`
	`1`	`+package telemetry`
	`2`	`+`
	`3`	`+import"time"`
	`4`	`+`
	`5`	`+typeOptionstruct {`
	`6`	+Namestring`json:"name"`
	`7`	+ValueSourcestring`json:"value_source"`
	`8`	`+}`
	`9`	`+`
	`10`	`+typeInvocationstruct {`
	`11`	+Commandstring`json:"command"`
	`12`	+Options []Option`json:"options"`
	`13`	`+// InvokedAt is provided for deduplication purposes.`
	`14`	+InvokedAt time.Time`json:"invoked_at"`
	`15`	`+}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"tailscale.com/tstime/rate"`
`12`	`12`
`13`	`13`	`"cdr.dev/slog"`
	`14`	`+clitelemetry"github.com/coder/coder/v2/cli/telemetry"`
`14`	`15`	`"github.com/coder/coder/v2/coderd/telemetry"`
`15`	`16`	`"github.com/coder/coder/v2/codersdk"`
`16`	`17`	`)`
`@@ -30,7 +31,7 @@ func ReportCLITelemetry(log slog.Logger, rep telemetry.Reporter) func(http.Handl`
`30`	`31`	`//`
`31`	`32`	`// This approach just helps us reduce storage and ingest fees, and doesn't`
`32`	`33`	`// change the correctness.`
`33`		`-queue=make(map[string]telemetry.CLIInvocation)`
	`34`	`+queue=make(map[string]clitelemetry.Invocation)`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`log=log.Named("cli-telemetry")`
`@@ -55,7 +56,7 @@ func ReportCLITelemetry(log slog.Logger, rep telemetry.Reporter) func(http.Handl`
`55`	`56`	`return`
`56`	`57`	`}`
`57`	`58`
`58`		`-varinvtelemetry.CLIInvocation`
	`59`	`+varinvclitelemetry.Invocation`
`59`	`60`	`err=json.Unmarshal(byt,&inv)`
`60`	`61`	`iferr!=nil {`
`61`	`62`	`log.Error(`

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`"cdr.dev/slog"`
`25`	`25`	`"github.com/coder/coder/v2/buildinfo"`
	`26`	`+clitelemetry"github.com/coder/coder/v2/cli/telemetry"`
`26`	`27`	`"github.com/coder/coder/v2/coderd/database"`
`27`	`28`	`"github.com/coder/coder/v2/coderd/database/dbtime"`
`28`	`29`	`)`
`@@ -714,7 +715,7 @@ type Snapshot struct {`
`714`	`715`	WorkspaceResources []WorkspaceResource`json:"workspace_resources"`
`715`	`716`	WorkspaceResourceMetadata []WorkspaceResourceMetadata`json:"workspace_resource_metadata"`
`716`	`717`	WorkspaceProxies []WorkspaceProxy`json:"workspace_proxies"`
`717`		-CLIInvocations []CLIInvocation`json:"cli_invocations"`
	`718`	+CLIInvocations []clitelemetry.Invocation`json:"cli_invocations"`
`718`	`719`	`}`
`719`	`720`
`720`	`721`	`// Deployment contains information about the host running Coder.`
`@@ -890,18 +891,6 @@ type License struct {`
`890`	`891`	UUID uuid.UUID`json:"uuid"`
`891`	`892`	`}`
`892`	`893`
`893`		`-typeCLIOptionstruct {`
`894`		-Namestring`json:"name"`
`895`		-ValueSourcestring`json:"value_source"`
`896`		`-}`
`897`		`-`
`898`		`-typeCLIInvocationstruct {`
`899`		-Commandstring`json:"command"`
`900`		-Options []CLIOption`json:"options"`
`901`		`-// InvokedAt is provided for deduplication purposes.`
`902`		-InvokedAt time.Time`json:"invoked_at"`
`903`		`-}`
`904`		`-`
`905`	`894`	`typeWorkspaceProxystruct {`
`906`	`895`	ID uuid.UUID`json:"id"`
`907`	`896`	Namestring`json:"name"`

Comments

(0)