Introduce log/slog for logging

Signed-off-by: Fredrik Lönnegren <[email protected]>

Author: frelon

cmd/device-plugin/main.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"flag"
+	"log/slog"
 	"time"
 
-	"github.com/golang/glog"
 	"github.com/kubevirt/device-plugin-manager/pkg/dpm"
 
 	rtlsdr "github.com/frelon/k8s-radio/device-plugin/rtl-sdr"
@@ -38,14 +38,14 @@ func (l *RadioDeviceLister) NewPlugin(resourceLastName string) dpm.PluginInterfa
 		}
 	}
 
-	glog.Errorf("Unknown resource name: '%s'", resourceLastName)
+	slog.Error("Unknown resource", "name", resourceLastName)
 	return nil
 }
 
 func main() {
 	flag.Parse()
 
-	glog.Info("Starting radio device plugin")
+	slog.Info("Starting radio device plugin")
 
 	l := RadioDeviceLister{
 		ResUpdateChan: make(chan dpm.PluginNameList),
@@ -54,7 +54,7 @@ func main() {
 
 	pulse := 2
 	go func() {
-		glog.Infof("Heart beating every %d seconds", pulse)
+		slog.Info("Heartbeat", "pulse", pulse)
 
 		for {
 			time.Sleep(time.Second * time.Duration(pulse))

device-plugin/rtl-sdr/rtl-sdr.go

@@ -3,8 +3,8 @@ package rtlsdr
 import (
 	"context"
 	"fmt"
+	"log/slog"
 
-	"github.com/golang/glog"
 	"github.com/google/gousb"
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 )
@@ -29,11 +29,11 @@ func (p *Plugin) PreStartContainer(ctx context.Context, r *pluginapi.PreStartCon
 func (p *Plugin) UpdateDevices() error {
 	rtls, err := ListDevices()
 	if err != nil {
-		glog.Infof("Error listing devices: %s", err.Error())
+		slog.Info("Error listing devices", slog.Any("error", err))
 		return err
 	}
 
-	glog.Infof("Found %d devices", len(rtls))
+	slog.Info("Found devices", "len", len(rtls))
 
 	for _, rtl := range p.RtlSdrs {
 		rtl.Connected = false
@@ -68,31 +68,31 @@ func (p *Plugin) GetDevices() []*pluginapi.Device {
 func (p *Plugin) ListAndWatch(e *pluginapi.Empty, s pluginapi.DevicePlugin_ListAndWatchServer) error {
 	err := p.UpdateDevices()
 	if err != nil {
-		glog.Errorf("Error listing devices: %s", err.Error())
+		slog.Error("Error listing devices", slog.Any("error", err))
 	}
 
 	devs := p.GetDevices()
 
 	err = s.Send(&pluginapi.ListAndWatchResponse{Devices: devs})
 	if err != nil {
-		glog.Errorf("Error sending initial response: %s", err.Error())
+		slog.Error("Error sending initial response", slog.Any("error", err))
 	}
 
-	glog.Info("Waiting for updates...")
+	slog.Info("Waiting for updates...")
 
 	for range p.Heartbeat {
 		err = p.UpdateDevices()
 		if err != nil {
-			glog.Errorf("Error reading devices: %s", err.Error())
+			slog.Error("Error reading devices", slog.Any("error", err))
 			continue
 		}
 
 		devs := p.GetDevices()
-		glog.Infof("Devices updated (len %d)", len(devs))
+		slog.Info("Devices updated", "len", len(devs))
 
 		err = s.Send(&pluginapi.ListAndWatchResponse{Devices: devs})
 		if err != nil {
-			glog.Errorf("Error sending response: %s", err.Error())
+			slog.Error("Error sending response", slog.Any("error", err))
 			continue
 		}
 	}
@@ -117,7 +117,7 @@ func (p *Plugin) Allocate(ctx context.Context, r *pluginapi.AllocateRequest) (*p
 		car.Devices = append(car.Devices, dev)
 
 		for _, id := range req.DevicesIDs {
-			glog.Infof("Allocating device ID: %s", id)
+			slog.Info("Allocating device", slog.String("ID", id))
 
 			dev.HostPath = p.RtlSdrs[id].DevicePath()
 			dev.ContainerPath = p.RtlSdrs[id].DevicePath()
@@ -166,7 +166,7 @@ func ListDevices() ([]*RtlSdrDev, error) {
 	}
 
 	if err != nil {
-		glog.Infof("Err open device (%d): %s", len(devs), err.Error())
+		slog.Info("Error open device", slog.Int("len", len(devs)), slog.Any("error", err))
 		return nil, err
 	}
 

go.mod

@@ -3,7 +3,6 @@ module github.com/frelon/k8s-radio
 go 1.25
 
 require (
-	github.com/golang/glog v1.2.5
 	github.com/google/gousb v1.1.2
 	github.com/kubevirt/device-plugin-manager v1.19.5
 	github.com/onsi/ginkgo/v2 v2.11.0
@@ -29,6 +28,7 @@ require (
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v1.2.5 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect