From 6877d4496585adb75da5efa2eb528684aa71f24f Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 15 May 2024 10:31:20 -0400 Subject: [PATCH] prober: plumb a now-required netmon to derphttp Updates #11896 Change-Id: Ie2f9cd024d85b51087d297aa36c14a9b8a2b8129 Signed-off-by: Brad Fitzpatrick --- prober/derp.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prober/derp.go b/prober/derp.go index 4108745ff..338782048 100644 --- a/prober/derp.go +++ b/prober/derp.go @@ -23,6 +23,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "tailscale.com/derp" "tailscale.com/derp/derphttp" + "tailscale.com/net/netmon" "tailscale.com/net/stun" "tailscale.com/syncs" "tailscale.com/tailcfg" @@ -544,7 +545,7 @@ func newConn(ctx context.Context, dm *tailcfg.DERPMap, n *tailcfg.DERPNode, isPr return !strings.Contains(s, "derphttp.Client.Connect: connecting to") }) priv := key.NewNode() - dc := derphttp.NewRegionClient(priv, l, nil /* no netMon */, func() *tailcfg.DERPRegion { + dc := derphttp.NewRegionClient(priv, l, netmon.NewStatic(), func() *tailcfg.DERPRegion { rid := n.RegionID return &tailcfg.DERPRegion{ RegionID: rid,