From 252d060a58326cda2cadf3ebb474a191cc86f4e1 Mon Sep 17 00:00:00 2001
From: rcourtman <courtmanr@gmail.com>
Date: Thu, 27 Nov 2025 10:08:37 +0000
Subject: [PATCH] refactor: use builtin max() and fix unused parameter

- Replace custom maxInt64 helper with Go 1.21+ builtin max()
- Mark unused cfg parameter in newAdaptiveIntervalSelector
- Remove test for deleted helper function
---
 internal/monitoring/helpers_test.go    | 11 -----------
 internal/monitoring/monitor.go         | 23 ++++++++---------------
 internal/monitoring/monitor_polling.go | 16 ++++++++--------
 internal/monitoring/scheduler.go       |  2 +-
 4 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/internal/monitoring/helpers_test.go b/internal/monitoring/helpers_test.go
index d11f62ffe..0f257f88c 100644
--- a/internal/monitoring/helpers_test.go
+++ b/internal/monitoring/helpers_test.go
@@ -207,17 +207,6 @@ func TestSafeFloat(t *testing.T) {
 	}
 }
 
-func TestMaxInt64(t *testing.T) {
-	t.Parallel()
-
-	if got := maxInt64(5, 10); got != 10 {
-		t.Fatalf("expected 10, got %d", got)
-	}
-	if got := maxInt64(-1, -5); got != -1 {
-		t.Fatalf("expected -1, got %d", got)
-	}
-}
-
 func TestConvertPoolInfoToModel(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/monitoring/monitor.go b/internal/monitoring/monitor.go
index 050b4637e..3fba8164b 100644
--- a/internal/monitoring/monitor.go
+++ b/internal/monitoring/monitor.go
@@ -624,13 +624,6 @@ func safePercentage(used, total float64) float64 {
 	return result
 }
 
-// maxInt64 returns the maximum of two int64 values
-func maxInt64(a, b int64) int64 {
-	if a > b {
-		return a
-	}
-	return b
-}
 
 // safeFloat ensures a float value is not NaN or Inf
 func safeFloat(val float64) float64 {
@@ -6769,10 +6762,10 @@ func (m *Monitor) pollVMsAndContainersEfficient(ctx context.Context, instanceNam
 				OSVersion:         osVersion,
 				AgentVersion:      agentVersion,
 				NetworkInterfaces: networkInterfaces,
-				NetworkIn:         maxInt64(0, int64(netInRate)),
-				NetworkOut:        maxInt64(0, int64(netOutRate)),
-				DiskRead:          maxInt64(0, int64(diskReadRate)),
-				DiskWrite:         maxInt64(0, int64(diskWriteRate)),
+				NetworkIn:         max(0, int64(netInRate)),
+				NetworkOut:        max(0, int64(netOutRate)),
+				DiskRead:          max(0, int64(diskReadRate)),
+				DiskWrite:         max(0, int64(diskWriteRate)),
 				Uptime:            int64(res.Uptime),
 				Template:          res.Template == 1,
 				LastSeen:          sampleTime,
@@ -6934,10 +6927,10 @@ func (m *Monitor) pollVMsAndContainersEfficient(ctx context.Context, instanceNam
 					Free:  int64(res.MaxDisk - res.Disk),
 					Usage: safePercentage(float64(res.Disk), float64(res.MaxDisk)),
 				},
-				NetworkIn:  maxInt64(0, int64(netInRate)),
-				NetworkOut: maxInt64(0, int64(netOutRate)),
-				DiskRead:   maxInt64(0, int64(diskReadRate)),
-				DiskWrite:  maxInt64(0, int64(diskWriteRate)),
+				NetworkIn:  max(0, int64(netInRate)),
+				NetworkOut: max(0, int64(netOutRate)),
+				DiskRead:   max(0, int64(diskReadRate)),
+				DiskWrite:  max(0, int64(diskWriteRate)),
 				Uptime:     int64(res.Uptime),
 				Template:   res.Template == 1,
 				LastSeen:   time.Now(),
diff --git a/internal/monitoring/monitor_polling.go b/internal/monitoring/monitor_polling.go
index 871afbc3a..bcb49ed78 100644
--- a/internal/monitoring/monitor_polling.go
+++ b/internal/monitoring/monitor_polling.go
@@ -743,10 +743,10 @@ func (m *Monitor) pollVMsWithNodes(ctx context.Context, instanceName string, cli
 					},
 					Disks:             individualDisks,
 					DiskStatusReason:  diskStatusReason,
-					NetworkIn:         maxInt64(0, int64(netInRate)),
-					NetworkOut:        maxInt64(0, int64(netOutRate)),
-					DiskRead:          maxInt64(0, int64(diskReadRate)),
-					DiskWrite:         maxInt64(0, int64(diskWriteRate)),
+					NetworkIn:         max(0, int64(netInRate)),
+					NetworkOut:        max(0, int64(netOutRate)),
+					DiskRead:          max(0, int64(diskReadRate)),
+					DiskWrite:         max(0, int64(diskWriteRate)),
 					Uptime:            int64(vm.Uptime),
 					Template:          vm.Template == 1,
 					LastSeen:          sampleTime,
@@ -998,10 +998,10 @@ func (m *Monitor) pollContainersWithNodes(ctx context.Context, instanceName stri
 						Free:  diskFreeBytes,
 						Usage: diskUsagePercent,
 					},
-					NetworkIn:  maxInt64(0, int64(netInRate)),
-					NetworkOut: maxInt64(0, int64(netOutRate)),
-					DiskRead:   maxInt64(0, int64(diskReadRate)),
-					DiskWrite:  maxInt64(0, int64(diskWriteRate)),
+					NetworkIn:  max(0, int64(netInRate)),
+					NetworkOut: max(0, int64(netOutRate)),
+					DiskRead:   max(0, int64(diskReadRate)),
+					DiskWrite:  max(0, int64(diskWriteRate)),
 					Uptime:     int64(container.Uptime),
 					Template:   container.Template == 1,
 					LastSeen:   time.Now(),
diff --git a/internal/monitoring/scheduler.go b/internal/monitoring/scheduler.go
index 20c394022..129c0080b 100644
--- a/internal/monitoring/scheduler.go
+++ b/internal/monitoring/scheduler.go
@@ -285,7 +285,7 @@ type adaptiveIntervalSelector struct {
 	errorPenalty   float64
 }
 
-func newAdaptiveIntervalSelector(cfg SchedulerConfig) *adaptiveIntervalSelector {
+func newAdaptiveIntervalSelector(_ SchedulerConfig) *adaptiveIntervalSelector {
 	return &adaptiveIntervalSelector{
 		state:          make(map[string]time.Duration),
 		rng:            rand.New(rand.NewSource(time.Now().UnixNano())),