Fix handling of slog logs before logging initialized

CHANGELOG.md

@@ -48,6 +48,9 @@ Main (unreleased)
 - Flow: Fix an issue where `faro.receiver`'s `extra_log_labels` with empty value don't
   map existing value in log line. (@hainenber)
 
+- Imported code using `slog` logging will now not panic and replay correctly when logged before the logging 
+  config block is initialized. (@mattdurham)
+
 ### Other changes
 
 - Update `alloy-mixin` to use more specific alert group names (for example,

internal/alloy/logging/deferred_handler.go

@@ -0,0 +1,107 @@
+package logging
+
+import (
+	"context"
+	"log/slog"
+	"sync"
+)
+
+// deferredSlogHandler is used if you are using a slog handler before the logging config block is processed.
+type deferredSlogHandler struct {
+	mut      sync.RWMutex
+	group    string
+	attrs    []slog.Attr
+	children []*deferredSlogHandler
+	parent   *deferredSlogHandler
+	handle   slog.Handler
+	l        *Logger
+}
+
+func newDeferredHandler(l *Logger) *deferredSlogHandler {
+	return &deferredSlogHandler{
+		children: make([]*deferredSlogHandler, 0),
+		l:        l,
+	}
+}
+
+func (d *deferredSlogHandler) Handle(_ context.Context, r slog.Record) error {
+	d.mut.RLock()
+	defer d.mut.RUnlock()
+
+	if d.handle != nil {
+		return d.handle.Handle(context.Background(), r)
+	}
+	d.l.addRecord(r, d)
+	return nil
+}
+
+// Enabled reports whether the handler handles records at the given level.
+// The handler ignores records whose level is lower.
+func (d *deferredSlogHandler) Enabled(_ context.Context, level slog.Level) bool {
+	d.mut.RLock()
+	defer d.mut.RUnlock()
+
+	if d.handle != nil {
+		return d.handle.Enabled(context.Background(), level)
+	}
+	return true
+}
+
+// WithAttrs returns a new [TextHandler] whose attributes consists
+// of h's attributes followed by attrs.
+func (d *deferredSlogHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	d.mut.RLock()
+	defer d.mut.RUnlock()
+
+	if d.handle != nil {
+		return d.handle.WithAttrs(attrs)
+	}
+
+	child := &deferredSlogHandler{
+		attrs:    attrs,
+		children: make([]*deferredSlogHandler, 0),
+		l:        d.l,
+		parent:   d,
+	}
+	d.children = append(d.children, child)
+	return child
+}
+
+func (d *deferredSlogHandler) WithGroup(name string) slog.Handler {
+	d.mut.RLock()
+	defer d.mut.RUnlock()
+
+	if d.handle != nil {
+		return d.handle.WithGroup(name)
+	}
+
+	child := &deferredSlogHandler{
+		children: make([]*deferredSlogHandler, 0),
+		group:    name,
+		l:        d.l,
+		parent:   d,
+	}
+	d.children = append(d.children, child)
+	return child
+}
+
+// buildHandlers will recursively build actual handlers, this should only be called before replaying once the logging config
+// block is set.
+func (d *deferredSlogHandler) buildHandlers(parent slog.Handler) {
+	d.mut.Lock()
+	defer d.mut.Unlock()
+
+	// Root node will not have attrs or groups.
+	if parent == nil {
+		d.handle = d.l.handler
+	} else {
+		if d.group != "" {
+			d.handle = parent.WithGroup(d.group)
+		} else {
+			d.handle = parent.WithAttrs(d.attrs)
+		}
+	}
+	for _, child := range d.children {
+		child.buildHandlers(d.handle)
+	}
+}

internal/alloy/logging/deferred_handler_test.go

@@ -0,0 +1,248 @@
+package logging
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"github.com/go-kit/log/level"
+	"github.com/stretchr/testify/require"
+	"log/slog"
+	"strings"
+	"testing"
+)
+
+func TestDefferredSlogTester(t *testing.T) {
+	buf := &bytes.Buffer{}
+	results := func(t *testing.T) map[string]any {
+		line := buf.Bytes()
+		if len(line) == 0 {
+			return nil
+		}
+		var m map[string]any
+		unmarshalErr := json.Unmarshal(line, &m)
+		require.NoError(t, unmarshalErr)
+		// Need to reset the buffer between each test
+		buf.Reset()
+		return m
+	}
+
+	// Had to add some custom logic to handle updated for the deferred tests.
+	// Also ignore anything that modifies the log line, which are two tests.
+	RunDeferredTests(t, func(t *testing.T) *Logger {
+		l, err := NewDeferred(buf)
+		require.NoError(t, err)
+		return l
+	}, results)
+}
+
+func TestDeferredHandlerWritingToBothLoggers(t *testing.T) {
+	bb := &bytes.Buffer{}
+	l, err := NewDeferred(bb)
+	slogger := slog.New(l.deferredSlog)
+	require.NoError(t, err)
+	l.Log("msg", "this should happen before")
+	slogger.Log(context.Background(), slog.LevelInfo, "this should happen after)")
+
+	err = l.Update(Options{
+		Level:   "info",
+		Format:  "json",
+		WriteTo: nil,
+	})
+	require.NoError(t, err)
+	firstIndex := strings.Index(bb.String(), "this should happen before")
+	secondIndex := strings.Index(bb.String(), "this should happen after")
+	require.True(t, firstIndex < secondIndex)
+}
+
+func TestSlogHandle(t *testing.T) {
+	bb := &bytes.Buffer{}
+	bbSl := &bytes.Buffer{}
+	sl, alloy, l := newLoggers(t, bb, bbSl)
+	logInfo(sl, alloy, "test")
+	err := l.Update(Options{
+		Level:   "debug",
+		Format:  "json",
+		WriteTo: nil,
+	})
+	require.NoError(t, err)
+	require.True(t, equal(bb, bbSl))
+}
+
+func TestSlogHandleWithDifferingLevelDeny(t *testing.T) {
+	bb := &bytes.Buffer{}
+	bbSl := &bytes.Buffer{}
+	sl, alloy, l := newLoggers(t, bb, bbSl)
+	logInfo(sl, alloy, "test")
+	err := l.Update(Options{
+		Level:   "warn",
+		Format:  "json",
+		WriteTo: nil,
+	})
+	require.NoError(t, err)
+	require.True(t, bb.Len() == 0)
+}
+
+func TestSlogHandleWithDifferingLevelAllow(t *testing.T) {
+	bb := &bytes.Buffer{}
+	bbSl := &bytes.Buffer{}
+	sl, alloy, l := newLoggers(t, bb, bbSl)
+	logError(sl, alloy, "test")
+	err := l.Update(Options{
+		Level:   "warn",
+		Format:  "json",
+		WriteTo: nil,
+	})
+	require.NoError(t, err)
+	require.True(t, bb.Len() > 0)
+}
+
+func TestNormalWithDifferingLevelDeny(t *testing.T) {
+	bb := &bytes.Buffer{}
+	l, err := newDeferredTest(bb)
+	require.NoError(t, err)
+	level.Debug(l).Log("msg", "this should not log")
+	err = l.Update(Options{
+		Level:   "error",
+		Format:  "json",
+		WriteTo: nil,
+	})
+	require.NoError(t, err)
+	require.True(t, bb.Len() == 0)
+}
+
+func TestNormalWithDifferingLevelAllow(t *testing.T) {
+	bb := &bytes.Buffer{}
+	l, err := newDeferredTest(bb)
+	require.NoError(t, err)
+	level.Error(l).Log("msg", "this should not log")
+	err = l.Update(Options{
+		Level:   "error",
+		Format:  "json",
+		WriteTo: nil,
+	})
+	require.NoError(t, err)
+	// Since we write logs at info, but change to error then our logInfo should be clean.
+	require.True(t, bb.Len() > 0)
+}
+
+func TestDeferredHandler(t *testing.T) {
+	type testCase struct {
+		name string
+		log  func(bb *bytes.Buffer, slBB *bytes.Buffer)
+	}
+
+	var testCases = []testCase{
+		{
+			name: "Single Attr",
+			log: func(bb *bytes.Buffer, bbSl *bytes.Buffer) {
+				sl, alloy, l := newLoggers(t, bb, bbSl)
+
+				sl, alloy = withAttrs(sl, alloy, "attr1", "value1")
+				logInfo(sl, alloy, "test")
+				err := l.Update(Options{
+					Level:   "debug",
+					Format:  "json",
+					WriteTo: nil,
+				})
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "Attrs Nested",
+			log: func(bb *bytes.Buffer, bbSl *bytes.Buffer) {
+				sl, alloy, l := newLoggers(t, bb, bbSl)
+				sl, alloy = withAttrs(sl, alloy, "attr1", "value1")
+				sl, alloy = withAttrs(sl, alloy, "nestedattr1", "nestedvalue1")
+				logInfo(sl, alloy, "test")
+				err := l.Update(Options{
+					Level:   "debug",
+					Format:  "json",
+					WriteTo: nil,
+				})
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "Group",
+			log: func(bb *bytes.Buffer, bbSl *bytes.Buffer) {
+				sl, alloy, l := newLoggers(t, bb, bbSl)
+				sl, alloy = withGroup(sl, alloy, "gr1")
+				sl, alloy = withAttrs(sl, alloy, "nestedattr1", "nestedvalue1")
+				logInfo(sl, alloy, "test")
+				err := l.Update(Options{
+					Level:   "debug",
+					Format:  "json",
+					WriteTo: nil,
+				})
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "Nested Group",
+			log: func(bb *bytes.Buffer, bbSl *bytes.Buffer) {
+				sl, alloy, l := newLoggers(t, bb, bbSl)
+				sl, alloy = withGroup(sl, alloy, "gr1")
+				sl, alloy = withGroup(sl, alloy, "gr2")
+				sl, alloy = withAttrs(sl, alloy, "nestedattr1", "nestedvalue1")
+				logInfo(sl, alloy, "test")
+				err := l.Update(Options{
+					Level:   "debug",
+					Format:  "json",
+					WriteTo: nil,
+				})
+				require.NoError(t, err)
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			bb := &bytes.Buffer{}
+			bbSl := &bytes.Buffer{}
+			tc.log(bb, bbSl)
+			require.True(t, equal(bb, bbSl))
+		})
+	}
+}
+
+func newLoggers(t *testing.T, bb, bbSl *bytes.Buffer) (*slog.Logger, *slog.Logger, *Logger) {
+	l, err := newDeferredTest(bb)
+	require.NoError(t, err)
+
+	jsonH := slog.NewJSONHandler(bbSl, &slog.HandlerOptions{
+		AddSource:   true,
+		Level:       nil,
+		ReplaceAttr: testReplace,
+	})
+	sl := slog.New(jsonH)
+	alloy := slog.New(l.deferredSlog)
+	return sl, alloy, l
+}
+
+func withAttrs(sl *slog.Logger, alloyL *slog.Logger, attrs ...string) (*slog.Logger, *slog.Logger) {
+	var attrAny []any
+	for _, a := range attrs {
+		attrAny = append(attrAny, a)
+	}
+	return sl.With(attrAny...), alloyL.With(attrAny...)
+}
+
+func withGroup(sl *slog.Logger, alloyL *slog.Logger, group string) (*slog.Logger, *slog.Logger) {
+	return sl.WithGroup(group), alloyL.WithGroup(group)
+}
+
+func logInfo(sl *slog.Logger, alloyL *slog.Logger, msg string) {
+	ctx := context.Background()
+	sl.Log(ctx, slog.LevelInfo, msg)
+	alloyL.Log(ctx, slog.LevelInfo, msg)
+}
+
+func logError(sl *slog.Logger, alloyL *slog.Logger, msg string) {
+	ctx := context.Background()
+	sl.Log(ctx, slog.LevelError, msg)
+	alloyL.Log(ctx, slog.LevelError, msg)
+}
+
+func equal(sl *bytes.Buffer, alloy *bytes.Buffer) bool {
+	return sl.String() == alloy.String()
+}