logger: use env-aware slog handler for subsystems

edgelesssys · Jan 9, 2024 · 4d77963 · 4d77963
1 parent 843c961
commit 4d77963
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git a/coordinator/coordapi.go b/coordinator/coordapi.go
@@ -41,7 +41,7 @@ func newCoordAPIServer(mSGetter manifestSetGetter, caGetter certChainGetter, log
 		policyTextStore: memstore.New[manifest.HexString, manifest.Policy](),
 		manifSetGetter:  mSGetter,
 		caChainGetter:   caGetter,
-		logger:          log.WithGroup("coordapi"),
+		logger:          log.WithGroup("coord-api"),
 	}
 	coordapi.RegisterCoordAPIServer(s.grpc, s)
 	return s

diff --git 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
@@ -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/cachedClient.go b/internal/attestation/snp/cachedClient.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"
 )
@@ -16,9 +17,10 @@ type cachedKDSHTTPClient struct {
 
 func newCachedKDSHTTPClient(log *slog.Logger) *cachedKDSHTTPClient {
 	trust.DefaultHTTPSGetter()
+	handler := logger.NewHandler(log.Handler(), "cached-kds-http-client")
 	return &cachedKDSHTTPClient{
 		HTTPSGetter: trust.DefaultHTTPSGetter(),
-		logger:      log.WithGroup("cached-kds-http-client"),
+		logger:      slog.New(handler),
 		cache:       memstore.New[string, cacheEntry](),
 	}
 }

diff --git 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
@@ -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"
@@ -51,9 +52,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),
 	}
 }
 
@@ -63,7 +65,7 @@ func NewValidatorWithCallbacks(optsGen validateOptsGenerator, log *slog.Logger,
 		validateOptsGen: optsGen,
 		callbackers:     callbacks,
 		kdsGetter:       newCachedKDSHTTPClient(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
@@ -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())