TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-22 21:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename usermetrics -> usermetric

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-08-12 14:46:49 +02:00
parent 9eec0d969c
commit a4945fc19e
No known key found for this signature in database
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/web/web.go
View File

@ -36,7 +36,7 @@ import (
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/httpm" "tailscale.com/util/httpm"
"tailscale.com/util/usermetrics" "tailscale.com/util/usermetric"
"tailscale.com/version" "tailscale.com/version"
"tailscale.com/version/distro" "tailscale.com/version/distro"
) )
@ -285,7 +285,7 @@ func (s *Server) serve(w http.ResponseWriter, r *http.Request) {
} }
if strings.HasPrefix(r.URL.Path, "/metrics") { if strings.HasPrefix(r.URL.Path, "/metrics") {
usermetrics.Handler(w, r) usermetric.Handler(w, r)
return return
} }

4
cmd/k8s-operator/depaware.txt
View File

@ -754,7 +754,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/
tailscale.com/tstime from tailscale.com/cmd/k8s-operator+ tailscale.com/tstime from tailscale.com/cmd/k8s-operator+
tailscale.com/tstime/mono from tailscale.com/net/tstun+ tailscale.com/tstime/mono from tailscale.com/net/tstun+
tailscale.com/tstime/rate from tailscale.com/derp+ tailscale.com/tstime/rate from tailscale.com/derp+
tailscale.com/tsweb/varz from tailscale.com/util/usermetrics tailscale.com/tsweb/varz from tailscale.com/util/usermetric
tailscale.com/types/appctype from tailscale.com/ipn/ipnlocal tailscale.com/types/appctype from tailscale.com/ipn/ipnlocal
tailscale.com/types/dnstype from tailscale.com/ipn/ipnlocal+ tailscale.com/types/dnstype from tailscale.com/ipn/ipnlocal+
tailscale.com/types/empty from tailscale.com/ipn+ tailscale.com/types/empty from tailscale.com/ipn+
@ -813,7 +813,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/
tailscale.com/util/testenv from tailscale.com/control/controlclient+ tailscale.com/util/testenv from tailscale.com/control/controlclient+
tailscale.com/util/truncate from tailscale.com/logtail tailscale.com/util/truncate from tailscale.com/logtail
tailscale.com/util/uniq from tailscale.com/ipn/ipnlocal+ tailscale.com/util/uniq from tailscale.com/ipn/ipnlocal+
tailscale.com/util/usermetrics from tailscale.com/client/web+ tailscale.com/util/usermetric from tailscale.com/client/web+
tailscale.com/util/vizerror from tailscale.com/tailcfg+ tailscale.com/util/vizerror from tailscale.com/tailcfg+
💣 tailscale.com/util/winutil from tailscale.com/clientupdate+ 💣 tailscale.com/util/winutil from tailscale.com/clientupdate+
W 💣 tailscale.com/util/winutil/authenticode from tailscale.com/clientupdate+ W 💣 tailscale.com/util/winutil/authenticode from tailscale.com/clientupdate+

4
cmd/tailscale/depaware.txt
View File

@ -132,7 +132,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
tailscale.com/tstime from tailscale.com/control/controlhttp+ tailscale.com/tstime from tailscale.com/control/controlhttp+
tailscale.com/tstime/mono from tailscale.com/tstime/rate tailscale.com/tstime/mono from tailscale.com/tstime/rate
tailscale.com/tstime/rate from tailscale.com/cmd/tailscale/cli+ tailscale.com/tstime/rate from tailscale.com/cmd/tailscale/cli+
tailscale.com/tsweb/varz from tailscale.com/util/usermetrics tailscale.com/tsweb/varz from tailscale.com/util/usermetric
tailscale.com/types/dnstype from tailscale.com/tailcfg tailscale.com/types/dnstype from tailscale.com/tailcfg
tailscale.com/types/empty from tailscale.com/ipn tailscale.com/types/empty from tailscale.com/ipn
tailscale.com/types/ipproto from tailscale.com/net/flowtrack+ tailscale.com/types/ipproto from tailscale.com/net/flowtrack+
@ -174,7 +174,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
tailscale.com/util/syspolicy/setting from tailscale.com/util/syspolicy tailscale.com/util/syspolicy/setting from tailscale.com/util/syspolicy
tailscale.com/util/testenv from tailscale.com/cmd/tailscale/cli tailscale.com/util/testenv from tailscale.com/cmd/tailscale/cli
tailscale.com/util/truncate from tailscale.com/cmd/tailscale/cli tailscale.com/util/truncate from tailscale.com/cmd/tailscale/cli
tailscale.com/util/usermetrics from tailscale.com/client/web tailscale.com/util/usermetric from tailscale.com/client/web
tailscale.com/util/vizerror from tailscale.com/tailcfg+ tailscale.com/util/vizerror from tailscale.com/tailcfg+
💣 tailscale.com/util/winutil from tailscale.com/clientupdate+ 💣 tailscale.com/util/winutil from tailscale.com/clientupdate+
W 💣 tailscale.com/util/winutil/authenticode from tailscale.com/clientupdate W 💣 tailscale.com/util/winutil/authenticode from tailscale.com/clientupdate

2
cmd/tailscaled/depaware.txt
View File

