coder
diff --git a/‎coderd/telemetry/telemetry.go‎
Lines changed: 24 additions & 25 deletions b/‎coderd/telemetry/telemetry.go‎
Lines changed: 24 additions & 25 deletions
diff --git a/‎tailnet/conn.go‎
Lines changed: 1 addition & 0 deletions b/‎tailnet/conn.go‎
Lines changed: 1 addition & 0 deletions
@@ -1230,19 +1230,18 @@ func netcheckFromProto(proto *tailnetproto.Netcheck) Netcheck {
 
 // NetworkEvent and all related structs come from tailnet.proto.
 type NetworkEvent struct {
-	ID                  uuid.UUID               `json:"id"`
-	Time                time.Time               `json:"time"`
-	Application         string                  `json:"application"`
-	Status              string                  `json:"status"` // connected, disconnected
-	DisconnectionReason string                  `json:"disconnection_reason"`
-	ClientType          string                  `json:"client_type"` // cli, agent, coderd, wsproxy
-	ClientVersion       string                  `json:"client_version"`
-	NodeIDSelf          uint64                  `json:"node_id_self"`
-	NodeIDRemote        uint64                  `json:"node_id_remote"`
-	P2PEndpoint         NetworkEventP2PEndpoint `json:"p2p_endpoint"`
-	HomeDERP            int                     `json:"home_derp"`
-	DERPMap             DERPMap                 `json:"derp_map"`
-	LatestNetcheck      Netcheck                `json:"latest_netcheck"`
+	ID             uuid.UUID               `json:"id"`
+	Time           time.Time               `json:"time"`
+	Application    string                  `json:"application"`
+	Status         string                  `json:"status"`      // connected, disconnected
+	ClientType     string                  `json:"client_type"` // cli, agent, coderd, wsproxy
+	ClientVersion  string                  `json:"client_version"`
+	NodeIDSelf     uint64                  `json:"node_id_self"`
+	NodeIDRemote   uint64                  `json:"node_id_remote"`
+	P2PEndpoint    NetworkEventP2PEndpoint `json:"p2p_endpoint"`
+	HomeDERP       int                     `json:"home_derp"`
+	DERPMap        DERPMap                 `json:"derp_map"`
+	LatestNetcheck Netcheck                `json:"latest_netcheck"`
 
 	ConnectionAge   *time.Duration `json:"connection_age"`
 	ConnectionSetup *time.Duration `json:"connection_setup"`
@@ -1277,18 +1276,18 @@ func NetworkEventFromProto(proto *tailnetproto.TelemetryEvent) (NetworkEvent, er
 	}
 
 	return NetworkEvent{
-		ID:                  id,
-		Time:                proto.Time.AsTime(),
-		Application:         proto.Application,
-		Status:              strings.ToLower(proto.Status.String()),
-		DisconnectionReason: proto.DisconnectionReason,
-		ClientType:          strings.ToLower(proto.ClientType.String()),
-		NodeIDSelf:          proto.NodeIdSelf,
-		NodeIDRemote:        proto.NodeIdRemote,
-		P2PEndpoint:         p2pEndpointFromProto(proto.P2PEndpoint),
-		HomeDERP:            int(proto.HomeDerp),
-		DERPMap:             derpMapFromProto(proto.DerpMap),
-		LatestNetcheck:      netcheckFromProto(proto.LatestNetcheck),
+		ID:             id,
+		Time:           proto.Time.AsTime(),
+		Application:    proto.Application,
+		Status:         strings.ToLower(proto.Status.String()),
+		ClientType:     strings.ToLower(proto.ClientType.String()),
+		ClientVersion:  proto.ClientVersion,
+		NodeIDSelf:     proto.NodeIdSelf,
+		NodeIDRemote:   proto.NodeIdRemote,
+		P2PEndpoint:    p2pEndpointFromProto(proto.P2PEndpoint),
+		HomeDERP:       int(proto.HomeDerp),
+		DERPMap:        derpMapFromProto(proto.DerpMap),
+		LatestNetcheck: netcheckFromProto(proto.LatestNetcheck),
 
 		ConnectionAge:   protoDurationNil(proto.ConnectionAge),
 		ConnectionSetup: protoDurationNil(proto.ConnectionSetup),
 
@@ -733,6 +733,7 @@ func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {
 	c.telemetryStore.markConnected(&ip, application)
 	e := c.newTelemetryEvent()
 	e.Status = proto.TelemetryEvent_CONNECTED
+	e.ConnectionSetup = durationpb.New(time.Since(c.createdAt))
 	c.sendTelemetryBackground(e)
 }
Original file line number	Diff line number	Diff line change
`@@ -733,6 +733,7 @@ func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {`
`733`	`733`	`c.telemetryStore.markConnected(&ip, application)`
`734`	`734`	`e := c.newTelemetryEvent()`
`735`	`735`	`e.Status = proto.TelemetryEvent_CONNECTED`
	`736`	`+ e.ConnectionSetup = durationpb.New(time.Since(c.createdAt))`
`736`	`737`	`c.sendTelemetryBackground(e)`
`737`	`738`	`}`
`738`	`739`