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

Register grpc metrics in main

Browse Source 
This needs to be registered last after all other services have been
registred.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-06-14 11:19:58 -07:00
parent 9b8e76edf1
commit c2dd40c9bc
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/containerd/builtins.go
View File

@ -9,7 +9,6 @@ import (
_ "github.com/containerd/containerd/services/execution" _ "github.com/containerd/containerd/services/execution"
_ "github.com/containerd/containerd/services/healthcheck" _ "github.com/containerd/containerd/services/healthcheck"
_ "github.com/containerd/containerd/services/images" _ "github.com/containerd/containerd/services/images"
_ "github.com/containerd/containerd/services/metrics"
_ "github.com/containerd/containerd/services/namespaces" _ "github.com/containerd/containerd/services/namespaces"
_ "github.com/containerd/containerd/services/snapshot" _ "github.com/containerd/containerd/services/snapshot"
_ "github.com/containerd/containerd/services/version" _ "github.com/containerd/containerd/services/version"

2
cmd/containerd/main.go
View File

@ -147,6 +147,8 @@ func main() {
return err return err
} }
} }
// register metrics last after all other services
grpc_prometheus.Register(server)
log.G(global).Info("starting GRPC API server...") log.G(global).Info("starting GRPC API server...")
if err := serveGRPC(server); err != nil { if err := serveGRPC(server); err != nil {
return err return err

26
services/metrics/metrics.go
View File

@ -1,26 +0,0 @@
package metrics
import (
"github.com/containerd/containerd/plugin"
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"google.golang.org/grpc"
)
func init() {
plugin.Register("metrics-grpc", &plugin.Registration{
Type: plugin.GRPCPlugin,
Init: New,
})
}
func New(_ *plugin.InitContext) (interface{}, error) {
return &Service{}, nil
}
type Service struct {
}
func (s *Service) Register(server *grpc.Server) error {
grpc_prometheus.Register(server)
return nil
}