chore(vpn): send info, debug logs over tunnel

ethanndickson · ethanndickson · commit 1f907e69a787 · 2025-06-06T04:19:31.000Z
diff --git a/cli/vpndaemon_windows.go b/cli/vpndaemon_windows.go
@@ -65,7 +65,6 @@ func (r *RootCmd) vpnDaemonRun() *serpent.Command {
 			logger.Info(ctx, "starting tunnel")
 			tunnel, err := vpn.NewTunnel(ctx, logger, pipe, vpn.NewClient(),
 				vpn.UseOSNetworkingStack(),
-				vpn.UseAsLogger(),
 				vpn.UseCustomLogSinks(sinks...),
 			)
 			if err != nil {
diff --git a/vpn/dylib/lib.go b/vpn/dylib/lib.go
@@ -46,7 +46,10 @@ func OpenTunnel(cReadFD, cWriteFD int32) int32 {
 		return ErrOpenPipe
 	}
 
-	_, err = vpn.NewTunnel(ctx, slog.Make(), conn, vpn.NewClient(),
+	// We log everything, as filtering is done by whatever renders the OS
+	// logs.
+	_, err = vpn.NewTunnel(ctx, slog.Make().Leveled(slog.LevelDebug), conn,
+		vpn.NewClient(),
 		vpn.UseOSNetworkingStack(),
 		vpn.UseAsLogger(),
 	)
diff --git a/vpn/tunnel.go b/vpn/tunnel.go
@@ -46,9 +46,6 @@ type Tunnel struct {
 
 	logger slog.Logger
 
-	logMu sync.Mutex
-	logs  []*TunnelMessage
-
 	client Client
 
 	// clientLogger is a separate logger than `logger` when the `UseAsLogger`
@@ -300,29 +297,22 @@ func (t *Tunnel) stop(*StopRequest) error {
 var _ slog.Sink = &Tunnel{}
 
 func (t *Tunnel) LogEntry(_ context.Context, e slog.SinkEntry) {
-	t.logMu.Lock()
-	defer t.logMu.Unlock()
-	t.logs = append(t.logs, &TunnelMessage{
+	msg := &TunnelMessage{
 		Msg: &TunnelMessage_Log{
 			Log: sinkEntryToPb(e),
 		},
-	})
-}
-
-func (t *Tunnel) Sync() {
-	t.logMu.Lock()
-	logs := t.logs
-	t.logs = nil
-	t.logMu.Unlock()
-	for _, msg := range logs {
-		select {
-		case <-t.ctx.Done():
-			return
-		case t.sendCh <- msg:
-		}
+	}
+	select {
+	case <-t.updater.ctx.Done():
+		return
+	case <-t.ctx.Done():
+		return
+	case t.sendCh <- msg:
 	}
 }
 
+func (t *Tunnel) Sync() {}
+
 func sinkEntryToPb(e slog.SinkEntry) *Log {
 	l := &Log{
 		// #nosec G115 - Safe conversion for log levels which are small positive integers
@@ -583,6 +573,8 @@ func (u *updater) sendAgentUpdate() {
 		return
 	}
 
+	u.logger.Debug(u.ctx, "sending agent update")
+
 	msg := &TunnelMessage{
 		Msg: &TunnelMessage_PeerUpdate{
 			PeerUpdate: &PeerUpdate{

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ func (r RootCmd) vpnDaemonRun() serpent.Command {`
`65`	`65`	`logger.Info(ctx, "starting tunnel")`
`66`	`66`	`tunnel, err := vpn.NewTunnel(ctx, logger, pipe, vpn.NewClient(),`
`67`	`67`	`vpn.UseOSNetworkingStack(),`
`68`		`- vpn.UseAsLogger(),`
`69`	`68`	`vpn.UseCustomLogSinks(sinks...),`
`70`	`69`	`)`
`71`	`70`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ func OpenTunnel(cReadFD, cWriteFD int32) int32 {`
`46`	`46`	`return ErrOpenPipe`
`47`	`47`	`}`
`48`	`48`
`49`		`- _, err = vpn.NewTunnel(ctx, slog.Make(), conn, vpn.NewClient(),`
	`49`	`+ // We log everything, as filtering is done by whatever renders the OS`
	`50`	`+ // logs.`
	`51`	`+ _, err = vpn.NewTunnel(ctx, slog.Make().Leveled(slog.LevelDebug), conn,`
	`52`	`+ vpn.NewClient(),`
`50`	`53`	`vpn.UseOSNetworkingStack(),`
`51`	`54`	`vpn.UseAsLogger(),`
`52`	`55`	`)`