From 3de3a296dd2c2252bb0628c19c9ef0739382521e Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 16 Oct 2025 16:08:01 +0200 Subject: [PATCH] Add reviewer feedback Signed-off-by: Arve Knudsen --- .../remote/otlptranslator/prometheusremotewrite/helper.go | 2 +- .../otlptranslator/prometheusremotewrite/metrics_to_prw.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/storage/remote/otlptranslator/prometheusremotewrite/helper.go b/storage/remote/otlptranslator/prometheusremotewrite/helper.go index 9f73bb1a49..a27447a90f 100644 --- a/storage/remote/otlptranslator/prometheusremotewrite/helper.go +++ b/storage/remote/otlptranslator/prometheusremotewrite/helper.go @@ -122,7 +122,7 @@ func (c *PrometheusConverter) createAttributes(resource pcommon.Resource, attrib } } - err := settings.PromoteResourceAttributes.addPromotedAttributes(c.builder, resourceAttrs, settings.AllowUTF8, settings.LabelNameUnderscoreSanitization, settings.LabelNamePreserveMultipleUnderscores) + err := settings.PromoteResourceAttributes.addPromotedAttributes(c.builder, resourceAttrs, labelNamer) if err != nil { return labels.EmptyLabels(), err } diff --git a/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go b/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go index 27daadc2bc..94726d4edf 100644 --- a/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go +++ b/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go @@ -310,16 +310,11 @@ func NewPromoteResourceAttributes(otlpCfg config.OTLPConfig) *PromoteResourceAtt } // addPromotedAttributes adds labels for promoted resourceAttributes to the builder. -func (s *PromoteResourceAttributes) addPromotedAttributes(builder *labels.Builder, resourceAttributes pcommon.Map, allowUTF8, underscoreSanitization, preserveMultipleUnderscores bool) error { +func (s *PromoteResourceAttributes) addPromotedAttributes(builder *labels.Builder, resourceAttributes pcommon.Map, labelNamer otlptranslator.LabelNamer) error { if s == nil { return nil } - labelNamer := otlptranslator.LabelNamer{ - UTF8Allowed: allowUTF8, - UnderscoreLabelSanitization: underscoreSanitization, - PreserveMultipleUnderscores: preserveMultipleUnderscores, - } if s.promoteAll { var err error resourceAttributes.Range(func(name string, value pcommon.Value) bool {