From cadf5f4b0852a22e89fd735e6f3f30858501145d Mon Sep 17 00:00:00 2001 From: criyle Date: Sat, 25 Jan 2025 22:56:34 -0500 Subject: [PATCH] build(deps): deprecate o-grpc-prometheu --- cmd/go-judge/main.go | 11 ++++++----- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd/go-judge/main.go b/cmd/go-judge/main.go index df3c03e..18f953f 100644 --- a/cmd/go-judge/main.go +++ b/cmd/go-judge/main.go @@ -30,10 +30,11 @@ import ( "github.com/criyle/go-judge/worker" ginzap "github.com/gin-contrib/zap" "github.com/gin-gonic/gin" + grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" grpc_logging "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" - grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ginprometheus "github.com/zsais/go-gin-prometheus" "go.uber.org/zap" @@ -384,14 +385,15 @@ func InterceptorLogger(l *zap.Logger) grpc_logging.Logger { } func newGRPCServer(conf *config.Config, esServer pb.ExecutorServer) *grpc.Server { + prom := grpc_prometheus.NewServerMetrics(grpc_prometheus.WithServerHandlingTimeHistogram()) grpclog.SetLoggerV2(zapgrpc.NewLogger(logger)) streamMiddleware := []grpc.StreamServerInterceptor{ - grpc_prometheus.StreamServerInterceptor, + prom.StreamServerInterceptor(), grpc_logging.StreamServerInterceptor(InterceptorLogger(logger)), grpc_recovery.StreamServerInterceptor(), } unaryMiddleware := []grpc.UnaryServerInterceptor{ - grpc_prometheus.UnaryServerInterceptor, + prom.UnaryServerInterceptor(), grpc_logging.UnaryServerInterceptor(InterceptorLogger(logger)), grpc_recovery.UnaryServerInterceptor(), } @@ -406,8 +408,7 @@ func newGRPCServer(conf *config.Config, esServer pb.ExecutorServer) *grpc.Server grpc.MaxRecvMsgSize(int(conf.GRPCMsgSize.Byte())), ) pb.RegisterExecutorServer(grpcServer, esServer) - grpc_prometheus.Register(grpcServer) - grpc_prometheus.EnableHandlingTimeHistogram() + prometheus.MustRegister(prom) return grpcServer } diff --git a/go.mod b/go.mod index 1c3e8de..4e0ea20 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,8 @@ require ( github.com/godbus/dbus/v5 v5.1.0 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/gorilla/websocket v1.5.3 + github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7 github.com/prometheus/client_golang v1.20.5 github.com/zsais/go-gin-prometheus v0.1.0 diff --git a/go.sum b/go.sum index 2936cdc..57b586c 100644 --- a/go.sum +++ b/go.sum @@ -67,10 +67,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 h1:kQ0NI7W1B3HwiN5gAYtY+XFItDPbLBwYRxAqbFTyDes= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0/go.mod h1:zrT2dxOAjNFPRGjTUe2Xmb4q4YdUwVvQFV6xiCSf+z0= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=