Merge branch 'master' into update-actions-ubuntu-latest

Author: vkmc

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21.13'
+          go-version: '1.24.11'
       - uses: actions/checkout@v4.1.3
       #- name: download libraries
       #  run: go mod download
@@ -32,7 +32,7 @@ jobs:
           # Caching conflicts happen in GHA, so just disable for now
           skip-cache: true
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.59.1
+          version: v1.64.2
   unit-tests:
     name: Unit tests
     runs-on: ubuntu-latest
@@ -77,7 +77,7 @@ jobs:
       - uses: actions/checkout@v4.1.3
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21.13'
+          go-version: '1.24.11'
       - name: Verify image builds
         run: |
           docker build --tag infrawatch/sg-core:latest --file build/Dockerfile .

.golangci.yaml

@@ -37,7 +37,7 @@ linters:
     - dupl
     - errcheck
     # - exhaustive
-    - exportloopref
+    - copyloopvar
     # - gochecknoinits
     - goconst
     - gocritic
@@ -61,5 +61,5 @@ linters:
     - unconvert
     # NOTE: not all application plugins use ability to emit internal events through
     #       passed bus function in it's constructor.
-    #- unparam
+    # - unparam
     # - whitespace

build/Dockerfile

@@ -10,7 +10,7 @@ COPY . $D/
 COPY build/repos/opstools.repo /etc/yum.repos.d/CentOS-OpsTools.repo
 
 RUN dnf install golang git qpid-proton-c-devel -y --setopt=tsflags=nodocs
-RUN go install golang.org/dl/go1.21.13@latest && /go/bin/go1.21.13 download && PRODUCTION_BUILD=false CONTAINER_BUILD=true GOCMD=/go/bin/go1.21.13 ./build.sh
+RUN go install golang.org/dl/go1.24.11@latest && /go/bin/go1.24.11 download && PRODUCTION_BUILD=false CONTAINER_BUILD=true GOCMD=/go/bin/go1.24.11 ./build.sh
 
 # --- end build, create smart gateway layer ---
 FROM registry.access.redhat.com/ubi9-minimal:latest

ci/integration/logging/run_sg.sh

@@ -12,11 +12,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOBIN
 
-go install golang.org/dl/go1.21.13@latest
-go1.21.13 download
+go install golang.org/dl/go1.24.11@latest
+go1.24.11 download
 
 # install sg-core and start sg-core
 mkdir -p /usr/lib64/sg-core
-PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
+PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
 
 ./sg-core -config ./ci/integration/logging/sg_config.yaml

ci/integration/metrics/ceilometer/bridge/run_sg.sh

@@ -12,11 +12,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOBIN
 
-go install golang.org/dl/go1.21.13@latest
-go1.21.13 download
+go install golang.org/dl/go1.24.11@latest
+go1.24.11 download
 
 # install sg-core and start sg-core
 mkdir -p /usr/lib64/sg-core
-PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
+PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
 
 ./sg-core -config ./ci/integration/metrics/ceilometer/bridge/sg_config.yaml

ci/integration/metrics/ceilometer/tcp/run_sg.sh

@@ -13,11 +13,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOBIN
 
-go install golang.org/dl/go1.21.13@latest
-go1.21.13 download
+go install golang.org/dl/go1.24.11@latest
+go1.24.11 download
 
 # install sg-core and start sg-core
 mkdir -p /usr/lib64/sg-core
-PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
+PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
 
 ./sg-core -config ./ci/integration/metrics/ceilometer/tcp/sg_config.yaml

ci/integration/metrics/collectd/run_sg.sh

@@ -12,11 +12,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOBIN
 
-go install golang.org/dl/go1.21.13@latest
-go1.21.13 download
+go install golang.org/dl/go1.24.11@latest
+go1.24.11 download
 
 # install sg-core and start sg-core
 mkdir -p /usr/lib64/sg-core
-PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
+PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
 
 ./sg-core -config ./ci/integration/metrics/collectd/sg_config.yaml

ci/unit/run_tests.sh

@@ -13,8 +13,8 @@ yum install -y git golang gcc make glibc-langpack-en qpid-proton-c-devel
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOBIN
 
-go install golang.org/dl/go1.21.13@latest
-go1.21.13 download
+go install golang.org/dl/go1.24.11@latest
+go1.24.11 download
 
 
-go1.21.13 test -v -coverprofile=profile.cov ./...
+go1.24.11 test -v -coverprofile=profile.cov ./...

go.mod

@@ -1,6 +1,6 @@
 module github.com/infrawatch/sg-core
 
-go 1.21.13
+go 1.24.11
 
 require (
 	collectd.org v0.5.0

plugins/transport/socket/main.go

@@ -263,15 +263,15 @@ func (s *Socket) Run(ctx context.Context, w transport.WriteFn, done chan bool) {
 	case udp:
 		pc = s.initUDPSocket()
 		if pc == (*net.UDPConn)(nil) {
-			s.logger.Errorf(nil, "Failed to initialize socket transport plugin with type: "+s.conf.Type)
+			s.logger.Errorf(nil, "Failed to initialize socket transport plugin with type: %s", s.conf.Type)
 			return
 		}
 		go s.ReceiveData(maxBufferSize, done, pc, w)
 
 	case tcp:
 		TCPSocket := s.initTCPSocket()
 		if TCPSocket == nil {
-			s.logger.Errorf(nil, "Failed to initialize socket transport plugin with type: "+s.conf.Type)
+			s.logger.Errorf(nil, "Failed to initialize socket transport plugin with type: %s", s.conf.Type)
 			return
 		}
 		go func() {
@@ -294,7 +294,7 @@ func (s *Socket) Run(ctx context.Context, w transport.WriteFn, done chan bool) {
 	default:
 		pc = s.initUnixSocket()
 		if pc == (*net.UnixConn)(nil) {
-			s.logger.Errorf(nil, "Failed to initialize socket transport plugin with type: "+s.conf.Type)
+			s.logger.Errorf(nil, "Failed to initialize socket transport plugin with type: %s", s.conf.Type)
 			return
 		}
 		go s.ReceiveData(maxBufferSize, done, pc, w)