Fix merge conflict resolution errors

alowde · alowde · commit dfce6bbad932 · 2025-11-13T13:02:16.000+10:30
diff --git a/main.go b/main.go
@@ -111,7 +111,7 @@ func fetchMetrics(deniedMetricsSet MetricsSet) {
 		go fetchWorkerAnalytics(a, &wg)
 		go fetchLogpushAnalyticsForAccount(a, &wg)
 		go fetchR2StorageForAccount(a, &wg)
-		go fetchLoadblancerPoolsHealth(a, &wg, deniedMetricsSet)
+		go fetchLoadblancerPoolsHealth(a, &wg)
 		go fetchZeroTrustAnalyticsForAccount(a, &wg)
 		go fetchDNSFirewallAnalytics(a, &wg, deniedMetricsSet)
 	}
diff --git a/prometheus.go b/prometheus.go
@@ -506,7 +506,7 @@ func mustRegisterMetrics(deniedMetrics MetricsSet) {
 	}
 }
 
-func fetchLoadblancerPoolsHealth(account cfaccounts.Account, wg *sync.WaitGroup, deniedMetrics MetricsSet) {
+func fetchLoadblancerPoolsHealth(account cfaccounts.Account, wg *sync.WaitGroup) {
 	wg.Add(1)
 	defer wg.Done()
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func fetchMetrics(deniedMetricsSet MetricsSet) {`
`111`	`111`	`go fetchWorkerAnalytics(a, &wg)`
`112`	`112`	`go fetchLogpushAnalyticsForAccount(a, &wg)`
`113`	`113`	`go fetchR2StorageForAccount(a, &wg)`
`114`		`- go fetchLoadblancerPoolsHealth(a, &wg, deniedMetricsSet)`
	`114`	`+ go fetchLoadblancerPoolsHealth(a, &wg)`
`115`	`115`	`go fetchZeroTrustAnalyticsForAccount(a, &wg)`
`116`	`116`	`go fetchDNSFirewallAnalytics(a, &wg, deniedMetricsSet)`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ func mustRegisterMetrics(deniedMetrics MetricsSet) {`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`
`509`		`-func fetchLoadblancerPoolsHealth(account cfaccounts.Account, wg *sync.WaitGroup, deniedMetrics MetricsSet) {`
	`509`	`+func fetchLoadblancerPoolsHealth(account cfaccounts.Account, wg *sync.WaitGroup) {`
`510`	`510`	`wg.Add(1)`
`511`	`511`	`defer wg.Done()`
`512`	`512`