chore: upgrade Go dependencies and Go to 1.24

Author: Thomas Delbende

agent/agent_test.go

@@ -18,7 +18,6 @@
 package agent
 
 import (
-	"context"
 	"net/url"
 	"testing"
 	"time"
@@ -515,7 +514,7 @@ func TestSMARTStatus(t *testing.T) {
 
 			store := store.New("test store", time.Minute, time.Minute)
 
-			store.PushPoints(context.Background(), test.points)
+			store.PushPoints(t.Context(), test.points)
 
 			gotMetric := statusFromLastPoint(now, store, "smart_device_health_ok", map[string]string{types.LabelName: "smart_device_health_status"}, smartHealthStatus)
 
@@ -811,7 +810,7 @@ func TestUPSDBatteryStatus(t *testing.T) { //nolint:maintidx
 
 			store := store.New("test store", time.Minute, time.Minute)
 
-			store.PushPoints(context.Background(), test.points)
+			store.PushPoints(t.Context(), test.points)
 
 			gotMetric := statusFromLastPoint(now, store, "upsd_status_flags", map[string]string{types.LabelName: "upsd_battery_status"}, upsdBatteryStatus)
 

agent/metric_test.go

@@ -1262,7 +1262,7 @@ func Benchmark_filters_no_match(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list1)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1274,7 +1274,7 @@ func Benchmark_filters_no_match(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list10)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1286,7 +1286,7 @@ func Benchmark_filters_no_match(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list100)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1326,7 +1326,7 @@ func Benchmark_filters_one_match_first(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list1)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1338,7 +1338,7 @@ func Benchmark_filters_one_match_first(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list10)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1350,7 +1350,7 @@ func Benchmark_filters_one_match_first(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list100)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1384,7 +1384,7 @@ func Benchmark_filters_one_match_middle(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list10)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1396,7 +1396,7 @@ func Benchmark_filters_one_match_middle(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list100)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1426,7 +1426,7 @@ func Benchmark_filters_one_match_last(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list10)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1438,7 +1438,7 @@ func Benchmark_filters_one_match_last(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list100)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1460,7 +1460,7 @@ func Benchmark_filters_all(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list10)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1472,7 +1472,7 @@ func Benchmark_filters_all(b *testing.B) {
 
 		b.ResetTimer()
 
-		for range b.N {
+		for b.Loop() {
 			copy(cop, list100)
 
 			metricFilter.FilterPoints(cop, false)
@@ -1670,7 +1670,7 @@ func Benchmark_MultipleFilters(b *testing.B) {
 	b.ResetTimer()
 
 	b.Run("or", func(b *testing.B) {
-		for range b.N {
+		for b.Loop() {
 			var allowed int
 
 			for _, lbls := range metrics {
@@ -1682,7 +1682,7 @@ func Benchmark_MultipleFilters(b *testing.B) {
 	})
 
 	b.Run("merge", func(b *testing.B) {
-		for range b.N {
+		for b.Loop() {
 			var allowed int
 
 			for _, lbls := range metrics {

bleemeo/internal/mqtt/mqtt_test.go

@@ -424,7 +424,7 @@ func BenchmarkFailedPointsDropping(b *testing.B) {
 
 	b.ResetTimer()
 
-	for range b.N {
+	for b.Loop() {
 		// Add 100 more points for each metric
 		for i := 1; i <= 10; i++ {
 			labels := map[string]string{labelID: strconv.Itoa(i)}

bleemeo/internal/synchronizer/execution_test.go

@@ -397,7 +397,7 @@ func TestExecution_LinkedSynchronization(t *testing.T) { //nolint:maintidx
 					}
 				}
 
-				e.applyNeedSynchronization(context.Background())
+				e.applyNeedSynchronization(t.Context())
 
 				for _, request := range tt.callsToRequestSynchronizationBefore {
 					e.RequestSynchronization(request.name, request.requestFull)

bleemeo/internal/synchronizer/helper_test.go

@@ -220,7 +220,7 @@ func (helper *syncTestHelper) pushPoints(t *testing.T, metrics []labels.Labels)
 		t.Fatal("pushPoints called before store is initialized")
 	}
 
-	helper.store.PushPoints(context.Background(), points)
+	helper.store.PushPoints(t.Context(), points)
 }
 
 func (helper *syncTestHelper) Close() {
@@ -274,7 +274,7 @@ func (helper *syncTestHelper) runOnceWithResult(t *testing.T) runOnceResult {
 func (helper *syncTestHelper) runOnceNoReset(t *testing.T) runOnceResult {
 	t.Helper()
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	result := runOnceResult{}
 

bleemeo/internal/synchronizer/syncapplications/applications_test.go

@@ -210,7 +210,7 @@ func Test_syncRemoteAndLocal(t *testing.T) {
 				ListResponse: tt.remoteApplication,
 			}
 
-			if err := syncRemoteAndLocal(context.Background(), tt.localServices, apiClient, cache); err != nil {
+			if err := syncRemoteAndLocal(t.Context(), tt.localServices, apiClient, cache); err != nil {
 				t.Errorf("syncRemoteAndLocal() error = %v", err)
 			}
 

check/process_test.go

@@ -17,7 +17,6 @@
 package check
 
 import (
-	"context"
 	"testing"
 
 	"github.com/bleemeo/glouton/facts"
@@ -120,7 +119,7 @@ func Test_processMainCheck(t *testing.T) {
 				t.Errorf("Failed to create process: %v", err)
 			}
 
-			status := pc.processMainCheck(context.Background())
+			status := pc.processMainCheck(t.Context())
 			if status.CurrentStatus != test.expectedStatus.CurrentStatus {
 				t.Errorf("Expected status %v, got %v", test.expectedStatus.CurrentStatus, status.CurrentStatus)
 			} else if status.StatusDescription != test.expectedStatus.StatusDescription {

collector/collector_test.go

@@ -17,7 +17,6 @@
 package collector
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -75,7 +74,7 @@ func TestAddRemove(t *testing.T) {
 }
 
 func TestRun(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	c := New(nil, gate.New(0))
 	c.runOnce(ctx, time.Now())
 
@@ -307,7 +306,7 @@ func TestMarkInactive(t *testing.T) {
 	t1 := t0.Add(10 * time.Second)
 	t2 := t1.Add(10 * time.Second)
 
-	err := c.RunGather(context.Background(), t0)
+	err := c.RunGather(t.Context(), t0)
 	if err != nil {
 		t.Fatalf("Unexpected c.RunGather() error: %v", err)
 	}
@@ -346,7 +345,7 @@ func TestMarkInactive(t *testing.T) {
 
 	input2.tag = "I2" // Tags have changed
 
-	err = c.RunGather(context.Background(), t1)
+	err = c.RunGather(t.Context(), t1)
 	if err != nil {
 		t.Fatalf("Unexpected c.RunGather() error: %v", err)
 	}
@@ -385,7 +384,7 @@ func TestMarkInactive(t *testing.T) {
 
 	input2bis.fields["f"] = 22.22
 
-	err = c.RunGather(context.Background(), t2)
+	err = c.RunGather(t.Context(), t2)
 	if err != nil {
 		t.Fatalf("Unexpected c.RunGather() error: %v", err)
 	}
@@ -511,7 +510,7 @@ func TestMarkInactiveWhileDroppingInput(t *testing.T) {
 		wg.Done()
 	}()
 
-	err = c.RunGather(context.Background(), time.Now())
+	err = c.RunGather(t.Context(), time.Now())
 	if err != nil {
 		t.Fatalf("Unexpected c.RunGather() error: %v", err)
 	}
@@ -547,7 +546,7 @@ func TestMarkInactiveWithErrors(t *testing.T) {
 	t1 := t0.Add(10 * time.Second)
 	t2 := t1.Add(keepMetricBecauseOfGatherErrorGraceDelay)
 
-	err = c.RunGather(context.Background(), t0)
+	err = c.RunGather(t.Context(), t0)
 	if err != nil {
 		t.Fatal("Gathering failed:", err)
 	}
@@ -570,7 +569,7 @@ func TestMarkInactiveWithErrors(t *testing.T) {
 	input.fields = map[string]float64{"f2": 0.22, "f3": 33} // no value for f1
 	input.retErr = io.ErrUnexpectedEOF                      // perhaps because of this error
 
-	err = c.RunGather(context.Background(), t1)
+	err = c.RunGather(t.Context(), t1)
 	if err != nil {
 		t.Fatal("Gathering failed:", err)
 	}
@@ -588,7 +587,7 @@ func TestMarkInactiveWithErrors(t *testing.T) {
 	input.fields = map[string]float64{"f3": 3, "f4": 4.4} // no more value for f2 neither; a new metric appears;
 	// the error is still present
 
-	err = c.RunGather(context.Background(), t2)
+	err = c.RunGather(t.Context(), t2)
 	if err != nil {
 		t.Fatal("Gathering failed:", err)
 	}
@@ -640,7 +639,7 @@ func TestErrorHandling(t *testing.T) {
 		}
 	}
 
-	err := c.RunGather(context.Background(), time.Now())
+	err := c.RunGather(t.Context(), time.Now())
 	expectedErrors := []error{os.ErrPermission, os.ErrPermission, io.ErrUnexpectedEOF}
 
 	for _, expectedErr := range expectedErrors {

config/hooks.go

@@ -143,3 +143,36 @@ func ParseBool(value string) (bool, error) {
 
 	return result, err
 }
+
+func StringToIntSliceHookFunc(sep string) mapstructure.DecodeHookFunc {
+	expectedToType := reflect.SliceOf(reflect.TypeFor[int]())
+
+	return func(f reflect.Type, t reflect.Type, data any) (any, error) {
+		if f.Kind() != reflect.String {
+			return data, nil
+		}
+
+		if t != expectedToType {
+			return data, nil
+		}
+
+		raw, _ := data.(string)
+		if raw == "" {
+			return []int{}, nil
+		}
+
+		split := strings.Split(raw, sep)
+		ints := make([]int, len(split))
+
+		for i, s := range split {
+			n, err := strconv.Atoi(s)
+			if err != nil {
+				return nil, err
+			}
+
+			ints[i] = n
+		}
+
+		return ints, nil
+	}
+}

config/loader.go

@@ -266,6 +266,7 @@ func convertTypes(
 				blackboxModuleHookFunc(),
 				stringToMapHookFunc(),
 				stringToBoolHookFunc(),
+				StringToIntSliceHookFunc(","),
 			),
 			Metadata:         nil,
 			ErrorUnused:      true,

crashreport/crash_report_test.go

@@ -311,7 +311,7 @@ func TestGenerateDiagnostic(t *testing.T) {
 				return tc.diagnosticError
 			}
 
-			ctx, cancel := context.WithTimeout(context.Background(), tc.ctxTimeout)
+			ctx, cancel := context.WithTimeout(t.Context(), tc.ctxTimeout)
 			defer cancel()
 
 			err := generateDiagnostic(ctx, nil, diagnosticFn)
@@ -491,7 +491,7 @@ func TestBundleCrashReportFiles(t *testing.T) { //nolint:maintidx
 				return nil
 			}
 
-			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+			ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
 			defer cancel()
 
 			reportPath := bundleCrashReportFiles(ctx, 2, stateDir, tc.reportingEnabled, diagnosticFn)

debouncer/debouncer_test.go

@@ -131,7 +131,7 @@ func TestDebouncer_Trigger(t *testing.T) {
 				}
 			}
 
-			ctx := context.Background()
+			ctx := t.Context()
 			t0 := time.Now()
 			testDeadline := t0.Add(2 * tt.period).Add(maxDuration)
 			target := func(_ context.Context) {