Fix minor bugs identified by CI

ammario · ammario · commit 3b55d4be5165 · 2022-08-30T05:55:18.000Z
diff --git a/agent/stats_test.go b/agent/stats_test.go
@@ -20,7 +20,7 @@ func TestConnStats(t *testing.T) {
 		c1, c2 := net.Pipe()
 
 		payload := []byte("dogs & cats")
-		statsConn := &agent.ConnStats{Conn: c1}
+		statsConn := &agent.ConnStats{Conn: c1, ProtocolStats: &agent.ProtocolStats{}}
 
 		got := make(chan []byte)
 		go func() {
@@ -44,7 +44,7 @@ func TestConnStats(t *testing.T) {
 		c1, c2 := net.Pipe()
 
 		payload := []byte("cats & dogs")
-		statsConn := &agent.ConnStats{Conn: c1}
+		statsConn := &agent.ConnStats{Conn: c1, ProtocolStats: &agent.ProtocolStats{}}
 
 		go func() {
 			c2.Write(payload)
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -342,7 +342,7 @@ func New(options *Options) *API {
 				r.Use(
 					apiKeyMiddleware,
 				)
-				r.Get("/daus", api.getDAUs)
+				r.Get("/daus", api.daus)
 			})
 		})
 		r.Route("/workspaceagents", func(r chi.Router) {
diff --git a/coderd/metrics.go b/coderd/metrics.go
@@ -21,7 +21,7 @@ import (
 
 const AgentStatIntervalEnv = "CODER_AGENT_STAT_INTERVAL"
 
-func (api *API) getDAUs(rw http.ResponseWriter, r *http.Request) {
+func (api *API) daus(rw http.ResponseWriter, r *http.Request) {
 	if !api.Authorize(r, rbac.ActionRead, rbac.ResourceMetrics) {
 		httpapi.Forbidden(rw)
 		return
diff --git a/codersdk/metrics.go b/codersdk/metrics.go
@@ -130,6 +130,8 @@ func (c *Client) GetDAUsFromAgentStats(ctx context.Context) (*GetDAUsResponse, e
 	return &resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
+// @typescript-ignore AgentStatsReportRequest
+
 // AgentStatsReportRequest is a WebSocket request by coderd
 // to the agent for stats.
 type AgentStatsReportRequest struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -29,9 +29,6 @@ export interface AgentGitSSHKey {
   readonly private_key: string
 }
 
-// From codersdk/metrics.go
-export interface AgentStatsReportRequest {}
-
 // From codersdk/metrics.go
 export interface AgentStatsReportResponse {
   readonly num_comms: number

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ func New(options Options) API {`
`342`	`342`	`r.Use(`
`343`	`343`	`apiKeyMiddleware,`
`344`	`344`	`)`
`345`		`- r.Get("/daus", api.getDAUs)`
	`345`	`+ r.Get("/daus", api.daus)`
`346`	`346`	`})`
`347`	`347`	`})`
`348`	`348`	`r.Route("/workspaceagents", func(r chi.Router) {`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@ func (c Client) GetDAUsFromAgentStats(ctx context.Context) (GetDAUsResponse, e`
`130`	`130`	`return &resp, json.NewDecoder(res.Body).Decode(&resp)`
`131`	`131`	`}`
`132`	`132`
	`133`	`+// @typescript-ignore AgentStatsReportRequest`
	`134`	`+`
`133`	`135`	`// AgentStatsReportRequest is a WebSocket request by coderd`
`134`	`136`	`// to the agent for stats.`
`135`	`137`	`type AgentStatsReportRequest struct {`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@ export interface AgentGitSSHKey {`
`29`	`29`	`readonly private_key: string`
`30`	`30`	`}`
`31`	`31`
`32`		`-// From codersdk/metrics.go`
`33`		`-export interface AgentStatsReportRequest {}`
`34`		`-`
`35`	`32`	`// From codersdk/metrics.go`
`36`	`33`	`export interface AgentStatsReportResponse {`
`37`	`34`	`readonly num_comms: number`