change minimal supported golang 1.24

and update dependencies

Author: sni

.golangci.yml

@@ -41,8 +41,8 @@ linters:
   disable:
     - cyclop
     - depguard
-    - exhaustruct
     - err113
+    - exhaustruct
     - gochecknoglobals
     - gochecknoinits
     - gofumpt
@@ -51,6 +51,7 @@ linters:
     - perfsprint
     - tagliatelle
     - testpackage
+    - wrapcheck
     - wsl
     # deprecated
     - tenv

Changes

@@ -5,6 +5,7 @@ This file documents the revision history for the Livestatus Multitool Daemon (LM
 next:
           - improve filter performance
           - fix accessing contacts.groups column when using icinga2
+          - minimal supported golang 1.24
 
 2.6.2    Fri Jul 25 11:53:14 CEST 2025
           - make sure thread dumps can always be logged

Makefile

@@ -7,10 +7,10 @@ GOVERSION:=$(shell \
     go version | \
     awk -F'go| ' '{ split($$5, a, /\./); printf ("%04d%04d", a[1], a[2]); exit; }' \
 )
-# also update README.md and .github/workflows/citest.yml when changing minumum version
+# also update README.md and .github/workflows/citest.yml when changing minimum version
 # find . -name go.mod
-MINGOVERSION:=00010023
-MINGOVERSIONSTR:=1.23
+MINGOVERSION:=00010024
+MINGOVERSIONSTR:=1.24
 BUILD:=$(shell git rev-parse --short HEAD)
 # see https://github.com/go-modules-by-example/index/blob/master/010_tools/README.md
 # and https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module

README.md

@@ -24,7 +24,7 @@ Log table requests and commands are just passed through to the actual backends.
 
 You will need
 
-- Go >= 1.23
+- Golang >= 1.24
 
 to compile lmd.
 

buildtools/go.mod

@@ -1,6 +1,6 @@
 module tools
 
-go 1.23
+go 1.24
 
 require (
 	github.com/daixiang0/gci v0.12.3

go.mod

@@ -1,8 +1,8 @@
 module github.com/sni/lmd/v2
 
-go 1.23.0
+go 1.24.0
 
-toolchain go1.23.6
+toolchain go1.24.7
 
 replace pkg/lmd => ./pkg/lmd
 
@@ -24,14 +24,15 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e // indirect
-	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
 	github.com/prometheus/procfs v0.17.0 // indirect
-	github.com/sasha-s/go-deadlock v0.3.5 // indirect
+	github.com/sasha-s/go-deadlock v0.3.6 // indirect
 	github.com/willabides/rjson v0.2.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	google.golang.org/protobuf v1.36.9 // indirect
 )

go.sum

@@ -22,6 +22,10 @@ github.com/kdar/factorlog v0.0.0-20211012144011-6ea75a169038 h1:ah2n2FwhELUb5o+K
 github.com/kdar/factorlog v0.0.0-20211012144011-6ea75a169038/go.mod h1:vLeQHWaOMUQZ1ytnCskhwI5fCcXA7xxK0QjCngYPqbo=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
@@ -37,38 +41,44 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
-github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e h1:D0bJD+4O3G4izvrQUmzCL80zazlN7EwJ0PPDhpJWC/I=
-github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 h1:QTvNkZ5ylY0PGgA+Lih+GdboMLY/G9SEGLMEGVjTVA4=
+github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
-github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
+github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
 github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
 github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
-github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=
-github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/sasha-s/go-deadlock v0.3.6 h1:TR7sfOnZ7x00tWPfD397Peodt57KzMDo+9Ae9rMiUmw=
+github.com/sasha-s/go-deadlock v0.3.6/go.mod h1:CUqNyyvMxTyjFqDT7MRg9mb4Dv/btmGTqSR+rky/UXo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/willabides/rjson v0.2.0 h1:cgBIzis7l9ugUTtaLMcl12pJBu1m62oTBGf/XXBHhJI=
 github.com/willabides/rjson v0.2.0/go.mod h1:9fWQED96t+VlaF7GPwf/qRHLdNbAjjBkaPxmmjyuW5E=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
+google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/lmd/a_helper_test.go

@@ -394,7 +394,7 @@ func StartTestPeerExtra(numPeers, numHosts, numServices int, extraConfig string)
 			err = fmt.Errorf("timeout while waiting for mock listenern to stop")
 		}
 
