From 2dcb319ef55e9d2f14c0240d17441fa326b48580 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 11 May 2021 16:16:08 +0000 Subject: [PATCH] Refactor: move collector metrics where they are used --- app/multitenant/aws_collector.go | 14 +++----------- app/multitenant/collector.go | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/multitenant/aws_collector.go b/app/multitenant/aws_collector.go index a3fe95b12..76ca3919d 100644 --- a/app/multitenant/aws_collector.go +++ b/app/multitenant/aws_collector.go @@ -83,17 +83,6 @@ var ( Name: "reports_bytes_total", Help: "Total bytes stored in reports per user.", }, []string{"user"}) - topologiesDropped = prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "scope", - Name: "topologies_dropped_total", - Help: "Total count of topologies dropped for being over limit.", - }, []string{"user", "topology"}) - - natsRequests = prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "scope", - Name: "nats_requests_total", - Help: "Total count of NATS requests.", - }, []string{"method", "status_code"}) flushDuration = instrument.NewHistogramCollectorFromOpts(prometheus.HistogramOpts{ Namespace: "scope", @@ -109,6 +98,9 @@ func registerAWSCollectorMetrics() { prometheus.MustRegister(dynamoValueSize) prometheus.MustRegister(inProcessCacheRequests) prometheus.MustRegister(inProcessCacheHits) + prometheus.MustRegister(reportSizeHistogram) + prometheus.MustRegister(reportsPerUser) + prometheus.MustRegister(reportSizePerUser) flushDuration.Register() } diff --git a/app/multitenant/collector.go b/app/multitenant/collector.go index 897c536f4..c001b775f 100644 --- a/app/multitenant/collector.go +++ b/app/multitenant/collector.go @@ -27,10 +27,21 @@ import ( "golang.org/x/sync/errgroup" ) +var ( + topologiesDropped = prometheus.NewCounterVec(prometheus.CounterOpts{ + Namespace: "scope", + Name: "topologies_dropped_total", + Help: "Total count of topologies dropped for being over limit.", + }, []string{"user", "topology"}) + + natsRequests = prometheus.NewCounterVec(prometheus.CounterOpts{ + Namespace: "scope", + Name: "nats_requests_total", + Help: "Total count of NATS requests.", + }, []string{"method", "status_code"}) +) + func registerLiveCollectorMetrics() { - prometheus.MustRegister(reportSizeHistogram) - prometheus.MustRegister(reportsPerUser) - prometheus.MustRegister(reportSizePerUser) prometheus.MustRegister(topologiesDropped) prometheus.MustRegister(natsRequests) }