Merge pull request #937 from iamemilio/logrus-attributes

Logrus attributes
newrelic · Jul 30, 2024 · 6110044 · 6110044
2 parents bc375fb + 74c0fbe
commit 6110044
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 2 deletions.
diff --git a/v3/integrations/logcontext-v2/nrlogrus/formatter.go b/v3/integrations/logcontext-v2/nrlogrus/formatter.go
@@ -30,8 +30,9 @@ func NewFormatter(app *newrelic.Application, formatter logrus.Formatter) Context
 // Format renders a single log entry.
 func (f ContextFormatter) Format(e *logrus.Entry) ([]byte, error) {
 	logData := newrelic.LogData{
-		Severity: e.Level.String(),
-		Message:  e.Message,
+		Severity:   e.Level.String(),
+		Message:    e.Message,
+		Attributes: e.Data,
 	}
 
 	logBytes, err := f.formatter.Format(e)

diff --git a/v3/integrations/logcontext-v2/nrlogrus/formatter_test.go b/v3/integrations/logcontext-v2/nrlogrus/formatter_test.go
@@ -114,6 +114,32 @@ func TestBackgroundLog(t *testing.T) {
 	})
 }
 
+func TestBackgroundLogWithFields(t *testing.T) {
+	app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn,
+		newrelic.ConfigAppLogDecoratingEnabled(true),
+		newrelic.ConfigAppLogForwardingEnabled(true),
+	)
+	out := bytes.NewBuffer([]byte{})
+	log := newTextLogger(out, app.Application)
+	message := "Hello World!"
+	log.WithField("test field", []string{"a", "b"}).Info(message)
+	logcontext.ValidateDecoratedOutput(t, out, &logcontext.DecorationExpect{
+		EntityGUID: integrationsupport.TestEntityGUID,
+		Hostname:   host,
+		EntityName: integrationsupport.SampleAppName,
+	})
+	app.ExpectLogEvents(t, []internal.WantLog{
+		{
+			Severity:  logrus.InfoLevel.String(),
+			Message:   message,
+			Timestamp: internal.MatchAnyUnixMilli,
+			Attributes: map[string]interface{}{
+				"test field": []string{"a", "b"},
+			},
+		},
+	})
+}
+
 func TestJSONBackgroundLog(t *testing.T) {
 	app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn,
 		newrelic.ConfigAppLogDecoratingEnabled(true),
@@ -192,3 +218,39 @@ func TestLogInContext(t *testing.T) {
 
 	txn.End()
 }
+
+func TestLogInContextWithFields(t *testing.T) {
+	app := integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn,
+		newrelic.ConfigAppLogDecoratingEnabled(true),
+		newrelic.ConfigAppLogForwardingEnabled(true),
+	)
+	out := bytes.NewBuffer([]byte{})
+	log := newTextLogger(out, app.Application)
+	txn := app.StartTransaction("test txn")
+
+	ctx := newrelic.NewContext(context.Background(), txn)
+	message := "Hello World!"
+	log.WithField("hi", 1).WithContext(ctx).Info(message)
+
+	logcontext.ValidateDecoratedOutput(t, out, &logcontext.DecorationExpect{
+		EntityGUID: integrationsupport.TestEntityGUID,
+		Hostname:   host,
+		EntityName: integrationsupport.SampleAppName,
+		TraceID:    txn.GetLinkingMetadata().TraceID,
+		SpanID:     txn.GetLinkingMetadata().SpanID,
+	})
+	txn.ExpectLogEvents(t, []internal.WantLog{
+		{
+			Severity:  logrus.InfoLevel.String(),
+			Message:   message,
+			Timestamp: internal.MatchAnyUnixMilli,
+			SpanID:    txn.GetLinkingMetadata().SpanID,
+			TraceID:   txn.GetLinkingMetadata().TraceID,
+			Attributes: map[string]interface{}{
+				"hi": 1,
+			},
+		},
+	})
+
+	txn.End()
+}