-		return
+		return err
 	}
 
 	return peer, cleanup, mocklmd
@@ -503,7 +503,7 @@ func GetHTTPMockServerPeer(t *testing.T, lmd *Daemon) (peer *Peer, cleanup func(
 	ts, cleanup := StartHTTPMockServer(t, lmd)
 	peer = NewPeer(lmd, &Connection{Source: []string{ts.URL}, Name: "TestPeer", ID: "testid"})
 
-	return
+	return peer, cleanup
 }
 
 func convertTestDataMapToList(filename string, columns []string) []byte {
@@ -587,7 +587,7 @@ func getTestDataColumns(dataFolder string) (columns [][]string) {
 		}
 	}
 
-	return
+	return columns
 }
 
 func getTestLogStats(req *Request) []byte {
@@ -673,7 +673,7 @@ func TestMock1(t *testing.T) {
 		Name:   "TestPeer",
 	})
 
-	err := peer.InitAllTables(context.TODO())
+	err := peer.InitAllTables(t.Context())
 	require.NoErrorf(t, err, "init tables failed")
 
 	// tear down

pkg/lmd/benchmark_test.go

@@ -3,7 +3,6 @@ package lmd
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"fmt"
 	"strings"
 	"testing"
@@ -25,13 +24,13 @@ func BenchmarkParseResultJSON(b *testing.B) {
 			columns = append(columns, col.Name)
 		}
 	}
-	req, _, err := NewRequest(context.TODO(), peer.lmd, bufio.NewReader(bytes.NewBufferString(fmt.Sprintf("GET services\nOutputFormat: json\nColumns: %s\nColumnHeaders: on\n", strings.Join(columns, " ")))), ParseOptimize)
+	req, _, err := NewRequest(b.Context(), peer.lmd, bufio.NewReader(bytes.NewBufferString(fmt.Sprintf("GET services\nOutputFormat: json\nColumns: %s\nColumnHeaders: on\n", strings.Join(columns, " ")))), ParseOptimize)
 	require.NoError(b, err)
 
 	conn, connType, err := peer.GetConnection(req)
 	require.NoError(b, err)
 
-	resBytes, _, err := peer.getQueryResponse(context.TODO(), req, req.String(), peer.peerAddr.Get(), conn, connType)
+	resBytes, _, err := peer.getQueryResponse(b.Context(), req, req.String(), peer.peerAddr.Get(), conn, connType)
 	require.NoError(b, err)
 
 	b.StartTimer()
@@ -67,13 +66,13 @@ func BenchmarkParseResultWrappedJSON(b *testing.B) {
 			columns = append(columns, col.Name)
 		}
 	}
-	req, _, err := NewRequest(context.TODO(), peer.lmd, bufio.NewReader(bytes.NewBufferString(fmt.Sprintf("GET services\nOutputFormat: wrapped_json\nColumns: %s\nColumnHeaders: on\n", strings.Join(columns, " ")))), ParseOptimize)
+	req, _, err := NewRequest(b.Context(), peer.lmd, bufio.NewReader(bytes.NewBufferString(fmt.Sprintf("GET services\nOutputFormat: wrapped_json\nColumns: %s\nColumnHeaders: on\n", strings.Join(columns, " ")))), ParseOptimize)
 	require.NoError(b, err)
 
 	conn, connType, err := peer.GetConnection(req)
 	require.NoError(b, err)
 
