Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/shiny-coins-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@livekit/protocol": patch
---

export discard logger
11 changes: 8 additions & 3 deletions logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ import (
)

var (
discardLogger = logr.Discard()
defaultLogger Logger = LogRLogger(discardLogger)
pkgLogger Logger = LogRLogger(discardLogger)
discardLogger = logr.Discard()
discardLoggerIface = LogRLogger(discardLogger)
defaultLogger = Logger(discardLoggerIface)
pkgLogger = Logger(discardLoggerIface)
)

// InitFromConfig initializes a Zap-based logger
Expand All @@ -52,6 +53,10 @@ func GetLogger() Logger {
return defaultLogger
}

func GetDiscardLogger() Logger {
return discardLoggerIface
}

// SetLogger lets you use a custom logger. Pass in a logr.Logger with default depth
func SetLogger(l Logger, name string) {
defaultLogger = l.WithName(name)
Expand Down
6 changes: 1 addition & 5 deletions observability/reporter.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package observability

import (
"github.com/go-logr/logr"

"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/agentsobs"
"github.com/livekit/protocol/observability/core_callobs"
Expand All @@ -17,8 +15,6 @@ import (

const Project = "livekit"

var discardLogger = logger.LogRLogger(logr.Discard())

type Reporter interface {
Logger(name, projectID string) (logger.Logger, error)
Room() roomobs.Reporter
Expand All @@ -40,7 +36,7 @@ func NewReporter() Reporter {
type reporter struct{}

func (reporter) Logger(name, projectID string) (logger.Logger, error) {
return discardLogger, nil
return logger.GetDiscardLogger(), nil
}

func (reporter) Room() roomobs.Reporter {
Expand Down
Loading