limit to just ssh for now

f0ssel · f0ssel · commit 1ab57a4c1c9a · 2024-06-14T20:02:03.000Z
diff --git a/coderd/agentapi/stats.go b/coderd/agentapi/stats.go
@@ -58,13 +58,14 @@ func (a *StatsAPI) UpdateStats(ctx context.Context, req *agentproto.UpdateStatsR
 	)
 
 	if a.Experiments.Enabled(codersdk.ExperimentWorkspaceUsage) {
-		// Session agent stats are being handled by postWorkspaceUsage route when this
+		// Certain session agent stats are being handled by postWorkspaceUsage route when this
 		// experiment is enabled. We still want most of the stats data but will zero
 		// out the ones being written elsewhere.
-		req.Stats.SessionCountVscode = 0
-		req.Stats.SessionCountJetbrains = 0
-		req.Stats.SessionCountReconnectingPty = 0
 		req.Stats.SessionCountSsh = 0
+		// TODO: More session types will be enabled as we migrate over.
+		// req.Stats.SessionCountVscode = 0
+		// req.Stats.SessionCountJetbrains = 0
+		// req.Stats.SessionCountReconnectingPty = 0
 	}
 
 	err = a.StatsReporter.ReportAgentStats(
diff --git a/coderd/agentapi/stats_test.go b/coderd/agentapi/stats_test.go
@@ -499,10 +499,11 @@ func TestUpdateStates(t *testing.T) {
 		batcher.mu.Lock()
 		defer batcher.mu.Unlock()
 		require.EqualValues(t, int64(1), batcher.called)
-		require.EqualValues(t, batcher.lastStats.SessionCountVscode, 0)
-		require.EqualValues(t, batcher.lastStats.SessionCountJetbrains, 0)
-		require.EqualValues(t, batcher.lastStats.SessionCountReconnectingPty, 0)
 		require.EqualValues(t, batcher.lastStats.SessionCountSsh, 0)
+		// TODO: other session values will come as they are migrated over
+		// require.EqualValues(t, batcher.lastStats.SessionCountVscode, 0)
+		// require.EqualValues(t, batcher.lastStats.SessionCountJetbrains, 0)
+		// require.EqualValues(t, batcher.lastStats.SessionCountReconnectingPty, 0)
 	})
 }
 
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1179,14 +1179,15 @@ func (api *API) postWorkspaceUsage(rw http.ResponseWriter, r *http.Request) {
 		ConnectionCount: 1,
 	}
 	switch req.AppName {
-	case codersdk.UsageAppNameVscode:
-		stat.SessionCountVscode = 1
-	case codersdk.UsageAppNameJetbrains:
-		stat.SessionCountJetbrains = 1
-	case codersdk.UsageAppNameReconnectingPty:
-		stat.SessionCountReconnectingPty = 1
 	case codersdk.UsageAppNameSSH:
 		stat.SessionCountSsh = 1
+	// TODO: More session types will be enabled as we migrate over.
+	// case codersdk.UsageAppNameVscode:
+	// 	stat.SessionCountVscode = 1
+	// case codersdk.UsageAppNameJetbrains:
+	// 	stat.SessionCountJetbrains = 1
+	// case codersdk.UsageAppNameReconnectingPty:
+	// 	stat.SessionCountReconnectingPty = 1
 	default:
 		// This means the app_name is in the codersdk.AllowedAppNames but not being
 		// handled by this switch statement.
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -331,10 +331,11 @@ const (
 )
 
 var AllowedAppNames = []UsageAppName{
-	UsageAppNameVscode,
-	UsageAppNameJetbrains,
-	UsageAppNameReconnectingPty,
 	UsageAppNameSSH,
+	// TODO: More session types will be enabled as we migrate over.
+	// UsageAppNameVscode,
+	// UsageAppNameJetbrains,
+	// UsageAppNameReconnectingPty,
 }
 
 // PostWorkspaceUsage marks the workspace as having been used recently and records an app stat.

Original file line number	Diff line number	Diff line change
`@@ -331,10 +331,11 @@ const (`
`331`	`331`	`)`
`332`	`332`
`333`	`333`	`var AllowedAppNames = []UsageAppName{`
`334`		`- UsageAppNameVscode,`
`335`		`- UsageAppNameJetbrains,`
`336`		`- UsageAppNameReconnectingPty,`
`337`	`334`	`UsageAppNameSSH,`
	`335`	`+ // TODO: More session types will be enabled as we migrate over.`
	`336`	`+ // UsageAppNameVscode,`
	`337`	`+ // UsageAppNameJetbrains,`
	`338`	`+ // UsageAppNameReconnectingPty,`
`338`	`339`	`}`
`339`	`340`
`340`	`341`	`// PostWorkspaceUsage marks the workspace as having been used recently and records an app stat.`