Skip to content

updated all logs to use slog #2366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPadovano1483 merged 4 commits into from
Feb 6, 2026
Merged

updated all logs to use slog #2366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8d9e1d
updated all logs to use slog
JPadovano1483 Jan 23, 2026
d0ce139
fixed formatting issues
JPadovano1483 Jan 26, 2026
67e80a8
adding logger to receiver types
JPadovano1483 Feb 2, 2026
a9b09de
ran make format
JPadovano1483 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"
"fmt"
"log"
"log/slog"
"os"
"os/signal"
"syscall"
Expand Down Expand Up @@ -55,19 +55,20 @@ func main() {
fmt.Println(version.Version)
os.Exit(0)
}
log.Printf("Version: %s", version.Version)
slog.Info("Version info:", slog.String("version", version.Version))
if config.WatchingAllNamespaces() {
log.Println("Skupper controller watching all namespaces")
slog.Info("Skupper controller watching all namespaces")
} else {
log.Println("Skupper controller watching namespace", config.WatchNamespace)
slog.Info("Skupper controller watching namespace", slog.String("namespace", config.WatchNamespace))
}

// set up signals so we handle the first shutdown signal gracefully
stopCh := SetupSignalHandler()

cli, err := internalclient.NewClient(config.Namespace, "", config.Kubeconfig)
if err != nil {
log.Fatal("Error getting van client ", err.Error())
slog.Error("Error getting van client", slog.Any("error", err))
os.Exit(1)
}
config.Namespace = cli.Namespace

Expand All @@ -78,16 +79,19 @@ func main() {
eventProcessorMetrics = metrics.MustRegisterEventProcessorMetrics(reg)
srv := metrics.NewServer(config.MetricsConfig, reg)
if err := srv.Start(stopCh); err != nil {
log.Fatalf("Error starting metrics server: %s", err)
slog.Error("Error starting metrics server", slog.Any("error", err))
os.Exit(1)
}
}

controller, err := controller.NewController(cli, config, watchers.WithMetricsProvider(eventProcessorMetrics))
if err != nil {
log.Fatal("Error getting new site controller ", err.Error())
slog.Error("Error getting new site controller", slog.Any("error", err))
os.Exit(1)
}

