Address comments

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>

storage/remote/otlptranslator/prometheusremotewrite/histograms_test.go

@@ -761,7 +761,9 @@ func TestPrometheusConverter_addExponentialHistogramDataPoints(t *testing.T) {
 			metric := tt.metric()
 
 			converter := NewPrometheusConverter()
-			converter.metricNamer.WithMetricSuffixes = true
+			namer := otlptranslator.MetricNamer{
+				WithMetricSuffixes: true,
+			}
 			annots, err := converter.addExponentialHistogramDataPoints(
 				context.Background(),
 				metric.ExponentialHistogram().DataPoints(),
@@ -769,7 +771,7 @@ func TestPrometheusConverter_addExponentialHistogramDataPoints(t *testing.T) {
 				Settings{
 					ExportCreatedMetric: true,
 				},
-				converter.metricNamer.Build(otlptranslator.Metric{Name: metric.Name(), Unit: metric.Unit(), Type: otelTypeToTranslatorType(metric)}),
+				namer.Build(translatorMetricFromOtelMetric(metric)),
 				pmetric.AggregationTemporalityCumulative,
 			)
 			require.NoError(t, err)
@@ -1130,7 +1132,9 @@ func TestPrometheusConverter_addCustomBucketsHistogramDataPoints(t *testing.T) {
 			metric := tt.metric()
 
 			converter := NewPrometheusConverter()
-			converter.metricNamer.WithMetricSuffixes = true
+			namer := otlptranslator.MetricNamer{
+				WithMetricSuffixes: true,
+			}
 			annots, err := converter.addCustomBucketsHistogramDataPoints(
 				context.Background(),
 				metric.Histogram().DataPoints(),
@@ -1139,7 +1143,7 @@ func TestPrometheusConverter_addCustomBucketsHistogramDataPoints(t *testing.T) {
 					ExportCreatedMetric:     true,
 					ConvertHistogramsToNHCB: true,
 				},
-				converter.metricNamer.Build(otlptranslator.Metric{Name: metric.Name(), Unit: metric.Unit(), Type: otelTypeToTranslatorType(metric)}),
+				namer.Build(translatorMetricFromOtelMetric(metric)),
 				pmetric.AggregationTemporalityCumulative,
 			)
 

storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go

@@ -52,45 +52,51 @@ type Settings struct {
 
 // PrometheusConverter converts from OTel write format to Prometheus remote write format.
 type PrometheusConverter struct {
-	unique      map[uint64]*prompb.TimeSeries
-	conflicts   map[uint64][]*prompb.TimeSeries
-	everyN      everyNTimes
-	metadata    []prompb.MetricMetadata
-	metricNamer *otlptranslator.MetricNamer
+	unique    map[uint64]*prompb.TimeSeries
+	conflicts map[uint64][]*prompb.TimeSeries
+	everyN    everyNTimes
+	metadata  []prompb.MetricMetadata
 }
 
 func NewPrometheusConverter() *PrometheusConverter {
 	return &PrometheusConverter{
-		unique:      map[uint64]*prompb.TimeSeries{},
-		conflicts:   map[uint64][]*prompb.TimeSeries{},
-		metricNamer: &otlptranslator.MetricNamer{},
+		unique:    map[uint64]*prompb.TimeSeries{},
+		conflicts: map[uint64][]*prompb.TimeSeries{},
 	}
 }
 
-func otelTypeToTranslatorType(metric pmetric.Metric) otlptranslator.MetricType {
+func translatorMetricFromOtelMetric(metric pmetric.Metric) otlptranslator.Metric {
+	m := otlptranslator.Metric{
+		Name: metric.Name(),
+		Unit: metric.Unit(),
+		Type: otlptranslator.MetricTypeUnknown,
+	}
 	switch metric.Type() {
 	case pmetric.MetricTypeGauge:
-		return otlptranslator.MetricTypeGauge
+		m.Type = otlptranslator.MetricTypeGauge
 	case pmetric.MetricTypeSum:
 		if metric.Sum().AggregationTemporality() == pmetric.AggregationTemporalityCumulative {
-			return otlptranslator.MetricTypeMonotonicCounter
+			m.Type = otlptranslator.MetricTypeMonotonicCounter
+		} else {
+			m.Type = otlptranslator.MetricTypeNonMonotonicCounter
 		}
-		return otlptranslator.MetricTypeNonMonotonicCounter
 	case pmetric.MetricTypeSummary:
-		return otlptranslator.MetricTypeSummary
+		m.Type = otlptranslator.MetricTypeSummary
 	case pmetric.MetricTypeHistogram:
-		return otlptranslator.MetricTypeHistogram
+		m.Type = otlptranslator.MetricTypeHistogram
 	case pmetric.MetricTypeExponentialHistogram:
-		return otlptranslator.MetricTypeExponentialHistogram
+		m.Type = otlptranslator.MetricTypeExponentialHistogram
 	}
-	return otlptranslator.MetricTypeUnknown
+	return m
 }
 
 // FromMetrics converts pmetric.Metrics to Prometheus remote write format.
 func (c *PrometheusConverter) FromMetrics(ctx context.Context, md pmetric.Metrics, settings Settings) (annots annotations.Annotations, errs error) {
-	c.metricNamer.Namespace = settings.Namespace
-	c.metricNamer.WithMetricSuffixes = settings.AddMetricSuffixes
-	c.metricNamer.UTF8Allowed = settings.AllowUTF8
+	namer := otlptranslator.MetricNamer{
+		Namespace:          settings.Namespace,
+		WithMetricSuffixes: settings.AddMetricSuffixes,
+		UTF8Allowed:        settings.AllowUTF8,
+	}
 	c.everyN = everyNTimes{n: 128}
 	resourceMetricsSlice := md.ResourceMetrics()
 
@@ -138,7 +144,7 @@ func (c *PrometheusConverter) FromMetrics(ctx context.Context, md pmetric.Metric
 					continue
 				}
 
-				promName := c.metricNamer.Build(otlptranslator.Metric{Name: metric.Name(), Unit: metric.Unit(), Type: otelTypeToTranslatorType(metric)})
+				promName := namer.Build(translatorMetricFromOtelMetric(metric))
 				c.metadata = append(c.metadata, prompb.MetricMetadata{
 					Type:             otelMetricTypeToPromMetricType(metric),
 					MetricFamilyName: promName,

storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw_test.go

@@ -48,7 +48,8 @@ func TestFromMetrics(t *testing.T) {
 					metricSlice := scopeMetricsSlice.At(j).Metrics()
 					for k := 0; k < metricSlice.Len(); k++ {
 						metric := metricSlice.At(k)
-						promName := converter.metricNamer.Build(otlptranslator.Metric{Name: metric.Name(), Unit: metric.Unit(), Type: otelTypeToTranslatorType(metric)})
+						namer := otlptranslator.MetricNamer{}
+						promName := namer.Build(translatorMetricFromOtelMetric(metric))
 						expMetadata = append(expMetadata, prompb.MetricMetadata{
 							Type:             otelMetricTypeToPromMetricType(metric),
 							MetricFamilyName: promName,