Expose Logger constructor for Zap.

livekit · Apr 30, 2024 · 4726711 · 4726711
1 parent e7962f4
commit 4726711
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.changeset/brave-ants-poke.md b/.changeset/brave-ants-poke.md
@@ -0,0 +1,5 @@
+---
+"github.com/livekit/protocol": minor
+---
+
+Expose Logger constructor for Zap.
diff --git a/logger/logger.go b/logger/logger.go
@@ -200,8 +200,11 @@ type zapLogger[T zaputil.Encoder[T]] struct {
 	sampler   *zaputil.Sampler
 }
 
-func NewZapLogger(conf *Config, opts ...ZapLoggerOption) (ZapLogger, error) {
-	zap := zap.New(nil).WithOptions(zap.AddCaller(), zap.AddStacktrace(zap.ErrorLevel)).Sugar()
+func FromZapLogger(log *zap.Logger, conf *Config, opts ...ZapLoggerOption) (ZapLogger, error) {
+	if log == nil {
+		log = zap.New(nil).WithOptions(zap.AddCaller(), zap.AddStacktrace(zap.ErrorLevel))
+	}
+	zap := log.Sugar()
 
 	zc := &zapConfig{
 		conf:          conf,
@@ -234,6 +237,10 @@ func NewZapLogger(conf *Config, opts ...ZapLoggerOption) (ZapLogger, error) {
 	}
 }
 
+func NewZapLogger(conf *Config, opts ...ZapLoggerOption) (ZapLogger, error) {
+	return FromZapLogger(nil, conf, opts...)
+}
+
 func newZapLogger[T zaputil.Encoder[T]](zap *zap.SugaredLogger, zc *zapConfig, enc T, sampler *zaputil.Sampler) ZapLogger {
 	l := &zapLogger[T]{
 		zap:       zap,