github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1967 from crosbymichael/grpc-timing

Browse Source 
Enable grpc timing histograms
This commit is contained in:
Stephen Day 2018-01-05 15:26:49 -08:00 committed by GitHub
commit 632f78a530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/config.go
View File

@ -50,7 +50,8 @@ type Debug struct {
// MetricsConfig provides metrics configuration // MetricsConfig provides metrics configuration
type MetricsConfig struct { type MetricsConfig struct {
Address string `toml:"address"` Address string `toml:"address"`
GRPCHistogram bool `toml:"grpc_histogram"`
} }
// CgroupConfig provides cgroup configuration // CgroupConfig provides cgroup configuration

6
server/server.go
View File

@ -70,6 +70,7 @@ func New(ctx context.Context, config *Config) (*Server, error) {
s = &Server{ s = &Server{
rpc: rpc, rpc: rpc,
events: exchange.NewExchange(), events: exchange.NewExchange(),
config: config,
} }
initialized = plugin.NewPluginSet() initialized = plugin.NewPluginSet()
) )
@ -127,10 +128,15 @@ func New(ctx context.Context, config *Config) (*Server, error) {
type Server struct { type Server struct {
rpc *grpc.Server rpc *grpc.Server
events *exchange.Exchange events *exchange.Exchange
config *Config
} }
// ServeGRPC provides the containerd grpc APIs on the provided listener // ServeGRPC provides the containerd grpc APIs on the provided listener
func (s *Server) ServeGRPC(l net.Listener) error { func (s *Server) ServeGRPC(l net.Listener) error {
if s.config.Metrics.GRPCHistogram {
// enable grpc time histograms to measure rpc latencies
grpc_prometheus.EnableHandlingTimeHistogram()
}
// before we start serving the grpc API regster the grpc_prometheus metrics // before we start serving the grpc API regster the grpc_prometheus metrics
// handler. This needs to be the last service registered so that it can collect // handler. This needs to be the last service registered so that it can collect
// metrics for every other service // metrics for every other service