fix lint

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>

Author: SungJin1212

CHANGELOG.md

@@ -24,8 +24,8 @@
 * [FEATURE] Querier: Support for configuring query optimizers and enabling XFunctions in the Thanos engine. #6873
 * [FEATURE] Query Frontend: Add support /api/v1/format_query API for formatting queries. #6893
 * [FEATURE] Query Frontend: Add support for /api/v1/parse_query API (experimental) to parse a PromQL expression and return it as a JSON-formatted AST (abstract syntax tree). #6978
+* [ENHANCEMENT] OTLP: Add a dedicated Cortex converter to skip the intermediate conversion from Prometheus format to Cortex for performance. #7014
 * [ENHANCEMENT] Modernizes the entire codebase by using go modernize tool. #7005
-* [ENHANCEMENT] OTLP: Add a dedicated Cortex converter to skip the intermediate conversion from Prometheus format to Cortex for performance. #7014 
 * [ENHANCEMENT] Overrides Exporter: Expose all fields that can be converted to float64. Also, the label value `max_local_series_per_metric` got renamed to `max_series_per_metric`, and `max_local_series_per_user` got renamed to `max_series_per_user`. #6979
 * [ENHANCEMENT] Ingester: Add `cortex_ingester_tsdb_wal_replay_unknown_refs_total` and `cortex_ingester_tsdb_wbl_replay_unknown_refs_total` metrics to track unknown series references during wal/wbl replaying. #6945
 * [ENHANCEMENT] Ruler: Emit an error message when the rule synchronization fails. #6902

go.mod

@@ -85,11 +85,14 @@ require (
 	github.com/oklog/ulid/v2 v2.1.1
 	github.com/parquet-go/parquet-go v0.25.1
 	github.com/prometheus-community/parquet-common v0.0.0-20250827225610-65f0b68d35e6
+	github.com/prometheus/otlptranslator v0.0.0-20250731173911-a9673827589a
 	github.com/prometheus/procfs v0.16.1
 	github.com/sercand/kuberesolver/v5 v5.1.1
 	github.com/tjhop/slog-gokit v0.1.4
 	go.opentelemetry.io/collector/pdata v1.35.0
+	go.opentelemetry.io/collector/semconv v0.128.0
 	go.uber.org/automaxprocs v1.6.0
+	go.uber.org/multierr v1.11.0
 	google.golang.org/protobuf v1.36.6
 )
 
@@ -226,7 +229,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus-community/prom-label-proxy v0.11.1 // indirect
 	github.com/prometheus/exporter-toolkit v0.14.0 // indirect
-	github.com/prometheus/otlptranslator v0.0.0-20250731173911-a9673827589a // indirect
 	github.com/prometheus/sigv4 v0.2.0 // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/rantav/go-grpc-channelz v0.0.4 // indirect
