From cb55d6adecceec6a956ea8677db9c532e6a1d40a Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Wed, 17 Jan 2024 20:24:50 +1100 Subject: [PATCH] [qfix] Change statsOpts to metricsOpts Signed-off-by: Nikita Skrynnik --- pkg/networkservice/chains/forwarder/options.go | 8 ++++---- pkg/networkservice/chains/forwarder/server.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/networkservice/chains/forwarder/options.go b/pkg/networkservice/chains/forwarder/options.go index f907e4b7..97aae6d1 100644 --- a/pkg/networkservice/chains/forwarder/options.go +++ b/pkg/networkservice/chains/forwarder/options.go @@ -40,7 +40,7 @@ type forwarderOptions struct { dialTimeout time.Duration domain2Device map[string]string mechanismPrioriyList []string - statsOpts []metrics.Option + metricsOpts []metrics.Option cleanupOpts []cleanup.Option vxlanOpts []vxlan.Option dialOpts []grpc.DialOption @@ -105,10 +105,10 @@ func WithMechanismPriority(priorityList []string) Option { } } -// WithStatsOptions sets metrics options -func WithStatsOptions(opts ...metrics.Option) Option { +// WithMetricsOptions sets metrics options +func WithMetricsOptions(opts ...metrics.Option) Option { return func(o *forwarderOptions) { - o.statsOpts = opts + o.metricsOpts = opts } } diff --git a/pkg/networkservice/chains/forwarder/server.go b/pkg/networkservice/chains/forwarder/server.go index c2ffc832..4a46cf92 100644 --- a/pkg/networkservice/chains/forwarder/server.go +++ b/pkg/networkservice/chains/forwarder/server.go @@ -123,7 +123,7 @@ func NewServer(ctx context.Context, tokenGenerator token.GeneratorFunc, vppConn sendfd.NewServer(), discover.NewServer(nsClient, nseClient), roundrobin.NewServer(), - metrics.NewServer(ctx, vppConn, opts.statsOpts...), + metrics.NewServer(ctx, vppConn, opts.metricsOpts...), up.NewServer(ctx, vppConn), xconnect.NewServer(vppConn), l2bridgedomain.NewServer(vppConn), @@ -153,7 +153,7 @@ func NewServer(ctx context.Context, tokenGenerator token.GeneratorFunc, vppConn cleanup.NewClient(ctx, opts.cleanupOpts...), mechanismtranslation.NewClient(), connectioncontextkernel.NewClient(), - metrics.NewClient(ctx, vppConn, opts.statsOpts...), + metrics.NewClient(ctx, vppConn, opts.metricsOpts...), up.NewClient(ctx, vppConn), mtu.NewClient(vppConn), tag.NewClient(ctx, vppConn),