telemetry on disconnect

ethanndickson · ethanndickson · commit ffd62caf447d · 2024-07-03T04:44:37.000Z
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

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,7 @@ func (r RootCmd) ssh() serpent.Command {`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`err = sshSession.Wait()`
	`440`	`+ conn.SendDisconnectedTelemetry("ssh")`
`440`	`441`	`if err != nil {`
`441`	`442`	`if exitErr := (&gossh.ExitError{}); errors.As(err, &exitErr) {`
`442`	`443`	`// Clear the error since it's not useful beyond`
Original file line number	Diff line number	Diff line change
`@@ -380,3 +380,7 @@ func (c AgentConn) apiClient() http.Client {`
`380`	`380`	`func (c *AgentConn) GetPeerDiagnostics() tailnet.PeerDiagnostics {`
`381`	`381`	`return c.Conn.GetPeerDiagnostics(c.opts.AgentID)`
`382`	`382`	`}`
	`383`	`+`
	`384`	`+func (c *AgentConn) SendDisconnectedTelemetry(application string) {`
	`385`	`+ c.Conn.SendDisconnectedTelemetry(c.agentAddress(), application)`
	`386`	`+}`