status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-09 04:14:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9162 from hashicorp/dnephin/fix-grpc-metrics

Browse Source 
grpc: fix metrics
This commit is contained in:
Daniel Nephin 2020-11-12 17:03:01 -05:00 committed by GitHub
commit a397ec85eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/grpc/client.go
View File

@ -61,7 +61,7 @@ func (c *ClientConnPool) ClientConn(datacenter string) (*grpc.ClientConn, error)
grpc.WithInsecure(), grpc.WithInsecure(),
grpc.WithContextDialer(c.dialer), grpc.WithContextDialer(c.dialer),
grpc.WithDisableRetry(), grpc.WithDisableRetry(),
grpc.WithStatsHandler(newStatsHandler(defaultMetrics)), grpc.WithStatsHandler(newStatsHandler(defaultMetrics())),
// nolint:staticcheck // there is no other supported alternative to WithBalancerName // nolint:staticcheck // there is no other supported alternative to WithBalancerName
grpc.WithBalancerName("pick_first")) grpc.WithBalancerName("pick_first"))
if err != nil { if err != nil {

5
agent/grpc/handler.go
View File

@ -14,11 +14,12 @@ import (
// The register function will be called with the grpc.Server to register // The register function will be called with the grpc.Server to register
// gRPC services with the server. // gRPC services with the server.
func NewHandler(addr net.Addr, register func(server *grpc.Server)) *Handler { func NewHandler(addr net.Addr, register func(server *grpc.Server)) *Handler {
metrics := defaultMetrics()
// We don't need to pass tls.Config to the server since it's multiplexed // We don't need to pass tls.Config to the server since it's multiplexed
// behind the RPC listener, which already has TLS configured. // behind the RPC listener, which already has TLS configured.
srv := grpc.NewServer( srv := grpc.NewServer(
grpc.StatsHandler(newStatsHandler(defaultMetrics)), grpc.StatsHandler(newStatsHandler(metrics)),
grpc.StreamInterceptor((&activeStreamCounter{metrics: defaultMetrics}).Intercept), grpc.StreamInterceptor((&activeStreamCounter{metrics: metrics}).Intercept),
) )
register(srv) register(srv)

2
agent/grpc/stats.go
View File

@ -9,7 +9,7 @@ import (
"google.golang.org/grpc/stats" "google.golang.org/grpc/stats"
) )
var defaultMetrics = metrics.Default() var defaultMetrics = metrics.Default
// statsHandler is a grpc/stats.StatsHandler which emits connection and // statsHandler is a grpc/stats.StatsHandler which emits connection and
// request metrics to go-metrics. // request metrics to go-metrics.

7
agent/grpc/stats_test.go
View File

@ -113,11 +113,14 @@ func patchGlobalMetrics(t *testing.T) (*fakeMetricsSink, func()) {
FilterDefault: true, FilterDefault: true,
} }
var err error var err error
defaultMetrics, err = metrics.New(cfg, sink) defaultMetrics = func() *metrics.Metrics {
m, _ := metrics.New(cfg, sink)
return m
}
require.NoError(t, err) require.NoError(t, err)
reset := func() { reset := func() {
t.Helper() t.Helper()
defaultMetrics, err = metrics.New(cfg, &metrics.BlackholeSink{}) defaultMetrics = metrics.Default
require.NoError(t, err, "failed to reset global metrics") require.NoError(t, err, "failed to reset global metrics")
} }
return sink, reset return sink, reset