From b8b52deee70b8f46dd42884ad27da6a2a094ee19 Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:13:30 +0100
Subject: [PATCH] logger: use env-aware slog handler for subsystems

---
 coordinator/main.go                       | 8 ++++++--
 initializer/main.go                       | 8 ++++++--
 internal/attestation/snp/cached_client.go | 3 ++-
 internal/attestation/snp/issuer.go        | 3 ++-
 internal/attestation/snp/validator.go     | 6 ++++--
 tools/parsesnp.go                         | 8 ++++++--
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/coordinator/main.go b/coordinator/main.go
index bca49b91c..6f9bdfee0 100644
--- a/coordinator/main.go
+++ b/coordinator/main.go
@@ -3,13 +3,13 @@ package main
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"net"
 	"os"
 
 	"github.com/edgelesssys/nunki/internal/ca"
 	"github.com/edgelesssys/nunki/internal/coordapi"
 	"github.com/edgelesssys/nunki/internal/intercom"
+	"github.com/edgelesssys/nunki/internal/logger"
 )
 
 func main() {
@@ -19,7 +19,11 @@ func main() {
 }
 
 func run() (retErr error) {
-	logger := slog.Default()
+	logger, err := logger.Default()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: creating logger: %v\n", err)
+		return err
+	}
 	defer func() {
 		if retErr != nil {
 			logger.Error(retErr.Error())
diff --git a/initializer/main.go b/initializer/main.go
index f1b727e18..8e22df4d6 100644
--- a/initializer/main.go
+++ b/initializer/main.go
@@ -11,7 +11,6 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"log/slog"
 	"net"
 	"os"
 	"time"
@@ -20,6 +19,7 @@ import (
 	"github.com/edgelesssys/nunki/internal/attestation/snp"
 	"github.com/edgelesssys/nunki/internal/grpc/dialer"
 	"github.com/edgelesssys/nunki/internal/intercom"
+	"github.com/edgelesssys/nunki/internal/logger"
 )
 
 func main() {
@@ -29,7 +29,11 @@ func main() {
 }
 
 func run() (retErr error) {
-	logger := slog.Default()
+	logger, err := logger.Default()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: creating logger: %v\n", err)
+		return err
+	}
 	defer func() {
 		if retErr != nil {
 			logger.Error(retErr.Error())
diff --git a/internal/attestation/snp/cached_client.go b/internal/attestation/snp/cached_client.go
index 301ee1c17..20f588235 100644
--- a/internal/attestation/snp/cached_client.go
+++ b/internal/attestation/snp/cached_client.go
@@ -3,6 +3,7 @@ package snp
 import (
 	"log/slog"
 
+	"github.com/edgelesssys/nunki/internal/logger"
 	"github.com/edgelesssys/nunki/internal/memstore"
 	"github.com/google/go-sev-guest/verify/trust"
 	"k8s.io/utils/clock"
@@ -21,7 +22,7 @@ func newCachedKDSHTTPClient(ticker clock.Ticker, log *slog.Logger) *cachedKDSHTT
 
 	c := &cachedKDSHTTPClient{
 		HTTPSGetter: trust.DefaultHTTPSGetter(),
-		logger:      log.WithGroup("cached-kds-http-client"),
+		logger:      slog.New(logger.NewHandler(log.Handler(), "cached-kds-http-client")),
 		cache:       memstore.New[string, []byte](),
 		gcTicker:    ticker,
 	}
diff --git a/internal/attestation/snp/issuer.go b/internal/attestation/snp/issuer.go
index cfebb98e2..73918bd73 100644
--- a/internal/attestation/snp/issuer.go
+++ b/internal/attestation/snp/issuer.go
@@ -14,6 +14,7 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/edgelesssys/nunki/internal/logger"
 	"github.com/google/go-sev-guest/client"
 )
 
@@ -24,7 +25,7 @@ type Issuer struct {
 
 // NewIssuer returns a new Issuer.
 func NewIssuer(log *slog.Logger) *Issuer {
-	return &Issuer{logger: log.WithGroup("snp-issuer")}
+	return &Issuer{logger: slog.New(logger.NewHandler(log.Handler(), "snp-issuer"))}
 }
 
 // OID returns the OID of the issuer.
diff --git a/internal/attestation/snp/validator.go b/internal/attestation/snp/validator.go
index ab2adcfcc..c882ced51 100644
--- a/internal/attestation/snp/validator.go
+++ b/internal/attestation/snp/validator.go
@@ -14,6 +14,7 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/edgelesssys/nunki/internal/logger"
 	"github.com/google/go-sev-guest/abi"
 	"github.com/google/go-sev-guest/proto/sevsnp"
 	"github.com/google/go-sev-guest/validate"
@@ -52,9 +53,10 @@ func (v *StaticValidateOptsGenerator) SNPValidateOpts(_ *sevsnp.Report) (*valida
 
 // NewValidator returns a new Validator.
 func NewValidator(optsGen validateOptsGenerator, log *slog.Logger) *Validator {
+	handler := logger.NewHandler(log.Handler(), "snp-validator")
 	return &Validator{
 		validateOptsGen: optsGen,
-		logger:          log.WithGroup("snp-validator"),
+		logger:          slog.New(handler),
 	}
 }
 
@@ -64,7 +66,7 @@ func NewValidatorWithCallbacks(optsGen validateOptsGenerator, ticker clock.Ticke
 		validateOptsGen: optsGen,
 		callbackers:     callbacks,
 		kdsGetter:       newCachedKDSHTTPClient(ticker, log),
-		logger:          log.WithGroup("snp-validator"),
+		logger:          slog.New(logger.NewHandler(log.Handler(), "snp-validator")),
 	}
 }
 
diff --git a/tools/parsesnp.go b/tools/parsesnp.go
index 2e06be43d..e8f6469ba 100644
--- a/tools/parsesnp.go
+++ b/tools/parsesnp.go
@@ -5,9 +5,9 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"log/slog"
 	"os"
 
+	"github.com/edgelesssys/nunki/internal/logger"
 	"github.com/google/go-sev-guest/abi"
 )
 
@@ -51,7 +51,11 @@ func main() {
 }
 
 func run() (retErr error) {
-	logger := slog.Default()
+	logger, err := logger.Default()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: creating logger: %v\n", err)
+		return err
+	}
 	defer func() {
 		if retErr != nil {
 			logger.Error(retErr.Error())