mv observer/stats to core

api/config.go

@@ -7,10 +7,10 @@ import (
 	"os"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/x/config"
 	"github.com/go-gost/x/registry"
 	"github.com/go-gost/x/service"
-	"github.com/go-gost/x/stats"
 )
 
 type serviceStatus interface {

config/parsing/service/parse.go

@@ -15,6 +15,7 @@ import (
 	"github.com/go-gost/core/listener"
 	"github.com/go-gost/core/logger"
 	mdutil "github.com/go-gost/core/metadata/util"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/core/recorder"
 	"github.com/go-gost/core/selector"
 	"github.com/go-gost/core/service"
@@ -32,7 +33,6 @@ import (
 	"github.com/go-gost/x/metadata"
 	"github.com/go-gost/x/registry"
 	xservice "github.com/go-gost/x/service"
-	"github.com/go-gost/x/stats"
 	"github.com/vishvananda/netns"
 )
 

go.mod

@@ -9,9 +9,9 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/gin-contrib/cors v1.5.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-gost/core v0.0.0-20240625123708-4e831b95e8cc
+	github.com/go-gost/core v0.0.0-20240704150322-30cc92870515
 	github.com/go-gost/gosocks4 v0.0.1
-	github.com/go-gost/gosocks5 v0.4.1
+	github.com/go-gost/gosocks5 v0.4.2
 	github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a
 	github.com/go-gost/relay v0.5.0
 	github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451

go.sum

@@ -53,12 +53,12 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-gost/core v0.0.0-20240625123708-4e831b95e8cc h1:aj0FZ3RYZPqlDko/pKPPAAve1/73g+uIq/sVEGtarss=
+github.com/go-gost/core v0.0.0-20240704150322-30cc92870515 h1:i/zcDZtz00hcmRosvJgXmgJsdc4bC32PAvt2+8MUOEg=
-github.com/go-gost/core v0.0.0-20240625123708-4e831b95e8cc/go.mod h1:aTPFucvJyqc/o5h5/ZtyHJ0xgFIq5Ip+cMlhazm+TaI=
+github.com/go-gost/core v0.0.0-20240704150322-30cc92870515/go.mod h1:QmVAZIXIYBsX44Vehwug5RFnG2K3/Hz/uu/Y4QVhAY0=
 github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s=
 github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc=
-github.com/go-gost/gosocks5 v0.4.1 h1:n79qlj525xVqGvUR/Uou5ewIbjs0QiDICzJbrK6z3PI=
+github.com/go-gost/gosocks5 v0.4.2 h1:IianxHTkACPqCwiOAT3MHoMdSUl+SEPSRu1ikawC1Pc=
-github.com/go-gost/gosocks5 v0.4.1/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4=
+github.com/go-gost/gosocks5 v0.4.2/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4=
 github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a h1:ME7P1Brcg4C640DSPqlvQr7JuvvQfJ8QpmS3yCFlK3A=
 github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a/go.mod h1:qXr2Zm9Ex2ATqnWuNUzVZqySPMnuIihvblYZt4MlZLw=
 github.com/go-gost/relay v0.5.0 h1:JG1tgy/KWiVXS0ukuVXvbM0kbYuJTWxYpJ5JwzsCf/c=

handler/http/handler.go

@@ -23,13 +23,13 @@ import (
 	traffic "github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
+	"github.com/go-gost/core/observer/stats"
 	ctxvalue "github.com/go-gost/x/ctx"
 	netpkg "github.com/go-gost/x/internal/net"
 	stats_util "github.com/go-gost/x/internal/util/stats"
 	traffic_wrapper "github.com/go-gost/x/limiter/traffic/wrapper"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	"github.com/go-gost/x/stats"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

handler/http2/handler.go

@@ -23,14 +23,14 @@ import (
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
+	"github.com/go-gost/core/observer/stats"
 	ctxvalue "github.com/go-gost/x/ctx"
 	xio "github.com/go-gost/x/internal/io"
 	netpkg "github.com/go-gost/x/internal/net"
 	stats_util "github.com/go-gost/x/internal/util/stats"
 	"github.com/go-gost/x/limiter/traffic/wrapper"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	"github.com/go-gost/x/stats"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

handler/relay/connect.go

@@ -10,13 +10,13 @@ import (
 
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/relay"
 	ctxvalue "github.com/go-gost/x/ctx"
 	xnet "github.com/go-gost/x/internal/net"
 	serial "github.com/go-gost/x/internal/util/serial"
 	"github.com/go-gost/x/limiter/traffic/wrapper"
-	"github.com/go-gost/x/stats"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) (err error) {

handler/relay/forward.go

@@ -9,12 +9,12 @@ import (
 
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/relay"
 	ctxvalue "github.com/go-gost/x/ctx"
 	netpkg "github.com/go-gost/x/internal/net"
 	"github.com/go-gost/x/limiter/traffic/wrapper"
-	"github.com/go-gost/x/stats"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network string, log logger.Logger) error {

handler/socks/v4/handler.go

@@ -11,14 +11,14 @@ import (
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/gosocks4"
 	ctxvalue "github.com/go-gost/x/ctx"
 	netpkg "github.com/go-gost/x/internal/net"
 	stats_util "github.com/go-gost/x/internal/util/stats"
 	"github.com/go-gost/x/limiter/traffic/wrapper"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	"github.com/go-gost/x/stats"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 var (

handler/socks/v5/connect.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/gosocks5"
 	ctxvalue "github.com/go-gost/x/ctx"
 	netpkg "github.com/go-gost/x/internal/net"
 	"github.com/go-gost/x/limiter/traffic/wrapper"
-	"github.com/go-gost/x/stats"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) error {

handler/socks/v5/udp.go

@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/go-gost/core/logger"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/gosocks5"
 	ctxvalue "github.com/go-gost/x/ctx"
 	xnet "github.com/go-gost/x/internal/net"
 	"github.com/go-gost/x/internal/net/udp"
 	"github.com/go-gost/x/internal/util/socks"
-	"github.com/go-gost/x/stats"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, log logger.Logger) error {

handler/socks/v5/udp_tun.go

@@ -7,13 +7,13 @@ import (
 	"time"
 
 	"github.com/go-gost/core/logger"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/gosocks5"
 	ctxvalue "github.com/go-gost/x/ctx"
 	xnet "github.com/go-gost/x/internal/net"
 	"github.com/go-gost/x/internal/net/udp"
 	"github.com/go-gost/x/internal/util/socks"
-	"github.com/go-gost/x/stats"
+	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
-	stats_wrapper "github.com/go-gost/x/stats/wrapper"
 )
 
 func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) error {

internal/util/stats/stats.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	"github.com/go-gost/core/observer"
-	"github.com/go-gost/x/stats"
+	"github.com/go-gost/core/observer/stats"
 )
 
 type HandlerStats struct {

listener/dns/listener.go

@@ -16,8 +16,8 @@ import (
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/miekg/dns"
 )
 

listener/dtls/listener.go

@@ -16,8 +16,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/pion/dtls/v2"
 )
 

listener/ftcp/listener.go

@@ -11,8 +11,8 @@ import (
 	xnet "github.com/go-gost/x/internal/net"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/xtaci/tcpraw"
 )
 

listener/grpc/listener.go

@@ -15,8 +15,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"

listener/http2/h2/listener.go

@@ -18,8 +18,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 )

listener/http2/listener.go

@@ -17,8 +17,8 @@ import (
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	mdx "github.com/go-gost/x/metadata"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"golang.org/x/net/http2"
 )
 

listener/http3/h3/listener.go

@@ -11,8 +11,8 @@ import (
 	pht_util "github.com/go-gost/x/internal/util/pht"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/quic-go/quic-go"
 )
 

listener/http3/wt/listener.go

@@ -13,8 +13,8 @@ import (
 	wt_util "github.com/go-gost/x/internal/util/wt"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/quic-go/quic-go"
 	"github.com/quic-go/quic-go/http3"
 	wt "github.com/quic-go/webtransport-go"

listener/icmp/listener.go

@@ -11,8 +11,8 @@ import (
 	icmp_pkg "github.com/go-gost/x/internal/util/icmp"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/quic-go/quic-go"
 	"golang.org/x/net/icmp"
 )

listener/kcp/listener.go

@@ -12,8 +12,8 @@ import (
 	kcp_util "github.com/go-gost/x/internal/util/kcp"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/xtaci/kcp-go/v5"
 	"github.com/xtaci/smux"
 	"github.com/xtaci/tcpraw"

listener/mtcp/listener.go

@@ -15,8 +15,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/mtls/listener.go

@@ -16,8 +16,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/mws/listener.go

@@ -19,8 +19,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/gorilla/websocket"
 )
 

listener/obfs/http/listener.go

@@ -14,8 +14,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/obfs/tls/listener.go

@@ -14,8 +14,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/pht/listener.go

@@ -13,8 +13,8 @@ import (
 	pht_util "github.com/go-gost/x/internal/util/pht"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/quic/listener.go

@@ -12,8 +12,8 @@ import (
 	quic_util "github.com/go-gost/x/internal/util/quic"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/quic-go/quic-go"
 )
 

listener/redirect/tcp/listener.go

@@ -14,8 +14,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/redirect/udp/listener.go

@@ -9,8 +9,8 @@ import (
 	admission "github.com/go-gost/x/admission/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/rtcp/listener.go

@@ -14,8 +14,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/rudp/listener.go

@@ -13,8 +13,8 @@ import (
 	xnet "github.com/go-gost/x/internal/net"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/serial/listener.go

@@ -11,8 +11,8 @@ import (
 	serial "github.com/go-gost/x/internal/util/serial"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/ssh/listener.go

@@ -16,8 +16,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"golang.org/x/crypto/ssh"
 )
 

listener/sshd/listener.go

@@ -18,9 +18,9 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
 	"golang.org/x/crypto/ssh"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 // Applicable SSH Request types for Port Forwarding - RFC 4254 7.X

listener/tap/listener.go

@@ -12,8 +12,8 @@ import (
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	mdx "github.com/go-gost/x/metadata"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/tcp/listener.go

@@ -14,8 +14,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/tls/listener.go

@@ -15,8 +15,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/tun/listener.go

@@ -13,8 +13,8 @@ import (
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	mdx "github.com/go-gost/x/metadata"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/udp/listener.go

@@ -11,8 +11,8 @@ import (
 	xnet "github.com/go-gost/x/internal/net"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/unix/listener.go

@@ -10,8 +10,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 )
 
 func init() {

listener/ws/listener.go

@@ -18,8 +18,8 @@ import (
 	climiter "github.com/go-gost/x/limiter/conn/wrapper"
 	limiter "github.com/go-gost/x/limiter/traffic/wrapper"
 	metrics "github.com/go-gost/x/metrics/wrapper"
+	stats "github.com/go-gost/x/observer/stats/wrapper"
 	"github.com/go-gost/x/registry"
-	stats "github.com/go-gost/x/stats/wrapper"
 	"github.com/gorilla/websocket"
 )
 

observer/plugin/grpc.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/core/observer"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/plugin/observer/proto"
 	"github.com/go-gost/x/internal/plugin"
 	"github.com/go-gost/x/service"
-	"github.com/go-gost/x/stats"
 	"google.golang.org/grpc"
 )
 

observer/plugin/http.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/core/observer"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/x/internal/plugin"
 	"github.com/go-gost/x/service"
-	"github.com/go-gost/x/stats"
 )
 
 type observeRequest struct {

observer/stats/wrapper/conn.go

@@ -7,9 +7,9 @@ import (
 	"syscall"
 
 	"github.com/go-gost/core/metadata"
+	"github.com/go-gost/core/observer/stats"
 	xnet "github.com/go-gost/x/internal/net"
 	"github.com/go-gost/x/internal/net/udp"
-	"github.com/go-gost/x/stats"
 )
 
 var (

observer/stats/wrapper/io.go

@@ -3,7 +3,7 @@ package wrapper
 import (
 	"io"
 
-	"github.com/go-gost/x/stats"
+	"github.com/go-gost/core/observer/stats"
 )
 
 // readWriter is an io.ReadWriter with Stats.

observer/stats/wrapper/listener.go

@@ -3,7 +3,7 @@ package wrapper
 import (
 	"net"
 
-	"github.com/go-gost/x/stats"
+	"github.com/go-gost/core/observer/stats"
 )
 
 type listener struct {

service/service.go

@@ -15,11 +15,11 @@ import (
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/core/metrics"
 	"github.com/go-gost/core/observer"
+	"github.com/go-gost/core/observer/stats"
 	"github.com/go-gost/core/recorder"
 	"github.com/go-gost/core/service"
 	ctxvalue "github.com/go-gost/x/ctx"
 	xmetrics "github.com/go-gost/x/metrics"
-	"github.com/go-gost/x/stats"
 	"github.com/rs/xid"
 )
 

service/status.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-gost/x/stats"
+	"github.com/go-gost/core/observer/stats"
 )
 
 const (

stats/stats.go

@@ -1,93 +0,0 @@
-package stats
-
-import (
-	"sync/atomic"
-
-	"github.com/go-gost/core/observer"
-)
-
-type Kind int
-
-const (
-	KindTotalConns   Kind = 1
-	KindCurrentConns Kind = 2
-	KindInputBytes   Kind = 3
-	KindOutputBytes  Kind = 4
-	KindTotalErrs    Kind = 5
-)
-
-type Stats struct {
-	updated      atomic.Bool
-	totalConns   atomic.Uint64
-	currentConns atomic.Int64
-	inputBytes   atomic.Uint64
-	outputBytes  atomic.Uint64
-	totalErrs    atomic.Uint64
-}
-
-func (s *Stats) Add(kind Kind, n int64) {
-	if s == nil {
-		return
-	}
-	switch kind {
-	case KindTotalConns:
-		if n > 0 {
-			s.totalConns.Add(uint64(n))
-		}
-	case KindCurrentConns:
-		s.currentConns.Add(n)
-	case KindInputBytes:
-		if n > 0 {
-			s.inputBytes.Add(uint64(n))
-		}
-	case KindOutputBytes:
-		if n > 0 {
-			s.outputBytes.Add(uint64(n))
-		}
-	case KindTotalErrs:
-		if n > 0 {
-			s.totalErrs.Add(uint64(n))
-		}
-	}
-	s.updated.Store(true)
-}
-
-func (s *Stats) Get(kind Kind) uint64 {
-	if s == nil {
-		return 0
-	}
-
-	switch kind {
-	case KindTotalConns:
-		return s.totalConns.Load()
-	case KindCurrentConns:
-		return uint64(s.currentConns.Load())
-	case KindInputBytes:
-		return s.inputBytes.Load()
-	case KindOutputBytes:
-		return s.outputBytes.Load()
-	case KindTotalErrs:
-		return s.totalErrs.Load()
-	}
-	return 0
-}
-
-func (s *Stats) IsUpdated() bool {
-	return s.updated.Swap(false)
-}
-
-type StatsEvent struct {
-	Kind    string
-	Service string
-	Client  string
-
-	TotalConns   uint64
-	CurrentConns uint64
-	InputBytes   uint64
-	OutputBytes  uint64
-	TotalErrs    uint64
-}
-
-func (StatsEvent) Type() observer.EventType {
-	return observer.EventStats
-}