Revert log changes

Author: adamsnoah98

kafkajobs/listener.go

@@ -142,18 +142,16 @@ func (d *Driver) listen() error {
 		case SerialPipelining:
 			fetchWg := &sync.WaitGroup{}
 			fetches.EachPartition(func(partition kgo.FetchTopicPartition) {
-				fetchWg.Add(1)
 				itemWg := &sync.WaitGroup{}
 
-				go func() {
-					defer fetchWg.Done()
+				fetchWg.Go(func() {
 					partition.EachRecord(func(r *kgo.Record) {
 						itemWg.Add(1)
 						item := fromConsumer(r, d.requeueCh, d.recordsCh, itemWg, &d.stopped)
 						d.insertTracedItem(item)
 						itemWg.Wait()
 					})
-				}()
+				})
 			})
 			fetchWg.Wait()
 		case FanOutPipelining:

tests/jobs_kafka_test.go

@@ -147,7 +147,7 @@ func TestKafkaInitCG(t *testing.T) {
 }
 
 func TestKafkaPQCG(t *testing.T) {
-	cont := endure.New(slog.LevelDebug, endure.GracefulShutdownTimeout(time.Second))
+	cont := endure.New(slog.LevelDebug)
 
 	cfg := &config.Plugin{
 		Version: "v2023.2.0",
@@ -365,7 +365,6 @@ func TestKafkaPipeliningStrategy(t *testing.T) {
 	stopCh <- struct{}{}
 	wg.Wait()
 
-	assert.Equal(t, 60, oLogger.FilterMessageSnippet("job was pushed successfully").Len())
 	assert.Equal(t, 60, oLogger.FilterMessageSnippet("job was pushed successfully").Len())
 
 	logs := oLogger.FilterMessageSnippet("php consumed:1:").All()

tests/mock/logger.go

@@ -1,12 +1,9 @@
 package mocklogger
 
 import (
-	"encoding/json"
 	"github.com/roadrunner-server/endure/v2/dep"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"os"
-	"strings"
 )
 
 type ZapLoggerMock struct {
@@ -18,36 +15,12 @@ type Logger interface {
 }
 
 func ZapTestLogger(enab zapcore.LevelEnabler) (*ZapLoggerMock, *ObservedLogs) {
-	logs := &ObservedLogs{}
-	core := zapcore.NewCore(
-		zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig()), // or zapcore.NewConsoleEncoder for plain text
-		zapcore.AddSync(os.Stdout),
-		enab,
-	)
+	core, logs := New(enab)
+	obsLog := zap.New(core, zap.Development())
 
-	logger := zap.New(
-		core,
-		zap.Development(),
-		zap.Hooks(func(entry zapcore.Entry) error {
-			line := strings.TrimSpace(entry.Message)
-			var rawFields map[string]interface{}
-			var c []zapcore.Field
-			jsonStartIndex := strings.Index(line, "{")
-			if jsonStartIndex > 0 {
-				jsonStr := line[jsonStartIndex:]
-				_ = json.Unmarshal([]byte(jsonStr), &rawFields)
-			}
-
-			for field, value := range rawFields {
-				c = append(c, zap.Any(field, value))
-			}
-
-			logs.add(LoggedEntry{entry, c})
-			return nil
-		}),
-	)
-
-	return &ZapLoggerMock{logger}, logs
+	return &ZapLoggerMock{
+		l: obsLog,
+	}, logs
 }
 
 func (z *ZapLoggerMock) Init() error {

tests/mock/observer.go

@@ -153,3 +153,47 @@ func (o *ObservedLogs) add(log LoggedEntry) {
 	o.logs = append(o.logs, log)
 	o.mu.Unlock()
 }
+
+// New creates a new Core that buffers logs in memory (without any encoding).
+// It's particularly useful in tests.
+func New(enab zapcore.LevelEnabler) (zapcore.Core, *ObservedLogs) {
+	ol := &ObservedLogs{}
+	return &contextObserver{
+		LevelEnabler: enab,
+		logs:         ol,
+	}, ol
+}
+
+type contextObserver struct {
+	zapcore.LevelEnabler
+	logs    *ObservedLogs
+	context []zapcore.Field
+}
+
+func (co *contextObserver) Check(ent zapcore.Entry, ce *zapcore.CheckedEntry) *zapcore.CheckedEntry {
+	if co.Enabled(ent.Level) {
+		return ce.AddCore(ent, co)
+	}
+	return ce
+}
+
+func (co *contextObserver) With(fields []zapcore.Field) zapcore.Core {
+	return &contextObserver{
+		LevelEnabler: co.LevelEnabler,
+		logs:         co.logs,
+		context:      append(co.context[:len(co.context):len(co.context)], fields...),
+	}
+}
+
+func (co *contextObserver) Write(ent zapcore.Entry, fields []zapcore.Field) error {
+	all := make([]zapcore.Field, 0, len(fields)+len(co.context))
+	all = append(all, co.context...)
+	all = append(all, fields...)
+	co.logs.add(LoggedEntry{ent, all})
+
+	return nil
+}
+
+func (co *contextObserver) Sync() error {
+	return nil
+}