-	resBytes, _, err := peer.getQueryResponse(context.TODO(), req, req.String(), peer.peerAddr.Get(), conn, connType)
+	resBytes, _, err := peer.getQueryResponse(b.Context(), req, req.String(), peer.peerAddr.Get(), conn, connType)
 	require.NoError(b, err)
 
 	b.StartTimer()
@@ -100,11 +99,10 @@ func BenchmarkPeerUpdate(b *testing.B) {
 	peer, cleanup, _ := StartTestPeer(1, 1000, 10000)
 	PauseTestPeers(peer)
 
-	ctx := context.TODO()
 	b.StartTimer()
 	data := peer.data.Load()
 	for range b.N {
-		err := data.UpdateFull(ctx, Objects.UpdateTables)
+		err := data.UpdateFull(b.Context(), Objects.UpdateTables)
 		if err != nil {
 			panic("Update failed")
 		}
@@ -129,7 +127,7 @@ func BenchmarkPeerUpdateServiceInsert(b *testing.B) {
 		OutputFormat:    OutputFormatJSON,
 		FilterStr:       "Filter: host_name !=\n",
 	}
-	res, meta, err := peer.Query(context.TODO(), req)
+	res, meta, err := peer.Query(b.Context(), req)
 	if err != nil {
 		return
 	}
@@ -335,7 +333,7 @@ func BenchmarkRequestParser1(b *testing.B) {
 	lmd := createTestLMDInstance()
 	for range b.N {
 		buf := bufio.NewReader(bytes.NewBufferString(servicesPageQuery))
-		_, size, err := NewRequest(context.TODO(), lmd, buf, ParseOptimize)
+		_, size, err := NewRequest(b.Context(), lmd, buf, ParseOptimize)
 		if err != nil {
 			panic(err.Error())
 		}
@@ -349,7 +347,7 @@ func BenchmarkRequestParser2(b *testing.B) {
 	lmd := createTestLMDInstance()
 	for range b.N {
 		buf := bufio.NewReader(bytes.NewBufferString(tacPageStatsQuery))
-		_, size, err := NewRequest(context.TODO(), lmd, buf, ParseOptimize)
+		_, size, err := NewRequest(b.Context(), lmd, buf, ParseOptimize)
 		if err != nil {
 			panic(err.Error())
 		}

pkg/lmd/client_con.go

@@ -221,27 +221,27 @@ func (cl *ClientConnection) processRequest(ctx context.Context, req *Request) (s
 		if errors.As(err, &netErr) {
 			LogErrors((&Response{code: ReturnCodeConnectionError, request: req, err: netErr}).Send(cl))
 
-			return
+			return size, err
 		}
 
 		var peerErr *PeerError
 		if errors.As(err, &peerErr) && peerErr.kind == ConnectionError {
 			LogErrors((&Response{code: ReturnCodeConnectionError, request: req, err: peerErr}).Send(cl))
 
-			return
+			return size, err
 		}
 		LogErrors((&Response{code: ReturnCodeBadRequest, request: req, err: err}).Send(cl))
 
-		return
+		return size, err
 	}
 
-	return
+	return size, err
 }
 
 // sendRemainingCommands sends all queued commands.
 func (cl *ClientConnection) sendRemainingCommands(ctx context.Context, commandsByPeer *map[string][]string) (err error) {
 	if len(*commandsByPeer) == 0 {
-		return
+		return err
 	}
 	time1 := time.Now()
 	code, msg := cl.SendCommands(ctx, *commandsByPeer)
@@ -250,11 +250,11 @@ func (cl *ClientConnection) sendRemainingCommands(ctx context.Context, commandsB
 	if code != ReturnCodeOK {
 		_, err = fmt.Fprintf(cl.connection, "%d: %s\n", code, msg)
 
-		return
+		return err
 	}
 	logWith(ctx).Infof("incoming command request finished in %s", time.Since(time1))
 
-	return
+	return err
 }
 
 // SendCommands sends commands for this request to all selected remote sites.