Print logr prefix if it exists (#1275)

onsi · Sep 19, 2023 · 90d4846 · 90d4846
1 parent 555f543
commit 90d4846
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/internal/writer.go b/internal/writer.go
@@ -135,6 +135,10 @@ func (w *Writer) Println(a ...interface{}) {
 
 func GinkgoLogrFunc(writer *Writer) logr.Logger {
 	return funcr.New(func(prefix, args string) {
-		writer.Printf("%s\n", args)
+		if prefix == "" {
+			writer.Printf("%s\n", args)
+		} else {
+			writer.Printf("%s %s\n", prefix, args)
+		}
 	}, funcr.Options{})
 }
diff --git a/internal/writer_test.go b/internal/writer_test.go
@@ -144,5 +144,11 @@ var _ = Describe("Writer", func() {
 			log.Error(errors.New("cake"), "planned failure", "key", "banana")
 			Ω(string(out.Contents())).Should(Equal("  \"level\"=0 \"msg\"=\"message\" \"key\"=5\n  \"msg\"=\"planned failure\" \"error\"=\"cake\" \"key\"=\"banana\"\n"))
 		})
+
+		It("can print the logr prefix", func() {
+			log := internal.GinkgoLogrFunc(writer)
+			log.WithName("berry").Info("message", "key", 5)
+			Ω(string(out.Contents())).Should(Equal("  berry \"level\"=0 \"msg\"=\"message\" \"key\"=5\n"))
+		})
 	})
 })