meminfo: Fix the size mismatch in the swapTotal check mib for BSD.

phyber · phyber · commit b9d47c69d93a · 2019-05-14T17:10:26.000+01:00
Signed-off-by: David O'Rourke &lt;david.orourke@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 * [CHANGE]
 * [FEATURE]
 * [ENHANCEMENT]
-* [BUGFIX]
+* [BUGFIX] Fix incorrect sysctl call in BSD meminfo collector, resulting in broken swap metrics on FreeBSD #1345
 
 ## 0.18.0 / 2019-05-09
 
diff --git a/collector/memory_bsd.go b/collector/memory_bsd.go
@@ -47,7 +47,7 @@ func NewMemoryCollector() (Collector, error) {
 
 	mibSwapTotal := "vm.swap_total"
 	/* swap_total is FreeBSD specific. Fall back to Dfly specific mib if not present. */
-	_, err = unix.SysctlUint32(mibSwapTotal)
+	_, err = unix.SysctlUint64(mibSwapTotal)
 	if err != nil {
 		mibSwapTotal = "vm.swap_size"
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func NewMemoryCollector() (Collector, error) {`
`47`	`47`
`48`	`48`	`mibSwapTotal := "vm.swap_total"`
`49`	`49`	`/* swap_total is FreeBSD specific. Fall back to Dfly specific mib if not present. */`
`50`		`- _, err = unix.SysctlUint32(mibSwapTotal)`
	`50`	`+ _, err = unix.SysctlUint64(mibSwapTotal)`
`51`	`51`	`if err != nil {`
`52`	`52`	`mibSwapTotal = "vm.swap_size"`
`53`	`53`	`}`