Fix regression by handling nil logger correctly (#507)

jaegertracing · Apr 28, 2020 · e7a6498 · e7a6498
1 parent 93622f9
commit e7a6498
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/log/logger.go b/log/logger.go
@@ -114,6 +114,9 @@ type DebugLogger interface {
 // If the provided Logger doesn't satisfy the interface, a logger with debug
 // disabled is returned
 func DebugLogAdapter(logger Logger) DebugLogger {
+	if logger == nil {
+		return nil
+	}
 	if debugLogger, ok := logger.(DebugLogger); ok {
 		return debugLogger
 	}

diff --git a/log/logger_test.go b/log/logger_test.go
@@ -36,6 +36,10 @@ func TestDebugLogAdapter_ReturnSameIfDebugLogger(t *testing.T) {
 	assert.Same(t, NullLogger, DebugLogAdapter(NullLogger))
 }
 
+func TestDebugLogAdapter_HandleNil(t *testing.T) {
+	assert.Nil(t, DebugLogAdapter(nil))
+}
+
 type mockLogger struct {
 	errorCalled bool
 	infoCalled  bool