Ensure no null responses

ammario · ammario · commit eb1c042b6870 · 2022-08-31T02:30:33.000Z
diff --git a/coderd/metrics.go b/coderd/metrics.go
@@ -25,8 +25,11 @@ func (api *API) daus(rw http.ResponseWriter, r *http.Request) {
 		httpapi.Forbidden(rw)
 		return
 	}
-
-	httpapi.Write(rw, http.StatusOK, api.metricsCache.GetDAUs())
+	resp := api.metricsCache.GetDAUs()
+	if resp.Entries == nil {
+		resp.Entries = []codersdk.DAUEntry{}
+	}
+	httpapi.Write(rw, http.StatusOK, resp)
 }
 
 const AgentStatIntervalEnv = "CODER_AGENT_STAT_INTERVAL_MS"
diff --git a/coderd/metrics_test.go b/coderd/metrics_test.go
@@ -27,6 +27,7 @@ func init() {
 }
 func TestWorkspaceReportStats(t *testing.T) {
 	t.Parallel()
+
 	client := coderdtest.New(t, &coderdtest.Options{
 		IncludeProvisionerD: true,
 	})
@@ -76,6 +77,13 @@ func TestWorkspaceReportStats(t *testing.T) {
 		Logger: slogtest.Make(t, nil).Named("client"),
 	}
 
+	daus, err := client.GetDAUsFromAgentStats(context.Background())
+	require.NoError(t, err)
+
+	require.Equal(t, &codersdk.GetDAUsResponse{
+		Entries: []codersdk.DAUEntry{},
+	}, daus, "no DAUs when stats are empty")
+
 	conn, err := client.DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, opts)
 	require.NoError(t, err)
 	defer func() {
@@ -95,7 +103,7 @@ func TestWorkspaceReportStats(t *testing.T) {
 	// and metrics cache to refresh.
 	time.Sleep(time.Second * 5)
 
-	daus, err := client.GetDAUsFromAgentStats(context.Background())
+	daus, err = client.GetDAUsFromAgentStats(context.Background())
 	require.NoError(t, err)
 
 	require.Equal(t, &codersdk.GetDAUsResponse{
diff --git a/site/src/pages/UsersPage/DAUChart.tsx b/site/src/pages/UsersPage/DAUChart.tsx
@@ -31,6 +31,9 @@ import { HelpTooltip, HelpTooltipText, HelpTooltipTitle } from "components/Toolt
 ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend)
 
 export const DAUChart: FC<DAUChartProps> = ({ userMetricsData }) => {
+  if (userMetricsData.entries.length === 0) {
+    return <p>DAU stats are loading. Check back later.</p>
+  }
   const theme: Theme = useTheme()
 
   const labels = userMetricsData.entries.map((val) => {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,11 @@ func (api API) daus(rw http.ResponseWriter, r http.Request) {`
`25`	`25`	`httpapi.Forbidden(rw)`
`26`	`26`	`return`
`27`	`27`	`}`
`28`		`-`
`29`		`- httpapi.Write(rw, http.StatusOK, api.metricsCache.GetDAUs())`
	`28`	`+ resp := api.metricsCache.GetDAUs()`
	`29`	`+ if resp.Entries == nil {`
	`30`	`+ resp.Entries = []codersdk.DAUEntry{}`
	`31`	`+ }`
	`32`	`+ httpapi.Write(rw, http.StatusOK, resp)`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`const AgentStatIntervalEnv = "CODER_AGENT_STAT_INTERVAL_MS"`