From 74069774bee3aeb52637a58587ddfb0369f69676 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 4 Dec 2024 08:41:37 -0800 Subject: [PATCH] net/tstun: remove tailscaled_outbound_dropped_packets_total reason=acl metric for now Updates #14280 Change-Id: Idff102b3d7650fc9dfbe0c340168806bdf542d76 Signed-off-by: Brad Fitzpatrick --- net/tstun/wrap.go | 7 ++++--- net/tstun/wrap_test.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/tstun/wrap.go b/net/tstun/wrap.go index c384abf9d..deb8bc094 100644 --- 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 index 9ebedda83..a3dfe7d86 100644 --- 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) {