From ffe3c4316845b6c776bacfa382b14b174a97bd31 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 15 Aug 2024 17:17:11 +0200 Subject: [PATCH] move metrics to health package Signed-off-by: Kristoffer Dalby --- cmd/tailscaled/tailscaled.go | 21 +++++++-------------- health/health.go | 12 ++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index 84ab8dc02..49e71247e 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -35,7 +35,11 @@ import ( "tailscale.com/control/controlclient" "tailscale.com/drive/driveimpl" "tailscale.com/envknob" +<<<<<<< HEAD "tailscale.com/hostinfo" +======= + "tailscale.com/health" +>>>>>>> 4a8cbaec4 (move metrics to health package) "tailscale.com/ipn" "tailscale.com/ipn/conffile" "tailscale.com/ipn/ipnlocal" @@ -63,7 +67,6 @@ import ( "tailscale.com/util/clientmetric" "tailscale.com/util/multierr" "tailscale.com/util/osshare" - "tailscale.com/util/usermetric" "tailscale.com/version" "tailscale.com/version/distro" "tailscale.com/wgengine" @@ -341,11 +344,11 @@ func run() (err error) { sys := new(tsd.System) - health := sys.HealthTracker() - metricHealthMessages.Set(healthMessageLabel{ + healthTracker := sys.HealthTracker() + health.MetricHealthMessage.Set(health.MetricHealthMessageLabel{ Severity: "warning", }, expvar.Func(func() any { - return health.OverallErrorCount() + return healthTracker.OverallErrorCount() })) // Parse config, if specified, to fail early if it's invalid. @@ -927,13 +930,3 @@ func applyIntegrationTestEnvKnob() { } } } - -type healthMessageLabel struct { - Severity string -} - -var metricHealthMessages = usermetric.NewMultiLabelMap[healthMessageLabel]( - "tailscaled_health_messages", - "gauge", - "Number of health messages broken down by severity.", -) diff --git a/health/health.go b/health/health.go index f7e220e70..64aa60c89 100644 --- a/health/health.go +++ b/health/health.go @@ -25,6 +25,7 @@ import ( "tailscale.com/util/mak" "tailscale.com/util/multierr" "tailscale.com/util/set" + "tailscale.com/util/usermetric" "tailscale.com/version" ) @@ -1244,3 +1245,14 @@ func (t *Tracker) checkReceiveFuncsLocked() { f.missing = true } } + + +type MetricHealthMessageLabel struct { + Severity string +} + +var MetricHealthMessage = usermetric.NewMultiLabelMap[MetricHealthMessageLabel]( + "tailscaled_health_messages", + "gauge", + "Number of health messages broken down by severity.", +)