From 0735d8696425465e292d7fa54a624138fb3bb668 Mon Sep 17 00:00:00 2001 From: Karl Sassenberg Date: Fri, 10 Mar 2023 16:09:12 +0000 Subject: [PATCH] feat: make deps --- .../nginx/agent/v2/src/core/metrics/metrics_util.go | 5 +++-- .../vendor/github.com/nginx/agent/v2/src/plugins/metrics.go | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go index bba00d44f2..77d16d31c1 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go @@ -377,7 +377,7 @@ func GetCalculationMap() map[string]string { } } -func GenerateMetricsReportBundle(entities []*StatsEntityWrapper) (bundle core.Payload) { +func GenerateMetricsReportBundle(entities []*StatsEntityWrapper) core.Payload { reportMap := make(map[proto.MetricsReport_Type]*proto.MetricsReport, 0) for _, entity := range entities { @@ -398,6 +398,7 @@ func GenerateMetricsReportBundle(entities []*StatsEntityWrapper) (bundle core.Pa for _, report := range reportMap { bundle.Data = append(bundle.Data, report) } + return bundle } - return + return nil } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go index 6c39a5beef..8895f37cfe 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go @@ -183,11 +183,14 @@ func (m *Metrics) metricsGoroutine() { return case <-m.ticker.C: stats := m.collectStats() - m.pipeline.Process(core.NewMessage(core.MetricReport, metrics.GenerateMetricsReportBundle(stats))) + if bundle := metrics.GenerateMetricsReportBundle(stats); bundle != nil { + m.pipeline.Process(core.NewMessage(core.MetricReport, bundle)) + } if m.collectorsUpdate.Load() { m.ticker = time.NewTicker(m.conf.AgentMetrics.CollectionInterval) m.collectorsUpdate.Store(false) } + case err := <-m.errors: log.Errorf("Error in metricsGoroutine %v", err) }