feat: enable agent connection reports by default, remove flag (#16778)

mafredri · mafredri · commit 0e0717772dbc · 2025-03-04T22:44:35.000Z
This change enables agent connection reports by default and removes the experimental flag for enabling them. Updates #15139 (cherry picked from commit dfcd93b)
diff --git a/agent/agent.go b/agent/agent.go
@@ -783,11 +783,6 @@ const (
 )
 
 func (a *agent) reportConnection(id uuid.UUID, connectionType proto.Connection_Type, ip string) (disconnected func(code int, reason string)) {
-	// If the experiment hasn't been enabled, we don't report connections.
-	if !a.experimentalConnectionReports {
-		return func(int, string) {} // Noop.
-	}
-
 	// Remove the port from the IP because ports are not supported in coderd.
 	if host, _, err := net.SplitHostPort(ip); err != nil {
 		a.logger.Error(a.hardCtx, "split host and port for connection report failed", slog.F("ip", ip), slog.Error(err))
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -169,9 +169,7 @@ func TestAgent_Stats_Magic(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 		//nolint:dogsled
-		conn, agentClient, stats, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
-			o.ExperimentalConnectionReports = true
-		})
+		conn, agentClient, stats, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
 		sshClient, err := conn.SSHClient(ctx)
 		require.NoError(t, err)
 		defer sshClient.Close()
@@ -239,9 +237,7 @@ func TestAgent_Stats_Magic(t *testing.T) {
 		remotePort := sc.Text()
 
 		//nolint:dogsled
-		conn, agentClient, stats, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
-			o.ExperimentalConnectionReports = true
-		})
+		conn, agentClient, stats, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
 		sshClient, err := conn.SSHClient(ctx)
 		require.NoError(t, err)
 
@@ -956,9 +952,7 @@ func TestAgent_SFTP(t *testing.T) {
 		home = "/" + strings.ReplaceAll(home, "\\", "/")
 	}
 	//nolint:dogsled
-	conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
-		o.ExperimentalConnectionReports = true
-	})
+	conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
 	sshClient, err := conn.SSHClient(ctx)
 	require.NoError(t, err)
 	defer sshClient.Close()
@@ -994,9 +988,7 @@ func TestAgent_SCP(t *testing.T) {
 	defer cancel()
 
 	//nolint:dogsled
-	conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
-		o.ExperimentalConnectionReports = true
-	})
+	conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
 	sshClient, err := conn.SSHClient(ctx)
 	require.NoError(t, err)
 	defer sshClient.Close()
@@ -1039,7 +1031,6 @@ func TestAgent_FileTransferBlocked(t *testing.T) {
 		//nolint:dogsled
 		conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
 			o.BlockFileTransfer = true
-			o.ExperimentalConnectionReports = true
 		})
 		sshClient, err := conn.SSHClient(ctx)
 		require.NoError(t, err)
@@ -1060,7 +1051,6 @@ func TestAgent_FileTransferBlocked(t *testing.T) {
 		//nolint:dogsled
 		conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
 			o.BlockFileTransfer = true
-			o.ExperimentalConnectionReports = true
 		})
 		sshClient, err := conn.SSHClient(ctx)
 		require.NoError(t, err)
@@ -1089,7 +1079,6 @@ func TestAgent_FileTransferBlocked(t *testing.T) {
 				//nolint:dogsled
 				conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
 					o.BlockFileTransfer = true
-					o.ExperimentalConnectionReports = true
 				})
 				sshClient, err := conn.SSHClient(ctx)
 				require.NoError(t, err)
@@ -1720,9 +1709,7 @@ func TestAgent_ReconnectingPTY(t *testing.T) {
 			defer cancel()
 
 			//nolint:dogsled
-			conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
-				o.ExperimentalConnectionReports = true
-			})
+			conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
 			id := uuid.New()
 
 			// Test that the connection is reported. This must be tested in the
diff --git a/cli/agent.go b/cli/agent.go
@@ -54,8 +54,6 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
 		agentHeaderCommand   string
 		agentHeader          []string
 		devcontainersEnabled bool
-
-		experimentalConnectionReports bool
 	)
 	cmd := &serpent.Command{
 		Use:   "agent",
@@ -327,10 +325,6 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
 				containerLister = agentcontainers.NewDocker(execer)
 			}
 
-			if experimentalConnectionReports {
-				logger.Info(ctx, "experimental connection reports enabled")
-			}
-
 			agnt := agent.New(agent.Options{
 				Client:            client,
 				Logger:            logger,
