address comments

CHANGELOG.md

@@ -4,8 +4,7 @@
 
 ### Grafana Mimir
 
-* [FEATURE] Ingester/Distributor: Add support for exporting cost attribution metrics (`cortex_ingester_attributed_active_series`, `cortex_distributor_received_attributed_samples_total`, and `cortex_discarded_attributed_samples_total`) with labels specified by customers to a custom Prometheus registry. This feature enables more flexible billing data tracking. #10269
-* [CHANGE] Ingester/Distributor: Prefix cost attribution metric labels with `attributed_` to prevent collisions with system cluster and namespace labels. #10509
+* [FEATURE] Ingester/Distributor: Add support for exporting cost attribution metrics (`cortex_ingester_attributed_active_series`, `cortex_distributor_received_attributed_samples_total`, and `cortex_discarded_attributed_samples_total`) with labels specified by customers to a custom Prometheus registry. This feature enables more flexible billing data tracking. #10269 #10509
 * [CHANGE] Querier: pass context to queryable `IsApplicable` hook. #10451
 * [CHANGE] Distributor: OTLP and push handler replace all non-UTF8 characters with the unicode replacement character `\uFFFD` in error messages before propagating them. #10236
 * [CHANGE] Querier: pass query matchers to queryable `IsApplicable` hook. #10256

pkg/costattribution/active_tracker.go

@@ -37,7 +37,7 @@ type ActiveSeriesTracker struct {
 func addLabelsPrefix(labels []string) []string {
 	out := make([]string, 0, len(labels))
 	for _, l := range labels {
-		out = append(out, strings.Join([]string{usagePrefix, l}, "_"))
+		out = append(out, strings.Join([]string{usagePrefix, l}, ""))
 	}
 	return out
 }

pkg/costattribution/manager.go

@@ -21,7 +21,7 @@ const (
 	defaultTrackerName = "cost-attribution"
 	missingValue       = "__missing__"
 	overflowValue      = "__overflow__"
-	usagePrefix        = "attributed"
+	usagePrefix        = "attributed_"
 )
 
 type Manager struct {