pass logger as server option

Author: Janelle Law

logging.go

@@ -3,6 +3,7 @@ package totem
 import (
 	"context"
 	"fmt"
+	"io"
 	"log"
 	"log/slog"
 	"reflect"
@@ -24,7 +25,6 @@ type Server struct {
 	stream             Stream
 	lock               sync.RWMutex
 	controller         *StreamController
-	logger             *slog.Logger
 	splicedControllers []*StreamController
 	tracer             trace.Tracer
 
@@ -33,6 +33,7 @@ type Server struct {
 }
 
 type ServerOptions struct {
+	logger            *slog.Logger
 	name              string
 	discoveryHopLimit int32
 	interceptors      InterceptorConfig
@@ -94,16 +95,23 @@ func WithName(name string) ServerOption {
 	}
 }
 
+func WithLogger(logger *slog.Logger) ServerOption {
+	return func(o *ServerOptions) {
+		o.logger = logger
+	}
+}
+
+var defaultNoopLogger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{Level: slog.LevelError}))
+
 func NewServer(stream Stream, opts ...ServerOption) (*Server, error) {
 	options := ServerOptions{
 		discoveryHopLimit: -1,
+		logger:            defaultNoopLogger,
 	}
 	options.apply(opts...)
 
-	lg := Log.WithGroup(options.name)
-
 	ctrl := NewStreamController(stream, StreamControllerOptions{
-		Logger:           lg,
+		Logger:           options.logger,
 		Name:             options.name,
 		Metrics:          options.metrics,
 		WorkerPoolParams: DefaultWorkerPoolParams(),
@@ -120,7 +128,6 @@ func NewServer(stream Stream, opts ...ServerOption) (*Server, error) {
 		ServerOptions: options,
 		stream:        stream,
 		controller:    ctrl,
-		logger:        lg,
 		setupCtx:      setupCtx,
 		setupSpan:     span,
 		tracer:        tracer,

server.go

@@ -82,9 +82,7 @@ type WorkerPoolParameters struct {
 // There can be at most one stream controller per stream.
 func NewStreamController(stream Stream, opts StreamControllerOptions) *StreamController {
 	if opts.Logger == nil {
-		opts.Logger = Log.WithGroup(opts.Name)
-	} else {
-		opts.Logger = opts.Logger.WithGroup(opts.Name)
+		opts.Logger = slog.Default()
 	}
 
 	sh := &StreamController{

stream.go

@@ -5,6 +5,7 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"fmt"
+	"log/slog"
 	"net"
 	"os"
 	"runtime"
@@ -20,6 +21,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	tracesdk "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -36,6 +38,7 @@ var defaultServerOpts = []grpc.ServerOption{
 }
 
 func TestTotem(t *testing.T) {
+	slog.SetDefault(slog.New(slog.NewTextHandler(GinkgoWriter, &slog.HandlerOptions{Level: slog.LevelDebug})))
 	SetDefaultEventuallyTimeout(60 * time.Second)
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Totem Suite")