Fix

Author: aorabdel

utils/logs/json_logger.go

@@ -72,15 +72,15 @@ func (l *JSONLoggers) Configure() error {
 }
 
 // Log logs to the output stream.
-func (l *JSONLoggers) Log(output ...interface{}) {
+func (l *JSONLoggers) Log(output ...any) {
 	if len(output) == 1 && output[0] == "\n" {
 		return
 	}
 	l.zerologger.Info().Str("source", l.GetLoggerSource()).Msg(fmt.Sprint(output...))
 }
 
 // LogError logs to the error stream.
-func (l *JSONLoggers) LogError(err ...interface{}) {
+func (l *JSONLoggers) LogError(err ...any) {
 	if len(err) == 1 && err[0] == "\n" {
 		return
 	}
@@ -99,7 +99,7 @@ func NewJSONLogger(writer WriterWithSource, loggerSource string, source string)
 	return newJSONLogger(true, writer, loggerSource, source)
 }
 
-// NewJSONLogger creates a Json logger. It is similar to NewJSONLogger but does not close the writer on Close().
+// NewJSONLoggerWithWriter creates a Json logger. It is similar to NewJSONLogger but does not close the writer on Close().
 func NewJSONLoggerWithWriter(writer WriterWithSource, loggerSource string, source string) (Loggers, error) {
 	return newJSONLogger(false, writer, loggerSource, source)
 }

utils/logs/json_logger_test.go

@@ -40,6 +40,7 @@ func TestLogMessageToSlowLogger(t *testing.T) {
 		require.NoError(t, err)
 		testLog(t, loggers)
 		time.Sleep(100 * time.Millisecond)
+		require.NoError(t, loggers.Close())
 	})
 	t.Run("without writer closing", func(t *testing.T) {
 		writer := NewTestSlowWriter(t)
@@ -48,6 +49,7 @@ func TestLogMessageToSlowLogger(t *testing.T) {
 		require.NoError(t, err)
 		testLog(t, loggers)
 		time.Sleep(100 * time.Millisecond)
+		require.NoError(t, loggers.Close())
 		require.NoError(t, writer.Close())
 	})
 }

utils/logs/writer.go

@@ -110,14 +110,10 @@ func (w *DiodeWriter) Write(p []byte) (n int, err error) {
 }
 
 func (w *DiodeWriter) Close() error {
-	err := w.slowWriter.Close()
-	if err != nil {
-		return err
-	}
-	if diodeCloser, ok := w.diodeWriter.(io.Closer); ok {
-		return diodeCloser.Close()
+	if w.closeStore == nil {
+		return nil
 	}
-	return err
+	return w.closeStore.Close()
 }
 
 func (w *DiodeWriter) SetSource(source string) error {
@@ -150,8 +146,7 @@ func newDiodeWriterForSlowWriter(closeWriterOnClose bool, slowWriter WriterWithS
 
 	// We pass a wrapper that "overrides" the close method to do nothing,
 	// this is because we control the writer's close behaviour through the `closeWriterOnClose` check
-	ncw := nonCloseableWriter{slowWriter}
-	d := diode.NewWriter(ncw, ringBufferSize, pollInterval, func(missed int) {
+	d := diode.NewWriter(nonCloseableWriter{Writer: slowWriter}, ringBufferSize, pollInterval, func(missed int) {
 		if droppedMessagesLogger != nil {
 			droppedMessagesLogger.LogError(fmt.Sprintf("Logger dropped %d messages", missed))
 		}

utils/logs/zap_logger_test.go

@@ -26,6 +26,7 @@ func TestZapLoggerProd(t *testing.T) {
 	logger, err := zap.NewProduction()
 	require.NoError(t, err)
 	loggers, err := NewZapLogger(logger, "Test")
+	defer func() { require.NoError(t, loggers.Close()) }()
 	require.NoError(t, err)
 	testLog(t, loggers)
 }