Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8878 from brancz/init-metrics

Browse Source 
*: initialize gRPC server metrics with zero values
This commit is contained in:
Gyu-Ho Lee 2017-11-15 10:20:41 -08:00 committed by GitHub
commit 6260df7404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdmain/grpc_proxy.go
View File

@ -318,6 +318,10 @@ func newGRPCProxyServer(client *clientv3.Client) *grpc.Server {
pb.RegisterAuthServer(server, authp) pb.RegisterAuthServer(server, authp)
v3electionpb.RegisterElectionServer(server, electionp) v3electionpb.RegisterElectionServer(server, electionp)
v3lockpb.RegisterLockServer(server, lockp) v3lockpb.RegisterLockServer(server, lockp)
// set zero values for metrics registered for this grpc server
grpc_prometheus.Register(server)
return server return server
} }

4
etcdserver/api/v3rpc/grpc.go
View File

@ -22,6 +22,7 @@ import (
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/grpc-ecosystem/go-grpc-prometheus"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
@ -66,5 +67,8 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config, gopts ...grpc.ServerOptio
hsrv.SetServingStatus("", healthpb.HealthCheckResponse_SERVING) hsrv.SetServingStatus("", healthpb.HealthCheckResponse_SERVING)
healthpb.RegisterHealthServer(grpcServer, hsrv) healthpb.RegisterHealthServer(grpcServer, hsrv)
// set zero values for metrics registered for this grpc server
grpc_prometheus.Register(grpcServer)
return grpcServer return grpcServer
} }