if err = controller.Run(stopCh); err != nil {
log.Fatal("Error running site controller: ", err.Error())
slog.Error("Error running site controller", slog.Any("error", err))
os.Exit(1)
}
}
29 changes: 17 additions & 12 deletions cmd/kube-adaptor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"
"fmt"
"log"
"log/slog"
"net/http"
"os"
"os/signal"
Expand Down Expand Up @@ -59,7 +59,8 @@ func main() {

metricsConfig, err := metrics.BoundConfig(flags)
if err != nil {
log.Fatalf("Error reading metrics configuration: %s", err)
slog.Error("Error reading metrics configuration", slog.Any("error", err))
os.Exit(1)
}
flags.Parse(os.Args[1:])
if *isVersion {
Expand All @@ -68,19 +69,21 @@ func main() {
}

// Startup message
log.Printf("Version: %s", version.Version)
slog.Info("Version info", slog.Any("version", version.Version))

// set up signals so we handle the first shutdown signal gracefully
stopCh := SetupSignalHandler()

cli, err := internalclient.NewClient(namespace, "", kubeconfig)
if err != nil {
log.Fatal("Error getting van client: ", err.Error())
slog.Error("Error getting van client", slog.Any("error", err))
os.Exit(1)
}

if *isInit {
if err := adaptor.InitialiseConfig(cli, cli.GetNamespace(), configDir, configMapName); err != nil {
log.Fatal("Error initialising config ", err.Error())
slog.Error("Error initialising config", slog.Any("error", err))
os.Exit(1)
}
os.Exit(0)
}
Expand All @@ -92,16 +95,18 @@ func main() {
eventProcessorMetrics = metrics.MustRegisterEventProcessorMetrics(reg)
srv := metrics.NewServer(metricsConfig, reg)
if err := srv.Start(stopCh); err != nil {
log.Fatalf("Error starting metrics server: %s", err)
slog.Error("Error starting metrics server", slog.Any("error", err))
os.Exit(1)
}
}

log.Println("Waiting for Skupper router to be ready")
slog.Info("Waiting for Skupper router to be ready")
if err := waitForAMQPConnection("amqp://localhost:5672", time.Second*180, time.Second*5); err != nil {
log.Fatal("Error waiting for router ", err.Error())
slog.Error("Error waiting for router", slog.Any("error", err))
os.Exit(1)
}

log.Println("Starting collector...")
slog.Info("Starting collector...")
go adaptor.StartCollector(cli)

//start health check
Expand All @@ -112,11 +117,11 @@ func main() {
go http.ListenAndServe(":9191", nil)

configSync := adaptor.NewConfigSync(cli, cli.GetNamespace(), configDir, configMapName, eventProcessorMetrics)
log.Println("Starting controller loop...")
slog.Info("Starting controller loop...")
configSync.Start(stopCh)

<-stopCh
log.Println("Shutting down...")
slog.Info("Shutting down...")
configSync.Stop()
}

Expand All @@ -131,7 +136,7 @@ func waitForAMQPConnection(address string, timeout, interval time.Duration) erro
return err
}
agent.Close()
log.Printf("Connected to router at %q", address)
slog.Info("Connected to router", slog.Any("address", address))
return nil
}, b)
}
14 changes: 9 additions & 5 deletions cmd/network-observer/codegen/main.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions cmd/system-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"
"fmt"
"log"
"log/slog"
"os"
"os/signal"
"sync"
Expand All @@ -17,19 +17,21 @@ import (

func main() {
parseFlags()
log.Printf("Version: %s", version.Version)
slog.Info("Version info:", slog.String("version", version.Version))
namespacesPath := api.GetDefaultOutputNamespacesPath()
log.Printf("Skupper System Controller watching %s", namespacesPath)
slog.Info("Skupper System Controller watching:", slog.String("path", namespacesPath))
if api.IsRunningInContainer() {
log.Printf("Host path %s", api.GetHostNamespacesPath())
slog.Info("Host path info:", slog.String("path", api.GetHostNamespacesPath()))
}
if err := os.MkdirAll(namespacesPath, 0755); err != nil {
log.Fatalf("Error creating skupper namespaces directory %q: %v", namespacesPath, err)
slog.Error("Error creating skupper namespaces directory", slog.String("path", namespacesPath), slog.Any("error", err))
os.Exit(1)
}

c, err := controller.NewController()
if err != nil {
log.Fatalf("Error creating controller: %v", err)
slog.Error("Error creating controller", slog.Any("error", err))
os.Exit(1)
}
stop, wait := c.Start()

Expand All @@ -41,7 +43,7 @@ func handleShutdown(stop chan struct{}, wait *sync.WaitGroup) {
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)

<-sigs
log.Println("Shutting down system controller")
slog.Info("Shutting down system controller")

close(stop)

Expand All @@ -55,13 +57,13 @@ func handleShutdown(stop chan struct{}, wait *sync.WaitGroup) {
for {
select {
case <-sigs:
log.Println("Second interrupt, forcing system controller shutdown")
slog.Info("Second interrupt, forcing system controller shutdown")
os.Exit(1)
case <-gracefulTimeout.C:
log.Println("Graceful shutdown timed out, exiting now")
slog.Info("Graceful shutdown timed out, exiting now")
os.Exit(1)
case <-graceful:
log.Println("System controller shutdown completed")
slog.Info("System controller shutdown completed")
os.Exit(0)
}
}
Expand Down
7 changes: 5 additions & 2 deletions internal/cmd/skupper/site/nonkube/site_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ type CmdSiteCreate struct {
namespace string
routerAccessName string
subjectAlternativeNames []string
logger *slog.Logger
}

func NewCmdSiteCreate() *CmdSiteCreate {
return &CmdSiteCreate{}
return &CmdSiteCreate{
logger: slog.New(slog.Default().Handler()).With("component", "nonkube.siteCreate"),
}
}

func (cmd *CmdSiteCreate) NewClient(cobraCommand *cobra.Command, args []string) {
Expand Down Expand Up @@ -83,7 +86,7 @@ func (cmd *CmdSiteCreate) InputToOptions() {
if cmd.Flags.EnableLinkAccess {
sanByDefault, err := utils.GetSansByDefault()
if err != nil {
slog.Error("Error getting SANs by default")
cmd.logger.Error("Error getting SANs by default")
}

cmd.linkAccessEnabled = true
Expand Down
7 changes: 5 additions & 2 deletions internal/cmd/skupper/site/nonkube/site_generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ type CmdSiteGenerate struct {
namespace string
routerAccessName string
subjectAlternativeNames []string
logger *slog.Logger
}

func NewCmdSiteGenerate() *CmdSiteGenerate {
return &CmdSiteGenerate{}
return &CmdSiteGenerate{
logger: slog.New(slog.Default().Handler()).With("component", "nonkube.siteGenerate"),
}
}

func (cmd *CmdSiteGenerate) NewClient(cobraCommand *cobra.Command, args []string) {
Expand Down Expand Up @@ -93,7 +96,7 @@ func (cmd *CmdSiteGenerate) InputToOptions() {
if cmd.Flags.EnableLinkAccess {
sanByDefault, err := utils.GetSansByDefault()
if err != nil {
slog.Error("Error getting SANs by default")
cmd.logger.Error("Error getting SANs by default")
}

cmd.linkAccessEnabled = true
Expand Down
Loading