telemetry on disconnect

coder · ethanndickson · Jul 3, 2024 · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024
commit ffd62caf447d822055ca16b70087eb606169a351
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -437,6 +437,7 @@ func (r *RootCmd) ssh() *serpent.Command {
 			}
 
 			err = sshSession.Wait()
+			conn.SendDisconnectedTelemetry("ssh")
 			if err != nil {
 				if exitErr := (&gossh.ExitError{}); errors.As(err, &exitErr) {
 					// Clear the error since it's not useful beyond

diff --git a/codersdk/workspacesdk/agentconn.go b/codersdk/workspacesdk/agentconn.go
@@ -380,3 +380,7 @@ func (c *AgentConn) apiClient() *http.Client {
 func (c *AgentConn) GetPeerDiagnostics() tailnet.PeerDiagnostics {
 	return c.Conn.GetPeerDiagnostics(c.opts.AgentID)
 }
+
+func (c *AgentConn) SendDisconnectedTelemetry(application string) {
+	c.Conn.SendDisconnectedTelemetry(c.agentAddress(), application)
+}
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -727,6 +727,24 @@ func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {
 	}()
 }
 
+func (c *Conn) SendDisconnectedTelemetry(ip netip.Addr, application string) {
+	if c.telemetrySink == nil {
+		return
+	}
+	e := c.newTelemetryEvent()
+	e.Status = proto.TelemetryEvent_DISCONNECTED
+	e.Application = application
+	pip, ok := c.wireguardEngine.PeerForIP(ip)
+	if ok {
+		e.NodeIdRemote = uint64(pip.Node.ID)
+	}
+	c.telemetryWg.Add(1)
+	go func() {
+		defer c.telemetryWg.Done()
+		c.telemetrySink.SendTelemetryEvent(e)
+	}()
+}
+
 func (c *Conn) SendSpeedtestTelemetry(throughputMbits float64) {
 	if c.telemetrySink == nil {
 		return