net/tstun: remove tailscaled_outbound_dropped_packets_total reason=acl metric for now

bradfitz · bradfitz · commit 74069774bee3 · 2024-12-04T08:55:54.000-08:00
Updates tailscale#14280 Change-Id: Idff102b3d7650fc9dfbe0c340168806bdf542d76 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
diff --git a/net/tstun/wrap.go b/net/tstun/wrap.go
@@ -876,9 +876,10 @@ func (t *Wrapper) filterPacketOutboundToWireGuard(p *packet.Parsed, pc *peerConf
 
 	if filt.RunOut(p, t.filterFlags) != filter.Accept {
 		metricPacketOutDropFilter.Add(1)
-		t.metrics.outboundDroppedPacketsTotal.Add(usermetric.DropLabels{
-			Reason: usermetric.ReasonACL,
-		}, 1)
+		// TODO(#14280): increment a t.metrics.outboundDroppedPacketsTotal here
+		// once we figure out & document what labels to use for multicast,
+		// link-local-unicast, IP fragments, etc. But they're not
+		// usermetric.ReasonACL.
 		return filter.Drop, gro
 	}
 
diff --git a/net/tstun/wrap_test.go b/net/tstun/wrap_test.go
@@ -453,7 +453,7 @@ func TestFilter(t *testing.T) {
 
 	assertMetricPackets(t, "inACL", 3, metricInboundDroppedPacketsACL)
 	assertMetricPackets(t, "inError", 0, metricInboundDroppedPacketsErr)
-	assertMetricPackets(t, "outACL", 1, metricOutboundDroppedPacketsACL)
+	assertMetricPackets(t, "outACL", 0, metricOutboundDroppedPacketsACL)
 }
 
 func assertMetricPackets(t *testing.T, metricName string, want, got int64) {

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ func TestFilter(t *testing.T) {`
`453`	`453`
`454`	`454`	`assertMetricPackets(t, "inACL", 3, metricInboundDroppedPacketsACL)`
`455`	`455`	`assertMetricPackets(t, "inError", 0, metricInboundDroppedPacketsErr)`
`456`		`- assertMetricPackets(t, "outACL", 1, metricOutboundDroppedPacketsACL)`
	`456`	`+ assertMetricPackets(t, "outACL", 0, metricOutboundDroppedPacketsACL)`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`func assertMetricPackets(t *testing.T, metricName string, want, got int64) {`