From bb7fb31e3d941983895c7eb26d7431b323d5f15c Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Wed, 16 Mar 2022 21:28:03 +0800 Subject: [PATCH] update metrics --- cmd/gost/config.go | 2 +- cmd/gost/main.go | 2 +- go.mod | 5 ++--- go.sum | 10 ++++------ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cmd/gost/config.go b/cmd/gost/config.go index 607e84f..01d9ec9 100644 --- a/cmd/gost/config.go +++ b/cmd/gost/config.go @@ -8,9 +8,9 @@ import ( "github.com/go-gost/config" "github.com/go-gost/config/parsing" "github.com/go-gost/core/logger" + metrics "github.com/go-gost/core/metrics/service" "github.com/go-gost/core/registry" "github.com/go-gost/core/service" - metrics "github.com/go-gost/metrics/service" ) func buildService(cfg *config.Config) (services []service.Service) { diff --git a/cmd/gost/main.go b/cmd/gost/main.go index 4615964..a760bc9 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -10,7 +10,7 @@ import ( "github.com/go-gost/config" "github.com/go-gost/core/logger" - "github.com/go-gost/metrics" + "github.com/go-gost/core/metrics" ) var ( diff --git a/go.mod b/go.mod index 75a97f3..1b44a3f 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,8 @@ replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20 require ( github.com/go-gost/api v0.0.0-20220316115521-ab4ad0f12488 github.com/go-gost/config v0.0.0-20220316114445-04016a392b1e - github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66 - github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8 - github.com/go-gost/x v0.0.0-20220316120634-36947bcbd9f3 + github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4 + github.com/go-gost/x v0.0.0-20220316132524-2682c4d63ba5 ) require ( diff --git a/go.sum b/go.sum index 47d63f5..6373fa7 100644 --- a/go.sum +++ b/go.sum @@ -125,20 +125,18 @@ github.com/go-gost/api v0.0.0-20220316115521-ab4ad0f12488 h1:c1hthEceq5yiXwZEdX7 github.com/go-gost/api v0.0.0-20220316115521-ab4ad0f12488/go.mod h1:TfLdWhO3b86fPiVOOtorOqhhZVSYwNS8C0BmarYaHtg= github.com/go-gost/config v0.0.0-20220316114445-04016a392b1e h1:0tQmXLljIgBxA1ghQ80HoF6RGlzLdkOirHjAgvGU4NA= github.com/go-gost/config v0.0.0-20220316114445-04016a392b1e/go.mod h1:TcXyaEcav8QK85dnpt+2piewCGLsUQ3W0D8SFTcRdAA= -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/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.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= github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= -github.com/go-gost/x v0.0.0-20220316120634-36947bcbd9f3 h1:rweJPJBr3k6wqzUgLbEMeoJq/AUa5koaUaqjp+rvk6I= -github.com/go-gost/x v0.0.0-20220316120634-36947bcbd9f3/go.mod h1:CEpilNHCLNGQO2sGEJMxTqPJIj1zJ7q3BuzSQU4CyG8= +github.com/go-gost/x v0.0.0-20220316132524-2682c4d63ba5 h1:WczlUcBQPbmuwWgFTsAzmSeumMiiKjmmGlSmAbOsnhg= +github.com/go-gost/x v0.0.0-20220316132524-2682c4d63ba5/go.mod h1:1AM/tfLXeHJbQfV4MV6eeIfsIM72CvpAH7AaliVRqZ0= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=