From 8cacfad9ebf83978b977a9337274c1dc66acdf38 Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Tue, 24 Jun 2025 21:13:30 +0800 Subject: [PATCH] fix metrics for listener --- metrics/wrapper/conn.go | 2 +- metrics/wrapper/listener.go | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/metrics/wrapper/conn.go b/metrics/wrapper/conn.go index d159523a..d1f12085 100644 --- a/metrics/wrapper/conn.go +++ b/metrics/wrapper/conn.go @@ -86,7 +86,7 @@ type packetConn struct { } func WrapPacketConn(service string, pc net.PacketConn) net.PacketConn { - if !xmetrics.IsEnabled() { + if !xmetrics.IsEnabled() || pc == nil { return pc } return &packetConn{ diff --git a/metrics/wrapper/listener.go b/metrics/wrapper/listener.go index eb339faf..ed863037 100644 --- a/metrics/wrapper/listener.go +++ b/metrics/wrapper/listener.go @@ -2,8 +2,6 @@ package wrapper import ( "net" - - xmetrics "github.com/go-gost/x/metrics" ) type listener struct { @@ -12,10 +10,6 @@ type listener struct { } func WrapListener(service string, ln net.Listener) net.Listener { - if !xmetrics.IsEnabled() { - return ln - } - return &listener{ service: service, Listener: ln,