@@ -35,6 +35,9 @@ type Tunnel struct {
3535client Client
3636conn Conn
3737
38+ // clientLogger is deliberately separate, to avoid the tunnel using itself
39+ // as a sink for it's own logs, which could lead to deadlocks
40+ clientLogger slog.Logger
3841// router and dnsConfigurator may be nil
3942router router.Router
4043dnsConfigurator dns.OSConfigurator
@@ -60,6 +63,7 @@ func NewTunnel(
6063speaker :* (s ),
6164ctx :ctx ,
6265logger :logger ,
66+ clientLogger :slog .Make (),
6367requestLoopDone :make (chan struct {}),
6468client :client ,
6569}
@@ -161,7 +165,7 @@ func UseAsRouter() TunnelOption {
161165
162166func UseAsLogger ()TunnelOption {
163167return func (t * Tunnel ) {
164- t .logger = t .logger .AppendSinks (t )
168+ t .clientLogger = t .clientLogger .AppendSinks (t )
165169}
166170}
167171
@@ -227,7 +231,7 @@ func (t *Tunnel) start(req *StartRequest) error {
227231apiToken ,
228232& Options {
229233Headers :header ,
230- Logger :t .logger ,
234+ Logger :t .clientLogger ,
231235DNSConfigurator :t .dnsConfigurator ,
232236Router :t .router ,
233237TUNFileDescriptor :ptr .Ref (int (req .GetTunnelFileDescriptor ())),
@@ -305,7 +309,7 @@ func convertWorkspaceUpdate(update tailnet.WorkspaceUpdate) *PeerUpdate {
305309for i ,agent := range update .UpsertedAgents {
306310fqdn := make ([]string ,0 ,len (agent .Hosts ))
307311for name := range agent .Hosts {
308- fqdn = append (fqdn ,name .WithoutTrailingDot ())
312+ fqdn = append (fqdn ,name .WithTrailingDot ())
309313}
310314out .UpsertedAgents [i ]= & Agent {
311315Id :tailnet .UUIDToByteSlice (agent .ID ),
@@ -327,7 +331,7 @@ func convertWorkspaceUpdate(update tailnet.WorkspaceUpdate) *PeerUpdate {
327331for i ,agent := range update .DeletedAgents {
328332fqdn := make ([]string ,0 ,len (agent .Hosts ))
329333for name := range agent .Hosts {
330- fqdn = append (fqdn ,name .WithoutTrailingDot ())
334+ fqdn = append (fqdn ,name .WithTrailingDot ())
331335}
332336out .DeletedAgents [i ]= & Agent {
333337Id :tailnet .UUIDToByteSlice (agent .ID ),