From ad7c7f429ab2ed030684fc7213180d04c2af5cba Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Tue, 19 May 2020 15:07:55 -0400 Subject: [PATCH] Remove source type from metrics. Fix metric name casing --- router/metrics/peekhandler.go | 2 +- router/router.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/router/metrics/peekhandler.go b/router/metrics/peekhandler.go index 12a5863f7..4b898caab 100644 --- a/router/metrics/peekhandler.go +++ b/router/metrics/peekhandler.go @@ -148,7 +148,7 @@ func NewXgressPeekHandler(registry metrics.Registry) xgress.PeekHandler { ingressRxBytesMeter := registry.Meter("ingress.rx.bytesrate") ingressRxMsgMeter := registry.Meter("ingress.rx.msgrate") egressTxBytesMeter := registry.Meter("egress.tx.bytesrate") - egressTxMsgMeter := registry.Meter("egress.tx.Msgrate") + egressTxMsgMeter := registry.Meter("egress.tx.msgrate") egressRxBytesMeter := registry.Meter("egress.rx.bytesrate") egressRxMsgMeter := registry.Meter("egress.rx.msgrate") diff --git a/router/router.go b/router/router.go index 48266cb07..c1703cfe2 100644 --- a/router/router.go +++ b/router/router.go @@ -36,7 +36,6 @@ import ( "github.com/netfoundry/ziti-fabric/router/xlink_transwarp" "github.com/netfoundry/ziti-foundation/channel2" "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/metrics/metrics_pb" "github.com/netfoundry/ziti-foundation/profiler" "github.com/netfoundry/ziti-foundation/util/concurrenz" "github.com/netfoundry/ziti-foundation/util/info" @@ -68,7 +67,7 @@ func (self *Router) Channel() channel2.Channel { } func Create(config *Config) *Router { - metricsRegistry := metrics.NewRegistry(metrics_pb.MetricsSourceType_Internal, config.Id.Token, make(map[string]string), time.Second*15, nil) + metricsRegistry := metrics.NewRegistry(config.Id.Token, make(map[string]string), time.Second*15, nil) return &Router{ config: config,