fix

mtojek · mtojek · commit 6eec4d7692e4 · 2023-05-18T20:29:18.000+02:00
diff --git a/agent/agent.go b/agent/agent.go
@@ -105,8 +105,10 @@ func New(options Options) Agent {
 			return "", nil
 		}
 	}
-	if options.PrometheusRegistry == nil {
-		options.PrometheusRegistry = prometheus.NewRegistry()
+
+	prometheusRegistry := options.PrometheusRegistry
+	if prometheusRegistry == nil {
+		prometheusRegistry = prometheus.NewRegistry()
 	}
 
 	ctx, cancelFunc := context.WithCancel(context.Background())
@@ -129,7 +131,7 @@ func New(options Options) Agent {
 		sshMaxTimeout:          options.SSHMaxTimeout,
 		subsystem:              options.Subsystem,
 
-		prometheusRegistry: options.PrometheusRegistry,
+		prometheusRegistry: prometheusRegistry,
 		metrics:            newAgentMetrics(options.PrometheusRegistry),
 	}
 	a.init(ctx)
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -71,8 +71,6 @@ type Server struct {
 	connCountJetBrains  atomic.Int64
 	connCountSSHSession atomic.Int64
 
-	prometheusRegistry *prometheus.Registry
-
 	metrics *sshServerMetrics
 }
 
diff --git a/cli/agent.go b/cli/agent.go
@@ -20,6 +20,9 @@ import (
 	"gopkg.in/natefinch/lumberjack.v2"
 	"tailscale.com/util/clientmetric"
 
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/expfmt"
+
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
 	"github.com/coder/coder/agent"
@@ -28,8 +31,6 @@ import (
 	"github.com/coder/coder/cli/clibase"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/codersdk/agentsdk"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/expfmt"
 )
 
 func (r *RootCmd) workspaceAgent() *clibase.Cmd {
@@ -400,7 +401,12 @@ func prometheusMetricsHandler(prometheusRegistry *prometheus.Registry, logger sl
 		}
 
 		for _, metricFamily := range metricFamilies {
-			expfmt.MetricFamilyToText(w, metricFamily)
+			_, err = expfmt.MetricFamilyToText(w, metricFamily)
+			if err != nil {
+				logger.Error(context.Background(), "expfmt.MetricFamilyToText failed", slog.Error(err))
+				return
+
+			}
 		}
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,10 @@ func New(options Options) Agent {`
`105`	`105`	`return "", nil`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`- if options.PrometheusRegistry == nil {`
`109`		`- options.PrometheusRegistry = prometheus.NewRegistry()`
	`108`	`+`
	`109`	`+ prometheusRegistry := options.PrometheusRegistry`
	`110`	`+ if prometheusRegistry == nil {`
	`111`	`+ prometheusRegistry = prometheus.NewRegistry()`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`ctx, cancelFunc := context.WithCancel(context.Background())`
`@@ -129,7 +131,7 @@ func New(options Options) Agent {`
`129`	`131`	`sshMaxTimeout: options.SSHMaxTimeout,`
`130`	`132`	`subsystem: options.Subsystem,`
`131`	`133`
`132`		`- prometheusRegistry: options.PrometheusRegistry,`
	`134`	`+ prometheusRegistry: prometheusRegistry,`
`133`	`135`	`metrics: newAgentMetrics(options.PrometheusRegistry),`
`134`	`136`	`}`
`135`	`137`	`a.init(ctx)`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,6 @@ type Server struct {`
`71`	`71`	`connCountJetBrains atomic.Int64`
`72`	`72`	`connCountSSHSession atomic.Int64`
`73`	`73`
`74`		`- prometheusRegistry *prometheus.Registry`
`75`		`-`
`76`	`74`	`metrics *sshServerMetrics`
`77`	`75`	`}`
`78`	`76`