diff --git a/CHANGELOG.md b/CHANGELOG.md index 041e0dd6bde8..c68abe2f5468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Main (unreleased) +- [BUGFIX] spanmetric `traces_spanmetrics_calls_total_total` renamed to `traces_spanmetrics_calls_total` + - [BUGFIX] `const_labels` in `traces_config` is now correctly parsed in the remote writer exporter (@fredr) - [ENHANCEMENT] opentelemetry trace exporters can now be configured to support Oauth utilizing diff --git a/pkg/traces/remotewriteexporter/exporter.go b/pkg/traces/remotewriteexporter/exporter.go index 10bf7c2c6fae..0c6f9c59a579 100644 --- a/pkg/traces/remotewriteexporter/exporter.go +++ b/pkg/traces/remotewriteexporter/exporter.go @@ -22,14 +22,13 @@ import ( ) const ( - nameLabelKey = "__name__" - sumSuffix = "sum" - countSuffix = "count" - bucketSuffix = "bucket" - leStr = "le" - infBucket = "+Inf" - counterSuffix = "total" - noSuffix = "" + nameLabelKey = "__name__" + sumSuffix = "sum" + countSuffix = "count" + bucketSuffix = "bucket" + leStr = "le" + infBucket = "+Inf" + noSuffix = "" ) type dataPoint interface { @@ -164,22 +163,23 @@ func (e *remoteWriteExporter) processScalarMetric(app storage.Appender, m pdata. switch m.DataType() { case pdata.MetricDataTypeSum: dataPoints := m.Sum().DataPoints() - if err := e.handleScalarIntDataPoints(app, m.Name(), counterSuffix, dataPoints); err != nil { + if err := e.handleScalarIntDataPoints(app, m.Name(), dataPoints); err != nil { return err } case pdata.MetricDataTypeGauge: dataPoints := m.Gauge().DataPoints() - if err := e.handleScalarIntDataPoints(app, m.Name(), noSuffix, dataPoints); err != nil { + if err := e.handleScalarIntDataPoints(app, m.Name(), dataPoints); err != nil { return err } } + return nil } -func (e *remoteWriteExporter) handleScalarIntDataPoints(app storage.Appender, name, suffix string, dataPoints pdata.NumberDataPointSlice) error { +func (e *remoteWriteExporter) handleScalarIntDataPoints(app storage.Appender, name string, dataPoints pdata.NumberDataPointSlice) error { for ix := 0; ix < dataPoints.Len(); ix++ { dataPoint := dataPoints.At(ix) - if err := e.appendDataPoint(app, name, suffix, dataPoint, float64(dataPoint.IntVal())); err != nil { + if err := e.appendDataPoint(app, name, noSuffix, dataPoint, float64(dataPoint.IntVal())); err != nil { return err } }