SD-11577: remove some functionality

Author: rtalvarez

cloudflare.go

@@ -9,7 +9,7 @@ import (
 	cfaccounts "github.com/cloudflare/cloudflare-go/v4/accounts"
 	cfload_balancers "github.com/cloudflare/cloudflare-go/v4/load_balancers"
 	cfpagination "github.com/cloudflare/cloudflare-go/v4/packages/pagination"
-	cfqueues "github.com/cloudflare/cloudflare-go/v4/queues"
+
 	cfrulesets "github.com/cloudflare/cloudflare-go/v4/rulesets"
 	cfzero_trust "github.com/cloudflare/cloudflare-go/v4/zero_trust"
 	cfzones "github.com/cloudflare/cloudflare-go/v4/zones"
@@ -1250,36 +1250,6 @@ func fetchWorkerSubrequests(accountID string) (*cloudflareResponseSubrequests, e
 	return &resp, nil
 }
 
-func fetchQueueNames(accountID string) (map[string]string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), cftimeout)
-	defer cancel()
-	page := cfclient.Queues.ListAutoPaging(ctx,
-		cfqueues.QueueListParams{
-			AccountID: cf.F(accountID),
-		})
-	if page.Err() != nil {
-		return nil, page.Err()
-	}
-
-	queueNames := make(map[string]string)
-	seenIDs := make(map[string]struct{})
-	for page.Next() {
-		if page.Err() != nil {
-			log.Errorf("error during paging queues: %v", page.Err())
-			break
-		}
-		q := page.Current()
-		if _, exists := seenIDs[q.QueueID]; exists {
-			log.Errorf("fetchQueueNames: duplicate queue ID detected (%s), breaking loop", q.QueueID)
-			break
-		}
-		seenIDs[q.QueueID] = struct{}{}
-		queueNames[q.QueueID] = q.QueueName
-	}
-
-	return queueNames, nil
-}
-
 func fetchQueueMetrics(accountID string) (*cloudflareResponseQueues, error) {
 	request := graphql.NewRequest(`
 	query ($accountID: String!, $mintime: Time!, $maxtime: Time!, $limit: Int!) {

main.go

@@ -196,7 +196,7 @@ func runExporter() {
 	h := health.New(health.Health{})
 	http.HandleFunc("/health", h.Handler)
 
-	log.Info("(live change) Beginning to serve metrics on ", viper.GetString("listen"), cfgMetricsPath)
+	log.Info("(live change v1) Beginning to serve metrics on ", viper.GetString("listen"), cfgMetricsPath)
 
 	server := &http.Server{
 		Addr:              viper.GetString("listen"),

prometheus.go

@@ -736,14 +736,6 @@ func fetchQueueAnalytics(account cfaccounts.Account, wg *sync.WaitGroup) {
 	wg.Add(1)
 	defer wg.Done()
 
-	queueNames, err := fetchQueueNames(account.ID)
-	if err != nil {
-		log.Error("failed to fetch queue names for account ", account.ID, ": ", err)
-		return
-	}
-
-	log.Info("fetched queue names")
-
 	r, err := fetchQueueMetrics(account.ID)
 	if err != nil {
 		log.Error("failed to fetch queue metrics for account ", account.ID, ": ", err)
@@ -755,19 +747,11 @@ func fetchQueueAnalytics(account cfaccounts.Account, wg *sync.WaitGroup) {
 
 	for _, a := range r.Viewer.Accounts {
 		for _, b := range a.QueueBacklogAdaptiveGroups {
-			queueName := b.Dimensions.QueueID
-			if name, ok := queueNames[b.Dimensions.QueueID]; ok {
-				queueName = name
-			}
-			queueBacklogMessages.With(prometheus.Labels{"queue_name": queueName, "account": accountName}).Set(b.Avg.Messages)
-			queueBacklogBytes.With(prometheus.Labels{"queue_name": queueName, "account": accountName}).Set(b.Avg.Bytes)
+			queueBacklogMessages.With(prometheus.Labels{"queue_name": b.Dimensions.QueueID, "account": accountName}).Set(b.Avg.Messages)
+			queueBacklogBytes.With(prometheus.Labels{"queue_name": b.Dimensions.QueueID, "account": accountName}).Set(b.Avg.Bytes)
 		}
 		for _, c := range a.QueueConsumerMetricsAdaptiveGroups {
-			queueName := c.Dimensions.QueueID
-			if name, ok := queueNames[c.Dimensions.QueueID]; ok {
-				queueName = name
-			}
-			queueConsumerConcurrency.With(prometheus.Labels{"queue_name": queueName, "account": accountName}).Set(c.Avg.Concurrency)
+			queueConsumerConcurrency.With(prometheus.Labels{"queue_name": c.Dimensions.QueueID, "account": accountName}).Set(c.Avg.Concurrency)
 		}
 	}
 }