remove uptime stat as it is trivial to implement in bash

johnstcn · johnstcn · commit 364340729b4c · 2023-06-13T17:33:36.000+01:00
diff --git a/cli/clistat/container.go b/cli/clistat/container.go
@@ -1,5 +1,3 @@
-//go:build !linux
-
 package clistat
 
 import (
diff --git a/cli/clistat/stat.go b/cli/clistat/stat.go
@@ -127,28 +127,3 @@ func (s *Statter) HostMemory() (*Result, error) {
 	r.Used = float64(hm.Used) / 1024 / 1024 / 1024
 	return r, nil
 }
-
-// Uptime returns the uptime of the host, in seconds.
-// If the host is containerized, this will return the uptime of the container
-// by checking /proc/1/stat.
-func (s *Statter) Uptime() (*Result, error) {
-	r := &Result{
-		Unit:  "minutes",
-		Total: nil, // Is time a finite quantity? For this purpose, no.
-	}
-
-	if ok, err := IsContainerized(s.fs); err == nil && ok {
-		procStat, err := sysinfo.Process(1)
-		if err != nil {
-			return nil, xerrors.Errorf("get pid 1 info: %w", err)
-		}
-		procInfo, err := procStat.Info()
-		if err != nil {
-			return nil, xerrors.Errorf("get pid 1 stat: %w", err)
-		}
-		r.Used = time.Since(procInfo.StartTime).Minutes()
-		return r, nil
-	}
-	r.Used = s.hi.Info().Uptime().Minutes()
-	return r, nil
-}
diff --git a/cli/clistat/stat_internal_test.go b/cli/clistat/stat_internal_test.go
@@ -75,15 +75,6 @@ func TestStatter(t *testing.T) {
 			assert.NotZero(t, disk.Total)
 			assert.NotZero(t, disk.Unit)
 		})
-
-		t.Run("Uptime", func(t *testing.T) {
-			t.Parallel()
-			uptime, err := s.Uptime()
-			require.NoError(t, err)
-			assert.NotZero(t, uptime.Used)
-			assert.Zero(t, uptime.Total)
-			assert.Equal(t, "minutes", uptime.Unit)
-		})
 	})
 
 	t.Run("CGroupV1", func(t *testing.T) {
diff --git a/cli/stat.go b/cli/stat.go
@@ -14,7 +14,7 @@ import (
 
 func (*RootCmd) stat() *clibase.Cmd {
 	fs := afero.NewReadOnlyFs(afero.NewOsFs())
-	defaultCols := []string{"host_cpu", "host_memory", "home_disk", "uptime"}
+	defaultCols := []string{"host_cpu", "host_memory", "home_disk"}
 	if ok, err := clistat.IsContainerized(fs); err == nil && ok {
 		// If running in a container, we assume that users want to see these first. Prepend.
 		defaultCols = append([]string{"container_cpu", "container_memory"}, defaultCols...)
@@ -68,13 +68,6 @@ func (*RootCmd) stat() *clibase.Cmd {
 			}
 			sr.Disk = ds
 
-			// Uptime is calculated either based on the host or the container, depending.
-			us, err := st.Uptime()
-			if err != nil {
-				return err
-			}
-			sr.Uptime = us
-
 			// Container-only stats.
 			if ok, err := clistat.IsContainerized(fs); err == nil && ok {
 				cs, err := st.ContainerCPU()
@@ -108,5 +101,4 @@ type statsRow struct {
 	Disk            *clistat.Result `json:"home_disk" table:"home_disk"`
 	ContainerCPU    *clistat.Result `json:"container_cpu" table:"container_cpu"`
 	ContainerMemory *clistat.Result `json:"container_memory" table:"container_memory"`
-	Uptime          *clistat.Result `json:"uptime" table:"uptime"`
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-//go:build !linux`
`2`		`-`
`3`	`1`	`package clistat`
`4`	`2`
`5`	`3`	`import (`