DONOTMERGE: keep metrics local to the struct instance

Author: stigok

pkg/store/github/github.go

@@ -28,9 +28,10 @@ type GitHubStore struct {
 	// Topic to filter repositories by. Leave empty for all.
 	topicFilter string
 
-	client *github.Client
-	cache  map[string][]*core.ModuleVersion
-	mut    sync.RWMutex
+	client  *github.Client
+	cache   map[string][]*core.ModuleVersion
+	mut     sync.RWMutex
+	metrics metrics
 
 	logger *zap.Logger
 }
@@ -51,6 +52,17 @@ func NewGitHubStore(ownerFilter, topicFilter, accessToken string, logger *zap.Lo
 		client:      github.NewClient(c),
 		cache:       make(map[string][]*core.ModuleVersion),
 		logger:      logger,
+		metrics: metrics{
+			rateLimitCoreLimit:             newGauge("rate_limit_core_limit"),
+			rateLimitCoreRemaining:         newGauge("rate_limit_core_remaining"),
+			rateLimitCoreResetTimestamp:    newGauge("rate_limit_core_reset_timestamp"),
+			rateLimitSearchLimit:           newGauge("rate_limit_search_limit"),
+			rateLimitSearchRemaining:       newGauge("rate_limit_search_remaining"),
+			rateLimitSearchResetTimestamp:  newGauge("rate_limit_search_reset_timestamp"),
+			rateLimitGraphQLLimit:          newGauge("rate_limit_graphql_limit"),
+			rateLimitGraphQLRemaining:      newGauge("rate_limit_graphql_remaining"),
+			rateLimitGraphQLResetTimestamp: newGauge("rate_limit_graphql_reset_timestamp"),
+		},
 	}
 }
 
@@ -214,6 +226,18 @@ func (s *GitHubStore) searchRepositories(ctx context.Context) ([]*github.Reposit
 	return allRepos, nil
 }
 
+type metrics struct {
+	rateLimitCoreLimit             prometheus.Gauge
+	rateLimitCoreRemaining         prometheus.Gauge
+	rateLimitCoreResetTimestamp    prometheus.Gauge
+	rateLimitSearchLimit           prometheus.Gauge
+	rateLimitSearchRemaining       prometheus.Gauge
+	rateLimitSearchResetTimestamp  prometheus.Gauge
+	rateLimitGraphQLLimit          prometheus.Gauge
+	rateLimitGraphQLRemaining      prometheus.Gauge
+	rateLimitGraphQLResetTimestamp prometheus.Gauge
+}
+
 // newGauge is a helper function for creating gauges with a common namespace and subsystem.
 func newGauge(name string) prometheus.Gauge {
 	return prometheus.NewGauge(prometheus.GaugeOpts{
@@ -223,38 +247,35 @@ func newGauge(name string) prometheus.Gauge {
 	})
 }
 
-var (
-	metRateLimitCoreLimit             = newGauge("rate_limit_core_limit")
-	metRateLimitCoreRemaining         = newGauge("rate_limit_core_remaining")
-	metRateLimitCoreResetTimestamp    = newGauge("rate_limit_core_reset_timestamp")
-	metRateLimitSearchLimit           = newGauge("rate_limit_search_limit")
-	metRateLimitSearchRemaining       = newGauge("rate_limit_search_remaining")
-	metRateLimitSearchResetTimestamp  = newGauge("rate_limit_search_reset_timestamp")
-	metRateLimitGraphQLLimit          = newGauge("rate_limit_graphql_limit")
-	metRateLimitGraphQLRemaining      = newGauge("rate_limit_graphql_remaining")
-	metRateLimitGraphQLResetTimestamp = newGauge("rate_limit_graphql_reset_timestamp")
-)
-
 // updateMetrics updates all metrics that needs polling.
 func (s *GitHubStore) updateMetrics(ctx context.Context) {
 	ratel, _, err := s.client.RateLimits(ctx)
 	if err != nil {
 		s.logger.Warn("failed to get rate limit status", zap.Errors("err", []error{err}))
 	} else {
-		metRateLimitCoreLimit.Set(float64(ratel.Core.Limit))
-		metRateLimitCoreRemaining.Set(float64(ratel.Core.Remaining))
-		metRateLimitCoreResetTimestamp.Set(float64(ratel.Core.Reset.Unix()))
-		metRateLimitSearchLimit.Set(float64(ratel.Search.Limit))
-		metRateLimitSearchRemaining.Set(float64(ratel.Search.Remaining))
-		metRateLimitSearchResetTimestamp.Set(float64(ratel.Search.Reset.Unix()))
-		metRateLimitGraphQLLimit.Set(float64(ratel.GraphQL.Limit))
-		metRateLimitGraphQLRemaining.Set(float64(ratel.GraphQL.Remaining))
-		metRateLimitGraphQLResetTimestamp.Set(float64(ratel.GraphQL.Reset.Unix()))
+		s.metrics.rateLimitCoreLimit.Set(float64(ratel.Core.Limit))
+		s.metrics.rateLimitCoreRemaining.Set(float64(ratel.Core.Remaining))
+		s.metrics.rateLimitCoreResetTimestamp.Set(float64(ratel.Core.Reset.Unix()))
+		s.metrics.rateLimitSearchLimit.Set(float64(ratel.Search.Limit))
+		s.metrics.rateLimitSearchRemaining.Set(float64(ratel.Search.Remaining))
+		s.metrics.rateLimitSearchResetTimestamp.Set(float64(ratel.Search.Reset.Unix()))
+		s.metrics.rateLimitGraphQLLimit.Set(float64(ratel.GraphQL.Limit))
+		s.metrics.rateLimitGraphQLRemaining.Set(float64(ratel.GraphQL.Remaining))
+		s.metrics.rateLimitGraphQLResetTimestamp.Set(float64(ratel.GraphQL.Reset.Unix()))
 	}
 }
 
+// Metrics returns a registry with metrics for this store.
 func (s *GitHubStore) Metrics() []prometheus.Collector {
 	return []prometheus.Collector{
-		metRateLimitCoreLimit,
+		s.metrics.rateLimitCoreLimit,
+		s.metrics.rateLimitCoreRemaining,
+		s.metrics.rateLimitCoreResetTimestamp,
+		s.metrics.rateLimitSearchLimit,
+		s.metrics.rateLimitSearchRemaining,
+		s.metrics.rateLimitSearchResetTimestamp,
+		s.metrics.rateLimitGraphQLLimit,
+		s.metrics.rateLimitGraphQLRemaining,
+		s.metrics.rateLimitGraphQLResetTimestamp,
 	}
 }