@ -403,7 +403,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
tailscale.com/util/testenv from tailscale.com/ipn/ipnlocal+ tailscale.com/util/testenv from tailscale.com/ipn/ipnlocal+
tailscale.com/util/truncate from tailscale.com/logtail tailscale.com/util/truncate from tailscale.com/logtail
tailscale.com/util/uniq from tailscale.com/ipn/ipnlocal+ tailscale.com/util/uniq from tailscale.com/ipn/ipnlocal+
tailscale.com/util/usermetrics from tailscale.com/client/web+ tailscale.com/util/usermetric from tailscale.com/client/web+
tailscale.com/util/vizerror from tailscale.com/tailcfg+ tailscale.com/util/vizerror from tailscale.com/tailcfg+
💣 tailscale.com/util/winutil from tailscale.com/clientupdate+ 💣 tailscale.com/util/winutil from tailscale.com/clientupdate+
W 💣 tailscale.com/util/winutil/authenticode from tailscale.com/clientupdate+ W 💣 tailscale.com/util/winutil/authenticode from tailscale.com/clientupdate+

4
control/controlclient/map.go
View File

@ -33,7 +33,7 @@ import (
"tailscale.com/util/clientmetric" "tailscale.com/util/clientmetric"
"tailscale.com/util/mak" "tailscale.com/util/mak"
"tailscale.com/util/set" "tailscale.com/util/set"
"tailscale.com/util/usermetrics" "tailscale.com/util/usermetric"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
) )
@ -362,7 +362,7 @@ type healthMessageLabel struct {
Severity string Severity string
} }
var metricHealthMessages = usermetrics.NewMultiLabelMap[healthMessageLabel]( var metricHealthMessages = usermetric.NewMultiLabelMap[healthMessageLabel](
"tailscaled_health_messages", "tailscaled_health_messages",
"gauge", "gauge",
"A gauge of health messages from control, by severity", "A gauge of health messages from control, by severity",

4
ipn/ipnlocal/local.go
View File

@ -107,7 +107,7 @@ import (
"tailscale.com/util/systemd" "tailscale.com/util/systemd"
"tailscale.com/util/testenv" "tailscale.com/util/testenv"
"tailscale.com/util/uniq" "tailscale.com/util/uniq"
"tailscale.com/util/usermetrics" "tailscale.com/util/usermetric"
"tailscale.com/version" "tailscale.com/version"
"tailscale.com/version/distro" "tailscale.com/version/distro"
"tailscale.com/wgengine" "tailscale.com/wgengine"
@ -4616,7 +4616,7 @@ func unmapIPPrefixes(ippsList ...[]netip.Prefix) (ret []netip.Prefix) {
return ret return ret
} }
var metricAdvertisedRoutes = usermetrics.NewMultiLabelMap[struct{}]( var metricAdvertisedRoutes = usermetric.NewMultiLabelMap[struct{}](
"tailscaled_advertised_routes", "tailscaled_advertised_routes",
"gauge", "gauge",
"Number of subnet routes advertised by the node. (excluding exit node /0 routes)", "Number of subnet routes advertised by the node. (excluding exit node /0 routes)",

6
net/tstun/wrap.go
View File

@ -34,7 +34,7 @@ import (
"tailscale.com/types/key" "tailscale.com/types/key"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/clientmetric" "tailscale.com/util/clientmetric"
"tailscale.com/util/usermetrics" "tailscale.com/util/usermetric"
"tailscale.com/wgengine/capture" "tailscale.com/wgengine/capture"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
"tailscale.com/wgengine/wgcfg" "tailscale.com/wgengine/wgcfg"
@ -1434,12 +1434,12 @@ type trafficLabel struct {
} }
var ( var (
metricInboundPacketsTotal = usermetrics.NewMultiLabelMap[trafficLabel]( metricInboundPacketsTotal = usermetric.NewMultiLabelMap[trafficLabel](
"tailscaled_inbound_packets_total", "tailscaled_inbound_packets_total",
"counter", "counter",
"Counts the number of packets received by the node from other peers", "Counts the number of packets received by the node from other peers",
) )
metricOutboundPacketsTotal = usermetrics.NewMultiLabelMap[trafficLabel]( metricOutboundPacketsTotal = usermetric.NewMultiLabelMap[trafficLabel](
"tailscaled_outbound_packets_total", "tailscaled_outbound_packets_total",
"counter", "counter",
"Counts the number of packets sent by the node to other peers", "Counts the number of packets sent by the node to other peers",

6
util/usermetrics/usermetrics.go → util/usermetric/usermetric.go
View File

@ -1,9 +1,9 @@
// Copyright (c) Tailscale Inc & AUTHORS // Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
// Package usermetrics provides a container and handler // Package usermetric provides a container and handler
// for user-facing metrics. // for user-facing metrics.
package usermetrics package usermetric
import ( import (
"expvar" "expvar"
@ -19,7 +19,7 @@ var vars expvar.Map
// MultiLabelMap[T] variable with the given name and returns it. // MultiLabelMap[T] variable with the given name and returns it.
// The variable is registered with the userfacing metrics package. // The variable is registered with the userfacing metrics package.
// //
// Note that usermetrics are not protected against duplicate // Note that usermetric are not protected against duplicate
// metrics name. It is the caller's responsibility to ensure that // metrics name. It is the caller's responsibility to ensure that
// the name is unique. // the name is unique.
func NewMultiLabelMap[T comparable](name string, promType, helpText string) *metrics.MultiLabelMap[T] { func NewMultiLabelMap[T comparable](name string, promType, helpText string) *metrics.MultiLabelMap[T] {