refactor: small improvements

Author: paguos

pkg/clients/cloudwatch/v1/client.go

@@ -75,9 +75,10 @@ func (c client) ListMetrics(ctx context.Context, namespace string, metric *model
 func toModelMetric(page *cloudwatch.ListMetricsOutput, includeLinkedAccounts []string) []*model.Metric {
 	modelMetrics := make([]*model.Metric, 0, len(page.Metrics))
 	if len(includeLinkedAccounts) > 0 {
+		includeAll := slices.Contains(includeLinkedAccounts, "*")
 		for i := 0; i < len(page.Metrics); i++ {
 			linkedAccountID := *page.OwningAccounts[i]
-			if !slices.Contains(includeLinkedAccounts, "*") && !slices.Contains(includeLinkedAccounts, linkedAccountID) {
+			if !includeAll && !slices.Contains(includeLinkedAccounts, linkedAccountID) {
 				continue
 			}
 			modelMetric := &model.Metric{

pkg/clients/cloudwatch/v2/client.go

@@ -78,9 +78,10 @@ func (c client) ListMetrics(ctx context.Context, namespace string, metric *model
 func toModelMetric(page *cloudwatch.ListMetricsOutput, includeLinkedAccounts []string) []*model.Metric {
 	modelMetrics := make([]*model.Metric, 0, len(page.Metrics))
 	if len(includeLinkedAccounts) > 0 {
+		includeAll := slices.Contains(includeLinkedAccounts, "*")
 		for i := 0; i < len(page.Metrics); i++ {
 			linkedAccountID := page.OwningAccounts[i]
-			if !slices.Contains(includeLinkedAccounts, "*") && !slices.Contains(includeLinkedAccounts, linkedAccountID) {
+			if !includeAll && !slices.Contains(includeLinkedAccounts, linkedAccountID) {
 				continue
 			}
 			modelMetric := &model.Metric{

pkg/promutil/migrate.go

@@ -145,6 +145,7 @@ func BuildMetrics(results []model.CloudwatchMetricResult, labelsSnakeCase bool,
 
 					promLabels := createPrometheusLabels(metric, labelsSnakeCase, contextLabels, logger)
 					maps.Copy(promLabels, contextLabels)
+					// When querying linked accounts, override account_id with the metric's owning account
 					if metric.LinkedAccountID != "" {
 						promLabels["account_id"] = metric.LinkedAccountID
 					}