application field

ethanndickson · ethanndickson · commit c0684bbf60f2 · 2024-07-02T13:40:06.000Z
diff --git a/codersdk/workspacesdk/agentconn.go b/codersdk/workspacesdk/agentconn.go
@@ -149,6 +149,7 @@ func (c *AgentConn) SSH(ctx context.Context) (*gonet.TCPConn, error) {
 		return nil, xerrors.Errorf("workspace agent not reachable in time: %v", ctx.Err())
 	}
 
+	c.Conn.SendConnectedTelemetry(c.agentAddress(), tailnet.TelemetryApplicationSSH)
 	return c.Conn.DialContextTCP(ctx, netip.AddrPortFrom(c.agentAddress(), AgentSSHPort))
 }
 
@@ -185,6 +186,7 @@ func (c *AgentConn) Speedtest(ctx context.Context, direction speedtest.Direction
 		return nil, xerrors.Errorf("workspace agent not reachable in time: %v", ctx.Err())
 	}
 
+	c.Conn.SendConnectedTelemetry(c.agentAddress(), tailnet.TelemetryApplicationSpeedtest)
 	speedConn, err := c.Conn.DialContextTCP(ctx, netip.AddrPortFrom(c.agentAddress(), AgentSpeedtestPort))
 	if err != nil {
 		return nil, xerrors.Errorf("dial speedtest: %w", err)
diff --git a/codersdk/workspacesdk/workspacesdk.go b/codersdk/workspacesdk/workspacesdk.go
@@ -21,6 +21,7 @@ import (
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/tailnet"
+	"github.com/coder/coder/v2/tailnet/proto"
 )
 
 // AgentIP is a static IPv6 address with the Tailscale prefix that is used to route
@@ -256,6 +257,7 @@ func (c *Client) DialAgent(dialCtx context.Context, agentID uuid.UUID, options *
 		Logger:              options.Logger,
 		BlockEndpoints:      c.client.DisableDirectConnections || options.BlockEndpoints,
 		CaptureHook:         options.CaptureHook,
+		ClientType:          proto.TelemetryEvent_CLI,
 		TelemetrySink:       telemetrySink,
 	})
 	if err != nil {
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -521,9 +521,6 @@ func (c *Conn) AwaitReachable(ctx context.Context, ip netip.Addr) bool {
 	for {
 		select {
 		case <-completedCtx.Done():
-			// TODO(ethanndickson): For now, I'm interpreting 'connected' as when the
-			// agent is reachable.
-			c.sendConnectedTelemetry(ip)
 			return true
 		case <-t.C:
 			// Pings can take a while, so we can run multiple
@@ -713,12 +710,13 @@ func (c *Conn) MagicsockServeHTTPDebug(w http.ResponseWriter, r *http.Request) {
 	c.magicConn.ServeHTTPDebug(w, r)
 }
 
-func (c *Conn) sendConnectedTelemetry(ip netip.Addr) {
+func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {
 	if c.telemetrySink == nil {
 		return
 	}
 	e := c.newTelemetryEvent()
 	e.Status = proto.TelemetryEvent_CONNECTED
+	e.Application = application
 	pip, ok := c.wireguardEngine.PeerForIP(ip)
 	if ok {
 		e.NodeIdRemote = uint64(pip.Node.ID)
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -17,6 +17,12 @@ import (
 	"github.com/coder/coder/v2/tailnet/proto"
 )
 
+// TODO(ethanndickson): How useful is the 'application' field?
+const (
+	TelemetryApplicationSSH       string = "ssh"
+	TelemetryApplicationSpeedtest string = "speedtest"
+)
+
 // Responsible for storing and anonymizing networking telemetry state.
 type TelemetryStore struct {
 	mu       sync.Mutex
@@ -50,7 +56,6 @@ func (b *TelemetryStore) newEvent() *proto.TelemetryEvent {
 		LatestNetcheck: b.cleanNetCheck,
 
 		// TODO(ethanndickson):
-		Application:     "",
 		ConnectionAge:   &durationpb.Duration{},
 		ConnectionSetup: &durationpb.Duration{},
 		P2PSetup:        &durationpb.Duration{},

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ func (c AgentConn) SSH(ctx context.Context) (gonet.TCPConn, error) {`
`149`	`149`	`return nil, xerrors.Errorf("workspace agent not reachable in time: %v", ctx.Err())`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ c.Conn.SendConnectedTelemetry(c.agentAddress(), tailnet.TelemetryApplicationSSH)`
`152`	`153`	`return c.Conn.DialContextTCP(ctx, netip.AddrPortFrom(c.agentAddress(), AgentSSHPort))`
`153`	`154`	`}`
`154`	`155`
`@@ -185,6 +186,7 @@ func (c *AgentConn) Speedtest(ctx context.Context, direction speedtest.Direction`
`185`	`186`	`return nil, xerrors.Errorf("workspace agent not reachable in time: %v", ctx.Err())`
`186`	`187`	`}`
`187`	`188`
	`189`	`+ c.Conn.SendConnectedTelemetry(c.agentAddress(), tailnet.TelemetryApplicationSpeedtest)`
`188`	`190`	`speedConn, err := c.Conn.DialContextTCP(ctx, netip.AddrPortFrom(c.agentAddress(), AgentSpeedtestPort))`
`189`	`191`	`if err != nil {`
`190`	`192`	`return nil, xerrors.Errorf("dial speedtest: %w", err)`