From 2682c4d63ba5fe5458a4490c02d0bd648fa64d6d Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Wed, 16 Mar 2022 21:25:24 +0800 Subject: [PATCH] update metrics --- go.mod | 3 +-- go.sum | 6 ++---- listener/dns/listener.go | 2 +- listener/ftcp/listener.go | 2 +- listener/grpc/listener.go | 2 +- listener/http2/h2/listener.go | 2 +- listener/http2/listener.go | 2 +- listener/http3/listener.go | 2 +- listener/icmp/listener.go | 2 +- listener/kcp/listener.go | 2 +- listener/mtls/listener.go | 2 +- listener/mws/listener.go | 2 +- listener/obfs/http/listener.go | 2 +- listener/obfs/tls/listener.go | 2 +- listener/pht/listener.go | 2 +- listener/quic/listener.go | 2 +- listener/ssh/listener.go | 2 +- listener/sshd/listener.go | 2 +- listener/tap/listener.go | 2 +- listener/tun/listener.go | 2 +- listener/ws/listener.go | 2 +- 21 files changed, 22 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index e92052b..cc733c7 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,8 @@ go 1.18 require ( github.com/LiamHaworth/go-tproxy v0.0.0-20190726054950-ef7efd7f24ed github.com/docker/libcontainer v2.2.1+incompatible - github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66 + github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4 github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 - github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8 github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e github.com/golang/snappy v0.0.4 diff --git a/go.sum b/go.sum index e91ad7a..90c9e04 100644 --- a/go.sum +++ b/go.sum @@ -104,12 +104,10 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66 h1:c2xJRqXxys5FSi66dK5xSxuz8IeoYy2N+uOPse4OooE= -github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66/go.mod h1:WyaY3XWXX0SHgao6DP8/YnSnzyMTJEWdyzegDWNSQFY= +github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4 h1:u2ryD5Csx21bvLFadzezwf5/TniK8YmMK1jmhfJmTLg= +github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4/go.mod h1:+Eqgm24sZ61yY9uPhRIPM79Ig+r2Rk5QIOcZWLL+5q0= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= -github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8 h1:X9PolYxy/7rSWY+AFP75rdfXoLlNdFemjL9/RduuuVA= -github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8/go.mod h1:Ac2Pigx5GMJEznkP9wLdBJ36+rYwWiJPqWk7lrg3FKg= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB4Igb0EbY8m+1Py2AaNNSBds/9gk4= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e h1:73NGqAs22ey3wJkIYVD/ACEoovuIuOlEzQTEoqrO5+U= diff --git a/listener/dns/listener.go b/listener/dns/listener.go index 9a21e3c..4894b3f 100644 --- a/listener/dns/listener.go +++ b/listener/dns/listener.go @@ -12,8 +12,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" "github.com/miekg/dns" ) diff --git a/listener/ftcp/listener.go b/listener/ftcp/listener.go index 9fe1fb6..deb2f94 100644 --- a/listener/ftcp/listener.go +++ b/listener/ftcp/listener.go @@ -8,8 +8,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" "github.com/xtaci/tcpraw" ) diff --git a/listener/grpc/listener.go b/listener/grpc/listener.go index 0cb053a..35fa371 100644 --- a/listener/grpc/listener.go +++ b/listener/grpc/listener.go @@ -7,8 +7,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" pb "github.com/go-gost/x/internal/util/grpc/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/listener/http2/h2/listener.go b/listener/http2/h2/listener.go index 43226fe..b9133d7 100644 --- a/listener/http2/h2/listener.go +++ b/listener/http2/h2/listener.go @@ -11,8 +11,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/listener/http2/listener.go b/listener/http2/listener.go index 6098bb1..0568237 100644 --- a/listener/http2/listener.go +++ b/listener/http2/listener.go @@ -9,8 +9,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" "golang.org/x/net/http2" ) diff --git a/listener/http3/listener.go b/listener/http3/listener.go index 961f298..f410d46 100644 --- a/listener/http3/listener.go +++ b/listener/http3/listener.go @@ -6,8 +6,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" pht_util "github.com/go-gost/x/internal/util/pht" "github.com/lucas-clemente/quic-go" ) diff --git a/listener/icmp/listener.go b/listener/icmp/listener.go index 7216e6e..9b7904d 100644 --- a/listener/icmp/listener.go +++ b/listener/icmp/listener.go @@ -8,8 +8,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" icmp_pkg "github.com/go-gost/x/internal/util/icmp" "github.com/lucas-clemente/quic-go" "golang.org/x/net/icmp" diff --git a/listener/kcp/listener.go b/listener/kcp/listener.go index b02606c..e018d83 100644 --- a/listener/kcp/listener.go +++ b/listener/kcp/listener.go @@ -8,8 +8,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" kcp_util "github.com/go-gost/x/internal/util/kcp" "github.com/xtaci/kcp-go/v5" "github.com/xtaci/smux" diff --git a/listener/mtls/listener.go b/listener/mtls/listener.go index ca59056..ffc1bda 100644 --- a/listener/mtls/listener.go +++ b/listener/mtls/listener.go @@ -8,8 +8,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" "github.com/xtaci/smux" ) diff --git a/listener/mws/listener.go b/listener/mws/listener.go index 738ecc7..74f43bf 100644 --- a/listener/mws/listener.go +++ b/listener/mws/listener.go @@ -10,8 +10,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ws_util "github.com/go-gost/x/internal/util/ws" "github.com/gorilla/websocket" "github.com/xtaci/smux" diff --git a/listener/obfs/http/listener.go b/listener/obfs/http/listener.go index 4e3d8b8..0c5b2b1 100644 --- a/listener/obfs/http/listener.go +++ b/listener/obfs/http/listener.go @@ -7,8 +7,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ) func init() { diff --git a/listener/obfs/tls/listener.go b/listener/obfs/tls/listener.go index 21eeef6..d240768 100644 --- a/listener/obfs/tls/listener.go +++ b/listener/obfs/tls/listener.go @@ -7,8 +7,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ) func init() { diff --git a/listener/pht/listener.go b/listener/pht/listener.go index 42c2be8..d7273d3 100644 --- a/listener/pht/listener.go +++ b/listener/pht/listener.go @@ -8,8 +8,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" pht_util "github.com/go-gost/x/internal/util/pht" ) diff --git a/listener/quic/listener.go b/listener/quic/listener.go index 6aabcec..811020a 100644 --- a/listener/quic/listener.go +++ b/listener/quic/listener.go @@ -7,8 +7,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" quic_util "github.com/go-gost/x/internal/util/quic" "github.com/lucas-clemente/quic-go" ) diff --git a/listener/ssh/listener.go b/listener/ssh/listener.go index 20691b3..42a366c 100644 --- a/listener/ssh/listener.go +++ b/listener/ssh/listener.go @@ -9,8 +9,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ssh_util "github.com/go-gost/x/internal/util/ssh" "golang.org/x/crypto/ssh" ) diff --git a/listener/sshd/listener.go b/listener/sshd/listener.go index 39a2858..5a344ee 100644 --- a/listener/sshd/listener.go +++ b/listener/sshd/listener.go @@ -11,8 +11,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ssh_util "github.com/go-gost/x/internal/util/ssh" sshd_util "github.com/go-gost/x/internal/util/sshd" "golang.org/x/crypto/ssh" diff --git a/listener/tap/listener.go b/listener/tap/listener.go index 9a3eeb8..c60695f 100644 --- a/listener/tap/listener.go +++ b/listener/tap/listener.go @@ -6,8 +6,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" mdata "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ) func init() { diff --git a/listener/tun/listener.go b/listener/tun/listener.go index c962b19..bb5faf5 100644 --- a/listener/tun/listener.go +++ b/listener/tun/listener.go @@ -6,8 +6,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" mdata "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ) func init() { diff --git a/listener/ws/listener.go b/listener/ws/listener.go index d064d78..13f175f 100644 --- a/listener/ws/listener.go +++ b/listener/ws/listener.go @@ -10,8 +10,8 @@ import ( "github.com/go-gost/core/listener" "github.com/go-gost/core/logger" md "github.com/go-gost/core/metadata" + metrics "github.com/go-gost/core/metrics/wrapper" "github.com/go-gost/core/registry" - metrics "github.com/go-gost/metrics/wrapper" ws_util "github.com/go-gost/x/internal/util/ws" "github.com/gorilla/websocket" )