TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsweb: normalize common StableID's in bucketed stats, export as LabelMap

Browse Source 
Signed-off-by: Tom DNetto <tom@tailscale.com>
Updates: corp#17075
This commit is contained in:
Tom DNetto 2024-02-07 14:59:55 -08:00 committed by Tom
parent e0762fe331
commit 8d6d9d28ba
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tsweb/tsweb.go
View File

@ -26,6 +26,7 @@
"go4.org/mem" "go4.org/mem"
"tailscale.com/envknob" "tailscale.com/envknob"
"tailscale.com/metrics"
"tailscale.com/net/tsaddr" "tailscale.com/net/tsaddr"
"tailscale.com/tsweb/varz" "tailscale.com/tsweb/varz"
"tailscale.com/types/logger" "tailscale.com/types/logger"
@ -185,18 +186,18 @@ type BucketedStatsOptions struct {
// If non-nil, Started maintains a counter of all requests which // If non-nil, Started maintains a counter of all requests which
// have begun processing. // have begun processing.
Started *expvar.Map Started *metrics.LabelMap
// If non-nil, Finished maintains a counter of all requests which // If non-nil, Finished maintains a counter of all requests which
// have finished processing (that is, the HTTP handler has returned). // have finished processing (that is, the HTTP handler has returned).
Finished *expvar.Map Finished *metrics.LabelMap
} }
// normalizePathRegex matches components in a HTTP request path // normalizePathRegex matches components in a HTTP request path
// that should be replaced. // that should be replaced.
// //
// See: https://regex101.com/r/WIfpaR/1 for the explainer and test cases. // See: https://regex101.com/r/WIfpaR/1 for the explainer and test cases.
var normalizePathRegex = regexp.MustCompile("([a-fA-F0-9]{9,}|([^\\/])+\\.([^\\/]){2,})") var normalizePathRegex = regexp.MustCompile("([a-fA-F0-9]{9,}|([^\\/])+\\.([^\\/]){2,}|((n|k|u|L|t|S)[a-zA-Z0-9]{5,}(CNTRL|Djz1H|LV5CY|mxgaY|jNy1b)))")
// NormalizedPath returns the given path with the following modifications: // NormalizedPath returns the given path with the following modifications:
// //
@ -205,6 +206,7 @@ type BucketedStatsOptions struct {
// replaced by an ellipsis // replaced by an ellipsis
// - any path component containing a period with at least two characters // - any path component containing a period with at least two characters
// after the period (i.e. an email or domain) // after the period (i.e. an email or domain)
// - any path component consisting of a common Tailscale Stable ID.
func NormalizedPath(p string) string { func NormalizedPath(p string) string {
// Fastpath: No hex sequences in there we might have to trim. // Fastpath: No hex sequences in there we might have to trim.
// Avoids allocating. // Avoids allocating.

2
tsweb/tsweb_test.go
View File

@ -684,6 +684,8 @@ func TestBucket(t *testing.T) {
{"/api/v2/tailnet/jeremiah@squish.com/devices", "/api/v2/tailnet/…/devices"}, {"/api/v2/tailnet/jeremiah@squish.com/devices", "/api/v2/tailnet/…/devices"},
{"/machine/ssh/wait/5227109621243650/to/7111899293970143/a/a9e4e04cc01b", "/machine/ssh/wait/…/to/…/a/…"}, {"/machine/ssh/wait/5227109621243650/to/7111899293970143/a/a9e4e04cc01b", "/machine/ssh/wait/…/to/…/a/…"},
{"/a/831a4bf39856?refreshed=true", "/a/…"}, {"/a/831a4bf39856?refreshed=true", "/a/…"},
{"/c2n/nxaaa1CNTRL", "/c2n/…"},
{"/api/v2/tailnet/blueberries.com/keys/kxaDK21CNTRL", "/api/v2/tailnet/…/keys/…"},
} }
for _, tc := range tcs { for _, tc := range tcs {