Send agent metrics

mtojek · mtojek · commit dc202c4219f1 · 2023-04-24T12:30:32.000+02:00
diff --git a/agent/agent.go b/agent/agent.go
@@ -16,7 +16,6 @@ import (
 	"os"
 	"os/user"
 	"path/filepath"
-	"reflect"
 	"sort"
 	"strconv"
 	"strings"
@@ -1221,11 +1220,11 @@ func (a *agent) startReportingConnectionStats(ctx context.Context) {
 		// Convert from microseconds to milliseconds.
 		stats.ConnectionMedianLatencyMS /= 1000
 
-		lastStat := a.latestStat.Load()
-		if lastStat != nil && reflect.DeepEqual(lastStat, stats) {
-			a.logger.Info(ctx, "skipping stat because nothing changed")
-			return
-		}
+		// Collect agent metrics.
+		// Agent metrics are changing all the time, so there is no need to perform
+		// reflect.DeepEqual to see if stats should be transferred.
+		stats.Metrics = collectMetrics()
+
 		a.latestStat.Store(stats)
 
 		select {
diff --git a/agent/metrics.go b/agent/metrics.go
@@ -0,0 +1,34 @@
+package agent
+
+import (
+	"fmt"
+
+	"tailscale.com/util/clientmetric"
+
+	"github.com/coder/coder/codersdk/agentsdk"
+)
+
+func collectMetrics() []agentsdk.AgentMetric {
+	// Tailscale metrics
+	metrics := clientmetric.Metrics()
+	collected := make([]agentsdk.AgentMetric, 0, len(metrics))
+	for _, m := range metrics {
+		collected = append(collected, agentsdk.AgentMetric{
+			Name:  m.Name(),
+			Type:  asMetricType(m.Type()),
+			Value: float64(m.Value()),
+		})
+	}
+	return collected
+}
+
+func asMetricType(typ clientmetric.Type) agentsdk.AgentMetricType {
+	switch typ {
+	case clientmetric.TypeGauge:
+		return agentsdk.AgentMetricTypeGauge
+	case clientmetric.TypeCounter:
+		return agentsdk.AgentMetricTypeCounter
+	default:
+		panic(fmt.Sprintf("unknown metric type: %d", typ))
+	}
+}
diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
@@ -488,10 +488,17 @@ type Stats struct {
 	Metrics []AgentMetric `json:"metrics"`
 }
 
+type AgentMetricType string
+
+const (
+	AgentMetricTypeCounter AgentMetricType = "counter"
+	AgentMetricTypeGauge   AgentMetricType = "gauge"
+)
+
 type AgentMetric struct {
-	Name  string  `json:"name"`
-	Type  string  `json:"type"`
-	Value float64 `json:"value"`
+	Name  string          `json:"name" validate:"required"`
+	Type  AgentMetricType `json:"type" validate:"required" enums:"counter,gauge"`
+	Value float64         `json:"value" validate:"required"`
 }
 
 type StatsResponse struct {
