From e002260b626f9101d7928a926a2ca3ed374f5e92 Mon Sep 17 00:00:00 2001
From: James Tucker <james@tailscale.com>
Date: Mon, 23 Jan 2023 14:05:33 -0800
Subject: [PATCH] wgengine/wglog: add a prefix for all wireguard logs

Fixes #7041

Signed-off-by: James Tucker <james@tailscale.com>
---
 wgengine/wglog/wglog.go      | 5 +++--
 wgengine/wglog/wglog_test.go | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wgengine/wglog/wglog.go b/wgengine/wglog/wglog.go
index 2d28ecc2a..152d92820 100644
--- a/wgengine/wglog/wglog.go
+++ b/wgengine/wglog/wglog.go
@@ -36,6 +36,7 @@ type strCache struct {
 // This logger silences repetitive/unhelpful noisy log lines
 // and rewrites peer keys from wireguard-go into Tailscale format.
 func NewLogger(logf logger.Logf) *Logger {
+	const prefix = "wg: "
 	ret := new(Logger)
 	wrapper := func(format string, args ...any) {
 		if strings.Contains(format, "Routine:") && !strings.Contains(format, "receive incoming") {
@@ -81,8 +82,8 @@ func NewLogger(logf logger.Logf) *Logger {
 		logf(format, newargs...)
 	}
 	ret.DeviceLogger = &device.Logger{
-		Verbosef: logger.WithPrefix(wrapper, "[v2] "),
-		Errorf:   wrapper,
+		Verbosef: logger.WithPrefix(wrapper, prefix+"[v2] "),
+		Errorf:   logger.WithPrefix(wrapper, prefix),
 	}
 	ret.strs = make(map[key.NodePublic]*strCache)
 	return ret
diff --git a/wgengine/wglog/wglog_test.go b/wgengine/wglog/wglog_test.go
index dc20e02f7..02c8dafbe 100644
--- a/wgengine/wglog/wglog_test.go
+++ b/wgengine/wglog/wglog_test.go
@@ -22,9 +22,9 @@ func TestLogger(t *testing.T) {
 		want   string
 		omit   bool
 	}{
-		{"hi", nil, "hi", false},
+		{"hi", nil, "wg: hi", false},
 		{"Routine: starting", nil, "", true},
-		{"%v says it misses you", []any{stringer("peer(IMTB…r7lM)")}, "[IMTBr] says it misses you", false},
+		{"%v says it misses you", []any{stringer("peer(IMTB…r7lM)")}, "wg: [IMTBr] says it misses you", false},
 	}
 
 	type log struct {