chore: query container memory if available

DanielleMaywood · DanielleMaywood · commit 87adb1d0dd53 · 2025-03-23T19:35:07.000Z
diff --git a/agent/proto/resourcesmonitor/fetcher.go b/agent/proto/resourcesmonitor/fetcher.go
@@ -13,19 +13,29 @@ type Fetcher interface {
 
 type fetcher struct {
 	*clistat.Statter
+	isContainerized bool
 }
 
 //nolint:revive
 func NewFetcher(f *clistat.Statter) *fetcher {
-	return &fetcher{
-		f,
-	}
+	isContainerized, _ := f.IsContainerized()
+
+	return &fetcher{f, isContainerized}
 }
 
 func (f *fetcher) FetchMemory() (total int64, used int64, err error) {
-	mem, err := f.HostMemory(clistat.PrefixDefault)
-	if err != nil {
-		return 0, 0, xerrors.Errorf("failed to fetch memory: %w", err)
+	var mem *clistat.Result
+
+	if f.isContainerized {
+		mem, err = f.ContainerMemory(clistat.PrefixDefault)
+		if err != nil {
+			return 0, 0, xerrors.Errorf("failed to fetch memory: %w", err)
+		}
+	} else {
+		mem, err = f.HostMemory(clistat.PrefixDefault)
+		if err != nil {
+			return 0, 0, xerrors.Errorf("failed to fetch memory: %w", err)
+		}
 	}
 
 	if mem.Total == nil {
diff --git a/cli/clistat/container.go b/cli/clistat/container.go
@@ -16,6 +16,10 @@ const (
 	kubernetesDefaultServiceAccountToken = "/var/run/secrets/kubernetes.io/serviceaccount/token" //nolint:gosec
 )
 
+func (s *Statter) IsContainerized() (ok bool, err error) {
+	return IsContainerized(s.fs)
+}
+
 // IsContainerized returns whether the host is containerized.
 // This is adapted from https://github.com/elastic/go-sysinfo/tree/main/providers/linux/container.go#L31
 // with modifications to support Sysbox containers.