@@ -258,7 +260,6 @@ require (
 	go.opentelemetry.io/collector/internal/telemetry v0.129.0 // indirect
 	go.opentelemetry.io/collector/pipeline v0.129.0 // indirect
 	go.opentelemetry.io/collector/processor v1.35.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.128.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
@@ -273,7 +274,6 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
 	go.uber.org/goleak v1.3.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect

pkg/util/push/cortexotlpconverter/helper.go

@@ -14,15 +14,15 @@ import (
 	"unicode/utf8"
 
 	"github.com/cespare/xxhash/v2"
-	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/otlptranslator"
+	"github.com/prometheus/prometheus/model/timestamp"
+	"github.com/prometheus/prometheus/model/value"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
-	"github.com/prometheus/prometheus/model/timestamp"
-	"github.com/prometheus/prometheus/model/value"
+	"github.com/cortexproject/cortex/pkg/cortexpb"
 )
 
 const (
@@ -551,20 +551,6 @@ func createLabels(name string, baseLabels []cortexpb.LabelAdapter, extras ...str
 	return labels
 }
 
-// addTypeAndUnitLabels appends type and unit labels to the given labels slice.
-func addTypeAndUnitLabels(labels []cortexpb.LabelAdapter, metadata cortexpb.MetricMetadata, settings Settings) []cortexpb.LabelAdapter {
-	unitNamer := otlptranslator.UnitNamer{UTF8Allowed: settings.AllowUTF8}
-
-	labels = slices.DeleteFunc(labels, func(l cortexpb.LabelAdapter) bool {
-		return l.Name == "__type__" || l.Name == "__unit__"
-	})
-
-	labels = append(labels, cortexpb.LabelAdapter{Name: "__type__", Value: strings.ToLower(metadata.Type.String())})
-	labels = append(labels, cortexpb.LabelAdapter{Name: "__unit__", Value: unitNamer.Build(metadata.Unit)})
-
-	return labels
-}
-
 // getOrCreateTimeSeries returns the time series corresponding to the label set if existent, and false.
 // Otherwise it creates a new one and returns that, and true.
 func (c *CortexConverter) getOrCreateTimeSeries(lbls []cortexpb.LabelAdapter) (*cortexpb.TimeSeries, bool) {

pkg/util/push/cortexotlpconverter/histograms.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/prometheus/common/model"
-	"go.opentelemetry.io/collector/pdata/pcommon"
-	"go.opentelemetry.io/collector/pdata/pmetric"
-
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/value"
 	"github.com/prometheus/prometheus/util/annotations"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/pmetric"
+
+	"github.com/cortexproject/cortex/pkg/cortexpb"
 )
 
 const defaultZeroThreshold = 1e-128

pkg/util/push/cortexotlpconverter/metrics_to_prw.go

@@ -8,14 +8,14 @@ import (
 	"sort"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/prometheus/otlptranslator"
+	"github.com/prometheus/prometheus/config"
+	"github.com/prometheus/prometheus/util/annotations"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/multierr"
 
-	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/util/annotations"
+	"github.com/cortexproject/cortex/pkg/cortexpb"
 )
 
 type PromoteResourceAttributes struct {

pkg/util/push/cortexotlpconverter/number_data_points.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"math"
 
-	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/value"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 
-	"github.com/prometheus/prometheus/model/value"
+	"github.com/cortexproject/cortex/pkg/cortexpb"
 )
 
 func (c *CortexConverter) addGaugeNumberDataPoints(ctx context.Context, dataPoints pmetric.NumberDataPointSlice,

pkg/util/push/cortexotlpconverter/otlp_to_openmetrics_metadata.go

@@ -1,8 +1,9 @@
 package cortexotlpconverter
 
 import (
-	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"go.opentelemetry.io/collector/pdata/pmetric"
+
+	"github.com/cortexproject/cortex/pkg/cortexpb"
 )
 
 func otelMetricTypeToPromMetricType(otelMetric pmetric.Metric) cortexpb.MetricMetadata_MetricType {

pkg/util/push/otlp.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/cortexproject/cortex/pkg/util/push/cortexotlpconverter"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/prometheus/config"
@@ -24,6 +23,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/tenant"
 	"github.com/cortexproject/cortex/pkg/util"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
+	"github.com/cortexproject/cortex/pkg/util/push/cortexotlpconverter"
 	"github.com/cortexproject/cortex/pkg/util/validation"
 )
 
@@ -88,14 +88,6 @@ func OTLPHandler(maxRecvMsgSize int, overrides *validation.Overrides, cfg distri
 	})
 }
 
-func makeMetadata(promMetadata []cortexpb.MetricMetadata) []*cortexpb.MetricMetadata {
-	metadata := make([]*cortexpb.MetricMetadata, 0, len(promMetadata))
-	for _, m := range promMetadata {
-		metadata = append(metadata, &m)
-	}
-	return metadata
-}
-
 func decodeOTLPWriteRequest(ctx context.Context, r *http.Request, maxSize int) (pmetricotlp.ExportRequest, error) {
 	expectedSize := int(r.ContentLength)
 	if expectedSize > maxSize {