fix: log attrs being dropped (#2168)

- Fixes #2167
TBD54566975 · Jul 25, 2024 · bbe565d · bbe565d
1 parent 9201184
commit bbe565d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/internal/log/logger.go b/internal/log/logger.go
@@ -74,7 +74,13 @@ func (l *Logger) Log(entry Entry) {
 	if entry.Time.IsZero() {
 		entry.Time = time.Now()
 	}
-	entry.Attributes = l.attributes
+
+	// merge logger and entry attributes
+	mergedAttributes := make(map[string]string)
+	maps.Copy(mergedAttributes, l.attributes)
+	maps.Copy(mergedAttributes, entry.Attributes)
+	entry.Attributes = mergedAttributes
+
 	if err := l.sink.Log(entry); err != nil {
 		fmt.Fprintf(os.Stderr, "ftl:log: failed to log entry: %v", err)
 	}