Add custom attributes to log messages in transaction context for slog (…

…#911)

v3/integrations/logcontext-v2/nrslog/example/main.go

@@ -28,7 +28,11 @@ func main() {
 	txn := app.StartTransaction("example transaction")
 	ctx := newrelic.NewContext(context.Background(), txn)
 
-	log.InfoContext(ctx, "I am a log inside a transaction")
+	log.InfoContext(ctx, "I am a log inside a transaction with custom attributes!",
+		slog.String("foo", "bar"),
+		slog.Int("answer", 42),
+		slog.Any("some_map", map[string]interface{}{"a": 1.0, "b": 2}),
+	)
 
 	// pretend to do some work
 	time.Sleep(500 * time.Millisecond)

v3/integrations/logcontext-v2/nrslog/handler.go

@@ -129,10 +129,18 @@ func (h NRHandler) Enabled(ctx context.Context, lvl slog.Level) bool {
 //   - If a group has no Attrs (even if it has a non-empty key),
 //     ignore it.
 func (h NRHandler) Handle(ctx context.Context, record slog.Record) error {
+	attrs := map[string]interface{}{}
+
+	record.Attrs(func(attr slog.Attr) bool {
+		attrs[attr.Key] = attr.Value.Any()
+		return true
+	})
+
 	data := newrelic.LogData{
-		Severity:  record.Level.String(),
-		Timestamp: record.Time.UnixMilli(),
-		Message:   record.Message,
+		Severity:   record.Level.String(),
+		Timestamp:  record.Time.UnixMilli(),
+		Message:    record.Message,
+		Attributes: attrs,
 	}
 	if h.txn != nil {
 		h.txn.RecordLog(data)

v3/integrations/logcontext-v2/nrslog/handler_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"log/slog"
+	"os"
 	"strings"
 	"testing"
 
@@ -225,6 +226,45 @@ func TestWithAttributes(t *testing.T) {
 
 }
 
+func TestWithAttributesFromContext(t *testing.T) {
+	app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn,
+		newrelic.ConfigAppLogDecoratingEnabled(false),
+		newrelic.ConfigAppLogForwardingEnabled(true),
+	)
+	log := slog.New(TextHandler(app.Application, os.Stdout, &slog.HandlerOptions{}))
+
+	log.Info("I am a log message")
+
+	txn := app.StartTransaction("example transaction")
+	ctx := newrelic.NewContext(context.Background(), txn)
+
+	log.InfoContext(ctx, "I am a log inside a transaction with custom attributes!",
+		slog.String("foo", "bar"),
+		slog.Int("answer", 42),
+		slog.Any("some_map", map[string]interface{}{"a": 1.0, "b": 2}),
+	)
+
+	txn.End()
+
+	app.ExpectLogEvents(t, []internal.WantLog{
+		{
+			Severity:  slog.LevelInfo.String(),
+			Message:   "I am a log message",
+			Timestamp: internal.MatchAnyUnixMilli,
+		},
+		{
+			Severity:  slog.LevelInfo.String(),
+			Message:   "I am a log inside a transaction with custom attributes!",
+			Timestamp: internal.MatchAnyUnixMilli,
+			Attributes: map[string]interface{}{
+				"foo":      "bar",
+				"answer":   42,
+				"some_map": map[string]interface{}{"a": 1.0, "b": 2},
+			},
+		},
+	})
+
+}
 func TestWithGroup(t *testing.T) {
 	app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn,
 		newrelic.ConfigAppLogDecoratingEnabled(false),