TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: add client metrics for profile switching

Browse Source 
Updates #713

Signed-off-by: Mihai Parparita <mihai@tailscale.com>
This commit is contained in:
Mihai Parparita 2022-11-15 14:41:36 -08:00 committed by Mihai Parparita
parent b08f37d069
commit d3878ecd62
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipn/ipnlocal/profiles.go
View File

@ -15,6 +15,7 @@
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/clientmetric"
"tailscale.com/util/strs" "tailscale.com/util/strs"
"tailscale.com/version" "tailscale.com/version"
) )
@ -201,6 +202,8 @@ func (pm *profileManager) Profiles() []ipn.LoginProfile {
// SwitchProfile switches to the profile with the given id. // SwitchProfile switches to the profile with the given id.
// If the profile is not known, it returns an errProfileNotFound. // If the profile is not known, it returns an errProfileNotFound.
func (pm *profileManager) SwitchProfile(id ipn.ProfileID) error { func (pm *profileManager) SwitchProfile(id ipn.ProfileID) error {
metricSwitchProfile.Add(1)
kp, ok := pm.knownProfiles[id] kp, ok := pm.knownProfiles[id]
if !ok { if !ok {
return errProfileNotFound return errProfileNotFound
@ -268,6 +271,8 @@ func (pm *profileManager) CurrentProfile() ipn.LoginProfile {
// useful for deleting the last profile. In other cases, it is // useful for deleting the last profile. In other cases, it is
// recommended to call SwitchProfile() first. // recommended to call SwitchProfile() first.
func (pm *profileManager) DeleteProfile(id ipn.ProfileID) error { func (pm *profileManager) DeleteProfile(id ipn.ProfileID) error {
metricDeleteProfile.Add(1)
if id == "" && pm.isNewProfile { if id == "" && pm.isNewProfile {
// Deleting the in-memory only new profile, just create a new one. // Deleting the in-memory only new profile, just create a new one.
pm.NewProfile() pm.NewProfile()
@ -298,6 +303,8 @@ func (pm *profileManager) writeKnownProfiles() error {
// NewProfile creates and switches to a new unnamed profile. The new profile is // NewProfile creates and switches to a new unnamed profile. The new profile is
// not persisted until SetPrefs is called with a logged-in user. // not persisted until SetPrefs is called with a logged-in user.
func (pm *profileManager) NewProfile() { func (pm *profileManager) NewProfile() {
metricNewProfile.Add(1)
pm.prefs = emptyPrefs pm.prefs = emptyPrefs
pm.isNewProfile = true pm.isNewProfile = true
pm.currentProfile = &ipn.LoginProfile{} pm.currentProfile = &ipn.LoginProfile{}
@ -420,6 +427,7 @@ func newProfileManagerWithGOOS(store ipn.StateStore, logf logger.Logf, stateKey
} }
func (pm *profileManager) migrateFromLegacyPrefs() error { func (pm *profileManager) migrateFromLegacyPrefs() error {
metricMigration.Add(1)
pm.NewProfile() pm.NewProfile()
k := ipn.LegacyGlobalDaemonStateKey k := ipn.LegacyGlobalDaemonStateKey
switch { switch {
@ -432,13 +440,26 @@ func (pm *profileManager) migrateFromLegacyPrefs() error {
} }
prefs, err := pm.loadSavedPrefs(k) prefs, err := pm.loadSavedPrefs(k)
if err != nil { if err != nil {
metricMigrationError.Add(1)
return fmt.Errorf("calling ReadState on state store: %w", err) return fmt.Errorf("calling ReadState on state store: %w", err)
} }
pm.logf("migrating %q profile to new format", k) pm.logf("migrating %q profile to new format", k)
if err := pm.SetPrefs(prefs); err != nil { if err := pm.SetPrefs(prefs); err != nil {
metricMigrationError.Add(1)
return fmt.Errorf("migrating _daemon profile: %w", err) return fmt.Errorf("migrating _daemon profile: %w", err)
} }
// Do not delete the old state key, as we may be downgraded to an // Do not delete the old state key, as we may be downgraded to an
// older version that still relies on it. // older version that still relies on it.
metricMigrationSuccess.Add(1)
return nil return nil
} }
var (
metricNewProfile = clientmetric.NewCounter("profiles_new")
metricSwitchProfile = clientmetric.NewCounter("profiles_switch")
metricDeleteProfile = clientmetric.NewCounter("profiles_delete")
metricMigration = clientmetric.NewCounter("profiles_migration")
metricMigrationError = clientmetric.NewCounter("profiles_migration_error")
metricMigrationSuccess = clientmetric.NewCounter("profiles_migration_success")
)