lib/prompb: Merge prompbmarshal logic into prompb

The prompb and prompbmarshal share exactly the same models and provide
marshal and unmarshale capabilities for them. This creates duplication
(changes in one model has to be made in another, case with metadata) and
confusion where for example you compare same looking models but golang
says they are not the same (because of the type).

This commit merge prompbmarshal logic into prompb so the rest of the
code is aligned on prompb models.

Moves samplesPool and labelsPool to WriteRequestUnmarshaller.
Make WriteRequest struct clean from unmarshal logic.

The benchmark shows no significant changes:

$benchstat prompbmarshal.bench prompb2.bench
goos: darwin
goarch: arm64
pkg: github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb
cpu: Apple M1 Pro
                                 │ prompbmarshal.bench │           prompb2.bench            │
                                 │       sec/op        │   sec/op     vs base               │
WriteRequestUnmarshalProtobuf-10           189.2µ ± 5%   190.8µ ± 8%       ~ (p=0.579 n=10)
WriteRequestMarshalProtobuf-10             145.3µ ± 7%   143.6µ ± 2%       ~ (p=0.143 n=10)
geomean                                    165.8µ        165.5µ       -0.14%

                                 │ prompbmarshal.bench │            prompb2.bench            │
                                 │         B/s         │     B/s       vs base               │
WriteRequestUnmarshalProtobuf-10          50.42Mi ± 5%   49.99Mi ± 8%       ~ (p=0.593 n=10)
WriteRequestMarshalProtobuf-10            65.64Mi ± 7%   66.39Mi ± 2%       ~ (p=0.143 n=10)
geomean                                   57.53Mi        57.61Mi       +0.14%

                                 │ prompbmarshal.bench │            prompb2.bench             │
                                 │        B/op         │     B/op       vs base               │
WriteRequestUnmarshalProtobuf-10         27.70Ki ±  4%   26.90Ki ±  7%       ~ (p=0.190 n=10)
WriteRequestMarshalProtobuf-10           3.267Ki ± 12%   3.273Ki ± 12%       ~ (p=0.971 n=10)
geomean                                  9.514Ki         9.383Ki        -1.38%

                                 │ prompbmarshal.bench │            prompb2.bench            │
                                 │      allocs/op      │ allocs/op   vs base                 │
WriteRequestUnmarshalProtobuf-10          0.000 ± 0%     0.000 ± 0%       ~ (p=1.000 n=10) ¹
WriteRequestMarshalProtobuf-10            0.000 ± 0%     0.000 ± 0%       ~ (p=1.000 n=10) ¹
geomean                                              ²               +0.00%                ²
¹ all samples are equal
² summaries must be >0 to compute geomean

app/victoria-metrics/self_scraper.go

@@ -10,7 +10,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeserieslimits"
@@ -49,7 +49,7 @@ func selfScraper(scrapeInterval time.Duration) {
 	var bb bytesutil.ByteBuffer
 	var rows prometheus.Rows
 	var mrs []storage.MetricRow
-	var labels []prompbmarshal.Label
+	var labels []prompb.Label
 	t := time.NewTicker(scrapeInterval)
 	f := func(currentTime time.Time, sendStaleMarkers bool) {
 		currentTimestamp := currentTime.UnixNano() / 1e6
@@ -104,11 +104,11 @@ func selfScraper(scrapeInterval time.Duration) {
 	}
 }
 
-func addLabel(dst []prompbmarshal.Label, key, value string) []prompbmarshal.Label {
+func addLabel(dst []prompb.Label, key, value string) []prompb.Label {
 	if len(dst) < cap(dst) {
 		dst = dst[:len(dst)+1]
 	} else {
-		dst = append(dst, prompbmarshal.Label{})
+		dst = append(dst, prompb.Label{})
 	}
 	lb := &dst[len(dst)-1]
 	lb.Name = key

app/vmagent/common/push_ctx.go

@@ -3,7 +3,7 @@ package common
 import (
 	"sync"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
@@ -12,13 +12,13 @@ type PushCtx struct {
 	// WriteRequest contains the WriteRequest, which must be pushed later to remote storage.
 	//
 	// The actual labels and samples for the time series are stored in Labels and Samples fields.
-	WriteRequest prompbmarshal.WriteRequest
+	WriteRequest prompb.WriteRequest
 
 	// Labels contains flat list of all the labels used in WriteRequest.
-	Labels []prompbmarshal.Label
+	Labels []prompb.Label
 
 	// Samples contains flat list of all the samples used in WriteRequest.
-	Samples []prompbmarshal.Sample
+	Samples []prompb.Sample
 }
 
 // Reset resets ctx.

app/vmagent/csvimport/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/csvimport"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/csvimport/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -31,7 +31,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, rows []csvimport.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, rows []csvimport.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -41,23 +41,23 @@ func insertRows(at *auth.Token, rows []csvimport.Row, extraLabels []prompbmarsha
 	for i := range rows {
 		r := &rows[i]
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: r.Metric,
 		})
 		for j := range r.Tags {
 			tag := &r.Tags[j]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
 		labels = append(labels, extraLabels...)
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     r.Value,
 			Timestamp: r.Timestamp,
 		})
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[len(samples)-1:],
 		})

app/vmagent/datadogsketches/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil"
@@ -33,7 +33,7 @@ func InsertHandlerForHTTP(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, sketches []*datadogsketches.Sketch, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, sketches []*datadogsketches.Sketch, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -45,12 +45,12 @@ func insertRows(at *auth.Token, sketches []*datadogsketches.Sketch, extraLabels
 		ms := sketch.ToSummary()
 		for _, m := range ms {
 			labelsLen := len(labels)
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  "__name__",
 				Value: m.Name,
 			})
 			for _, label := range m.Labels {
-				labels = append(labels, prompbmarshal.Label{
+				labels = append(labels, prompb.Label{
 					Name:  label.Name,
 					Value: label.Value,
 				})
@@ -60,7 +60,7 @@ func insertRows(at *auth.Token, sketches []*datadogsketches.Sketch, extraLabels
 				if name == "host" {
 					name = "exported_host"
 				}
-				labels = append(labels, prompbmarshal.Label{
+				labels = append(labels, prompb.Label{
 					Name:  name,
 					Value: value,
 				})
@@ -68,13 +68,13 @@ func insertRows(at *auth.Token, sketches []*datadogsketches.Sketch, extraLabels
 			labels = append(labels, extraLabels...)
 			samplesLen := len(samples)
 			for _, p := range m.Points {
-				samples = append(samples, prompbmarshal.Sample{
+				samples = append(samples, prompb.Sample{
 					Timestamp: p.Timestamp,
 					Value:     p.Value,
 				})
 			}
 			rowsTotal += len(m.Points)
-			tssDst = append(tssDst, prompbmarshal.TimeSeries{
+			tssDst = append(tssDst, prompb.TimeSeries{
 				Labels:  labels[labelsLen:],
 				Samples: samples[samplesLen:],
 			})

app/vmagent/datadogv1/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1/stream"
@@ -33,7 +33,7 @@ func InsertHandlerForHTTP(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, series []datadogv1.Series, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, series []datadogv1.Series, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -45,18 +45,18 @@ func insertRows(at *auth.Token, series []datadogv1.Series, extraLabels []prompbm
 		ss := &series[i]
 		rowsTotal += len(ss.Points)
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: ss.Metric,
 		})
 		if ss.Host != "" {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  "host",
 				Value: ss.Host,
 			})
 		}
 		if ss.Device != "" {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  "device",
 				Value: ss.Device,
 			})
@@ -66,7 +66,7 @@ func insertRows(at *auth.Token, series []datadogv1.Series, extraLabels []prompbm
 			if name == "host" {
 				name = "exported_host"
 			}
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  name,
 				Value: value,
 			})
@@ -74,12 +74,12 @@ func insertRows(at *auth.Token, series []datadogv1.Series, extraLabels []prompbm
 		labels = append(labels, extraLabels...)
 		samplesLen := len(samples)
 		for _, pt := range ss.Points {
-			samples = append(samples, prompbmarshal.Sample{
+			samples = append(samples, prompb.Sample{
 				Timestamp: pt.Timestamp(),
 				Value:     pt.Value(),
 			})
 		}
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[samplesLen:],
 		})

app/vmagent/datadogv2/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2/stream"
@@ -36,7 +36,7 @@ func InsertHandlerForHTTP(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, series []datadogv2.Series, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, series []datadogv2.Series, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -48,18 +48,18 @@ func insertRows(at *auth.Token, series []datadogv2.Series, extraLabels []prompbm
 		ss := &series[i]
 		rowsTotal += len(ss.Points)
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: ss.Metric,
 		})
 		for _, rs := range ss.Resources {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  rs.Type,
 				Value: rs.Name,
 			})
 		}
 		if ss.SourceTypeName != "" {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  "source_type_name",
 				Value: ss.SourceTypeName,
 			})
@@ -69,7 +69,7 @@ func insertRows(at *auth.Token, series []datadogv2.Series, extraLabels []prompbm
 			if name == "host" {
 				name = "exported_host"
 			}
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  name,
 				Value: value,
 			})
@@ -77,12 +77,12 @@ func insertRows(at *auth.Token, series []datadogv2.Series, extraLabels []prompbm
 		labels = append(labels, extraLabels...)
 		samplesLen := len(samples)
 		for _, pt := range ss.Points {
-			samples = append(samples, prompbmarshal.Sample{
+			samples = append(samples, prompb.Sample{
 				Timestamp: pt.Timestamp * 1000,
 				Value:     pt.Value,
 			})
 		}
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[samplesLen:],
 		})

app/vmagent/graphite/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/graphite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/graphite/stream"
 	"github.com/VictoriaMetrics/metrics"
@@ -36,22 +36,22 @@ func insertRows(at *auth.Token, rows []parser.Row) error {
 	for i := range rows {
 		r := &rows[i]
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: r.Metric,
 		})
 		for j := range r.Tags {
 			tag := &r.Tags[j]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     r.Value,
 			Timestamp: r.Timestamp,
 		})
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[len(samples)-1:],
 		})

app/vmagent/influx/request_handler.go

@@ -10,7 +10,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx/stream"
@@ -60,7 +60,7 @@ func InsertHandlerForHTTP(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, db string, rows []influx.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, db string, rows []influx.Row, extraLabels []prompb.Label) error {
 	ctx := getPushCtx()
 	defer putPushCtx(ctx)
 
@@ -80,13 +80,13 @@ func insertRows(at *auth.Token, db string, rows []influx.Row, extraLabels []prom
 			if tag.Key == *dbLabel {
 				hasDBKey = true
 			}
-			commonLabels = append(commonLabels, prompbmarshal.Label{
+			commonLabels = append(commonLabels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
 		if len(db) > 0 && !hasDBKey {
-			commonLabels = append(commonLabels, prompbmarshal.Label{
+			commonLabels = append(commonLabels, prompb.Label{
 				Name:  *dbLabel,
 				Value: db,
 			})
@@ -110,16 +110,16 @@ func insertRows(at *auth.Token, db string, rows []influx.Row, extraLabels []prom
 			}
 			metricGroup := bytesutil.ToUnsafeString(buf[bufLen:])
 			labelsLen := len(labels)
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  "__name__",
 				Value: metricGroup,
 			})
 			labels = append(labels, commonLabels...)
-			samples = append(samples, prompbmarshal.Sample{
+			samples = append(samples, prompb.Sample{
 				Timestamp: r.Timestamp,
 				Value:     f.Value,
 			})
-			tssDst = append(tssDst, prompbmarshal.TimeSeries{
+			tssDst = append(tssDst, prompb.TimeSeries{
 				Labels:  labels[labelsLen:],
 				Samples: samples[len(samples)-1:],
 			})
@@ -144,7 +144,7 @@ func insertRows(at *auth.Token, db string, rows []influx.Row, extraLabels []prom
 
 type pushCtx struct {
 	ctx            common.PushCtx
-	commonLabels   []prompbmarshal.Label
+	commonLabels   []prompb.Label
 	metricGroupBuf []byte
 	buf            []byte
 }

app/vmagent/native/request_handler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/native/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
@@ -35,7 +35,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, block *stream.Block, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, block *stream.Block, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -53,13 +53,13 @@ func insertRows(at *auth.Token, block *stream.Block, extraLabels []prompbmarshal
 	samples := ctx.Samples[:0]
 	mn := &block.MetricName
 	labelsLen := len(labels)
-	labels = append(labels, prompbmarshal.Label{
+	labels = append(labels, prompb.Label{
 		Name:  "__name__",
 		Value: bytesutil.ToUnsafeString(mn.MetricGroup),
 	})
 	for j := range mn.Tags {
 		tag := &mn.Tags[j]
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  bytesutil.ToUnsafeString(tag.Key),
 			Value: bytesutil.ToUnsafeString(tag.Value),
 		})
@@ -72,12 +72,12 @@ func insertRows(at *auth.Token, block *stream.Block, extraLabels []prompbmarshal
 	}
 	samplesLen := len(samples)
 	for j, value := range values {
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     value,
 			Timestamp: timestamps[j],
 		})
 	}
-	tssDst = append(tssDst, prompbmarshal.TimeSeries{
+	tssDst = append(tssDst, prompb.TimeSeries{
 		Labels:  labels[labelsLen:],
 		Samples: samples[samplesLen:],
 	})

app/vmagent/newrelic/request_handler.go

@@ -9,7 +9,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/newrelic"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/newrelic/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -34,7 +34,7 @@ func InsertHandlerForHTTP(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, rows []newrelic.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, rows []newrelic.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -49,22 +49,22 @@ func insertRows(at *auth.Token, rows []newrelic.Row, extraLabels []prompbmarshal
 		for j := range srcSamples {
 			s := &srcSamples[j]
 			labelsLen := len(labels)
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  "__name__",
 				Value: bytesutil.ToUnsafeString(s.Name),
 			})
 			for k := range tags {
 				t := &tags[k]
-				labels = append(labels, prompbmarshal.Label{
+				labels = append(labels, prompb.Label{
 					Name:  bytesutil.ToUnsafeString(t.Key),
 					Value: bytesutil.ToUnsafeString(t.Value),
 				})
 			}
-			samples = append(samples, prompbmarshal.Sample{
+			samples = append(samples, prompb.Sample{
 				Value:     s.Value,
 				Timestamp: r.Timestamp,
 			})
-			tssDst = append(tssDst, prompbmarshal.TimeSeries{
+			tssDst = append(tssDst, prompb.TimeSeries{
 				Labels:  labels[labelsLen:],
 				Samples: samples[len(samples)-1:],
 			})

app/vmagent/opentelemetry/request_handler.go

@@ -7,7 +7,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/firehose"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -36,12 +36,12 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 			return fmt.Errorf("json encoding isn't supported for opentelemetry format. Use protobuf encoding")
 		}
 	}
-	return stream.ParseStream(req.Body, encoding, processBody, func(tss []prompbmarshal.TimeSeries) error {
+	return stream.ParseStream(req.Body, encoding, processBody, func(tss []prompb.TimeSeries) error {
 		return insertRows(at, tss, extraLabels)
 	})
 }
 
-func insertRows(at *auth.Token, tss []prompbmarshal.TimeSeries, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, tss []prompb.TimeSeries, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -57,7 +57,7 @@ func insertRows(at *auth.Token, tss []prompbmarshal.TimeSeries, extraLabels []pr
 		labels = append(labels, extraLabels...)
 		samplesLen := len(samples)
 		samples = append(samples, ts.Samples...)
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[samplesLen:],
 		})

app/vmagent/opentsdb/request_handler.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdb/stream"
 	"github.com/VictoriaMetrics/metrics"
@@ -33,22 +33,22 @@ func insertRows(rows []parser.Row) error {
 	for i := range rows {
 		r := &rows[i]
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: r.Metric,
 		})
 		for j := range r.Tags {
 			tag := &r.Tags[j]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     r.Value,
 			Timestamp: r.Timestamp,
 		})
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[len(samples)-1:],
 		})

app/vmagent/opentsdbhttp/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdbhttp"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdbhttp/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -30,7 +30,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, rows []opentsdbhttp.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, rows []opentsdbhttp.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -40,23 +40,23 @@ func insertRows(at *auth.Token, rows []opentsdbhttp.Row, extraLabels []prompbmar
 	for i := range rows {
 		r := &rows[i]
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: r.Metric,
 		})
 		for j := range r.Tags {
 			tag := &r.Tags[j]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
 		labels = append(labels, extraLabels...)
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     r.Value,
 			Timestamp: r.Timestamp,
 		})
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[len(samples)-1:],
 		})

app/vmagent/prometheusimport/request_handler.go

@@ -7,7 +7,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -39,7 +39,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, rows []prometheus.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, rows []prometheus.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -49,23 +49,23 @@ func insertRows(at *auth.Token, rows []prometheus.Row, extraLabels []prompbmarsh
 	for i := range rows {
 		r := &rows[i]
 		labelsLen := len(labels)
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: r.Metric,
 		})
 		for j := range r.Tags {
 			tag := &r.Tags[j]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
 		labels = append(labels, extraLabels...)
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     r.Value,
 			Timestamp: r.Timestamp,
 		})
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[len(samples)-1:],
 		})

app/vmagent/promremotewrite/request_handler.go

@@ -7,7 +7,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/promremotewrite/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
@@ -32,7 +31,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, timeseries []prompb.TimeSeries, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, timeseries []prompb.TimeSeries, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -46,7 +45,7 @@ func insertRows(at *auth.Token, timeseries []prompb.TimeSeries, extraLabels []pr
 		labelsLen := len(labels)
 		for i := range ts.Labels {
 			label := &ts.Labels[i]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  label.Name,
 				Value: label.Value,
 			})
@@ -55,12 +54,12 @@ func insertRows(at *auth.Token, timeseries []prompb.TimeSeries, extraLabels []pr
 		samplesLen := len(samples)
 		for i := range ts.Samples {
 			sample := &ts.Samples[i]
-			samples = append(samples, prompbmarshal.Sample{
+			samples = append(samples, prompb.Sample{
 				Value:     sample.Value,
 				Timestamp: sample.Timestamp,
 			})
 		}
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[samplesLen:],
 		})

app/vmagent/remotewrite/pendingseries.go

@@ -14,7 +14,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/persistentqueue"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/slicesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeutil"
@@ -60,7 +60,7 @@ func (ps *pendingSeries) MustStop() {
 	ps.periodicFlusherWG.Wait()
 }
 
-func (ps *pendingSeries) TryPush(tss []prompbmarshal.TimeSeries) bool {
+func (ps *pendingSeries) TryPush(tss []prompb.TimeSeries) bool {
 	ps.mu.Lock()
 	ok := ps.wr.tryPush(tss)
 	ps.mu.Unlock()
@@ -108,11 +108,11 @@ type writeRequest struct {
 	// How many decimal digits after point must be left before sending the writeRequest to fq.
 	roundDigits int
 
-	wr prompbmarshal.WriteRequest
+	wr prompb.WriteRequest
 
-	tss     []prompbmarshal.TimeSeries
-	labels  []prompbmarshal.Label
-	samples []prompbmarshal.Sample
+	tss     []prompb.TimeSeries
+	labels  []prompb.Label
+	samples []prompb.Sample
 
 	// buf holds labels data
 	buf []byte
@@ -159,7 +159,7 @@ func (wr *writeRequest) tryFlush() bool {
 	return true
 }
 
-func adjustSampleValues(samples []prompbmarshal.Sample, significantFigures, roundDigits int) {
+func adjustSampleValues(samples []prompb.Sample, significantFigures, roundDigits int) {
 	if n := significantFigures; n > 0 {
 		for i := range samples {
 			s := &samples[i]
@@ -174,7 +174,7 @@ func adjustSampleValues(samples []prompbmarshal.Sample, significantFigures, roun
 	}
 }
 
-func (wr *writeRequest) tryPush(src []prompbmarshal.TimeSeries) bool {
+func (wr *writeRequest) tryPush(src []prompb.TimeSeries) bool {
 	tssDst := wr.tss
 	maxSamplesPerBlock := *maxRowsPerBlock
 	// Allow up to 10x of labels per each block on average.
@@ -189,7 +189,7 @@ func (wr *writeRequest) tryPush(src []prompbmarshal.TimeSeries) bool {
 		}
 		tsSrc := &src[i]
 		adjustSampleValues(tsSrc.Samples, wr.significantFigures, wr.roundDigits)
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{})
+		tssDst = append(tssDst, prompb.TimeSeries{})
 		wr.copyTimeSeries(&tssDst[len(tssDst)-1], tsSrc)
 	}
 
@@ -197,7 +197,7 @@ func (wr *writeRequest) tryPush(src []prompbmarshal.TimeSeries) bool {
 	return true
 }
 
-func (wr *writeRequest) copyTimeSeries(dst, src *prompbmarshal.TimeSeries) {
+func (wr *writeRequest) copyTimeSeries(dst, src *prompb.TimeSeries) {
 	labelsSrc := src.Labels
 
 	// Pre-allocate memory for labels.
@@ -240,7 +240,7 @@ func (wr *writeRequest) copyTimeSeries(dst, src *prompbmarshal.TimeSeries) {
 // marshalConcurrency limits the maximum number of concurrent workers, which marshal and compress WriteRequest.
 var marshalConcurrencyCh = make(chan struct{}, cgroup.AvailableCPUs())
 
-func tryPushWriteRequest(wr *prompbmarshal.WriteRequest, tryPushBlock func(block []byte) bool, isVMRemoteWrite bool) bool {
+func tryPushWriteRequest(wr *prompb.WriteRequest, tryPushBlock func(block []byte) bool, isVMRemoteWrite bool) bool {
 	if len(wr.Timeseries) == 0 {
 		// Nothing to push
 		return true

app/vmagent/remotewrite/pendingseries_test.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestPushWriteRequest(t *testing.T) {
@@ -49,19 +49,19 @@ func testPushWriteRequest(t *testing.T, rowsCount, expectedBlockLenProm, expecte
 	f(true, expectedBlockLenVM, 15)
 }
 
-func newTestWriteRequest(seriesCount, labelsCount int) *prompbmarshal.WriteRequest {
-	var wr prompbmarshal.WriteRequest
+func newTestWriteRequest(seriesCount, labelsCount int) *prompb.WriteRequest {
+	var wr prompb.WriteRequest
 	for i := 0; i < seriesCount; i++ {
-		var labels []prompbmarshal.Label
+		var labels []prompb.Label
 		for j := 0; j < labelsCount; j++ {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  fmt.Sprintf("label_%d_%d", i, j),
 				Value: fmt.Sprintf("value_%d_%d", i, j),
 			})
 		}
-		wr.Timeseries = append(wr.Timeseries, prompbmarshal.TimeSeries{
+		wr.Timeseries = append(wr.Timeseries, prompb.TimeSeries{
 			Labels: labels,
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     float64(i),
 					Timestamp: 1000 * int64(i),

app/vmagent/remotewrite/relabel.go

@@ -10,7 +10,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 
 	"github.com/VictoriaMetrics/metrics"
@@ -32,7 +32,7 @@ var (
 		"See https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels")
 )
 
-var labelsGlobal []prompbmarshal.Label
+var labelsGlobal []prompb.Label
 
 var (
 	relabelConfigReloads      *metrics.Counter
@@ -146,14 +146,14 @@ func initLabelsGlobal() {
 		if n < 0 {
 			logger.Fatalf("missing '=' in `-remoteWrite.label`. It must contain label in the form `name=value`; got %q", s)
 		}
-		labelsGlobal = append(labelsGlobal, prompbmarshal.Label{
+		labelsGlobal = append(labelsGlobal, prompb.Label{
 			Name:  s[:n],
 			Value: s[n+1:],
 		})
 	}
 }
 
-func (rctx *relabelCtx) applyRelabeling(tss []prompbmarshal.TimeSeries, pcs *promrelabel.ParsedConfigs) []prompbmarshal.TimeSeries {
+func (rctx *relabelCtx) applyRelabeling(tss []prompb.TimeSeries, pcs *promrelabel.ParsedConfigs) []prompb.TimeSeries {
 	if pcs.Len() == 0 && !*usePromCompatibleNaming {
 		// Nothing to change.
 		return tss
@@ -174,7 +174,7 @@ func (rctx *relabelCtx) applyRelabeling(tss []prompbmarshal.TimeSeries, pcs *pro
 		if *usePromCompatibleNaming {
 			fixPromCompatibleNaming(labels[labelsLen:])
 		}
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: ts.Samples,
 		})
@@ -183,7 +183,7 @@ func (rctx *relabelCtx) applyRelabeling(tss []prompbmarshal.TimeSeries, pcs *pro
 	return tssDst
 }
 
-func (rctx *relabelCtx) appendExtraLabels(tss []prompbmarshal.TimeSeries, extraLabels []prompbmarshal.Label) {
+func (rctx *relabelCtx) appendExtraLabels(tss []prompb.TimeSeries, extraLabels []prompb.Label) {
 	if len(extraLabels) == 0 {
 		return
 	}
@@ -207,7 +207,7 @@ func (rctx *relabelCtx) appendExtraLabels(tss []prompbmarshal.TimeSeries, extraL
 	rctx.labels = labels
 }
 
-func (rctx *relabelCtx) tenantToLabels(tss []prompbmarshal.TimeSeries, accountID, projectID uint32) {
+func (rctx *relabelCtx) tenantToLabels(tss []prompb.TimeSeries, accountID, projectID uint32) {
 	rctx.reset()
 	accountIDStr := strconv.FormatUint(uint64(accountID), 10)
 	projectIDStr := strconv.FormatUint(uint64(projectID), 10)
@@ -222,11 +222,11 @@ func (rctx *relabelCtx) tenantToLabels(tss []prompbmarshal.TimeSeries, accountID
 			}
 			labels = append(labels, label)
 		}
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "vm_account_id",
 			Value: accountIDStr,
 		})
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "vm_project_id",
 			Value: projectIDStr,
 		})
@@ -237,7 +237,7 @@ func (rctx *relabelCtx) tenantToLabels(tss []prompbmarshal.TimeSeries, accountID
 
 type relabelCtx struct {
 	// pool for labels, which are used during the relabeling.
-	labels []prompbmarshal.Label
+	labels []prompb.Label
 }
 
 func (rctx *relabelCtx) reset() {
@@ -260,7 +260,7 @@ func putRelabelCtx(rctx *relabelCtx) {
 	relabelCtxPool.Put(rctx)
 }
 
-func fixPromCompatibleNaming(labels []prompbmarshal.Label) {
+func fixPromCompatibleNaming(labels []prompb.Label) {
 	// Replace unsupported Prometheus chars in label names and metric names with underscores.
 	for i := range labels {
 		label := &labels[i]

app/vmagent/remotewrite/relabel_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 )
@@ -39,7 +39,7 @@ func TestApplyRelabeling(t *testing.T) {
 }
 
 func TestAppendExtraLabels(t *testing.T) {
-	f := func(extraLabels []prompbmarshal.Label, sTss, sExpTss string) {
+	f := func(extraLabels []prompb.Label, sTss, sExpTss string) {
 		t.Helper()
 		rctx := &relabelCtx{}
 		tss, expTss := parseSeries(sTss), parseSeries(sExpTss)
@@ -50,19 +50,19 @@ func TestAppendExtraLabels(t *testing.T) {
 	}
 
 	f(nil, "up", "up")
-	f([]prompbmarshal.Label{{Name: "foo", Value: "bar"}}, "up", `up{foo="bar"}`)
-	f([]prompbmarshal.Label{{Name: "foo", Value: "bar"}}, `up{foo="baz"}`, `up{foo="bar"}`)
-	f([]prompbmarshal.Label{{Name: "baz", Value: "qux"}}, `up{foo="baz"}`, `up{foo="baz",baz="qux"}`)
+	f([]prompb.Label{{Name: "foo", Value: "bar"}}, "up", `up{foo="bar"}`)
+	f([]prompb.Label{{Name: "foo", Value: "bar"}}, `up{foo="baz"}`, `up{foo="bar"}`)
+	f([]prompb.Label{{Name: "baz", Value: "qux"}}, `up{foo="baz"}`, `up{foo="baz",baz="qux"}`)
 
 	oldVal := *usePromCompatibleNaming
 	*usePromCompatibleNaming = true
-	f([]prompbmarshal.Label{{Name: "foo.bar", Value: "baz"}}, "up", `up{foo.bar="baz"}`)
+	f([]prompb.Label{{Name: "foo.bar", Value: "baz"}}, "up", `up{foo.bar="baz"}`)
 	*usePromCompatibleNaming = oldVal
 }
 
-func parseSeries(data string) []prompbmarshal.TimeSeries {
-	var tss []prompbmarshal.TimeSeries
-	tss = append(tss, prompbmarshal.TimeSeries{
+func parseSeries(data string) []prompb.TimeSeries {
+	var tss []prompb.TimeSeries
+	tss = append(tss, prompb.TimeSeries{
 		Labels: promutil.MustNewLabelsFromString(data).GetLabels(),
 	})
 	return tss

app/vmagent/remotewrite/remotewrite.go

@@ -23,7 +23,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/memory"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/persistentqueue"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/ratelimiter"
@@ -372,7 +372,7 @@ func Stop() {
 // PushDropSamplesOnFailure drops wr samples if they cannot be sent to -remoteWrite.url by any reason.
 //
 // PushDropSamplesOnFailure can modify wr contents.
-func PushDropSamplesOnFailure(at *auth.Token, wr *prompbmarshal.WriteRequest) {
+func PushDropSamplesOnFailure(at *auth.Token, wr *prompb.WriteRequest) {
 	_ = tryPush(at, wr, true)
 }
 
@@ -382,11 +382,11 @@ func PushDropSamplesOnFailure(at *auth.Token, wr *prompbmarshal.WriteRequest) {
 // TryPush may send partial data from wr on unsuccessful attempt, so repeated call for the same wr may send the data multiple times.
 //
 // The caller must return ErrQueueFullHTTPRetry to the client, which sends wr, if TryPush returns false.
-func TryPush(at *auth.Token, wr *prompbmarshal.WriteRequest) bool {
+func TryPush(at *auth.Token, wr *prompb.WriteRequest) bool {
 	return tryPush(at, wr, dropSamplesOnFailureGlobal)
 }
 
-func tryPush(at *auth.Token, wr *prompbmarshal.WriteRequest, forceDropSamplesOnFailure bool) bool {
+func tryPush(at *auth.Token, wr *prompb.WriteRequest, forceDropSamplesOnFailure bool) bool {
 	tss := wr.Timeseries
 
 	var tenantRctx *relabelCtx
@@ -492,7 +492,7 @@ func tryPush(at *auth.Token, wr *prompbmarshal.WriteRequest, forceDropSamplesOnF
 // returns only the unblocked rwctx.
 //
 // calculateHealthyRwctxIdx will rely on the order of rwctx to be in ascending order.
-func getEligibleRemoteWriteCtxs(tss []prompbmarshal.TimeSeries, forceDropSamplesOnFailure bool) ([]*remoteWriteCtx, bool) {
+func getEligibleRemoteWriteCtxs(tss []prompb.TimeSeries, forceDropSamplesOnFailure bool) ([]*remoteWriteCtx, bool) {
 	if !disableOnDiskQueueAny {
 		return rwctxsGlobal, true
 	}
@@ -520,7 +520,7 @@ func getEligibleRemoteWriteCtxs(tss []prompbmarshal.TimeSeries, forceDropSamples
 	return rwctxs, true
 }
 
-func pushToRemoteStoragesTrackDropped(tss []prompbmarshal.TimeSeries) {
+func pushToRemoteStoragesTrackDropped(tss []prompb.TimeSeries) {
 	rwctxs, _ := getEligibleRemoteWriteCtxs(tss, true)
 	if len(rwctxs) == 0 {
 		return
@@ -531,7 +531,7 @@ func pushToRemoteStoragesTrackDropped(tss []prompbmarshal.TimeSeries) {
 	}
 }
 
-func tryPushBlockToRemoteStorages(rwctxs []*remoteWriteCtx, tssBlock []prompbmarshal.TimeSeries, forceDropSamplesOnFailure bool) bool {
+func tryPushBlockToRemoteStorages(rwctxs []*remoteWriteCtx, tssBlock []prompb.TimeSeries, forceDropSamplesOnFailure bool) bool {
 	if len(tssBlock) == 0 {
 		// Nothing to push
 		return true
@@ -571,7 +571,7 @@ func tryPushBlockToRemoteStorages(rwctxs []*remoteWriteCtx, tssBlock []prompbmar
 	return !anyPushFailed.Load()
 }
 
-func tryShardingBlockAmongRemoteStorages(rwctxs []*remoteWriteCtx, tssBlock []prompbmarshal.TimeSeries, replicas int, forceDropSamplesOnFailure bool) bool {
+func tryShardingBlockAmongRemoteStorages(rwctxs []*remoteWriteCtx, tssBlock []prompb.TimeSeries, replicas int, forceDropSamplesOnFailure bool) bool {
 	x := getTSSShards(len(rwctxs))
 	defer putTSSShards(x)
 
@@ -588,7 +588,7 @@ func tryShardingBlockAmongRemoteStorages(rwctxs []*remoteWriteCtx, tssBlock []pr
 			continue
 		}
 		wg.Add(1)
-		go func(rwctx *remoteWriteCtx, tss []prompbmarshal.TimeSeries) {
+		go func(rwctx *remoteWriteCtx, tss []prompb.TimeSeries) {
 			defer wg.Done()
 			if !rwctx.TryPush(tss, forceDropSamplesOnFailure) {
 				anyPushFailed.Store(true)
@@ -624,7 +624,7 @@ func calculateHealthyRwctxIdx(healthyRwctxs []*remoteWriteCtx) ([]int, []int) {
 }
 
 // shardAmountRemoteWriteCtx distribute time series to shards by consistent hashing.
-func shardAmountRemoteWriteCtx(tssBlock []prompbmarshal.TimeSeries, shards [][]prompbmarshal.TimeSeries, rwctxs []*remoteWriteCtx, replicas int) {
+func shardAmountRemoteWriteCtx(tssBlock []prompb.TimeSeries, shards [][]prompb.TimeSeries, rwctxs []*remoteWriteCtx, replicas int) {
 	tmpLabels := promutil.GetLabels()
 	defer promutil.PutLabels(tmpLabels)
 
@@ -680,7 +680,7 @@ func shardAmountRemoteWriteCtx(tssBlock []prompbmarshal.TimeSeries, shards [][]p
 }
 
 type tssShards struct {
-	shards [][]prompbmarshal.TimeSeries
+	shards [][]prompb.TimeSeries
 }
 
 func getTSSShards(n int) *tssShards {
@@ -690,7 +690,7 @@ func getTSSShards(n int) *tssShards {
 	}
 	x := v.(*tssShards)
 	if cap(x.shards) < n {
-		x.shards = make([][]prompbmarshal.TimeSeries, n)
+		x.shards = make([][]prompb.TimeSeries, n)
 	}
 	x.shards = x.shards[:n]
 	return x
@@ -708,7 +708,7 @@ func putTSSShards(x *tssShards) {
 var tssShardsPool sync.Pool
 
 // sortLabelsIfNeeded sorts labels if -sortLabels command-line flag is set.
-func sortLabelsIfNeeded(tss []prompbmarshal.TimeSeries) {
+func sortLabelsIfNeeded(tss []prompb.TimeSeries) {
 	if !*sortLabels {
 		return
 	}
@@ -717,11 +717,11 @@ func sortLabelsIfNeeded(tss []prompbmarshal.TimeSeries) {
 	}
 }
 
-func limitSeriesCardinality(tss []prompbmarshal.TimeSeries) []prompbmarshal.TimeSeries {
+func limitSeriesCardinality(tss []prompb.TimeSeries) []prompb.TimeSeries {
 	if hourlySeriesLimiter == nil && dailySeriesLimiter == nil {
 		return tss
 	}
-	dst := make([]prompbmarshal.TimeSeries, 0, len(tss))
+	dst := make([]prompb.TimeSeries, 0, len(tss))
 	for i := range tss {
 		labels := tss[i].Labels
 		h := getLabelsHash(labels)
@@ -748,7 +748,7 @@ var (
 	dailySeriesLimitRowsDropped  = metrics.NewCounter(`vmagent_daily_series_limit_rows_dropped_total`)
 )
 
-func getLabelsHash(labels []prompbmarshal.Label) uint64 {
+func getLabelsHash(labels []prompb.Label) uint64 {
 	bb := labelsHashBufPool.Get()
 	b := bb.B[:0]
 	for _, label := range labels {
@@ -763,12 +763,12 @@ func getLabelsHash(labels []prompbmarshal.Label) uint64 {
 
 var labelsHashBufPool bytesutil.ByteBufferPool
 
-func logSkippedSeries(labels []prompbmarshal.Label, flagName string, flagValue int) {
+func logSkippedSeries(labels []prompb.Label, flagName string, flagValue int) {
 	select {
 	case <-logSkippedSeriesTicker.C:
 		// Do not use logger.WithThrottler() here, since this will increase CPU usage
-		// because every call to logSkippedSeries will result to a call to prompbmarshal.LabelsToString.
-		logger.Warnf("skip series %s because %s=%d reached", prompbmarshal.LabelsToString(labels), flagName, flagValue)
+		// because every call to logSkippedSeries will result to a call to prompb.LabelsToString.
+		logger.Warnf("skip series %s because %s=%d reached", prompb.LabelsToString(labels), flagName, flagValue)
 	default:
 	}
 }
@@ -900,14 +900,14 @@ func (rwctx *remoteWriteCtx) MustStop() {
 // TryPush sends tss series to the configured remote write endpoint
 //
 // TryPush doesn't modify tss, so tss can be passed concurrently to TryPush across distinct rwctx instances.
-func (rwctx *remoteWriteCtx) TryPush(tss []prompbmarshal.TimeSeries, forceDropSamplesOnFailure bool) bool {
+func (rwctx *remoteWriteCtx) TryPush(tss []prompb.TimeSeries, forceDropSamplesOnFailure bool) bool {
 	var rctx *relabelCtx
-	var v *[]prompbmarshal.TimeSeries
+	var v *[]prompb.TimeSeries
 	defer func() {
 		if rctx == nil {
 			return
 		}
-		*v = prompbmarshal.ResetTimeSeries(tss)
+		*v = prompb.ResetTimeSeries(tss)
 		tssPool.Put(v)
 		putRelabelCtx(rctx)
 	}()
@@ -921,7 +921,7 @@ func (rwctx *remoteWriteCtx) TryPush(tss []prompbmarshal.TimeSeries, forceDropSa
 		// from affecting time series for other remoteWrite.url configs.
 		// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/467
 		// and https://github.com/VictoriaMetrics/VictoriaMetrics/issues/599
-		v = tssPool.Get().(*[]prompbmarshal.TimeSeries)
+		v = tssPool.Get().(*[]prompb.TimeSeries)
 		tss = append(*v, tss...)
 		rowsCountBeforeRelabel := getRowsCount(tss)
 		tss = rctx.applyRelabeling(tss, pcs)
@@ -940,7 +940,7 @@ func (rwctx *remoteWriteCtx) TryPush(tss []prompbmarshal.TimeSeries, forceDropSa
 			if rctx == nil {
 				rctx = getRelabelCtx()
 				// Make a copy of tss before dropping aggregated series
-				v = tssPool.Get().(*[]prompbmarshal.TimeSeries)
+				v = tssPool.Get().(*[]prompb.TimeSeries)
 				tss = append(*v, tss...)
 			}
 			tss = dropAggregatedSeries(tss, matchIdxs.B, rwctx.streamAggrDropInput)
@@ -969,7 +969,7 @@ func (rwctx *remoteWriteCtx) TryPush(tss []prompbmarshal.TimeSeries, forceDropSa
 
 var matchIdxsPool bytesutil.ByteBufferPool
 
-func dropAggregatedSeries(src []prompbmarshal.TimeSeries, matchIdxs []byte, dropInput bool) []prompbmarshal.TimeSeries {
+func dropAggregatedSeries(src []prompb.TimeSeries, matchIdxs []byte, dropInput bool) []prompb.TimeSeries {
 	dst := src[:0]
 	if !dropInput {
 		for i, match := range matchIdxs {
@@ -984,7 +984,7 @@ func dropAggregatedSeries(src []prompbmarshal.TimeSeries, matchIdxs []byte, drop
 	return dst
 }
 
-func (rwctx *remoteWriteCtx) pushInternalTrackDropped(tss []prompbmarshal.TimeSeries) {
+func (rwctx *remoteWriteCtx) pushInternalTrackDropped(tss []prompb.TimeSeries) {
 	if rwctx.tryPushInternal(tss) {
 		return
 	}
@@ -996,14 +996,14 @@ func (rwctx *remoteWriteCtx) pushInternalTrackDropped(tss []prompbmarshal.TimeSe
 	rwctx.rowsDroppedOnPushFailure.Add(rowsCount)
 }
 
-func (rwctx *remoteWriteCtx) tryPushInternal(tss []prompbmarshal.TimeSeries) bool {
+func (rwctx *remoteWriteCtx) tryPushInternal(tss []prompb.TimeSeries) bool {
 	var rctx *relabelCtx
-	var v *[]prompbmarshal.TimeSeries
+	var v *[]prompb.TimeSeries
 	defer func() {
 		if rctx == nil {
 			return
 		}
-		*v = prompbmarshal.ResetTimeSeries(tss)
+		*v = prompb.ResetTimeSeries(tss)
 		tssPool.Put(v)
 		putRelabelCtx(rctx)
 	}()
@@ -1012,7 +1012,7 @@ func (rwctx *remoteWriteCtx) tryPushInternal(tss []prompbmarshal.TimeSeries) boo
 		// Make a copy of tss before adding extra labels in order to prevent
 		// from affecting time series for other remoteWrite.url configs.
 		rctx = getRelabelCtx()
-		v = tssPool.Get().(*[]prompbmarshal.TimeSeries)
+		v = tssPool.Get().(*[]prompb.TimeSeries)
 		tss = append(*v, tss...)
 		rctx.appendExtraLabels(tss, labelsGlobal)
 	}
@@ -1025,12 +1025,12 @@ func (rwctx *remoteWriteCtx) tryPushInternal(tss []prompbmarshal.TimeSeries) boo
 
 var tssPool = &sync.Pool{
 	New: func() any {
-		a := []prompbmarshal.TimeSeries{}
+		a := []prompb.TimeSeries{}
 		return &a
 	},
 }
 
-func getRowsCount(tss []prompbmarshal.TimeSeries) int {
+func getRowsCount(tss []prompb.TimeSeries) int {
 	rowsCount := 0
 	for _, ts := range tss {
 		rowsCount += len(ts.Samples)

app/vmagent/remotewrite/remotewrite_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/consistenthash"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/streamaggr"
@@ -25,14 +25,14 @@ func TestGetLabelsHash_Distribution(t *testing.T) {
 		// Distribute itemsCount hashes returned by getLabelsHash() across bucketsCount buckets.
 		itemsCount := 1_000 * bucketsCount
 		m := make([]int, bucketsCount)
-		var labels []prompbmarshal.Label
+		var labels []prompb.Label
 		for i := 0; i < itemsCount; i++ {
-			labels = append(labels[:0], prompbmarshal.Label{
+			labels = append(labels[:0], prompb.Label{
 				Name:  "__name__",
 				Value: fmt.Sprintf("some_name_%d", i),
 			})
 			for j := 0; j < 10; j++ {
-				labels = append(labels, prompbmarshal.Label{
+				labels = append(labels, prompb.Label{
 					Name:  fmt.Sprintf("label_%d", j),
 					Value: fmt.Sprintf("value_%d_%d", i, j),
 				})
@@ -88,7 +88,7 @@ func TestRemoteWriteContext_TryPush_ImmutableTimeseries(t *testing.T) {
 		}
 
 		if streamAggrConfig != "" {
-			pushNoop := func(_ []prompbmarshal.TimeSeries) {}
+			pushNoop := func(_ []prompb.TimeSeries) {}
 			opts := streamaggr.Options{
 				EnableWindows: enableWindows,
 			}
@@ -102,7 +102,7 @@ func TestRemoteWriteContext_TryPush_ImmutableTimeseries(t *testing.T) {
 
 		offsetMsecs := time.Now().UnixMilli()
 		inputTss := prometheus.MustParsePromMetrics(input, offsetMsecs)
-		expectedTss := make([]prompbmarshal.TimeSeries, len(inputTss))
+		expectedTss := make([]prompb.TimeSeries, len(inputTss))
 
 		// copy inputTss to make sure it is not mutated during TryPush call
 		copy(expectedTss, inputTss)
@@ -220,16 +220,16 @@ func TestShardAmountRemoteWriteCtx(t *testing.T) {
 
 		seriesCount := 100000
 		// build 1000000 series
-		tssBlock := make([]prompbmarshal.TimeSeries, 0, seriesCount)
+		tssBlock := make([]prompb.TimeSeries, 0, seriesCount)
 		for i := 0; i < seriesCount; i++ {
-			tssBlock = append(tssBlock, prompbmarshal.TimeSeries{
-				Labels: []prompbmarshal.Label{
+			tssBlock = append(tssBlock, prompb.TimeSeries{
+				Labels: []prompb.Label{
 					{
 						Name:  "label",
 						Value: strconv.Itoa(i),
 					},
 				},
-				Samples: []prompbmarshal.Sample{
+				Samples: []prompb.Sample{
 					{
 						Timestamp: 0,
 						Value:     0,
@@ -258,7 +258,7 @@ func TestShardAmountRemoteWriteCtx(t *testing.T) {
 		for i, nodeIdx := range healthyIdx {
 			for _, ts := range shards[i] {
 				// add it to node[nodeIdx]'s active time series
-				activeTimeSeriesByNodes[nodeIdx][prompbmarshal.LabelsToString(ts.Labels)] = struct{}{}
+				activeTimeSeriesByNodes[nodeIdx][prompb.LabelsToString(ts.Labels)] = struct{}{}
 			}
 		}
 
@@ -281,7 +281,7 @@ func TestShardAmountRemoteWriteCtx(t *testing.T) {
 		for i, nodeIdx := range healthyIdx {
 			for _, ts := range shards[i] {
 				// add it to node[nodeIdx]'s active time series
-				activeTimeSeriesByNodes[nodeIdx][prompbmarshal.LabelsToString(ts.Labels)] = struct{}{}
+				activeTimeSeriesByNodes[nodeIdx][prompb.LabelsToString(ts.Labels)] = struct{}{}
 			}
 		}
 

app/vmagent/remotewrite/streamaggr.go

@@ -8,7 +8,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/streamaggr"
 	"github.com/VictoriaMetrics/metrics"
 )
@@ -80,7 +80,7 @@ func CheckStreamAggrConfigs() error {
 		return fmt.Errorf("too many -remoteWrite.streamAggr.config args: %d; it mustn't exceed the number of -remoteWrite.url args: %d", len(*streamAggrConfig), len(*remoteWriteURLs))
 	}
 
-	pushNoop := func(_ []prompbmarshal.TimeSeries) {}
+	pushNoop := func(_ []prompb.TimeSeries) {}
 	for idx := range *streamAggrConfig {
 		sas, err := newStreamAggrConfigPerURL(idx, pushNoop)
 		if err != nil {

app/vmagent/vmimport/request_handler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/vmimport"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/vmimport/stream"
@@ -36,7 +36,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 	})
 }
 
-func insertRows(at *auth.Token, rows []vmimport.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(at *auth.Token, rows []vmimport.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetPushCtx()
 	defer common.PutPushCtx(ctx)
 
@@ -50,7 +50,7 @@ func insertRows(at *auth.Token, rows []vmimport.Row, extraLabels []prompbmarshal
 		labelsLen := len(labels)
 		for j := range r.Tags {
 			tag := &r.Tags[j]
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  bytesutil.ToUnsafeString(tag.Key),
 				Value: bytesutil.ToUnsafeString(tag.Value),
 			})
@@ -63,12 +63,12 @@ func insertRows(at *auth.Token, rows []vmimport.Row, extraLabels []prompbmarshal
 		}
 		samplesLen := len(samples)
 		for j, value := range values {
-			samples = append(samples, prompbmarshal.Sample{
+			samples = append(samples, prompb.Sample{
 				Value:     value,
 				Timestamp: timestamps[j],
 			})
 		}
-		tssDst = append(tssDst, prompbmarshal.TimeSeries{
+		tssDst = append(tssDst, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[samplesLen:],
 		})

app/vmalert-tool/unittest/recording.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	"github.com/VictoriaMetrics/metricsql"
 )
@@ -49,7 +49,7 @@ Outer:
 		}
 		var expSamples []parsedSample
 		for _, s := range mt.ExpSamples {
-			expLb := []prompbmarshal.Label{}
+			expLb := []prompb.Label{}
 			if s.Labels != "" {
 				metricsqlExpr, err := metricsql.Parse(s.Labels)
 				if err != nil {
@@ -65,7 +65,7 @@ Outer:
 				}
 				if len(metricsqlMetricExpr.LabelFilterss) > 0 {
 					for _, l := range metricsqlMetricExpr.LabelFilterss[0] {
-						expLb = append(expLb, prompbmarshal.Label{
+						expLb = append(expLb, prompb.Label{
 							Name:  l.Label,
 							Value: l.Value,
 						})

app/vmalert/datasource/client_prom.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 
 	"github.com/valyala/fastjson"
 )
@@ -85,14 +85,14 @@ func (pi *promInstant) Unmarshal(b []byte) error {
 		labels := metric.GetObject()
 
 		r := &pi.ms[i]
-		r.Labels = make([]prompbmarshal.Label, 0, labels.Len())
+		r.Labels = make([]prompb.Label, 0, labels.Len())
 		labels.Visit(func(key []byte, v *fastjson.Value) {
 			lv, errLocal := v.StringBytes()
 			if errLocal != nil {
 				err = fmt.Errorf("error when parsing label value %q: %s", v, errLocal)
 				return
 			}
-			r.Labels = append(r.Labels, prompbmarshal.Label{
+			r.Labels = append(r.Labels, prompb.Label{
 				Name:  string(key),
 				Value: string(lv),
 			})

app/vmalert/datasource/client_test.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 var (
@@ -147,12 +147,12 @@ func TestVMInstantQuery(t *testing.T) {
 	}
 	expected := []Metric{
 		{
-			Labels:     []prompbmarshal.Label{{Value: "vm_rows", Name: "__name__"}, {Value: "bar", Name: "foo"}},
+			Labels:     []prompb.Label{{Value: "vm_rows", Name: "__name__"}, {Value: "bar", Name: "foo"}},
 			Timestamps: []int64{1583786142},
 			Values:     []float64{13763},
 		},
 		{
-			Labels:     []prompbmarshal.Label{{Value: "vm_requests", Name: "__name__"}, {Value: "baz", Name: "foo"}},
+			Labels:     []prompb.Label{{Value: "vm_requests", Name: "__name__"}, {Value: "baz", Name: "foo"}},
 			Timestamps: []int64{1583786140},
 			Values:     []float64{2000},
 		},
@@ -225,7 +225,7 @@ func TestVMInstantQuery(t *testing.T) {
 	}
 	exp := []Metric{
 		{
-			Labels:     []prompbmarshal.Label{{Value: "constantLine(10)", Name: "name"}},
+			Labels:     []prompb.Label{{Value: "constantLine(10)", Name: "name"}},
 			Timestamps: []int64{1611758403},
 			Values:     []float64{10},
 		},
@@ -247,12 +247,12 @@ func TestVMInstantQuery(t *testing.T) {
 	}
 	expected = []Metric{
 		{
-			Labels:     []prompbmarshal.Label{{Value: "total", Name: "stats_result"}, {Value: "bar", Name: "foo"}},
+			Labels:     []prompb.Label{{Value: "total", Name: "stats_result"}, {Value: "bar", Name: "foo"}},
 			Timestamps: []int64{1583786142},
 			Values:     []float64{13763},
 		},
 		{
-			Labels:     []prompbmarshal.Label{{Value: "total", Name: "stats_result"}, {Value: "baz", Name: "foo"}},
+			Labels:     []prompb.Label{{Value: "total", Name: "stats_result"}, {Value: "baz", Name: "foo"}},
 			Timestamps: []int64{1583786140},
 			Values:     []float64{2000},
 		},
@@ -455,7 +455,7 @@ func TestVMRangeQuery(t *testing.T) {
 		t.Fatalf("expected 1 metric  got %d in %+v", len(m), m)
 	}
 	expected := Metric{
-		Labels:     []prompbmarshal.Label{{Value: "vm_rows", Name: "__name__"}},
+		Labels:     []prompb.Label{{Value: "vm_rows", Name: "__name__"}},
 		Timestamps: []int64{1583786142},
 		Values:     []float64{13763},
 	}
@@ -486,7 +486,7 @@ func TestVMRangeQuery(t *testing.T) {
 		t.Fatalf("expected 1 metric  got %d in %+v", len(m), m)
 	}
 	expected = Metric{
-		Labels:     []prompbmarshal.Label{{Value: "total", Name: "stats_result"}},
+		Labels:     []prompb.Label{{Value: "total", Name: "stats_result"}},
 		Timestamps: []int64{1583786142},
 		Values:     []float64{10},
 	}

app/vmalert/datasource/datasource.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // Querier interface wraps Query and QueryRange methods
@@ -60,7 +60,7 @@ type QuerierParams struct {
 
 // Metric is the basic entity which should be return by datasource
 type Metric struct {
-	Labels     []prompbmarshal.Label
+	Labels     []prompb.Label
 	Timestamps []int64
 	Values     []float64
 }
@@ -79,7 +79,7 @@ func (m *Metric) SetLabel(key, value string) {
 
 // AddLabel appends the given label to the label set
 func (m *Metric) AddLabel(key, value string) {
-	m.Labels = append(m.Labels, prompbmarshal.Label{Name: key, Value: value})
+	m.Labels = append(m.Labels, prompb.Label{Name: key, Value: value})
 }
 
 // DelLabel deletes the given label from the label set
@@ -103,7 +103,7 @@ func (m *Metric) Label(key string) string {
 }
 
 // Labels is collection of Label
-type Labels []prompbmarshal.Label
+type Labels []prompb.Label
 
 func (ls Labels) Len() int           { return len(ls) }
 func (ls Labels) Swap(i, j int)      { ls[i], ls[j] = ls[j], ls[i] }
@@ -158,7 +158,7 @@ func LabelCompare(a, b Labels) int {
 // ConvertToLabels convert map to Labels
 func ConvertToLabels(m map[string]string) (labelset Labels) {
 	for k, v := range m {
-		labelset = append(labelset, prompbmarshal.Label{
+		labelset = append(labelset, prompb.Label{
 			Name:  k,
 			Value: v,
 		})

app/vmalert/datasource/vm_prom_api_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestPromInstant_UnmarshalPositive(t *testing.T) {
@@ -23,7 +23,7 @@ func TestPromInstant_UnmarshalPositive(t *testing.T) {
 
 	f(`[{"metric":{"__name__":"up"},"value":[1583780000,"42"]}]`, []Metric{
 		{
-			Labels:     []prompbmarshal.Label{{Name: "__name__", Value: "up"}},
+			Labels:     []prompb.Label{{Name: "__name__", Value: "up"}},
 			Timestamps: []int64{1583780000},
 			Values:     []float64{42},
 		},
@@ -33,17 +33,17 @@ func TestPromInstant_UnmarshalPositive(t *testing.T) {
 {"metric":{"__name__":"foo"},"value":[1583780001,"7"]},
 {"metric":{"__name__":"baz", "instance":"bar"},"value":[1583780002,"8"]}]`, []Metric{
 		{
-			Labels:     []prompbmarshal.Label{{Name: "__name__", Value: "up"}},
+			Labels:     []prompb.Label{{Name: "__name__", Value: "up"}},
 			Timestamps: []int64{1583780000},
 			Values:     []float64{42},
 		},
 		{
-			Labels:     []prompbmarshal.Label{{Name: "__name__", Value: "foo"}},
+			Labels:     []prompb.Label{{Name: "__name__", Value: "foo"}},
 			Timestamps: []int64{1583780001},
 			Values:     []float64{7},
 		},
 		{
-			Labels:     []prompbmarshal.Label{{Name: "__name__", Value: "baz"}, {Name: "instance", Value: "bar"}},
+			Labels:     []prompb.Label{{Name: "__name__", Value: "baz"}, {Name: "instance", Value: "bar"}},
 			Timestamps: []int64{1583780002},
 			Values:     []float64{8},
 		},

app/vmalert/notifier/alert.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/templates"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
@@ -195,10 +195,10 @@ func templateAnnotation(dst io.Writer, text string, data tplData, tpl *textTpl.T
 	return nil
 }
 
-func (a Alert) applyRelabelingIfNeeded(relabelCfg *promrelabel.ParsedConfigs) []prompbmarshal.Label {
-	var labels []prompbmarshal.Label
+func (a Alert) applyRelabelingIfNeeded(relabelCfg *promrelabel.ParsedConfigs) []prompb.Label {
+	var labels []prompb.Label
 	for k, v := range a.Labels {
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  promrelabel.SanitizeMetricName(k),
 			Value: v,
 		})

app/vmalert/notifier/alert_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
@@ -33,7 +33,7 @@ func TestAlertExecTemplate(t *testing.T) {
 		qFn := func(_ string) ([]datasource.Metric, error) {
 			return []datasource.Metric{
 				{
-					Labels: []prompbmarshal.Label{
+					Labels: []prompb.Label{
 						{Name: "foo", Value: "bar"},
 						{Name: "baz", Value: "qux"},
 					},
@@ -41,7 +41,7 @@ func TestAlertExecTemplate(t *testing.T) {
 					Timestamps: []int64{1},
 				},
 				{
-					Labels: []prompbmarshal.Label{
+					Labels: []prompb.Label{
 						{Name: "foo", Value: "garply"},
 						{Name: "baz", Value: "fred"},
 					},
@@ -213,7 +213,7 @@ func TestAlertExecTemplate(t *testing.T) {
 }
 
 func TestAlert_toPromLabels(t *testing.T) {
-	fn := func(labels map[string]string, exp []prompbmarshal.Label, relabel *promrelabel.ParsedConfigs) {
+	fn := func(labels map[string]string, exp []prompb.Label, relabel *promrelabel.ParsedConfigs) {
 		t.Helper()
 		a := Alert{Labels: labels}
 		got := a.applyRelabelingIfNeeded(relabel)
@@ -226,12 +226,12 @@ func TestAlert_toPromLabels(t *testing.T) {
 	fn(nil, nil, nil)
 	fn(
 		map[string]string{"foo": "bar", "a": "baz"}, // unsorted
-		[]prompbmarshal.Label{{Name: "a", Value: "baz"}, {Name: "foo", Value: "bar"}},
+		[]prompb.Label{{Name: "a", Value: "baz"}, {Name: "foo", Value: "bar"}},
 		nil,
 	)
 	fn(
 		map[string]string{"foo.bar": "baz", "service!name": "qux"},
-		[]prompbmarshal.Label{{Name: "foo_bar", Value: "baz"}, {Name: "service_name", Value: "qux"}},
+		[]prompb.Label{{Name: "foo_bar", Value: "baz"}, {Name: "service_name", Value: "qux"}},
 		nil,
 	)
 
@@ -247,17 +247,17 @@ func TestAlert_toPromLabels(t *testing.T) {
 
 	fn(
 		map[string]string{"a": "baz"},
-		[]prompbmarshal.Label{{Name: "a", Value: "baz"}, {Name: "foo", Value: "aaa"}},
+		[]prompb.Label{{Name: "a", Value: "baz"}, {Name: "foo", Value: "aaa"}},
 		pcs,
 	)
 	fn(
 		map[string]string{"foo": "bar", "a": "baz"},
-		[]prompbmarshal.Label{{Name: "a", Value: "baz"}, {Name: "foo", Value: "aaa"}},
+		[]prompb.Label{{Name: "a", Value: "baz"}, {Name: "foo", Value: "aaa"}},
 		pcs,
 	)
 	fn(
 		map[string]string{"qux": "bar", "env": "prod", "environment": "production"},
-		[]prompbmarshal.Label{{Name: "foo", Value: "aaa"}, {Name: "qux", Value: "bar"}},
+		[]prompb.Label{{Name: "foo", Value: "aaa"}, {Name: "qux", Value: "bar"}},
 		pcs,
 	)
 }

app/vmalert/notifier/alertmanager.go

@@ -15,7 +15,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
@@ -86,7 +86,7 @@ func (am *AlertManager) Send(ctx context.Context, alerts []Alert, headers map[st
 func (am *AlertManager) send(ctx context.Context, alerts []Alert, headers map[string]string) error {
 	b := &bytes.Buffer{}
 	alertsToSend := make([]Alert, 0, len(alerts))
-	lblss := make([][]prompbmarshal.Label, 0, len(alerts))
+	lblss := make([][]prompb.Label, 0, len(alerts))
 	for _, a := range alerts {
 		lbls := a.applyRelabelingIfNeeded(am.relabelConfigs)
 		if len(lbls) == 0 {

app/vmalert/notifier/alertmanager_request.qtpl

@@ -1,11 +1,11 @@
 {% import (
     "time"
 
-    "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+    "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 ) %}
 {% stripspace %}
 
-{% func amRequest(alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) %}
+{% func amRequest(alerts []Alert, generatorURL func(Alert) string, lblss [][]prompb.Label) %}
 [
 {% for i, alert := range alerts %}
 {% code lbls := lblss[i] %}

app/vmalert/notifier/alertmanager_request.qtpl.go

@@ -8,7 +8,7 @@ package notifier
 import (
 	"time"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 //line app/vmalert/notifier/alertmanager_request.qtpl:8
@@ -25,7 +25,7 @@ var (
 )
 
 //line app/vmalert/notifier/alertmanager_request.qtpl:8
-func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) {
+func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL func(Alert) string, lblss [][]prompb.Label) {
 //line app/vmalert/notifier/alertmanager_request.qtpl:8
 	qw422016.N().S(`[`)
 //line app/vmalert/notifier/alertmanager_request.qtpl:10
@@ -114,7 +114,7 @@ func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL fun
 }
 
 //line app/vmalert/notifier/alertmanager_request.qtpl:35
-func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) {
+func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL func(Alert) string, lblss [][]prompb.Label) {
 //line app/vmalert/notifier/alertmanager_request.qtpl:35
 	qw422016 := qt422016.AcquireWriter(qq422016)
 //line app/vmalert/notifier/alertmanager_request.qtpl:35
@@ -125,7 +125,7 @@ func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL fun
 }
 
 //line app/vmalert/notifier/alertmanager_request.qtpl:35
-func amRequest(alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) string {
+func amRequest(alerts []Alert, generatorURL func(Alert) string, lblss [][]prompb.Label) string {
 //line app/vmalert/notifier/alertmanager_request.qtpl:35
 	qb422016 := qt422016.AcquireByteBuffer()
 //line app/vmalert/notifier/alertmanager_request.qtpl:35

app/vmalert/remotewrite/client.go

@@ -20,7 +20,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/metrics"
 )
 
@@ -46,7 +46,7 @@ type Client struct {
 	addr          string
 	c             *http.Client
 	authCfg       *promauth.Config
-	input         chan prompbmarshal.TimeSeries
+	input         chan prompb.TimeSeries
 	flushInterval time.Duration
 	maxBatchSize  int
 	maxQueueSize  int
@@ -110,7 +110,7 @@ func NewClient(ctx context.Context, cfg Config) (*Client, error) {
 		maxBatchSize:  cfg.MaxBatchSize,
 		maxQueueSize:  cfg.MaxQueueSize,
 		doneCh:        make(chan struct{}),
-		input:         make(chan prompbmarshal.TimeSeries, cfg.MaxQueueSize),
+		input:         make(chan prompb.TimeSeries, cfg.MaxQueueSize),
 	}
 
 	for i := 0; i < cc; i++ {
@@ -121,7 +121,7 @@ func NewClient(ctx context.Context, cfg Config) (*Client, error) {
 
 // Push adds timeseries into queue for writing into remote storage.
 // Push returns and error if client is stopped or if queue is full.
-func (c *Client) Push(s prompbmarshal.TimeSeries) error {
+func (c *Client) Push(s prompb.TimeSeries) error {
 	rwTotal.Inc()
 	select {
 	case <-c.doneCh:
@@ -158,7 +158,7 @@ func (c *Client) Close() error {
 
 func (c *Client) run(ctx context.Context) {
 	ticker := time.NewTicker(c.flushInterval)
-	wr := &prompbmarshal.WriteRequest{}
+	wr := &prompb.WriteRequest{}
 	shutdown := func() {
 		lastCtx, cancel := context.WithTimeout(context.Background(), defaultWriteTimeout)
 
@@ -221,7 +221,7 @@ func GetDroppedRows() int { return int(droppedRows.Get()) }
 // flush is a blocking function that marshals WriteRequest and sends
 // it to remote-write endpoint. Flush performs limited amount of retries
 // if request fails.
-func (c *Client) flush(ctx context.Context, wr *prompbmarshal.WriteRequest) {
+func (c *Client) flush(ctx context.Context, wr *prompb.WriteRequest) {
 	if len(wr.Timeseries) < 1 {
 		return
 	}

app/vmalert/remotewrite/client_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/golang/snappy"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
 )
 
 func TestClient_Push(t *testing.T) {
@@ -46,8 +45,8 @@ func TestClient_Push(t *testing.T) {
 	r := rand.New(rand.NewSource(1))
 	const rowsN = int(1e4)
 	for i := 0; i < rowsN; i++ {
-		s := prompbmarshal.TimeSeries{
-			Samples: []prompbmarshal.Sample{{
+		s := prompb.TimeSeries{
+			Samples: []prompb.Sample{{
 				Value:     r.Float64(),
 				Timestamp: time.Now().Unix(),
 			}},
@@ -104,7 +103,7 @@ func TestClient_run_maxBatchSizeDuringShutdown(t *testing.T) {
 
 		// push time series to the client.
 		for i := 0; i < pushCnt; i++ {
-			if err = rwClient.Push(prompbmarshal.TimeSeries{}); err != nil {
+			if err = rwClient.Push(prompb.TimeSeries{}); err != nil {
 				t.Fatalf("cannot time series to the client: %s", err)
 			}
 		}
@@ -183,8 +182,9 @@ func (rw *rwServer) handler(w http.ResponseWriter, r *http.Request) {
 		rw.err(w, fmt.Errorf("decode err: %w", err))
 		return
 	}
-	wr := &prompb.WriteRequest{}
-	if err := wr.UnmarshalProtobuf(b); err != nil {
+	wru := &prompb.WriteRequestUnmarshaller{}
+	wr, err := wru.UnmarshalProtobuf(b)
+	if err != nil {
 		rw.err(w, fmt.Errorf("unmarhsal err: %w", err))
 		return
 	}

app/vmalert/remotewrite/debug_client.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // DebugClient won't push series periodically, but will write data to remote endpoint
@@ -48,10 +48,10 @@ func NewDebugClient() (*DebugClient, error) {
 }
 
 // Push sends the given timeseries to the remote storage.
-func (c *DebugClient) Push(s prompbmarshal.TimeSeries) error {
+func (c *DebugClient) Push(s prompb.TimeSeries) error {
 	c.wg.Add(1)
 	defer c.wg.Done()
-	wr := &prompbmarshal.WriteRequest{Timeseries: []prompbmarshal.TimeSeries{s}}
+	wr := &prompb.WriteRequest{Timeseries: []prompb.TimeSeries{s}}
 	data := wr.MarshalProtobuf(nil)
 
 	return c.send(data)

app/vmalert/remotewrite/debug_client_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestDebugClient_Push(t *testing.T) {
@@ -23,8 +23,8 @@ func TestDebugClient_Push(t *testing.T) {
 	const rowsN = 100
 	var sent int
 	for i := 0; i < rowsN; i++ {
-		s := prompbmarshal.TimeSeries{
-			Samples: []prompbmarshal.Sample{{
+		s := prompb.TimeSeries{
+			Samples: []prompb.Sample{{
 				Value:     float64(i),
 				Timestamp: time.Now().Unix(),
 			}},

app/vmalert/remotewrite/remotewrite.go

@@ -1,13 +1,13 @@
 package remotewrite
 
 import (
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // RWClient represents an HTTP client for pushing data via remote write protocol
 type RWClient interface {
 	// Push pushes the give time series to remote storage
-	Push(s prompbmarshal.TimeSeries) error
+	Push(s prompb.TimeSeries) error
 	// Close stops the client. Client can't be reused after Close call.
 	Close() error
 }

app/vmalert/replay_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 )
 
@@ -23,7 +23,7 @@ func (fr *fakeReplayQuerier) BuildWithParams(_ datasource.QuerierParams) datasou
 
 type fakeRWClient struct{}
 
-func (fc *fakeRWClient) Push(_ prompbmarshal.TimeSeries) error {
+func (fc *fakeRWClient) Push(_ prompb.TimeSeries) error {
 	return nil
 }
 

app/vmalert/rule/alerting.go

@@ -19,7 +19,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
@@ -328,12 +328,12 @@ func (ar *AlertingRule) toLabels(m datasource.Metric, qFn templates.QueryFn) (*l
 // as this function modifies AlertingRule alerts state.
 // It is not thread safe.
 // It returns ALERT and ALERT_FOR_STATE time series as a result.
-func (ar *AlertingRule) execRange(ctx context.Context, start, end time.Time) ([]prompbmarshal.TimeSeries, error) {
+func (ar *AlertingRule) execRange(ctx context.Context, start, end time.Time) ([]prompb.TimeSeries, error) {
 	res, err := ar.q.QueryRange(ctx, ar.Expr, start, end)
 	if err != nil {
 		return nil, err
 	}
-	var result []prompbmarshal.TimeSeries
+	var result []prompb.TimeSeries
 	holdAlertState := make(map[uint64]*notifier.Alert)
 	qFn := func(_ string) ([]datasource.Metric, error) {
 		logger.Warnf("`query` template isn't supported in replay mode, mocked data is used")
@@ -392,7 +392,7 @@ const resolvedRetention = 15 * time.Minute
 
 // exec executes AlertingRule expression via the given Querier.
 // Based on the Querier results AlertingRule maintains notifier.Alerts
-func (ar *AlertingRule) exec(ctx context.Context, ts time.Time, limit int) ([]prompbmarshal.TimeSeries, error) {
+func (ar *AlertingRule) exec(ctx context.Context, ts time.Time, limit int) ([]prompb.TimeSeries, error) {
 	start := time.Now()
 	res, req, err := ar.q.Query(ctx, ar.Expr, ts)
 	curState := StateEntry{
@@ -480,7 +480,7 @@ func (ar *AlertingRule) exec(ctx context.Context, ts time.Time, limit int) ([]pr
 		ar.logDebugf(ts, a, "created in state PENDING")
 	}
 	var numActivePending int
-	var tss []prompbmarshal.TimeSeries
+	var tss []prompb.TimeSeries
 	for h, a := range ar.alerts {
 		// if alert wasn't updated in this iteration
 		// means it is resolved already
@@ -560,8 +560,8 @@ func (ar *AlertingRule) expandTemplates(m datasource.Metric, qFn templates.Query
 }
 
 // toTimeSeries creates `ALERTS` and `ALERTS_FOR_STATE` for active alerts
-func (ar *AlertingRule) toTimeSeries(timestamp int64) []prompbmarshal.TimeSeries {
-	var tss []prompbmarshal.TimeSeries
+func (ar *AlertingRule) toTimeSeries(timestamp int64) []prompb.TimeSeries {
+	var tss []prompb.TimeSeries
 	for _, a := range ar.alerts {
 		if a.State == notifier.StateInactive {
 			continue
@@ -632,67 +632,67 @@ const (
 )
 
 // alertToTimeSeries converts the given alert with the given timestamp to time series
-func (ar *AlertingRule) alertToTimeSeries(a *notifier.Alert, timestamp int64) []prompbmarshal.TimeSeries {
-	return []prompbmarshal.TimeSeries{
+func (ar *AlertingRule) alertToTimeSeries(a *notifier.Alert, timestamp int64) []prompb.TimeSeries {
+	return []prompb.TimeSeries{
 		alertToTimeSeries(a, timestamp),
 		alertForToTimeSeries(a, timestamp),
 	}
 }
 
-func alertToTimeSeries(a *notifier.Alert, timestamp int64) prompbmarshal.TimeSeries {
-	labels := make([]prompbmarshal.Label, 0, len(a.Labels)+2)
+func alertToTimeSeries(a *notifier.Alert, timestamp int64) prompb.TimeSeries {
+	labels := make([]prompb.Label, 0, len(a.Labels)+2)
 	for k, v := range a.Labels {
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  k,
 			Value: v,
 		})
 	}
 	// __name__ already been dropped, no need to check duplication
-	labels = append(labels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
+	labels = append(labels, prompb.Label{Name: "__name__", Value: alertMetricName})
 	if ol := promrelabel.GetLabelByName(labels, alertStateLabel); ol != nil {
 		ol.Value = a.State.String()
 	} else {
-		labels = append(labels, prompbmarshal.Label{Name: alertStateLabel, Value: a.State.String()})
+		labels = append(labels, prompb.Label{Name: alertStateLabel, Value: a.State.String()})
 	}
 	return newTimeSeries([]float64{1}, []int64{timestamp}, labels)
 }
 
 // alertForToTimeSeries returns a time series that represents
 // state of active alerts, where value is time when alert become active
-func alertForToTimeSeries(a *notifier.Alert, timestamp int64) prompbmarshal.TimeSeries {
-	labels := make([]prompbmarshal.Label, 0, len(a.Labels)+1)
+func alertForToTimeSeries(a *notifier.Alert, timestamp int64) prompb.TimeSeries {
+	labels := make([]prompb.Label, 0, len(a.Labels)+1)
 	for k, v := range a.Labels {
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  k,
 			Value: v,
 		})
 	}
 	// __name__ already been dropped, no need to check duplication
-	labels = append(labels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
+	labels = append(labels, prompb.Label{Name: "__name__", Value: alertForStateMetricName})
 	return newTimeSeries([]float64{float64(a.ActiveAt.Unix())}, []int64{timestamp}, labels)
 }
 
 // pendingAlertStaleTimeSeries returns stale `ALERTS` and `ALERTS_FOR_STATE` time series
 // for alerts which changed their state from Pending to Inactive or Firing.
-func pendingAlertStaleTimeSeries(ls map[string]string, timestamp int64, includeAlertForState bool) []prompbmarshal.TimeSeries {
-	var result []prompbmarshal.TimeSeries
-	baseLabels := make([]prompbmarshal.Label, 0, len(ls)+1)
+func pendingAlertStaleTimeSeries(ls map[string]string, timestamp int64, includeAlertForState bool) []prompb.TimeSeries {
+	var result []prompb.TimeSeries
+	baseLabels := make([]prompb.Label, 0, len(ls)+1)
 	for k, v := range ls {
-		baseLabels = append(baseLabels, prompbmarshal.Label{
+		baseLabels = append(baseLabels, prompb.Label{
 			Name:  k,
 			Value: v,
 		})
 	}
 
-	alertsLabels := make([]prompbmarshal.Label, 0, len(ls)+2)
+	alertsLabels := make([]prompb.Label, 0, len(ls)+2)
 	alertsLabels = append(alertsLabels, baseLabels...)
 	// __name__ already been dropped, no need to check duplication
-	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
-	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: alertStateLabel, Value: notifier.StatePending.String()})
+	alertsLabels = append(alertsLabels, prompb.Label{Name: "__name__", Value: alertMetricName})
+	alertsLabels = append(alertsLabels, prompb.Label{Name: alertStateLabel, Value: notifier.StatePending.String()})
 	result = append(result, newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, alertsLabels))
 
 	if includeAlertForState {
-		baseLabels = append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
+		baseLabels = append(baseLabels, prompb.Label{Name: "__name__", Value: alertForStateMetricName})
 		result = append(result, newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, baseLabels))
 	}
 	return result
@@ -700,24 +700,24 @@ func pendingAlertStaleTimeSeries(ls map[string]string, timestamp int64, includeA
 
 // firingAlertStaleTimeSeries returns stale `ALERTS` and `ALERTS_FOR_STATE` time series
 // for alerts which changed their state from Firing to Inactive.
-func firingAlertStaleTimeSeries(ls map[string]string, timestamp int64) []prompbmarshal.TimeSeries {
-	baseLabels := make([]prompbmarshal.Label, 0, len(ls)+1)
+func firingAlertStaleTimeSeries(ls map[string]string, timestamp int64) []prompb.TimeSeries {
+	baseLabels := make([]prompb.Label, 0, len(ls)+1)
 	for k, v := range ls {
-		baseLabels = append(baseLabels, prompbmarshal.Label{
+		baseLabels = append(baseLabels, prompb.Label{
 			Name:  k,
 			Value: v,
 		})
 	}
 
-	alertsLabels := make([]prompbmarshal.Label, 0, len(ls)+2)
+	alertsLabels := make([]prompb.Label, 0, len(ls)+2)
 	alertsLabels = append(alertsLabels, baseLabels...)
 	// __name__ already been dropped, no need to check duplication
-	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
-	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: alertStateLabel, Value: notifier.StateFiring.String()})
+	alertsLabels = append(alertsLabels, prompb.Label{Name: "__name__", Value: alertMetricName})
+	alertsLabels = append(alertsLabels, prompb.Label{Name: alertStateLabel, Value: notifier.StateFiring.String()})
 
-	baseLabels = append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
+	baseLabels = append(baseLabels, prompb.Label{Name: "__name__", Value: alertForStateMetricName})
 
-	return []prompbmarshal.TimeSeries{
+	return []prompb.TimeSeries{
 		newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, alertsLabels),
 		newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, baseLabels),
 	}

app/vmalert/rule/alerting_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 )
 
@@ -51,7 +51,7 @@ func TestNewAlertingRule(t *testing.T) {
 func TestAlertingRuleToTimeSeries(t *testing.T) {
 	timestamp := time.Now()
 
-	f := func(rule *AlertingRule, alert *notifier.Alert, tssExpected []prompbmarshal.TimeSeries) {
+	f := func(rule *AlertingRule, alert *notifier.Alert, tssExpected []prompb.TimeSeries) {
 		t.Helper()
 
 		rule.alerts[alert.ID] = alert
@@ -64,8 +64,8 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 	f(newTestAlertingRule("instant", 0), &notifier.Alert{
 		State:    notifier.StateFiring,
 		ActiveAt: timestamp.Add(time.Second),
-	}, []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+	}, []prompb.TimeSeries{
+		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: alertMetricName,
@@ -77,7 +77,7 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 		}),
 		newTimeSeries([]float64{float64(timestamp.Add(time.Second).Unix())},
 			[]int64{timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: alertForStateMetricName,
@@ -91,9 +91,9 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 			"job":      "foo",
 			"instance": "bar",
 		},
-	}, []prompbmarshal.TimeSeries{
+	}, []prompb.TimeSeries{
 		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: alertMetricName,
@@ -113,7 +113,7 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 			}),
 		newTimeSeries([]float64{float64(timestamp.Add(time.Second).Unix())},
 			[]int64{timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: alertForStateMetricName,
@@ -134,8 +134,8 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 		Labels: map[string]string{
 			alertStateLabel: "foo",
 		},
-	}, []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+	}, []prompb.TimeSeries{
+		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: alertMetricName,
@@ -147,7 +147,7 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 		}),
 		newTimeSeries([]float64{float64(timestamp.Add(time.Second).Unix())},
 			[]int64{timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: alertForStateMetricName,
@@ -162,8 +162,8 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 	f(newTestAlertingRule("for", time.Second), &notifier.Alert{
 		State:    notifier.StateFiring,
 		ActiveAt: timestamp.Add(time.Second),
-	}, []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+	}, []prompb.TimeSeries{
+		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: alertMetricName,
@@ -175,7 +175,7 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 		}),
 		newTimeSeries([]float64{float64(timestamp.Add(time.Second).Unix())},
 			[]int64{timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: alertForStateMetricName,
@@ -186,8 +186,8 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 	f(newTestAlertingRule("for pending", 10*time.Second), &notifier.Alert{
 		State:    notifier.StatePending,
 		ActiveAt: timestamp.Add(time.Second),
-	}, []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+	}, []prompb.TimeSeries{
+		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: alertMetricName,
@@ -197,7 +197,7 @@ func TestAlertingRuleToTimeSeries(t *testing.T) {
 				Value: notifier.StatePending.String(),
 			},
 		}),
-		newTimeSeries([]float64{float64(timestamp.Add(time.Second).Unix())}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+		newTimeSeries([]float64{float64(timestamp.Add(time.Second).Unix())}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: alertForStateMetricName,
@@ -215,7 +215,7 @@ func TestAlertingRule_Exec(t *testing.T) {
 
 	ts, _ := time.Parse(time.RFC3339, "2024-10-29T00:00:00Z")
 
-	f := func(rule *AlertingRule, steps [][]datasource.Metric, alertsExpected map[int][]testAlert, tssExpected map[int][]prompbmarshal.TimeSeries) {
+	f := func(rule *AlertingRule, steps [][]datasource.Metric, alertsExpected map[int][]testAlert, tssExpected map[int][]prompb.TimeSeries) {
 		t.Helper()
 
 		fq := &datasource.FakeQuerier{}
@@ -278,15 +278,15 @@ func TestAlertingRule_Exec(t *testing.T) {
 	}, map[int][]testAlert{
 		0: {{alert: &notifier.Alert{State: notifier.StateFiring}}},
 	},
-		map[int][]prompbmarshal.TimeSeries{
+		map[int][]prompb.TimeSeries{
 			0: {
 				{
-					Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "empty_labels"}, {Name: "alertstate", Value: "firing"}},
-					Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
+					Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "empty_labels"}, {Name: "alertstate", Value: "firing"}},
+					Samples: []prompb.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
 				},
 				{
-					Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "empty_labels"}},
-					Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
+					Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "empty_labels"}},
+					Samples: []prompb.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
 				},
 			},
 		})
@@ -303,35 +303,35 @@ func TestAlertingRule_Exec(t *testing.T) {
 		2: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StateFiring}}},
 		3: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StateInactive}}},
 		4: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StateInactive}}},
-	}, map[int][]prompbmarshal.TimeSeries{
+	}, map[int][]prompb.TimeSeries{
 		0: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
 			},
 		},
 		1: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 		},
 		2: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 		},
 	})
@@ -386,55 +386,55 @@ func TestAlertingRule_Exec(t *testing.T) {
 			{labels: []string{"name", "foo1"}, alert: &notifier.Alert{State: notifier.StateInactive}},
 			{labels: []string{"name", "foo2"}, alert: &notifier.Alert{State: notifier.StateFiring}},
 		},
-	}, map[int][]prompbmarshal.TimeSeries{
+	}, map[int][]prompb.TimeSeries{
 		0: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
 			},
 		},
 		1: {
 			// stale time series for foo, `firing -> inactive`
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			// new time series for foo1
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 		},
 		2: {
 			// stale time series for foo1
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 			// new time series for foo2
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo2"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo2"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo2"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo2"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 		},
 	})
@@ -451,30 +451,30 @@ func TestAlertingRule_Exec(t *testing.T) {
 	}, map[int][]testAlert{
 		0: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StatePending}}},
 		1: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StateFiring}}},
-	}, map[int][]prompbmarshal.TimeSeries{
+	}, map[int][]prompb.TimeSeries{
 		0: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
 			},
 		},
 		1: {
 			// stale time series for `pending -> firing`
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 		},
 	})
@@ -488,36 +488,36 @@ func TestAlertingRule_Exec(t *testing.T) {
 		0: {{labels: []string{"name", "foo", "a1", "b1", "a2", "b2", "a3", "b3"}, alert: &notifier.Alert{State: notifier.StatePending}}},
 		1: {{labels: []string{"name", "foo", "a1", "b1", "a2", "b2", "a3", "b3"}, alert: &notifier.Alert{State: notifier.StatePending}}},
 		2: {},
-	}, map[int][]prompbmarshal.TimeSeries{
+	}, map[int][]prompb.TimeSeries{
 		0: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
 			},
 		},
 		1: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: float64(ts.Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
 			},
 		},
 		// stale time series for `pending -> inactive`
 		2: {
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
+				Labels:  []prompb.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
+				Samples: []prompb.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
 			},
 		},
 	})
@@ -588,7 +588,7 @@ func TestAlertingRuleExecRange(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %s", err)
 		}
-		var expTS []prompbmarshal.TimeSeries
+		var expTS []prompb.TimeSeries
 		var j int
 		for _, series := range data {
 			for _, timestamp := range series.Timestamps {
@@ -728,7 +728,7 @@ func TestAlertingRuleExecRange(t *testing.T) {
 		{Values: []float64{1, 1, 1}, Timestamps: []int64{1, 3, 5}},
 		{
 			Values: []float64{1, 1}, Timestamps: []int64{1, 5},
-			Labels: []prompbmarshal.Label{{Name: "foo", Value: "bar"}},
+			Labels: []prompb.Label{{Name: "foo", Value: "bar"}},
 		},
 	}, []*notifier.Alert{
 		{State: notifier.StatePending, ActiveAt: time.Unix(1, 0)},
@@ -776,7 +776,7 @@ func TestAlertingRuleExecRange(t *testing.T) {
 		{Values: []float64{1, 1}, Timestamps: []int64{1, 100}},
 		{
 			Values: []float64{1, 1}, Timestamps: []int64{1, 5},
-			Labels: []prompbmarshal.Label{{Name: "foo", Value: "bar"}},
+			Labels: []prompb.Label{{Name: "foo", Value: "bar"}},
 		},
 	}, []*notifier.Alert{
 		{
@@ -1353,7 +1353,7 @@ func newTestAlertingRuleWithCustomFields(name string, waitFor, evalInterval, kee
 
 func TestAlertingRule_ToLabels(t *testing.T) {
 	metric := datasource.Metric{
-		Labels: []prompbmarshal.Label{
+		Labels: []prompb.Label{
 			{Name: "instance", Value: "0.0.0.0:8800"},
 			{Name: "group", Value: "vmalert"},
 			{Name: "alertname", Value: "ConfigurationReloadFailure"},

app/vmalert/rule/group.go

@@ -21,7 +21,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 var (
@@ -755,7 +755,7 @@ func (e *executor) exec(ctx context.Context, r Rule, ts time.Time, resolveDurati
 	}
 
 	if e.Rw != nil {
-		pushToRW := func(tss []prompbmarshal.TimeSeries) error {
+		pushToRW := func(tss []prompb.TimeSeries) error {
 			var lastErr error
 			for _, ts := range tss {
 				if err := e.Rw.Push(ts); err != nil {

app/vmalert/rule/recording.go

@@ -14,7 +14,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
@@ -132,13 +132,13 @@ func (rr *RecordingRule) unregisterMetrics() {
 // execRange executes recording rule on the given time range similarly to Exec.
 // It doesn't update internal states of the Rule and meant to be used just
 // to get time series for backfilling.
-func (rr *RecordingRule) execRange(ctx context.Context, start, end time.Time) ([]prompbmarshal.TimeSeries, error) {
+func (rr *RecordingRule) execRange(ctx context.Context, start, end time.Time) ([]prompb.TimeSeries, error) {
 	res, err := rr.q.QueryRange(ctx, rr.Expr, start, end)
 	if err != nil {
 		return nil, err
 	}
 	duplicates := make(map[string]struct{}, len(res.Data))
-	var tss []prompbmarshal.TimeSeries
+	var tss []prompb.TimeSeries
 	for _, s := range res.Data {
 		ts := rr.toTimeSeries(s)
 		key := stringifyLabels(ts.Labels)
@@ -152,7 +152,7 @@ func (rr *RecordingRule) execRange(ctx context.Context, start, end time.Time) ([
 }
 
 // exec executes RecordingRule expression via the given Querier.
-func (rr *RecordingRule) exec(ctx context.Context, ts time.Time, limit int) ([]prompbmarshal.TimeSeries, error) {
+func (rr *RecordingRule) exec(ctx context.Context, ts time.Time, limit int) ([]prompb.TimeSeries, error) {
 	start := time.Now()
 	res, req, err := rr.q.Query(ctx, rr.Expr, ts)
 	curState := StateEntry{
@@ -187,7 +187,7 @@ func (rr *RecordingRule) exec(ctx context.Context, ts time.Time, limit int) ([]p
 
 	curEvaluation := make(map[string]struct{}, len(qMetrics))
 	lastEvaluation := rr.lastEvaluation
-	var tss []prompbmarshal.TimeSeries
+	var tss []prompb.TimeSeries
 	for _, r := range qMetrics {
 		ts := rr.toTimeSeries(r)
 		key := stringifyLabels(ts.Labels)
@@ -201,9 +201,9 @@ func (rr *RecordingRule) exec(ctx context.Context, ts time.Time, limit int) ([]p
 	}
 	// check for stale time series
 	for k := range lastEvaluation {
-		tss = append(tss, prompbmarshal.TimeSeries{
+		tss = append(tss, prompb.TimeSeries{
 			Labels: stringToLabels(k),
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{Value: decimal.StaleNaN, Timestamp: ts.UnixNano() / 1e6},
 			}})
 	}
@@ -222,12 +222,12 @@ func (rr *RecordingRule) logDebugf(at time.Time, format string, args ...any) {
 	logger.Infof("%s", prefix+msg)
 }
 
-func stringToLabels(s string) []prompbmarshal.Label {
+func stringToLabels(s string) []prompb.Label {
 	labels := strings.Split(s, ",")
-	rLabels := make([]prompbmarshal.Label, 0, len(labels))
+	rLabels := make([]prompb.Label, 0, len(labels))
 	for i := range labels {
 		if label := strings.Split(labels[i], "="); len(label) == 2 {
-			rLabels = append(rLabels, prompbmarshal.Label{
+			rLabels = append(rLabels, prompb.Label{
 				Name:  label[0],
 				Value: label[1],
 			})
@@ -236,7 +236,7 @@ func stringToLabels(s string) []prompbmarshal.Label {
 	return rLabels
 }
 
-func stringifyLabels(labels []prompbmarshal.Label) string {
+func stringifyLabels(labels []prompb.Label) string {
 	b := strings.Builder{}
 	for i, l := range labels {
 		b.WriteString(l.Name)
@@ -249,11 +249,11 @@ func stringifyLabels(labels []prompbmarshal.Label) string {
 	return b.String()
 }
 
-func (rr *RecordingRule) toTimeSeries(m datasource.Metric) prompbmarshal.TimeSeries {
+func (rr *RecordingRule) toTimeSeries(m datasource.Metric) prompb.TimeSeries {
 	if preN := promrelabel.GetLabelByName(m.Labels, "__name__"); preN != nil {
 		preN.Value = rr.Name
 	} else {
-		m.Labels = append(m.Labels, prompbmarshal.Label{
+		m.Labels = append(m.Labels, prompb.Label{
 			Name:  "__name__",
 			Value: rr.Name,
 		})
@@ -270,7 +270,7 @@ func (rr *RecordingRule) toTimeSeries(m datasource.Metric) prompbmarshal.TimeSer
 			existingLabel.Name = fmt.Sprintf("exported_%s", existingLabel.Name)
 		}
 		// add extra label
-		m.Labels = append(m.Labels, prompbmarshal.Label{
+		m.Labels = append(m.Labels, prompb.Label{
 			Name:  k,
 			Value: rr.Labels[k],
 		})

app/vmalert/rule/recording_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestNewRecordingRule(t *testing.T) {
@@ -41,7 +41,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 	ts, _ := time.Parse(time.RFC3339, "2024-10-29T00:00:00Z")
 	const defaultStep = 5 * time.Millisecond
 
-	f := func(rule *RecordingRule, steps [][]datasource.Metric, tssExpected [][]prompbmarshal.TimeSeries) {
+	f := func(rule *RecordingRule, steps [][]datasource.Metric, tssExpected [][]prompb.TimeSeries) {
 		t.Helper()
 
 		fq := &datasource.FakeQuerier{}
@@ -68,8 +68,8 @@ func TestRecordingRule_Exec(t *testing.T) {
 		Name: "foo",
 	}, [][]datasource.Metric{{
 		metricWithValueAndLabels(t, 10, "__name__", "bar"),
-	}}, [][]prompbmarshal.TimeSeries{{
-		newTimeSeries([]float64{10}, []int64{ts.UnixNano()}, []prompbmarshal.Label{
+	}}, [][]prompb.TimeSeries{{
+		newTimeSeries([]float64{10}, []int64{ts.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: "foo",
@@ -90,9 +90,9 @@ func TestRecordingRule_Exec(t *testing.T) {
 		{
 			metricWithValueAndLabels(t, 10, "__name__", "foo", "job", "bar"),
 		},
-	}, [][]prompbmarshal.TimeSeries{
+	}, [][]prompb.TimeSeries{
 		{
-			newTimeSeries([]float64{1}, []int64{ts.UnixNano()}, []prompbmarshal.Label{
+			newTimeSeries([]float64{1}, []int64{ts.UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -102,7 +102,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 					Value: "foo",
 				},
 			}),
-			newTimeSeries([]float64{2}, []int64{ts.UnixNano()}, []prompbmarshal.Label{
+			newTimeSeries([]float64{2}, []int64{ts.UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -114,7 +114,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 			}),
 		},
 		{
-			newTimeSeries([]float64{10}, []int64{ts.Add(defaultStep).UnixNano()}, []prompbmarshal.Label{
+			newTimeSeries([]float64{10}, []int64{ts.Add(defaultStep).UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -125,7 +125,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 				},
 			}),
 			// stale time series
-			newTimeSeries([]float64{decimal.StaleNaN}, []int64{ts.Add(defaultStep).UnixNano()}, []prompbmarshal.Label{
+			newTimeSeries([]float64{decimal.StaleNaN}, []int64{ts.Add(defaultStep).UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -137,7 +137,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 			}),
 		},
 		{
-			newTimeSeries([]float64{10}, []int64{ts.Add(2 * defaultStep).UnixNano()}, []prompbmarshal.Label{
+			newTimeSeries([]float64{10}, []int64{ts.Add(2 * defaultStep).UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -147,7 +147,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 					Value: "bar",
 				},
 			}),
-			newTimeSeries([]float64{decimal.StaleNaN}, []int64{ts.Add(2 * defaultStep).UnixNano()}, []prompbmarshal.Label{
+			newTimeSeries([]float64{decimal.StaleNaN}, []int64{ts.Add(2 * defaultStep).UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -169,8 +169,8 @@ func TestRecordingRule_Exec(t *testing.T) {
 		metricWithValueAndLabels(t, 2, "__name__", "foo", "job", "foo"),
 		metricWithValueAndLabels(t, 1, "__name__", "bar", "job", "bar", "source", "origin"),
 		metricWithValueAndLabels(t, 1, "__name__", "baz", "job", "baz", "source", "test"),
-	}}, [][]prompbmarshal.TimeSeries{{
-		newTimeSeries([]float64{2}, []int64{ts.UnixNano()}, []prompbmarshal.Label{
+	}}, [][]prompb.TimeSeries{{
+		newTimeSeries([]float64{2}, []int64{ts.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: "job:foo",
@@ -185,7 +185,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 			},
 		}),
 		newTimeSeries([]float64{1}, []int64{ts.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "job:foo",
@@ -204,7 +204,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 				},
 			}),
 		newTimeSeries([]float64{1}, []int64{ts.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "job:foo",
@@ -222,7 +222,7 @@ func TestRecordingRule_Exec(t *testing.T) {
 }
 
 func TestRecordingRule_ExecRange(t *testing.T) {
-	f := func(rule *RecordingRule, metrics []datasource.Metric, tssExpected []prompbmarshal.TimeSeries) {
+	f := func(rule *RecordingRule, metrics []datasource.Metric, tssExpected []prompb.TimeSeries) {
 		t.Helper()
 
 		fq := &datasource.FakeQuerier{}
@@ -243,9 +243,9 @@ func TestRecordingRule_ExecRange(t *testing.T) {
 		Name: "foo",
 	}, []datasource.Metric{
 		metricWithValuesAndLabels(t, []float64{10, 20, 30}, "__name__", "bar"),
-	}, []prompbmarshal.TimeSeries{
+	}, []prompb.TimeSeries{
 		newTimeSeries([]float64{10, 20, 30}, []int64{timestamp.UnixNano(), timestamp.UnixNano(), timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foo",
@@ -259,8 +259,8 @@ func TestRecordingRule_ExecRange(t *testing.T) {
 		metricWithValuesAndLabels(t, []float64{1}, "__name__", "foo", "job", "foo"),
 		metricWithValuesAndLabels(t, []float64{2, 3}, "__name__", "bar", "job", "bar"),
 		metricWithValuesAndLabels(t, []float64{4, 5, 6}, "__name__", "baz", "job", "baz"),
-	}, []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+	}, []prompb.TimeSeries{
+		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: "foobarbaz",
@@ -270,7 +270,7 @@ func TestRecordingRule_ExecRange(t *testing.T) {
 				Value: "foo",
 			},
 		}),
-		newTimeSeries([]float64{2, 3}, []int64{timestamp.UnixNano(), timestamp.UnixNano()}, []prompbmarshal.Label{
+		newTimeSeries([]float64{2, 3}, []int64{timestamp.UnixNano(), timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: "foobarbaz",
@@ -281,7 +281,7 @@ func TestRecordingRule_ExecRange(t *testing.T) {
 			},
 		}),
 		newTimeSeries([]float64{4, 5, 6},
-			[]int64{timestamp.UnixNano(), timestamp.UnixNano(), timestamp.UnixNano()}, []prompbmarshal.Label{
+			[]int64{timestamp.UnixNano(), timestamp.UnixNano(), timestamp.UnixNano()}, []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "foobarbaz",
@@ -301,8 +301,8 @@ func TestRecordingRule_ExecRange(t *testing.T) {
 	}, []datasource.Metric{
 		metricWithValueAndLabels(t, 2, "__name__", "foo", "job", "foo"),
 		metricWithValueAndLabels(t, 1, "__name__", "bar", "job", "bar"),
-	}, []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{2}, []int64{timestamp.UnixNano()}, []prompbmarshal.Label{
+	}, []prompb.TimeSeries{
+		newTimeSeries([]float64{2}, []int64{timestamp.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: "job:foo",
@@ -317,7 +317,7 @@ func TestRecordingRule_ExecRange(t *testing.T) {
 			},
 		}),
 		newTimeSeries([]float64{1}, []int64{timestamp.UnixNano()},
-			[]prompbmarshal.Label{
+			[]prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "job:foo",
@@ -480,8 +480,8 @@ func TestRecordingRuleExec_Partial(t *testing.T) {
 	rule.Debug = true
 	rule.q = fq
 	got, err := rule.exec(context.TODO(), ts, 0)
-	want := []prompbmarshal.TimeSeries{
-		newTimeSeries([]float64{10}, []int64{ts.UnixNano()}, []prompbmarshal.Label{
+	want := []prompb.TimeSeries{
+		newTimeSeries([]float64{10}, []int64{ts.UnixNano()}, []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: "foo",

app/vmalert/rule/rule.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // Rule represents alerting or recording rule
@@ -23,9 +23,9 @@ type Rule interface {
 	ID() uint64
 	// exec executes the rule with given context at the given timestamp and limit.
 	// returns an err if number of resulting time series exceeds the limit.
-	exec(ctx context.Context, ts time.Time, limit int) ([]prompbmarshal.TimeSeries, error)
+	exec(ctx context.Context, ts time.Time, limit int) ([]prompb.TimeSeries, error)
 	// execRange executes the rule on the given time range.
-	execRange(ctx context.Context, start, end time.Time) ([]prompbmarshal.TimeSeries, error)
+	execRange(ctx context.Context, start, end time.Time) ([]prompb.TimeSeries, error)
 	// updateWith performs modification of current Rule
 	// with fields of the given Rule.
 	updateWith(Rule) error
@@ -151,7 +151,7 @@ func (s *ruleState) add(e StateEntry) {
 
 func replayRule(r Rule, start, end time.Time, rw remotewrite.RWClient, replayRuleRetryAttempts int) (int, error) {
 	var err error
-	var tss []prompbmarshal.TimeSeries
+	var tss []prompb.TimeSeries
 	for i := 0; i < replayRuleRetryAttempts; i++ {
 		tss, err = r.execRange(context.Background(), start, end)
 		if err == nil {

app/vmalert/rule/test_helpers.go

@@ -9,7 +9,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // CompareRules is a test helper func for other tests
@@ -94,7 +94,7 @@ func metricWithLabels(t *testing.T, labels ...string) datasource.Metric {
 	}
 	m := datasource.Metric{Values: []float64{1}, Timestamps: []int64{1}}
 	for i := 0; i < len(labels); i += 2 {
-		m.Labels = append(m.Labels, prompbmarshal.Label{
+		m.Labels = append(m.Labels, prompb.Label{
 			Name:  labels[i],
 			Value: labels[i+1],
 		})
@@ -102,7 +102,7 @@ func metricWithLabels(t *testing.T, labels ...string) datasource.Metric {
 	return m
 }
 
-func compareTimeSeries(t *testing.T, a, b []prompbmarshal.TimeSeries) error {
+func compareTimeSeries(t *testing.T, a, b []prompb.TimeSeries) error {
 	t.Helper()
 	if len(a) != len(b) {
 		return fmt.Errorf("expected number of timeseries %d; got %d", len(a), len(b))

app/vmalert/rule/utils.go

@@ -8,19 +8,19 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )
 
 // newTimeSeries first sorts given labels, then returns new time series.
-func newTimeSeries(values []float64, timestamps []int64, labels []prompbmarshal.Label) prompbmarshal.TimeSeries {
+func newTimeSeries(values []float64, timestamps []int64, labels []prompb.Label) prompb.TimeSeries {
 	promrelabel.SortLabels(labels)
-	ts := prompbmarshal.TimeSeries{
+	ts := prompb.TimeSeries{
 		Labels:  labels,
-		Samples: make([]prompbmarshal.Sample, len(values)),
+		Samples: make([]prompb.Sample, len(values)),
 	}
 	for i := range values {
-		ts.Samples[i] = prompbmarshal.Sample{
+		ts.Samples[i] = prompb.Sample{
 			Value:     values[i],
 			Timestamp: time.Unix(timestamps[i], 0).UnixNano() / 1e6,
 		}

app/vminsert/common/insert_ctx.go

@@ -10,7 +10,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/ratelimiter"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/slicesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
@@ -63,7 +63,7 @@ type InsertCtx struct {
 func (ctx *InsertCtx) Reset(rowsLen int) {
 	labels := ctx.Labels
 	for i := range labels {
-		labels[i] = prompbmarshal.Label{}
+		labels[i] = prompb.Label{}
 	}
 	ctx.Labels = labels[:0]
 
@@ -84,7 +84,7 @@ func cleanMetricRow(mr *storage.MetricRow) {
 	mr.MetricNameRaw = nil
 }
 
-func (ctx *InsertCtx) marshalMetricNameRaw(prefix []byte, labels []prompbmarshal.Label) []byte {
+func (ctx *InsertCtx) marshalMetricNameRaw(prefix []byte, labels []prompb.Label) []byte {
 	start := len(ctx.metricNamesBuf)
 	ctx.metricNamesBuf = append(ctx.metricNamesBuf, prefix...)
 	ctx.metricNamesBuf = storage.MarshalMetricNameRaw(ctx.metricNamesBuf, labels)
@@ -113,7 +113,7 @@ func (ctx *InsertCtx) TryPrepareLabels(hasRelabeling bool) bool {
 // WriteDataPoint writes (timestamp, value) with the given prefix and labels into ctx buffer.
 //
 // caller should invoke TryPrepareLabels before using this function if needed
-func (ctx *InsertCtx) WriteDataPoint(prefix []byte, labels []prompbmarshal.Label, timestamp int64, value float64) error {
+func (ctx *InsertCtx) WriteDataPoint(prefix []byte, labels []prompb.Label, timestamp int64, value float64) error {
 	metricNameRaw := ctx.marshalMetricNameRaw(prefix, labels)
 	return ctx.addRow(metricNameRaw, timestamp, value)
 }
@@ -123,7 +123,7 @@ func (ctx *InsertCtx) WriteDataPoint(prefix []byte, labels []prompbmarshal.Label
 // caller must invoke TryPrepareLabels before using this function
 //
 // It returns metricNameRaw for the given labels if len(metricNameRaw) == 0.
-func (ctx *InsertCtx) WriteDataPointExt(metricNameRaw []byte, labels []prompbmarshal.Label, timestamp int64, value float64) ([]byte, error) {
+func (ctx *InsertCtx) WriteDataPointExt(metricNameRaw []byte, labels []prompb.Label, timestamp int64, value float64) ([]byte, error) {
 	if len(metricNameRaw) == 0 {
 		metricNameRaw = ctx.marshalMetricNameRaw(nil, labels)
 	}
@@ -161,7 +161,7 @@ func (ctx *InsertCtx) AddLabelBytes(name, value []byte) {
 		// Do not skip labels with empty name, since they are equal to __name__.
 		return
 	}
-	ctx.Labels = append(ctx.Labels, prompbmarshal.Label{
+	ctx.Labels = append(ctx.Labels, prompb.Label{
 		// Do not copy name and value contents for performance reasons.
 		// This reduces GC overhead on the number of objects and allocations.
 		Name:  bytesutil.ToUnsafeString(name),
@@ -179,7 +179,7 @@ func (ctx *InsertCtx) AddLabel(name, value string) {
 		// Do not skip labels with empty name, since they are equal to __name__.
 		return
 	}
-	ctx.Labels = append(ctx.Labels, prompbmarshal.Label{
+	ctx.Labels = append(ctx.Labels, prompb.Label{
 		// Do not copy name and value contents for performance reasons.
 		// This reduces GC overhead on the number of objects and allocations.
 		Name:  name,

app/vminsert/common/sort_labels.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"sort"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 var sortLabels = flag.Bool("sortLabels", false, `Whether to sort labels for incoming samples before writing them to storage. `+
@@ -19,7 +19,7 @@ func (ctx *InsertCtx) SortLabelsIfNeeded() {
 	}
 }
 
-type sortedLabels []prompbmarshal.Label
+type sortedLabels []prompb.Label
 
 func (sl *sortedLabels) Len() int { return len(*sl) }
 func (sl *sortedLabels) Less(i, j int) bool {

app/vminsert/common/streamaggr.go

@@ -12,7 +12,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/streamaggr"
 	"github.com/VictoriaMetrics/metrics"
@@ -59,7 +59,7 @@ func CheckStreamAggrConfig() error {
 	if *streamAggrConfig == "" {
 		return nil
 	}
-	pushNoop := func(_ []prompbmarshal.TimeSeries) {}
+	pushNoop := func(_ []prompb.TimeSeries) {}
 	opts := &streamaggr.Options{
 		DedupInterval:        *streamAggrDedupInterval,
 		DropInputLabels:      *streamAggrDropInputLabels,
@@ -170,9 +170,9 @@ func MustStopStreamAggr() {
 
 type streamAggrCtx struct {
 	mn      storage.MetricName
-	tss     []prompbmarshal.TimeSeries
-	labels  []prompbmarshal.Label
-	samples []prompbmarshal.Sample
+	tss     []prompb.TimeSeries
+	labels  []prompb.Label
+	samples []prompb.Sample
 	buf     []byte
 }
 
@@ -207,7 +207,7 @@ func (ctx *streamAggrCtx) push(mrs []storage.MetricRow, matchIdxs []byte) []byte
 		bufLen := len(buf)
 		buf = append(buf, mn.MetricGroup...)
 		metricGroup := bytesutil.ToUnsafeString(buf[bufLen:])
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: metricGroup,
 		})
@@ -220,19 +220,19 @@ func (ctx *streamAggrCtx) push(mrs []storage.MetricRow, matchIdxs []byte) []byte
 			bufLen = len(buf)
 			buf = append(buf, tag.Value...)
 			value := bytesutil.ToUnsafeString(buf[bufLen:])
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  name,
 				Value: value,
 			})
 		}
 
 		samplesLen := len(samples)
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Timestamp: mr.Timestamp,
 			Value:     mr.Value,
 		})
 
-		tss = append(tss, prompbmarshal.TimeSeries{
+		tss = append(tss, prompb.TimeSeries{
 			Labels:  labels[labelsLen:],
 			Samples: samples[samplesLen:],
 		})
@@ -260,7 +260,7 @@ func (ctx *streamAggrCtx) push(mrs []storage.MetricRow, matchIdxs []byte) []byte
 	return matchIdxs
 }
 
-func pushAggregateSeries(tss []prompbmarshal.TimeSeries) {
+func pushAggregateSeries(tss []prompb.TimeSeries) {
 	currentTimestamp := int64(fasttime.UnixTimestamp()) * 1000
 	var ctx InsertCtx
 	ctx.Reset(len(tss))

app/vminsert/csvimport/request_handler.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/csvimport"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/csvimport/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -28,7 +28,7 @@ func InsertHandler(req *http.Request) error {
 	})
 }
 
-func insertRows(rows []csvimport.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(rows []csvimport.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/datadogsketches/request_handler.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil"
@@ -30,7 +30,7 @@ func InsertHandlerForHTTP(req *http.Request) error {
 	})
 }
 
-func insertRows(sketches []*datadogsketches.Sketch, extraLabels []prompbmarshal.Label) error {
+func insertRows(sketches []*datadogsketches.Sketch, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/datadogv1/request_handler.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1/stream"
@@ -30,7 +30,7 @@ func InsertHandlerForHTTP(req *http.Request) error {
 	})
 }
 
-func insertRows(series []datadogv1.Series, extraLabels []prompbmarshal.Label) error {
+func insertRows(series []datadogv1.Series, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/datadogv2/request_handler.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2/stream"
@@ -33,7 +33,7 @@ func InsertHandlerForHTTP(req *http.Request) error {
 	})
 }
 
-func insertRows(series []datadogv2.Series, extraLabels []prompbmarshal.Label) error {
+func insertRows(series []datadogv2.Series, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/influx/request_handler.go

@@ -9,7 +9,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -58,7 +58,7 @@ func InsertHandlerForHTTP(req *http.Request) error {
 	})
 }
 
-func insertRows(db string, rows []influx.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(db string, rows []influx.Row, extraLabels []prompb.Label) error {
 	ctx := getPushCtx()
 	defer putPushCtx(ctx)
 
@@ -157,7 +157,7 @@ type pushCtx struct {
 	Common         common.InsertCtx
 	metricNameBuf  []byte
 	metricGroupBuf []byte
-	originLabels   []prompbmarshal.Label
+	originLabels   []prompb.Label
 }
 
 func (ctx *pushCtx) reset() {
@@ -167,7 +167,7 @@ func (ctx *pushCtx) reset() {
 
 	originLabels := ctx.originLabels
 	for i := range originLabels {
-		originLabels[i] = prompbmarshal.Label{}
+		originLabels[i] = prompb.Label{}
 	}
 	ctx.originLabels = originLabels[:0]
 }

app/vminsert/main.go

@@ -37,7 +37,7 @@ import (
 	opentsdbserver "github.com/VictoriaMetrics/VictoriaMetrics/lib/ingestserver/opentsdb"
 	opentsdbhttpserver "github.com/VictoriaMetrics/VictoriaMetrics/lib/ingestserver/opentsdbhttp"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/firehose"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -101,7 +101,7 @@ func Init() {
 	if len(*opentsdbHTTPListenAddr) > 0 {
 		opentsdbhttpServer = opentsdbhttpserver.MustStart(*opentsdbHTTPListenAddr, *opentsdbHTTPUseProxyProtocol, opentsdbhttp.InsertHandler)
 	}
-	promscrape.Init(func(_ *auth.Token, wr *prompbmarshal.WriteRequest) {
+	promscrape.Init(func(_ *auth.Token, wr *prompb.WriteRequest) {
 		prompush.Push(wr)
 	})
 	timeserieslimits.Init(*maxLabelsPerTimeseries, *maxLabelNameLen, *maxLabelValueLen)

app/vminsert/native/request_handler.go

@@ -7,7 +7,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/native/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
@@ -31,7 +31,7 @@ func InsertHandler(req *http.Request) error {
 	})
 }
 
-func insertRows(block *stream.Block, extraLabels []prompbmarshal.Label) error {
+func insertRows(block *stream.Block, extraLabels []prompb.Label) error {
 	ctx := getPushCtx()
 	defer putPushCtx(ctx)
 

app/vminsert/newrelic/request_handler.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/newrelic"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/newrelic/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -30,7 +30,7 @@ func InsertHandlerForHTTP(req *http.Request) error {
 	})
 }
 
-func insertRows(rows []newrelic.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(rows []newrelic.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/opentelemetry/request_handler.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/firehose"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -33,12 +33,12 @@ func InsertHandler(req *http.Request) error {
 			return fmt.Errorf("json encoding isn't supported for opentelemetry format. Use protobuf encoding")
 		}
 	}
-	return stream.ParseStream(req.Body, encoding, processBody, func(tss []prompbmarshal.TimeSeries) error {
+	return stream.ParseStream(req.Body, encoding, processBody, func(tss []prompb.TimeSeries) error {
 		return insertRows(tss, extraLabels)
 	})
 }
 
-func insertRows(tss []prompbmarshal.TimeSeries, extraLabels []prompbmarshal.Label) error {
+func insertRows(tss []prompb.TimeSeries, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/opentsdbhttp/request_handler.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdbhttp"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentsdbhttp/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -36,7 +36,7 @@ func InsertHandler(req *http.Request) error {
 	}
 }
 
-func insertRows(rows []opentsdbhttp.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(rows []opentsdbhttp.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/prometheusimport/request_handler.go

@@ -6,7 +6,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -36,7 +36,7 @@ func InsertHandler(req *http.Request) error {
 	})
 }
 
-func insertRows(rows []prometheus.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(rows []prometheus.Row, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/prompush/push.go

@@ -4,7 +4,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/metrics"
 )
 
@@ -16,7 +16,7 @@ var (
 const maxRowsPerBlock = 10000
 
 // Push pushes wr for the given at to storage.
-func Push(wr *prompbmarshal.WriteRequest) {
+func Push(wr *prompb.WriteRequest) {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 
@@ -43,7 +43,7 @@ func Push(wr *prompbmarshal.WriteRequest) {
 	}
 }
 
-func push(ctx *common.InsertCtx, tss []prompbmarshal.TimeSeries) {
+func push(ctx *common.InsertCtx, tss []prompb.TimeSeries) {
 	rowsLen := 0
 	for i := range tss {
 		rowsLen += len(tss[i].Samples)

app/vminsert/promremotewrite/request_handler.go

@@ -6,7 +6,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/promremotewrite/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/metrics"
@@ -29,7 +28,7 @@ func InsertHandler(req *http.Request) error {
 	})
 }
 
-func insertRows(timeseries []prompb.TimeSeries, extraLabels []prompbmarshal.Label) error {
+func insertRows(timeseries []prompb.TimeSeries, extraLabels []prompb.Label) error {
 	ctx := common.GetInsertCtx()
 	defer common.PutInsertCtx(ctx)
 

app/vminsert/relabel/relabel.go

@@ -8,7 +8,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/metrics"
 )
@@ -102,7 +102,7 @@ func HasRelabeling() bool {
 // Ctx holds relabeling context.
 type Ctx struct {
 	// tmpLabels is used during ApplyRelabeling call.
-	tmpLabels []prompbmarshal.Label
+	tmpLabels []prompb.Label
 }
 
 // Reset resets ctx.
@@ -114,13 +114,13 @@ func (ctx *Ctx) Reset() {
 // ApplyRelabeling applies relabeling to the given labels and returns the result.
 //
 // The returned labels are valid until the next call to ApplyRelabeling.
-func (ctx *Ctx) ApplyRelabeling(labels []prompbmarshal.Label) []prompbmarshal.Label {
+func (ctx *Ctx) ApplyRelabeling(labels []prompb.Label) []prompb.Label {
 	pcs := pcsGlobal.Load()
 	if pcs.Len() == 0 && !*usePromCompatibleNaming {
 		// There are no relabeling rules.
 		return labels
 	}
-	// Convert labels to prompbmarshal.Label format suitable for relabeling.
+	// Convert labels to prompb.Label format suitable for relabeling.
 	tmpLabels := ctx.tmpLabels[:0]
 	for _, label := range labels {
 		name := label.Name
@@ -128,7 +128,7 @@ func (ctx *Ctx) ApplyRelabeling(labels []prompbmarshal.Label) []prompbmarshal.La
 			name = "__name__"
 		}
 		value := label.Value
-		tmpLabels = append(tmpLabels, prompbmarshal.Label{
+		tmpLabels = append(tmpLabels, prompb.Label{
 			Name:  name,
 			Value: value,
 		})
@@ -165,7 +165,7 @@ func (ctx *Ctx) ApplyRelabeling(labels []prompbmarshal.Label) []prompbmarshal.La
 			name = ""
 		}
 		value := label.Value
-		dst = append(dst, prompbmarshal.Label{
+		dst = append(dst, prompb.Label{
 			Name:  name,
 			Value: value,
 		})

app/vminsert/vmimport/request_handler.go

@@ -7,7 +7,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/vmimport"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/vmimport/stream"
@@ -34,7 +34,7 @@ func InsertHandler(req *http.Request) error {
 	})
 }
 
-func insertRows(rows []vmimport.Row, extraLabels []prompbmarshal.Label) error {
+func insertRows(rows []vmimport.Row, extraLabels []prompb.Label) error {
 	ctx := getPushCtx()
 	defer putPushCtx(ctx)
 

app/vmselect/graphite/tags_api.go

@@ -14,7 +14,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bufferedwriter"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	graphiteparser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/graphite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 	"github.com/VictoriaMetrics/metrics"
@@ -95,7 +95,7 @@ func registerMetrics(startTime time.Time, w http.ResponseWriter, r *http.Request
 	_ = deadline // TODO: use the deadline as in the cluster branch
 	paths := r.Form["path"]
 	var row graphiteparser.Row
-	var labels []prompbmarshal.Label
+	var labels []prompb.Label
 	var b []byte
 	var tagsPool []graphiteparser.Tag
 	mrs := make([]storage.MetricRow, len(paths))
@@ -122,12 +122,12 @@ func registerMetrics(startTime time.Time, w http.ResponseWriter, r *http.Request
 		canonicalPaths[i] = string(b)
 
 		// Convert parsed metric and tags to labels.
-		labels = append(labels[:0], prompbmarshal.Label{
+		labels = append(labels[:0], prompb.Label{
 			Name:  "__name__",
 			Value: row.Metric,
 		})
 		for _, tag := range row.Tags {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})

apptest/model.go

@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // PrometheusQuerier contains methods available to Prometheus-like HTTP API for Querying
@@ -40,7 +40,7 @@ type PrometheusQuerier interface {
 // Writer contains methods for writing new data
 type Writer interface {
 	// Prometheus APIs
-	PrometheusAPIV1Write(t *testing.T, records []prompbmarshal.TimeSeries, opts QueryOpts)
+	PrometheusAPIV1Write(t *testing.T, records []prompb.TimeSeries, opts QueryOpts)
 	PrometheusAPIV1ImportPrometheus(t *testing.T, records []string, opts QueryOpts)
 	PrometheusAPIV1ImportCSV(t *testing.T, records []string, opts QueryOpts)
 	PrometheusAPIV1ImportNative(t *testing.T, data []byte, opts QueryOpts)

apptest/tests/dedup_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestSingleDeduplication_dedulicationIsOff(t *testing.T) {
@@ -99,34 +99,34 @@ func testDeduplication(tc *apptest.TestCase, sut apptest.PrometheusWriteQuerier,
 	ts3 := start.Add(3 * time.Second).UnixMilli()
 	ts5 := start.Add(5 * time.Second).UnixMilli()
 	ts10 := start.Add(10 * time.Second).UnixMilli()
-	data := []prompbmarshal.TimeSeries{
+	data := []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{{Name: "__name__", Value: "metric1"}},
-			Samples: []prompbmarshal.Sample{
+			Labels: []prompb.Label{{Name: "__name__", Value: "metric1"}},
+			Samples: []prompb.Sample{
 				{Timestamp: ts1, Value: 3},
 				{Timestamp: ts3, Value: 10},
 				{Timestamp: ts5, Value: 5},
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{{Name: "__name__", Value: "metric2"}},
-			Samples: []prompbmarshal.Sample{
+			Labels: []prompb.Label{{Name: "__name__", Value: "metric2"}},
+			Samples: []prompb.Sample{
 				{Timestamp: ts1, Value: 3},
 				{Timestamp: ts3, Value: decimal.StaleNaN},
 				{Timestamp: ts5, Value: 5},
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{{Name: "__name__", Value: "metric3"}},
-			Samples: []prompbmarshal.Sample{
+			Labels: []prompb.Label{{Name: "__name__", Value: "metric3"}},
+			Samples: []prompb.Sample{
 				{Timestamp: ts10, Value: 30},
 				{Timestamp: ts10, Value: 100},
 				{Timestamp: ts10, Value: 50},
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{{Name: "__name__", Value: "metric4"}},
-			Samples: []prompbmarshal.Sample{
+			Labels: []prompb.Label{{Name: "__name__", Value: "metric4"}},
+			Samples: []prompb.Sample{
 				{Timestamp: ts10, Value: 30},
 				{Timestamp: ts10, Value: decimal.StaleNaN},
 				{Timestamp: ts10, Value: 50},

apptest/tests/ingestprotocols_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestSingleIngestionProtocols(t *testing.T) {
@@ -187,15 +187,15 @@ func TestSingleIngestionProtocols(t *testing.T) {
 	})
 
 	// prometheus remote write format
-	pbData := []prompbmarshal.TimeSeries{
+	pbData := []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "prometheusrw_series",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     10,
 					Timestamp: 1707123456700, // 2024-02-05T08:57:36.700Z
@@ -204,7 +204,7 @@ func TestSingleIngestionProtocols(t *testing.T) {
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "prometheusrw_series2",
@@ -218,7 +218,7 @@ func TestSingleIngestionProtocols(t *testing.T) {
 					Value: "value1",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     20,
 					Timestamp: 1707123456800, // 2024-02-05T08:57:36.800Z
@@ -434,15 +434,15 @@ func TestClusterIngestionProtocols(t *testing.T) {
 	})
 
 	// prometheus remote write format
-	pbData := []prompbmarshal.TimeSeries{
+	pbData := []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "prometheusrw_series",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     10,
 					Timestamp: 1707123456700, // 2024-02-05T08:57:36.700Z
@@ -451,7 +451,7 @@ func TestClusterIngestionProtocols(t *testing.T) {
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "prometheusrw_series2",
@@ -465,7 +465,7 @@ func TestClusterIngestionProtocols(t *testing.T) {
 					Value: "value1",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     20,
 					Timestamp: 1707123456800, // 2024-02-05T08:57:36.800Z

apptest/tests/metricsql_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func millis(s string) int64 {
@@ -47,13 +47,13 @@ func TestClusterInstantQuery(t *testing.T) {
 }
 
 func testInstantQueryWithUTFNames(t *testing.T, sut apptest.PrometheusWriteQuerier) {
-	data := []prompbmarshal.TimeSeries{
+	data := []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{Name: "__name__", Value: "3fooµ¥"},
 				{Name: "3👋tfにちは", Value: "漢©®€£"},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{Value: 1, Timestamp: millis("2024-01-01T00:01:00Z")},
 			},
 		},
@@ -89,16 +89,16 @@ func testInstantQueryWithUTFNames(t *testing.T, sut apptest.PrometheusWriteQueri
 	fn(`{"3👋tfにちは"="漢©®€£"}`)
 }
 
-var staleNaNsData = func() []prompbmarshal.TimeSeries {
-	return []prompbmarshal.TimeSeries{
+var staleNaNsData = func() []prompb.TimeSeries {
+	return []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "metric",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     1,
 					Timestamp: millis("2024-01-01T00:01:00Z"),
@@ -185,20 +185,20 @@ func testInstantQueryDoesNotReturnStaleNaNs(t *testing.T, sut apptest.Prometheus
 // However, conversion of math.NaN to int64 could behave differently depending on platform and Go version.
 // Hence, this test could succeed for some platforms even if fix is rolled back.
 func testQueryRangeWithAtModifier(t *testing.T, sut apptest.PrometheusWriteQuerier) {
-	data := []prompbmarshal.TimeSeries{
+	data := []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{Name: "__name__", Value: "up"},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{Value: 1, Timestamp: millis("2025-01-01T00:01:00Z")},
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{Name: "__name__", Value: "metricNaN"},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{Value: decimal.StaleNaN, Timestamp: millis("2025-01-01T00:01:00Z")},
 			},
 		},

apptest/tests/relabeling_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestSingleIngestionWithRelabeling(t *testing.T) {
@@ -139,9 +139,9 @@ func TestSingleIngestionWithRelabeling(t *testing.T) {
 		},
 	})
 
-	pbData := []prompbmarshal.TimeSeries{
+	pbData := []prompb.TimeSeries{
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "prometheusrw_series",
@@ -151,7 +151,7 @@ func TestSingleIngestionWithRelabeling(t *testing.T) {
 					Value: "foo2",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     10,
 					Timestamp: 1707123456700, // 2024-02-05T08:57:36.700Z
@@ -160,7 +160,7 @@ func TestSingleIngestionWithRelabeling(t *testing.T) {
 			},
 		},
 		{
-			Labels: []prompbmarshal.Label{
+			Labels: []prompb.Label{
 				{
 					Name:  "__name__",
 					Value: "must_drop_series",
@@ -170,7 +170,7 @@ func TestSingleIngestionWithRelabeling(t *testing.T) {
 					Value: "foo2",
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []prompb.Sample{
 				{
 					Value:     20,
 					Timestamp: 1707123456800, // 2024-02-05T08:57:36.800Z

apptest/vminsert.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/golang/snappy"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // Vminsert holds the state of a vminsert app and provides vminsert-specific
@@ -198,11 +198,11 @@ func (app *Vminsert) OpenTSDBAPIPut(t *testing.T, records []string, opts QueryOp
 // PrometheusAPIV1Write is a test helper function that inserts a
 // collection of records in Prometheus remote-write format by sending a HTTP
 // POST request to /prometheus/api/v1/write vminsert endpoint.
-func (app *Vminsert) PrometheusAPIV1Write(t *testing.T, records []prompbmarshal.TimeSeries, opts QueryOpts) {
+func (app *Vminsert) PrometheusAPIV1Write(t *testing.T, records []prompb.TimeSeries, opts QueryOpts) {
 	t.Helper()
 
 	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/write", app.httpListenAddr, opts.getTenant())
-	wr := prompbmarshal.WriteRequest{Timeseries: records}
+	wr := prompb.WriteRequest{Timeseries: records}
 	data := snappy.Encode(nil, wr.MarshalProtobuf(nil))
 	app.sendBlocking(t, len(records), func() {
 		_, statusCode := app.cli.Post(t, url, "application/x-protobuf", data)

apptest/vmsingle.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/golang/snappy"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // Vmsingle holds the state of a vmsingle app and provides vmsingle-specific
@@ -209,10 +209,10 @@ func (app *Vmsingle) OpenTSDBAPIPut(t *testing.T, records []string, opts QueryOp
 // PrometheusAPIV1Write is a test helper function that inserts a
 // collection of records in Prometheus remote-write format by sending a HTTP
 // POST request to /prometheus/api/v1/write vmsingle endpoint.
-func (app *Vmsingle) PrometheusAPIV1Write(t *testing.T, records []prompbmarshal.TimeSeries, _ QueryOpts) {
+func (app *Vmsingle) PrometheusAPIV1Write(t *testing.T, records []prompb.TimeSeries, _ QueryOpts) {
 	t.Helper()
 
-	wr := prompbmarshal.WriteRequest{Timeseries: records}
+	wr := prompb.WriteRequest{Timeseries: records}
 	data := snappy.Encode(nil, wr.MarshalProtobuf(nil))
 	_, statusCode := app.cli.Post(t, app.prometheusAPIV1WriteURL, "application/x-protobuf", data)
 	if statusCode != http.StatusNoContent {

lib/prompb/marshal.go

@@ -1,28 +1,36 @@
-package prompbmarshal
+package prompb
 
 import (
 	"encoding/binary"
+	"fmt"
 	"math"
-	"sort"
-	"strconv"
+	"math/bits"
+
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/slicesutil"
 )
 
-// Sample is a metric sample
-type Sample struct {
-	Value     float64
-	Timestamp int64
+// MarshalProtobuf marshals wr to dst and returns the result.
+func (wr *WriteRequest) MarshalProtobuf(dst []byte) []byte {
+	size := wr.size()
+	dstLen := len(dst)
+	dst = slicesutil.SetLength(dst, dstLen+size)
+	n, err := wr.marshalToSizedBuffer(dst[dstLen:])
+	if err != nil {
+		panic(fmt.Errorf("BUG: unexpected error when marshaling WriteRequest: %w", err))
+	}
+	return dst[:dstLen+n]
 }
 
-// TimeSeries represents samples and labels for a single time series.
-type TimeSeries struct {
-	Labels  []Label
-	Samples []Sample
+// ResetTimeSeries clears all the GC references from tss and returns an empty tss ready for further use.
+func ResetTimeSeries(tss []TimeSeries) []TimeSeries {
+	clear(tss)
+	return tss[:0]
 }
 
-// Label is a key-value label pair
-type Label struct {
-	Name  string
-	Value string
+// ResetMetadata clears all the GC references from mms and returns an empty mms ready for further use.
+func ResetMetadata(mms []MetricMetadata) []MetricMetadata {
+	clear(mms)
+	return mms[:0]
 }
 
 func (m *Sample) marshalToSizedBuffer(dst []byte) (int, error) {
@@ -126,39 +134,59 @@ func (m *Label) size() (n int) {
 	return n
 }
 
-// LabelsToString converts labels to Prometheus-compatible string
-func LabelsToString(labels []Label) string {
-	labelsCopy := append([]Label{}, labels...)
-	sort.Slice(labelsCopy, func(i, j int) bool {
-		return string(labelsCopy[i].Name) < string(labelsCopy[j].Name)
-	})
-	var b []byte
-	b = append(b, '{')
-	for i, label := range labelsCopy {
-		if len(label.Name) == 0 {
-			b = append(b, "__name__"...)
-		} else {
-			b = append(b, label.Name...)
-		}
-		b = append(b, '=')
-		b = strconv.AppendQuote(b, label.Value)
-		if i < len(labels)-1 {
-			b = append(b, ',')
+func (m *WriteRequest) marshalToSizedBuffer(dst []byte) (int, error) {
+	i := len(dst)
+	for j := len(m.Metadata) - 1; j >= 0; j-- {
+		size, err := m.Metadata[j].marshalToSizedBuffer(dst[:i])
+		if err != nil {
+			return 0, err
 		}
+		i -= size
+		i = encodeVarint(dst, i, uint64(size))
+		i--
+		dst[i] = 0x1a
 	}
-	b = append(b, '}')
-	return string(b)
+	for j := len(m.Timeseries) - 1; j >= 0; j-- {
+		size, err := m.Timeseries[j].marshalToSizedBuffer(dst[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarint(dst, i, uint64(size))
+		i--
+		dst[i] = 0xa
+	}
+	return len(dst) - i, nil
 }
 
-// MetricMetadata represents additional meta information for specific MetricFamilyName
-// Refer to https://github.com/prometheus/prometheus/blob/c5282933765ec322a0664d0a0268f8276e83b156/prompb/types.proto#L21
-type MetricMetadata struct {
-	// Represents the metric type, these match the set from Prometheus.
-	// Refer to https://github.com/prometheus/common/blob/95acce133ca2c07a966a71d475fb936fc282db18/model/metadata.go for details.
-	Type             uint32
-	MetricFamilyName string
-	Help             string
-	Unit             string
+func encodeVarint(dst []byte, offset int, v uint64) int {
+	offset -= sov(v)
+	base := offset
+	for v >= 1<<7 {
+		dst[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dst[offset] = uint8(v)
+	return base
+}
+func (m *WriteRequest) size() (n int) {
+	if m == nil {
+		return 0
+	}
+	for _, e := range m.Timeseries {
+		l := e.size()
+		n += 1 + l + sov(uint64(l))
+	}
+	for _, e := range m.Metadata {
+		l := e.size()
+		n += 1 + l + sov(uint64(l))
+	}
+	return n
+}
+
+func sov(x uint64) (n int) {
+	return (bits.Len64(x|1) + 6) / 7
 }
 
 func (m *MetricMetadata) marshalToSizedBuffer(dst []byte) (int, error) {

lib/prompb/prompb.go

@@ -2,6 +2,8 @@ package prompb
 
 import (
 	"fmt"
+	"sort"
+	"strconv"
 
 	"github.com/VictoriaMetrics/easyproto"
 )
@@ -13,24 +15,12 @@ type WriteRequest struct {
 
 	// Metadata is a list of metadata info in the given WriteRequest
 	Metadata []MetricMetadata
-
-	labelsPool  []Label
-	samplesPool []Sample
 }
 
 // Reset resets wr for subsequent reuse.
 func (wr *WriteRequest) Reset() {
-	clear(wr.Timeseries)
-	wr.Timeseries = wr.Timeseries[:0]
-
-	clear(wr.Metadata)
-	wr.Metadata = wr.Metadata[:0]
-
-	clear(wr.labelsPool)
-	wr.labelsPool = wr.labelsPool[:0]
-
-	clear(wr.samplesPool)
-	wr.samplesPool = wr.samplesPool[:0]
+	wr.Timeseries = ResetTimeSeries(wr.Timeseries)
+	wr.Metadata = ResetMetadata(wr.Metadata)
 }
 
 // TimeSeries is a timeseries.
@@ -60,32 +50,80 @@ type Label struct {
 	Value string
 }
 
-// UnmarshalProtobuf unmarshals wr from src.
+// LabelsToString converts labels to Prometheus-compatible string
+func LabelsToString(labels []Label) string {
+	labelsCopy := append([]Label{}, labels...)
+	sort.Slice(labelsCopy, func(i, j int) bool {
+		return string(labelsCopy[i].Name) < string(labelsCopy[j].Name)
+	})
+	var b []byte
+	b = append(b, '{')
+	for i, label := range labelsCopy {
+		if len(label.Name) == 0 {
+			b = append(b, "__name__"...)
+		} else {
+			b = append(b, label.Name...)
+		}
+		b = append(b, '=')
+		b = strconv.AppendQuote(b, label.Value)
+		if i < len(labels)-1 {
+			b = append(b, ',')
+		}
+	}
+	b = append(b, '}')
+	return string(b)
+}
+
+type WriteRequestUnmarshaller struct {
+	wr WriteRequest
+
+	labelsPool  []Label
+	samplesPool []Sample
+}
+
+func (wru *WriteRequestUnmarshaller) Reset() {
+	wru.wr.Reset()
+
+	clear(wru.labelsPool)
+	wru.labelsPool = wru.labelsPool[:0]
+
+	clear(wru.samplesPool)
+	wru.samplesPool = wru.samplesPool[:0]
+}
+
+// UnmarshalProtobuf parses the given Protobuf-encoded `src` into an internal WriteRequest instance
+// and returns a pointer to it. This method avoids allocations by reusing preallocated slices and pools.
 //
-// src mustn't change while wr is in use, since wr points to src.
-func (wr *WriteRequest) UnmarshalProtobuf(src []byte) (err error) {
-	wr.Reset()
+// Notes:
+//   - The `src` slice must remain unchanged for the lifetime of the returned WriteRequest,
+//     as the WriteRequest retain references to it.
+//   - The returned WriteRequest is only valid until the next call to UnmarshalProtobuf,
+//     which reuses internal buffers and structs.
+func (wru *WriteRequestUnmarshaller) UnmarshalProtobuf(src []byte) (*WriteRequest, error) {
+	wru.Reset()
+
+	var err error
 
 	// message WriteRequest {
 	//    repeated TimeSeries timeseries = 1;
 	//    reserved 2;
 	//    repeated Metadata metadata = 3;
 	// }
-	tss := wr.Timeseries
-	mds := wr.Metadata
-	labelsPool := wr.labelsPool
-	samplesPool := wr.samplesPool
+	tss := wru.wr.Timeseries
+	mds := wru.wr.Metadata
+	labelsPool := wru.labelsPool
+	samplesPool := wru.samplesPool
 	var fc easyproto.FieldContext
 	for len(src) > 0 {
 		src, err = fc.NextField(src)
 		if err != nil {
-			return fmt.Errorf("cannot read the next field: %w", err)
+			return nil, fmt.Errorf("cannot read the next field: %w", err)
 		}
 		switch fc.FieldNum {
 		case 1:
 			data, ok := fc.MessageData()
 			if !ok {
-				return fmt.Errorf("cannot read timeseries data")
+				return nil, fmt.Errorf("cannot read timeseries data")
 			}
 			if len(tss) < cap(tss) {
 				tss = tss[:len(tss)+1]
@@ -95,12 +133,12 @@ func (wr *WriteRequest) UnmarshalProtobuf(src []byte) (err error) {
 			ts := &tss[len(tss)-1]
 			labelsPool, samplesPool, err = ts.unmarshalProtobuf(data, labelsPool, samplesPool)
 			if err != nil {
-				return fmt.Errorf("cannot unmarshal timeseries: %w", err)
+				return nil, fmt.Errorf("cannot unmarshal timeseries: %w", err)
 			}
 		case 3:
 			data, ok := fc.MessageData()
 			if !ok {
-				return fmt.Errorf("cannot read metricMetadata data")
+				return nil, fmt.Errorf("cannot read metricMetadata data")
 			}
 			if len(mds) < cap(mds) {
 				mds = mds[:len(mds)+1]
@@ -109,16 +147,16 @@ func (wr *WriteRequest) UnmarshalProtobuf(src []byte) (err error) {
 			}
 			md := &mds[len(mds)-1]
 			if err := md.unmarshalProtobuf(data); err != nil {
-				return fmt.Errorf("cannot unmarshal metricMetadata: %w", err)
+				return nil, fmt.Errorf("cannot unmarshal metricMetadata: %w", err)
 			}
 
 		}
 	}
-	wr.Timeseries = tss
-	wr.Metadata = mds
-	wr.labelsPool = labelsPool
-	wr.samplesPool = samplesPool
-	return nil
+	wru.wr.Timeseries = tss
+	wru.wr.Metadata = mds
+	wru.labelsPool = labelsPool
+	wru.samplesPool = samplesPool
+	return &wru.wr, nil
 }
 
 func (ts *TimeSeries) unmarshalProtobuf(src []byte, labelsPool []Label, samplesPool []Sample) ([]Label, []Sample, error) {

lib/prompb/prompb_test.go

@@ -2,52 +2,27 @@ package prompb_test
 
 import (
 	"bytes"
+	"reflect"
 	"testing"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
 )
 
-func TestWriteRequestUnmarshalProtobuf(t *testing.T) {
-	var wr prompb.WriteRequest
-
-	f := func(data []byte) {
+func TestWriteRequestMarshalUnmarshal(t *testing.T) {
+	// Verify that the marshaled protobuf is unmarshalled properly
+	f := func(wrm *prompb.WriteRequest) {
 		t.Helper()
 
-		// Verify that the marshaled protobuf is unmarshaled properly
-		if err := wr.UnmarshalProtobuf(data); err != nil {
+		data := wrm.MarshalProtobuf(nil)
+
+		wru := &prompb.WriteRequestUnmarshaller{}
+		wr, err := wru.UnmarshalProtobuf(data)
+		if err != nil {
 			t.Fatalf("cannot unmarshal protobuf: %s", err)
 		}
 
-		// Compare the unmarshaled wr with the original wrm.
-		var wrm prompbmarshal.WriteRequest
-		for _, ts := range wr.Timeseries {
-			var labels []prompbmarshal.Label
-			for _, label := range ts.Labels {
-				labels = append(labels, prompbmarshal.Label{
-					Name:  label.Name,
-					Value: label.Value,
-				})
-			}
-			var samples []prompbmarshal.Sample
-			for _, sample := range ts.Samples {
-				samples = append(samples, prompbmarshal.Sample{
-					Value:     sample.Value,
-					Timestamp: sample.Timestamp,
-				})
-			}
-			wrm.Timeseries = append(wrm.Timeseries, prompbmarshal.TimeSeries{
-				Labels:  labels,
-				Samples: samples,
-			})
-		}
-		for _, md := range wr.Metadata {
-			wrm.Metadata = append(wrm.Metadata, prompbmarshal.MetricMetadata{
-				Type:             md.Type,
-				MetricFamilyName: md.MetricFamilyName,
-				Help:             md.Help,
-				Unit:             md.Unit,
-			})
+		if !reflect.DeepEqual(wrm, wr) {
+			t.Fatalf("unmarshaled WriteRequest is not equal to the original\nGot:\n%+v\nWant:\n%+v", wr, wrm)
 		}
 
 		dataResult := wrm.MarshalProtobuf(nil)
@@ -56,159 +31,169 @@ func TestWriteRequestUnmarshalProtobuf(t *testing.T) {
 		}
 	}
 
-	var data []byte
-	wrm := &prompbmarshal.WriteRequest{}
+	f(&prompb.WriteRequest{})
 
-	wrm.Reset()
-	data = wrm.MarshalProtobuf(data[:0])
-	f(data)
+	f(&prompb.WriteRequest{
+		Timeseries: []prompb.TimeSeries{
+			{
+				Labels: []prompb.Label{
+					{
+						Name:  "__name__",
+						Value: "process_cpu_seconds_total",
+					},
+					{
+						Name:  "instance",
+						Value: "host-123:4567",
+					},
+					{
+						Name:  "job",
+						Value: "node-exporter",
+					},
+				},
+			},
+		},
+	})
 
-	wrm.Reset()
-	wrm.Timeseries = []prompbmarshal.TimeSeries{
-		{
-			Labels: []prompbmarshal.Label{
-				{
-					Name:  "__name__",
-					Value: "process_cpu_seconds_total",
-				},
-				{
-					Name:  "instance",
-					Value: "host-123:4567",
-				},
-				{
-					Name:  "job",
-					Value: "node-exporter",
+	f(&prompb.WriteRequest{
+		Timeseries: []prompb.TimeSeries{
+			{
+				Samples: []prompb.Sample{
+					{
+						Value:     123.3434,
+						Timestamp: 8939432423,
+					},
+					{
+						Value:     -123.3434,
+						Timestamp: 18939432423,
+					},
 				},
 			},
 		},
-	}
-	data = wrm.MarshalProtobuf(data[:0])
-	f(data)
+	})
 
-	wrm.Reset()
-	wrm.Timeseries = []prompbmarshal.TimeSeries{
-		{
-			Samples: []prompbmarshal.Sample{
-				{
-					Value:     123.3434,
-					Timestamp: 8939432423,
+	f(&prompb.WriteRequest{
+		Timeseries: []prompb.TimeSeries{
+			{
+				Labels: []prompb.Label{
+					{
+						Name:  "__name__",
+						Value: "process_cpu_seconds_total",
+					},
+					{
+						Name:  "instance",
+						Value: "host-123:4567",
+					},
+					{
+						Name:  "job",
+						Value: "node-exporter",
+					},
 				},
-				{
-					Value:     -123.3434,
-					Timestamp: 18939432423,
+				Samples: []prompb.Sample{
+					{
+						Value:     123.3434,
+						Timestamp: 8939432423,
+					},
+					{
+						Value:     -123.3434,
+						Timestamp: 18939432423,
+					},
 				},
 			},
 		},
-	}
-	data = wrm.MarshalProtobuf(data[:0])
-	f(data)
+		Metadata: []prompb.MetricMetadata{
+			{
+				// COUNTER = 1
+				Type:             1,
+				MetricFamilyName: "process_cpu_seconds_total",
+				Help:             "Total user and system CPU time spent in seconds",
+				Unit:             "seconds",
+			},
+		},
+	})
 
-	wrm.Reset()
-	wrm.Timeseries = []prompbmarshal.TimeSeries{
-		{
-			Labels: []prompbmarshal.Label{
-				{
-					Name:  "__name__",
-					Value: "process_cpu_seconds_total",
+	f(&prompb.WriteRequest{
+		Timeseries: []prompb.TimeSeries{
+			{
+				Labels: []prompb.Label{
+					{
+						Name:  "__name__",
+						Value: "process_cpu_seconds_total",
+					},
+					{
+						Name:  "instance",
+						Value: "host-123:4567",
+					},
+					{
+						Name:  "job",
+						Value: "node-exporter",
+					},
 				},
-				{
-					Name:  "instance",
-					Value: "host-123:4567",
-				},
-				{
-					Name:  "job",
-					Value: "node-exporter",
+				Samples: []prompb.Sample{
+					{
+						Value:     123.3434,
+						Timestamp: 8939432423,
+					},
+					{
+						Value:     -123.3434,
+						Timestamp: 18939432423,
+					},
 				},
 			},
-			Samples: []prompbmarshal.Sample{
-				{
-					Value:     123.3434,
-					Timestamp: 8939432423,
+			{
+				Labels: []prompb.Label{
+					{
+						Name:  "foo",
+						Value: "bar",
+					},
 				},
-				{
-					Value:     -123.3434,
-					Timestamp: 18939432423,
+				Samples: []prompb.Sample{
+					{
+						Value: 9873,
+					},
 				},
 			},
 		},
-	}
-	wrm.Metadata = []prompbmarshal.MetricMetadata{
-		{
-			// COUNTER = 1
-			Type:             1,
-			MetricFamilyName: "process_cpu_seconds_total",
-			Help:             "Total user and system CPU time spent in seconds",
-			Unit:             "seconds",
+		Metadata: []prompb.MetricMetadata{
+			{
+				// COUNTER = 1
+				Type:             1,
+				MetricFamilyName: "process_cpu_seconds_total",
+				Help:             "Total user and system CPU time spent in seconds",
+				Unit:             "seconds",
+			},
 		},
-	}
-	data = wrm.MarshalProtobuf(data[:0])
-	f(data)
+	})
 
-	wrm.Reset()
-	wrm.Timeseries = []prompbmarshal.TimeSeries{
-		{
-			Labels: []prompbmarshal.Label{
-				{
-					Name:  "__name__",
-					Value: "process_cpu_seconds_total",
-				},
-				{
-					Name:  "instance",
-					Value: "host-123:4567",
-				},
-				{
-					Name:  "job",
-					Value: "node-exporter",
-				},
-			},
-			Samples: []prompbmarshal.Sample{
-				{
-					Value:     123.3434,
-					Timestamp: 8939432423,
-				},
-				{
-					Value:     -123.3434,
-					Timestamp: 18939432423,
-				},
+	// only metadata
+	f(&prompb.WriteRequest{
+		Metadata: []prompb.MetricMetadata{
+			{
+				// COUNTER = 1
+				Type:             1,
+				MetricFamilyName: "process_cpu_seconds_total",
+				Help:             "Total user and system CPU time spent in seconds",
+				Unit:             "seconds",
 			},
 		},
-		{
-			Labels: []prompbmarshal.Label{
-				{
-					Name:  "foo",
-					Value: "bar",
-				},
-			},
-			Samples: []prompbmarshal.Sample{
-				{
-					Value: 9873,
-				},
-			},
-		},
-	}
-	wrm.Metadata = []prompbmarshal.MetricMetadata{
-		{
-			// COUNTER = 1
-			Type:             1,
-			MetricFamilyName: "process_cpu_seconds_total",
-			Help:             "Total user and system CPU time spent in seconds",
-			Unit:             "seconds",
-		},
-	}
-	data = wrm.MarshalProtobuf(data[:0])
-	f(data)
+	})
 
-	wrm.Reset()
-	// pass only MetricMetadata, no series
-	wrm.Metadata = []prompbmarshal.MetricMetadata{
-		{
-			// COUNTER = 1
-			Type:             1,
-			MetricFamilyName: "process_cpu_seconds_total",
-			Help:             "Total user and system CPU time spent in seconds",
-			Unit:             "seconds",
+	// only metadata several
+	f(&prompb.WriteRequest{
+		Metadata: []prompb.MetricMetadata{
+			{
+				// COUNTER = 1
+				Type:             1,
+				MetricFamilyName: "process_cpu_seconds_total",
+				Help:             "Total user and system CPU time spent in seconds",
+				Unit:             "seconds",
+			},
+			{
+				// GAUGE = 2
+				Type:             2,
+				MetricFamilyName: "process_memory_bytes",
+				Help:             "Total user and system memory in bytes",
+				Unit:             "bytes",
+			},
 		},
-	}
-	data = wrm.MarshalProtobuf(data[:0])
-	f(data)
+	})
 }

lib/prompb/prompb_timing_test.go

@@ -3,8 +3,6 @@ package prompb
 import (
 	"fmt"
 	"testing"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
 )
 
 func BenchmarkWriteRequestUnmarshalProtobuf(b *testing.B) {
@@ -13,20 +11,31 @@ func BenchmarkWriteRequestUnmarshalProtobuf(b *testing.B) {
 	b.ReportAllocs()
 	b.SetBytes(int64(len(benchWriteRequest.Timeseries)))
 	b.RunParallel(func(pb *testing.PB) {
-		var wr WriteRequest
+		wru := &WriteRequestUnmarshaller{}
 		for pb.Next() {
-			if err := wr.UnmarshalProtobuf(data); err != nil {
+			if _, err := wru.UnmarshalProtobuf(data); err != nil {
 				panic(fmt.Errorf("unexpected error: %s", err))
 			}
 		}
 	})
 }
 
-var benchWriteRequest = func() *prompbmarshal.WriteRequest {
-	var tss []prompbmarshal.TimeSeries
+func BenchmarkWriteRequestMarshalProtobuf(b *testing.B) {
+	b.ReportAllocs()
+	b.SetBytes(int64(len(benchWriteRequest.Timeseries)))
+	b.RunParallel(func(pb *testing.PB) {
+		var data []byte
+		for pb.Next() {
+			data = benchWriteRequest.MarshalProtobuf(data[:0])
+		}
+	})
+}
+
+var benchWriteRequest = func() *WriteRequest {
+	var tss []TimeSeries
 	for i := 0; i < 10_000; i++ {
-		ts := prompbmarshal.TimeSeries{
-			Labels: []prompbmarshal.Label{
+		ts := TimeSeries{
+			Labels: []Label{
 				{
 					Name:  "__name__",
 					Value: "process_cpu_seconds_total",
@@ -64,7 +73,7 @@ var benchWriteRequest = func() *prompbmarshal.WriteRequest {
 					Value: fmt.Sprintf("aaa-bb-cc-dd-ee-%d", i),
 				},
 			},
-			Samples: []prompbmarshal.Sample{
+			Samples: []Sample{
 				{
 					Value:     float64(i),
 					Timestamp: 1e9 + int64(i)*1000,
@@ -73,11 +82,10 @@ var benchWriteRequest = func() *prompbmarshal.WriteRequest {
 		}
 		tss = append(tss, ts)
 	}
-	wrm := &prompbmarshal.WriteRequest{
+	wr := &WriteRequest{
 		Timeseries: tss,
-		Metadata: []prompbmarshal.MetricMetadata{
+		Metadata: []MetricMetadata{
 			{
-				// COUNTER = 1
 				Type:             1,
 				MetricFamilyName: "process_cpu_seconds_total",
 				Help:             "Total user and system CPU time spent in seconds",
@@ -85,5 +93,5 @@ var benchWriteRequest = func() *prompbmarshal.WriteRequest {
 			},
 		},
 	}
-	return wrm
+	return wr
 }()

lib/prompbmarshal/prompbmarshal_test.go

@@ -1,95 +0,0 @@
-package prompbmarshal_test
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
-)
-
-func TestWriteRequestMarshalProtobuf(t *testing.T) {
-	wrm := &prompbmarshal.WriteRequest{
-		Timeseries: []prompbmarshal.TimeSeries{
-			{
-				Labels: []prompbmarshal.Label{
-					{
-						Name:  "__name__",
-						Value: "process_cpu_seconds_total",
-					},
-					{
-						Name:  "instance",
-						Value: "host-123:4567",
-					},
-					{
-						Name:  "job",
-						Value: "node-exporter",
-					},
-				},
-				Samples: []prompbmarshal.Sample{
-					{
-						Value:     123.3434,
-						Timestamp: 8939432423,
-					},
-					{
-						Value:     -123.3434,
-						Timestamp: 18939432423,
-					},
-				},
-			},
-		},
-		Metadata: []prompbmarshal.MetricMetadata{
-			{
-				// COUNTER = 1
-				Type:             1,
-				MetricFamilyName: "process_cpu_seconds_total",
-				Help:             "Total user and system CPU time spent in seconds",
-				Unit:             "seconds",
-			},
-		},
-	}
-	data := wrm.MarshalProtobuf(nil)
-
-	// Verify that the marshaled protobuf is unmarshaled properly
-	var wr prompb.WriteRequest
-	if err := wr.UnmarshalProtobuf(data); err != nil {
-		t.Fatalf("cannot unmarshal protobuf: %s", err)
-	}
-
-	// Compare the unmarshaled wr with the original wrm.
-	wrm.Reset()
-	for _, ts := range wr.Timeseries {
-		var labels []prompbmarshal.Label
-		for _, label := range ts.Labels {
-			labels = append(labels, prompbmarshal.Label{
-				Name:  label.Name,
-				Value: label.Value,
-			})
-		}
-		var samples []prompbmarshal.Sample
-		for _, sample := range ts.Samples {
-			samples = append(samples, prompbmarshal.Sample{
-				Value:     sample.Value,
-				Timestamp: sample.Timestamp,
-			})
-		}
-		wrm.Timeseries = append(wrm.Timeseries, prompbmarshal.TimeSeries{
-			Labels:  labels,
-			Samples: samples,
-		})
-	}
-	for _, md := range wr.Metadata {
-		wrm.Metadata = append(wrm.Metadata, prompbmarshal.MetricMetadata{
-			Type:             md.Type,
-			MetricFamilyName: md.MetricFamilyName,
-			Help:             md.Help,
-			Unit:             md.Unit,
-		})
-	}
-
-	dataResult := wrm.MarshalProtobuf(nil)
-
-	if !bytes.Equal(dataResult, data) {
-		t.Fatalf("unexpected data obtained after marshaling\ngot\n%X\nwant\n%X", dataResult, data)
-	}
-}

lib/prompbmarshal/prompbmarshal_timing_test.go

@@ -1,82 +0,0 @@
-package prompbmarshal
-
-import (
-	"fmt"
-	"testing"
-)
-
-func BenchmarkWriteRequestMarshalProtobuf(b *testing.B) {
-	b.ReportAllocs()
-	b.SetBytes(int64(len(benchWriteRequest.Timeseries)))
-	b.RunParallel(func(pb *testing.PB) {
-		var data []byte
-		for pb.Next() {
-			data = benchWriteRequest.MarshalProtobuf(data[:0])
-		}
-	})
-}
-
-var benchWriteRequest = func() *WriteRequest {
-	var tss []TimeSeries
-	for i := 0; i < 1_000; i++ {
-		ts := TimeSeries{
-			Labels: []Label{
-				{
-					Name:  "__name__",
-					Value: "process_cpu_seconds_total",
-				},
-				{
-					Name:  "instance",
-					Value: fmt.Sprintf("host-%d:4567", i),
-				},
-				{
-					Name:  "job",
-					Value: "node-exporter",
-				},
-				{
-					Name:  "pod",
-					Value: "foo-bar-pod-8983423843",
-				},
-				{
-					Name:  "cpu",
-					Value: "1",
-				},
-				{
-					Name:  "mode",
-					Value: "system",
-				},
-				{
-					Name:  "node",
-					Value: "host-123",
-				},
-				{
-					Name:  "namespace",
-					Value: "foo-bar-baz",
-				},
-				{
-					Name:  "container",
-					Value: fmt.Sprintf("aaa-bb-cc-dd-ee-%d", i),
-				},
-			},
-			Samples: []Sample{
-				{
-					Value:     float64(i),
-					Timestamp: 1e9 + int64(i)*1000,
-				},
-			},
-		}
-		tss = append(tss, ts)
-	}
-	wr := &WriteRequest{
-		Timeseries: tss,
-		Metadata: []MetricMetadata{
-			{
-				Type:             1,
-				MetricFamilyName: "process_cpu_seconds_total",
-				Help:             "Total user and system CPU time spent in seconds",
-				Unit:             "seconds",
-			},
-		},
-	}
-	return wr
-}()

lib/prompbmarshal/remote.pb.go

@@ -1,66 +0,0 @@
-package prompbmarshal
-
-import (
-	"math/bits"
-)
-
-// WriteRequest represents Remote Write request
-type WriteRequest struct {
-	Timeseries []TimeSeries
-	Metadata   []MetricMetadata
-}
-
-func (m *WriteRequest) marshalToSizedBuffer(dst []byte) (int, error) {
-	i := len(dst)
-	for j := len(m.Metadata) - 1; j >= 0; j-- {
-		size, err := m.Metadata[j].marshalToSizedBuffer(dst[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarint(dst, i, uint64(size))
-		i--
-		dst[i] = 0x1a
-	}
-	for j := len(m.Timeseries) - 1; j >= 0; j-- {
-		size, err := m.Timeseries[j].marshalToSizedBuffer(dst[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarint(dst, i, uint64(size))
-		i--
-		dst[i] = 0xa
-	}
-	return len(dst) - i, nil
-}
-
-func encodeVarint(dst []byte, offset int, v uint64) int {
-	offset -= sov(v)
-	base := offset
-	for v >= 1<<7 {
-		dst[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dst[offset] = uint8(v)
-	return base
-}
-func (m *WriteRequest) size() (n int) {
-	if m == nil {
-		return 0
-	}
-	for _, e := range m.Timeseries {
-		l := e.size()
-		n += 1 + l + sov(uint64(l))
-	}
-	for _, e := range m.Metadata {
-		l := e.size()
-		n += 1 + l + sov(uint64(l))
-	}
-	return n
-}
-
-func sov(x uint64) (n int) {
-	return (bits.Len64(x|1) + 6) / 7
-}

lib/prompbmarshal/util.go

@@ -1,37 +0,0 @@
-package prompbmarshal
-
-import (
-	"fmt"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/slicesutil"
-)
-
-// MarshalProtobuf marshals wr to dst and returns the result.
-func (wr *WriteRequest) MarshalProtobuf(dst []byte) []byte {
-	size := wr.size()
-	dstLen := len(dst)
-	dst = slicesutil.SetLength(dst, dstLen+size)
-	n, err := wr.marshalToSizedBuffer(dst[dstLen:])
-	if err != nil {
-		panic(fmt.Errorf("BUG: unexpected error when marshaling WriteRequest: %w", err))
-	}
-	return dst[:dstLen+n]
-}
-
-// Reset resets wr.
-func (wr *WriteRequest) Reset() {
-	wr.Timeseries = ResetTimeSeries(wr.Timeseries)
-	wr.Metadata = ResetMetadata(wr.Metadata)
-}
-
-// ResetTimeSeries clears all the GC references from tss and returns an empty tss ready for further use.
-func ResetTimeSeries(tss []TimeSeries) []TimeSeries {
-	clear(tss)
-	return tss[:0]
-}
-
-// ResetMetadata clears all the GC references from mms and returns an empty mms ready for further use.
-func ResetMetadata(mms []MetricMetadata) []MetricMetadata {
-	clear(mms)
-	return mms[:0]
-}

lib/promrelabel/if_expression.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/regexutil"
 	"github.com/VictoriaMetrics/metricsql"
 )
@@ -28,7 +28,7 @@ type IfExpression struct {
 // Match returns true if labels match at least a single label filter inside ie.
 //
 // Match returns true for empty ie.
-func (ie *IfExpression) Match(labels []prompbmarshal.Label) bool {
+func (ie *IfExpression) Match(labels []prompb.Label) bool {
 	if ie == nil || len(ie.ies) == 0 {
 		return true
 	}
@@ -214,7 +214,7 @@ func (ie *ifExpression) MarshalYAML() (any, error) {
 }
 
 // Match returns true if ie matches the given labels.
-func (ie *ifExpression) Match(labels []prompbmarshal.Label) bool {
+func (ie *ifExpression) Match(labels []prompb.Label) bool {
 	if ie == nil {
 		return true
 	}
@@ -226,7 +226,7 @@ func (ie *ifExpression) Match(labels []prompbmarshal.Label) bool {
 	return false
 }
 
-func matchLabelFilters(lfs []*labelFilter, labels []prompbmarshal.Label) bool {
+func matchLabelFilters(lfs []*labelFilter, labels []prompb.Label) bool {
 	for _, lf := range lfs {
 		if !lf.match(labels) {
 			return false
@@ -277,7 +277,7 @@ func newLabelFilter(mlf *metricsql.LabelFilter) (*labelFilter, error) {
 	return lf, nil
 }
 
-func (lf *labelFilter) match(labels []prompbmarshal.Label) bool {
+func (lf *labelFilter) match(labels []prompb.Label) bool {
 	switch lf.op {
 	case "=":
 		return lf.equalValue(labels)
@@ -293,7 +293,7 @@ func (lf *labelFilter) match(labels []prompbmarshal.Label) bool {
 	return false
 }
 
-func (lf *labelFilter) equalNameValue(labels []prompbmarshal.Label) bool {
+func (lf *labelFilter) equalNameValue(labels []prompb.Label) bool {
 	for _, label := range labels {
 		if label.Name == "__name__" {
 			return label.Value == lf.value
@@ -302,7 +302,7 @@ func (lf *labelFilter) equalNameValue(labels []prompbmarshal.Label) bool {
 	return false
 }
 
-func (lf *labelFilter) equalValue(labels []prompbmarshal.Label) bool {
+func (lf *labelFilter) equalValue(labels []prompb.Label) bool {
 	if lf.label == "" {
 		return lf.equalNameValue(labels)
 	}
@@ -323,7 +323,7 @@ func (lf *labelFilter) equalValue(labels []prompbmarshal.Label) bool {
 	return false
 }
 
-func (lf *labelFilter) matchRegexp(labels []prompbmarshal.Label) bool {
+func (lf *labelFilter) matchRegexp(labels []prompb.Label) bool {
 	labelNameMatches := 0
 	for _, label := range labels {
 		if toCanonicalLabelName(label.Name) != lf.label {

lib/promrelabel/if_expression_timing_test.go

@@ -5,14 +5,14 @@ import (
 	"gopkg.in/yaml.v2"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func BenchmarkIfExpression(b *testing.B) {
 	const maxLabels = 100
-	labels := make([]prompbmarshal.Label, maxLabels)
+	labels := make([]prompb.Label, maxLabels)
 	for i := 0; i < maxLabels; i++ {
-		label := prompbmarshal.Label{
+		label := prompb.Label{
 			Name:  fmt.Sprintf("foo%d", i),
 			Value: fmt.Sprintf("bar%d", i),
 		}
@@ -34,7 +34,7 @@ func BenchmarkIfExpression(b *testing.B) {
 		benchIfExpr(b, ifExpr, labels)
 	})
 
-	labels[maxLabels-1] = prompbmarshal.Label{
+	labels[maxLabels-1] = prompb.Label{
 		Name:  "__name__",
 		Value: "foo",
 	}
@@ -43,7 +43,7 @@ func BenchmarkIfExpression(b *testing.B) {
 		benchIfExpr(b, ifExpr, labels)
 	})
 
-	labels[maxLabels/2] = prompbmarshal.Label{
+	labels[maxLabels/2] = prompb.Label{
 		Name:  "__name__",
 		Value: "foo",
 	}
@@ -52,7 +52,7 @@ func BenchmarkIfExpression(b *testing.B) {
 		benchIfExpr(b, ifExpr, labels)
 	})
 
-	labels[0] = prompbmarshal.Label{
+	labels[0] = prompb.Label{
 		Name:  "__name__",
 		Value: "foo",
 	}
@@ -62,7 +62,7 @@ func BenchmarkIfExpression(b *testing.B) {
 	})
 }
 
-func benchIfExpr(b *testing.B, expr string, labels []prompbmarshal.Label) {
+func benchIfExpr(b *testing.B, expr string, labels []prompb.Label) {
 	b.Helper()
 	var ie IfExpression
 	if err := yaml.UnmarshalStrict([]byte(expr), &ie); err != nil {

lib/promrelabel/relabel.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/regexutil"
 	"github.com/cespare/xxhash/v2"
@@ -69,7 +69,7 @@ func (prc *parsedRelabelConfig) String() string {
 // ApplyDebug applies pcs to labels in debug mode.
 //
 // It returns DebugStep list - one entry per each applied relabeling step.
-func (pcs *ParsedConfigs) ApplyDebug(labels []prompbmarshal.Label) ([]prompbmarshal.Label, []DebugStep) {
+func (pcs *ParsedConfigs) ApplyDebug(labels []prompb.Label) ([]prompb.Label, []DebugStep) {
 	// Protect from overwriting labels between len(labels) and cap(labels) by limiting labels capacity to its length.
 	labels = labels[:len(labels):len(labels)]
 
@@ -108,7 +108,7 @@ func (pcs *ParsedConfigs) ApplyDebug(labels []prompbmarshal.Label) ([]prompbmars
 //
 // This function may add additional labels after the len(labels), so make sure it doesn't corrupt in-use labels
 // stored between len(labels) and cap(labels).
-func (pcs *ParsedConfigs) Apply(labels []prompbmarshal.Label, labelsOffset int) []prompbmarshal.Label {
+func (pcs *ParsedConfigs) Apply(labels []prompb.Label, labelsOffset int) []prompb.Label {
 	if pcs != nil {
 		for _, prc := range pcs.prcs {
 			labels = prc.apply(labels, labelsOffset)
@@ -122,7 +122,7 @@ func (pcs *ParsedConfigs) Apply(labels []prompbmarshal.Label, labelsOffset int)
 	return labels
 }
 
-func removeEmptyLabels(labels []prompbmarshal.Label, labelsOffset int) []prompbmarshal.Label {
+func removeEmptyLabels(labels []prompb.Label, labelsOffset int) []prompb.Label {
 	src := labels[labelsOffset:]
 	needsRemoval := false
 	for i := range src {
@@ -146,7 +146,7 @@ func removeEmptyLabels(labels []prompbmarshal.Label, labelsOffset int) []prompbm
 }
 
 // FinalizeLabels removes labels with "__" in the beginning (except of "__name__").
-func FinalizeLabels(dst, src []prompbmarshal.Label) []prompbmarshal.Label {
+func FinalizeLabels(dst, src []prompb.Label) []prompb.Label {
 	for _, label := range src {
 		name := label.Name
 		if strings.HasPrefix(name, "__") && name != "__name__" {
@@ -160,7 +160,7 @@ func FinalizeLabels(dst, src []prompbmarshal.Label) []prompbmarshal.Label {
 // apply applies relabeling according to prc.
 //
 // See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
-func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset int) []prompbmarshal.Label {
+func (prc *parsedRelabelConfig) apply(labels []prompb.Label, labelsOffset int) []prompb.Label {
 	src := labels[labelsOffset:]
 	if !prc.If.Match(src) {
 		if prc.Action == "keep" {
@@ -515,7 +515,7 @@ func (prc *parsedRelabelConfig) expandCaptureGroups(template, source string, mat
 
 var relabelBufPool bytesutil.ByteBufferPool
 
-func containsAllLabelValues(labels []prompbmarshal.Label, targetLabel string, sourceLabels []string) bool {
+func containsAllLabelValues(labels []prompb.Label, targetLabel string, sourceLabels []string) bool {
 	targetLabelValue := getLabelValue(labels, targetLabel)
 	for _, sourceLabel := range sourceLabels {
 		v := getLabelValue(labels, sourceLabel)
@@ -526,7 +526,7 @@ func containsAllLabelValues(labels []prompbmarshal.Label, targetLabel string, so
 	return true
 }
 
-func areEqualLabelValues(labels []prompbmarshal.Label, labelNames []string) bool {
+func areEqualLabelValues(labels []prompb.Label, labelNames []string) bool {
 	if len(labelNames) < 2 {
 		logger.Panicf("BUG: expecting at least 2 labelNames; got %d", len(labelNames))
 		return false
@@ -541,7 +541,7 @@ func areEqualLabelValues(labels []prompbmarshal.Label, labelNames []string) bool
 	return true
 }
 
-func concatLabelValues(dst []byte, labels []prompbmarshal.Label, labelNames []string, separator string) []byte {
+func concatLabelValues(dst []byte, labels []prompb.Label, labelNames []string, separator string) []byte {
 	if len(labelNames) == 0 {
 		return dst
 	}
@@ -553,19 +553,19 @@ func concatLabelValues(dst []byte, labels []prompbmarshal.Label, labelNames []st
 	return dst[:len(dst)-len(separator)]
 }
 
-func setLabelValue(labels []prompbmarshal.Label, labelsOffset int, name, value string) []prompbmarshal.Label {
+func setLabelValue(labels []prompb.Label, labelsOffset int, name, value string) []prompb.Label {
 	if label := GetLabelByName(labels[labelsOffset:], name); label != nil {
 		label.Value = value
 		return labels
 	}
-	labels = append(labels, prompbmarshal.Label{
+	labels = append(labels, prompb.Label{
 		Name:  name,
 		Value: value,
 	})
 	return labels
 }
 
-func getLabelValue(labels []prompbmarshal.Label, name string) string {
+func getLabelValue(labels []prompb.Label, name string) string {
 	for _, label := range labels {
 		if label.Name == name {
 			return label.Value
@@ -575,7 +575,7 @@ func getLabelValue(labels []prompbmarshal.Label, name string) string {
 }
 
 // GetLabelByName returns label with the given name from labels.
-func GetLabelByName(labels []prompbmarshal.Label, name string) *prompbmarshal.Label {
+func GetLabelByName(labels []prompb.Label, name string) *prompb.Label {
 	for i := range labels {
 		label := &labels[i]
 		if label.Name == name {
@@ -588,7 +588,7 @@ func GetLabelByName(labels []prompbmarshal.Label, name string) *prompbmarshal.La
 // CleanLabels sets label.Name and label.Value to an empty string for all the labels.
 //
 // This should help GC cleaning up label.Name and label.Value strings.
-func CleanLabels(labels []prompbmarshal.Label) {
+func CleanLabels(labels []prompb.Label) {
 	clear(labels)
 }
 
@@ -596,8 +596,8 @@ func CleanLabels(labels []prompbmarshal.Label) {
 //
 // Labels in the returned string are sorted by name,
 // while the __name__ label is put in front of {} labels.
-func LabelsToString(labels []prompbmarshal.Label) string {
-	labelsCopy := append([]prompbmarshal.Label{}, labels...)
+func LabelsToString(labels []prompb.Label) string {
+	labelsCopy := append([]prompb.Label{}, labels...)
 	SortLabels(labelsCopy)
 	mname := ""
 	for i, label := range labelsCopy {
@@ -625,7 +625,7 @@ func LabelsToString(labels []prompbmarshal.Label) string {
 }
 
 // SortLabels sorts labels in alphabetical order.
-func SortLabels(labels []prompbmarshal.Label) {
+func SortLabels(labels []prompb.Label) {
 	x := promutil.GetLabels()
 	labelsOrig := x.Labels
 	x.Labels = labels
@@ -634,7 +634,7 @@ func SortLabels(labels []prompbmarshal.Label) {
 	promutil.PutLabels(x)
 }
 
-func fillLabelReferences(dst []byte, replacement string, labels []prompbmarshal.Label) []byte {
+func fillLabelReferences(dst []byte, replacement string, labels []prompb.Label) []byte {
 	s := replacement
 	for len(s) > 0 {
 		n := strings.Index(s, "{{")

lib/promrelabel/relabel_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 )
 
@@ -42,7 +42,7 @@ func TestSanitizeLabelName(t *testing.T) {
 }
 
 func TestLabelsToString(t *testing.T) {
-	f := func(labels []prompbmarshal.Label, sExpected string) {
+	f := func(labels []prompb.Label, sExpected string) {
 		t.Helper()
 		s := LabelsToString(labels)
 		if s != sExpected {
@@ -50,19 +50,19 @@ func TestLabelsToString(t *testing.T) {
 		}
 	}
 	f(nil, "{}")
-	f([]prompbmarshal.Label{
+	f([]prompb.Label{
 		{
 			Name:  "__name__",
 			Value: "foo",
 		},
 	}, "foo")
-	f([]prompbmarshal.Label{
+	f([]prompb.Label{
 		{
 			Name:  "foo",
 			Value: "bar",
 		},
 	}, `{foo="bar"}`)
-	f([]prompbmarshal.Label{
+	f([]prompb.Label{
 		{
 			Name:  "foo",
 			Value: "bar",
@@ -72,7 +72,7 @@ func TestLabelsToString(t *testing.T) {
 			Value: "bc",
 		},
 	}, `{a="bc",foo="bar"}`)
-	f([]prompbmarshal.Label{
+	f([]prompb.Label{
 		{
 			Name:  "foo",
 			Value: "bar",
@@ -1045,7 +1045,7 @@ func TestParsedRelabelConfigsApplyForMultipleSeries(t *testing.T) {
 		}
 
 		totalLabels := 0
-		var labels []prompbmarshal.Label
+		var labels []prompb.Label
 		for _, metric := range metrics {
 			labels = append(labels, promutil.MustNewLabelsFromString(metric).GetLabels()...)
 			resultLabels := pcs.Apply(labels, totalLabels)

lib/promrelabel/relabel_timing_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func BenchmarkSanitizeMetricName(b *testing.B) {
@@ -412,7 +412,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -435,7 +435,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -472,7 +472,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -508,7 +508,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -546,7 +546,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -584,7 +584,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -621,7 +621,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -658,7 +658,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -683,7 +683,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -708,7 +708,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -733,7 +733,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -770,7 +770,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -806,7 +806,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -842,7 +842,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -872,7 +872,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -902,7 +902,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -932,7 +932,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -956,7 +956,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -986,7 +986,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -1016,7 +1016,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -1045,7 +1045,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -1074,7 +1074,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -1109,7 +1109,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -1147,7 +1147,7 @@ func BenchmarkApplyRelabelConfigs(b *testing.B) {
 		b.ReportAllocs()
 		b.SetBytes(1)
 		b.RunParallel(func(pb *testing.PB) {
-			var labels []prompbmarshal.Label
+			var labels []prompb.Label
 			for pb.Next() {
 				labels = append(labels[:0], labelsOrig...)
 				labels = pcs.Apply(labels, 0)
@@ -1181,11 +1181,11 @@ func mustParseRelabelConfigs(config string) *ParsedConfigs {
 	return pcs
 }
 
-func labelsFromStrings(ss ...string) []prompbmarshal.Label {
+func labelsFromStrings(ss ...string) []prompb.Label {
 	labelsLen := len(ss) / 2
-	labels := make([]prompbmarshal.Label, 0, labelsLen)
+	labels := make([]prompb.Label, 0, labelsLen)
 	for i := 0; i < len(ss); i += 2 {
-		labels = append(labels, prompbmarshal.Label{
+		labels = append(labels, prompb.Label{
 			Name:  ss[i],
 			Value: ss[i+1],
 		})

lib/promscrape/scraper.go

@@ -15,7 +15,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape/discovery/azure"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape/discovery/consul"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape/discovery/consulagent"
@@ -65,7 +65,7 @@ func CheckConfig() error {
 // Init initializes Prometheus scraper with config from the `-promscrape.config`.
 //
 // Scraped data is passed to pushData.
-func Init(pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest)) {
+func Init(pushData func(at *auth.Token, wr *prompb.WriteRequest)) {
 	mustInitClusterMemberID()
 	globalStopChan = make(chan struct{})
 	scraperWG.Add(1)
@@ -102,7 +102,7 @@ func WriteConfigData(w io.Writer) {
 	_, _ = w.Write(*p)
 }
 
-func runScraper(configFile string, pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest), globalStopCh <-chan struct{}) {
+func runScraper(configFile string, pushData func(at *auth.Token, wr *prompb.WriteRequest), globalStopCh <-chan struct{}) {
 	if configFile == "" {
 		// Nothing to scrape.
 		return
@@ -218,14 +218,14 @@ var (
 )
 
 type scrapeConfigs struct {
-	pushData     func(at *auth.Token, wr *prompbmarshal.WriteRequest)
+	pushData     func(at *auth.Token, wr *prompb.WriteRequest)
 	wg           sync.WaitGroup
 	stopCh       chan struct{}
 	globalStopCh <-chan struct{}
 	scfgs        []*scrapeConfig
 }
 
-func newScrapeConfigs(pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest), globalStopCh <-chan struct{}) *scrapeConfigs {
+func newScrapeConfigs(pushData func(at *auth.Token, wr *prompb.WriteRequest), globalStopCh <-chan struct{}) *scrapeConfigs {
 	return &scrapeConfigs{
 		pushData:     pushData,
 		stopCh:       make(chan struct{}),
@@ -267,7 +267,7 @@ func (scs *scrapeConfigs) stop() {
 
 type scrapeConfig struct {
 	name          string
-	pushData      func(at *auth.Token, wr *prompbmarshal.WriteRequest)
+	pushData      func(at *auth.Token, wr *prompb.WriteRequest)
 	getScrapeWork func(cfg *Config, swsPrev []*ScrapeWork) []*ScrapeWork
 	checkInterval time.Duration
 	cfgCh         chan *Config
@@ -320,7 +320,7 @@ type scraperGroup struct {
 	wg       sync.WaitGroup
 	mLock    sync.Mutex
 	m        map[string]*scraper
-	pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest)
+	pushData func(at *auth.Token, wr *prompb.WriteRequest)
 
 	changesCount    *metrics.Counter
 	activeScrapers  *metrics.Counter
@@ -330,7 +330,7 @@ type scraperGroup struct {
 	globalStopCh <-chan struct{}
 }
 
-func newScraperGroup(name string, pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest), globalStopCh <-chan struct{}) *scraperGroup {
+func newScraperGroup(name string, pushData func(at *auth.Token, wr *prompb.WriteRequest), globalStopCh <-chan struct{}) *scraperGroup {
 	sg := &scraperGroup{
 		name:     name,
 		m:        make(map[string]*scraper),
@@ -450,7 +450,7 @@ type scraper struct {
 	stoppedCh chan struct{}
 }
 
-func newScraper(sw *ScrapeWork, group string, pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest)) (*scraper, error) {
+func newScraper(sw *ScrapeWork, group string, pushData func(at *auth.Token, wr *prompb.WriteRequest)) (*scraper, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	sc := &scraper{
 		ctx:       ctx,

lib/promscrape/scraper_test.go

@@ -6,12 +6,12 @@ import (
 	"testing"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestScraperReload(t *testing.T) {
 	f := func(oldCfgData, newCfgData string, reloadExpected bool) {
-		pushData := func(_ *auth.Token, _ *prompbmarshal.WriteRequest) {}
+		pushData := func(_ *auth.Token, _ *prompb.WriteRequest) {}
 		globalStopChan = make(chan struct{})
 		defer close(globalStopChan)
 

lib/promscrape/scrapework.go

@@ -24,7 +24,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/leveledbytebufferpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
@@ -200,7 +200,7 @@ type scrapeWork struct {
 	// PushData is called for pushing collected data.
 	//
 	// The PushData must be safe for calling from multiple concurrent goroutines.
-	PushData func(at *auth.Token, wr *prompbmarshal.WriteRequest)
+	PushData func(at *auth.Token, wr *prompb.WriteRequest)
 
 	// ScrapeGroup is name of ScrapeGroup that
 	// scrapeWork belongs to
@@ -709,7 +709,7 @@ func (sw *scrapeWork) pushAutoMetrics(am *autoMetrics, timestamp int64) {
 // pushData sends wr to the remote storage.
 //
 // sw is used as a read-only configuration source.
-func (sw *scrapeWork) pushData(wr *prompbmarshal.WriteRequest) {
+func (sw *scrapeWork) pushData(wr *prompb.WriteRequest) {
 	startTime := time.Now()
 	sw.PushData(sw.Config.AuthToken, wr)
 	pushDataDuration.UpdateDuration(startTime)
@@ -772,9 +772,9 @@ func (lwp *leveledWriteRequestCtxPool) getPoolIDAndCapacity(size int) (int, int)
 type writeRequestCtx struct {
 	rows parser.Rows
 
-	writeRequest prompbmarshal.WriteRequest
-	labels       []prompbmarshal.Label
-	samples      []prompbmarshal.Sample
+	writeRequest prompb.WriteRequest
+	labels       []prompb.Label
+	samples      []prompb.Sample
 }
 
 func (wc *writeRequestCtx) reset() {
@@ -893,7 +893,7 @@ func (sw *scrapeWork) sendStaleSeries(lastScrape, currScrape string, timestamp i
 	}
 }
 
-func setStaleMarkersForRows(series []prompbmarshal.TimeSeries) {
+func setStaleMarkersForRows(series []prompb.TimeSeries) {
 	for _, tss := range series {
 		samples := tss.Samples
 		for i := range samples {
@@ -907,7 +907,7 @@ var staleSamplesCreated = metrics.NewCounter(`vm_promscrape_stale_samples_create
 
 var labelsHashBufferPool = &bytesutil.ByteBufferPool{}
 
-func getLabelsHash(labels []prompbmarshal.Label) uint64 {
+func getLabelsHash(labels []prompb.Label) uint64 {
 	// It is OK if there will be hash collisions for distinct sets of labels,
 	// since the accuracy for `scrape_series_added` metric may be lower than 100%.
 
@@ -1099,12 +1099,12 @@ func (wc *writeRequestCtx) addRow(cfg *ScrapeWork, r *parser.Row, timestamp int6
 	if !cfg.HonorTimestamps || sampleTimestamp == 0 {
 		sampleTimestamp = timestamp
 	}
-	wc.samples = append(wc.samples, prompbmarshal.Sample{
+	wc.samples = append(wc.samples, prompb.Sample{
 		Value:     r.Value,
 		Timestamp: sampleTimestamp,
 	})
 	wr := &wc.writeRequest
-	wr.Timeseries = append(wr.Timeseries, prompbmarshal.TimeSeries{
+	wr.Timeseries = append(wr.Timeseries, prompb.TimeSeries{
 		Labels:  wc.labels[labelsLen:],
 		Samples: wc.samples[len(wc.samples)-1:],
 	})
@@ -1113,15 +1113,15 @@ func (wc *writeRequestCtx) addRow(cfg *ScrapeWork, r *parser.Row, timestamp int6
 
 var bbPool bytesutil.ByteBufferPool
 
-func appendLabels(dst []prompbmarshal.Label, metric string, src []parser.Tag, extraLabels []prompbmarshal.Label, honorLabels bool) []prompbmarshal.Label {
+func appendLabels(dst []prompb.Label, metric string, src []parser.Tag, extraLabels []prompb.Label, honorLabels bool) []prompb.Label {
 	dstLen := len(dst)
-	dst = append(dst, prompbmarshal.Label{
+	dst = append(dst, prompb.Label{
 		Name:  "__name__",
 		Value: metric,
 	})
 	for i := range src {
 		tag := &src[i]
-		dst = append(dst, prompbmarshal.Label{
+		dst = append(dst, prompb.Label{
 			Name:  tag.Key,
 			Value: tag.Value,
 		})
@@ -1129,7 +1129,7 @@ func appendLabels(dst []prompbmarshal.Label, metric string, src []parser.Tag, ex
 	return appendExtraLabels(dst, extraLabels, dstLen, honorLabels)
 }
 
-func appendExtraLabels(dst, extraLabels []prompbmarshal.Label, offset int, honorLabels bool) []prompbmarshal.Label {
+func appendExtraLabels(dst, extraLabels []prompb.Label, offset int, honorLabels bool) []prompb.Label {
 	// Add extraLabels to labels.
 	// Handle duplicates in the same way as Prometheus does.
 	if len(dst) == offset {

lib/promscrape/scrapework_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/chunkedbuffer"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
@@ -100,7 +100,7 @@ func TestScrapeWorkScrapeInternalFailure(t *testing.T) {
 
 	pushDataCalls := 0
 	var pushDataErr error
-	sw.PushData = func(_ *auth.Token, wr *prompbmarshal.WriteRequest) {
+	sw.PushData = func(_ *auth.Token, wr *prompb.WriteRequest) {
 		if err := expectEqualTimeseries(wr.Timeseries, timeseriesExpected); err != nil {
 			pushDataErr = fmt.Errorf("unexpected data pushed: %w\ngot\n%#v\nwant\n%#v", err, wr.Timeseries, timeseriesExpected)
 		}
@@ -158,7 +158,7 @@ func testScrapeWorkScrapeInternalSuccess(t *testing.T, streamParse bool) {
 		var pushDataMu sync.Mutex
 		var pushDataCalls int
 		var pushDataErr error
-		sw.PushData = func(_ *auth.Token, wr *prompbmarshal.WriteRequest) {
+		sw.PushData = func(_ *auth.Token, wr *prompb.WriteRequest) {
 			pushDataMu.Lock()
 			defer pushDataMu.Unlock()
 
@@ -570,7 +570,7 @@ func TestScrapeWorkScrapeInternalStreamConcurrency(t *testing.T) {
 
 		var pushDataCalls atomic.Int64
 		var pushedTimeseries atomic.Int64
-		sw.PushData = func(_ *auth.Token, wr *prompbmarshal.WriteRequest) {
+		sw.PushData = func(_ *auth.Token, wr *prompb.WriteRequest) {
 			pushDataCalls.Add(1)
 			pushedTimeseries.Add(int64(len(wr.Timeseries)))
 		}
@@ -889,7 +889,7 @@ func TestSendStaleSeries(t *testing.T) {
 		defer protoparserutil.StopUnmarshalWorkers()
 
 		var staleMarks atomic.Int64
-		sw.PushData = func(_ *auth.Token, wr *prompbmarshal.WriteRequest) {
+		sw.PushData = func(_ *auth.Token, wr *prompb.WriteRequest) {
 			staleMarks.Add(int64(len(wr.Timeseries)))
 		}
 		sw.sendStaleSeries(lastScrape, currScrape, 0, false)
@@ -926,11 +926,11 @@ func parsePromRow(data string) *prometheus.Row {
 	return &rows.Rows[0]
 }
 
-func parseData(data string) []prompbmarshal.TimeSeries {
+func parseData(data string) []prompb.TimeSeries {
 	return prometheus.MustParsePromMetrics(data, 0)
 }
 
-func expectEqualTimeseries(tss, tssExpected []prompbmarshal.TimeSeries) error {
+func expectEqualTimeseries(tss, tssExpected []prompb.TimeSeries) error {
 	m, err := timeseriesToMap(tss)
 	if err != nil {
 		return fmt.Errorf("invalid generated timeseries: %w", err)
@@ -951,7 +951,7 @@ func expectEqualTimeseries(tss, tssExpected []prompbmarshal.TimeSeries) error {
 	return nil
 }
 
-func timeseriesToMap(tss []prompbmarshal.TimeSeries) (map[string]string, error) {
+func timeseriesToMap(tss []prompb.TimeSeries) (map[string]string, error) {
 	m := make(map[string]string, len(tss))
 	for i := range tss {
 		ts := &tss[i]
@@ -973,7 +973,7 @@ func timeseriesToMap(tss []prompbmarshal.TimeSeries) (map[string]string, error)
 	return m, nil
 }
 
-func timeseriesToString(ts *prompbmarshal.TimeSeries) string {
+func timeseriesToString(ts *prompb.TimeSeries) string {
 	promrelabel.SortLabels(ts.Labels)
 	var sb strings.Builder
 	fmt.Fprintf(&sb, "{")

lib/promscrape/scrapework_timing_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/chunkedbuffer"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 )
 
@@ -78,7 +78,7 @@ vm_tcplistener_read_timeouts_total{name="https", addr=":443"} 12353
 vm_tcplistener_write_calls_total{name="http", addr=":80"} 3996
 vm_tcplistener_write_calls_total{name="https", addr=":443"} 132356
 `
-	pushData := func(_ *auth.Token, _ *prompbmarshal.WriteRequest) {}
+	pushData := func(_ *auth.Token, _ *prompb.WriteRequest) {}
 	benchmarkScrapeWorkScrapeInternal(b, []byte(data), false, pushData)
 }
 
@@ -105,7 +105,7 @@ vm_tcplistener_read_timeouts_total{name="https", addr=":443"} 12353
 vm_tcplistener_write_calls_total{name="http", addr=":80"} 3996
 vm_tcplistener_write_calls_total{name="https", addr=":443"} 132356
 `
-	pushData := func(_ *auth.Token, _ *prompbmarshal.WriteRequest) {}
+	pushData := func(_ *auth.Token, _ *prompb.WriteRequest) {}
 	benchmarkScrapeWorkScrapeInternal(b, []byte(data), true, pushData)
 }
 
@@ -121,7 +121,7 @@ func BenchmarkScrapeWorkScrapeInternalStreamBigData(b *testing.B) {
 	}
 
 	data := generateScrape(200_000)
-	pushData := func(_ *auth.Token, _ *prompbmarshal.WriteRequest) {
+	pushData := func(_ *auth.Token, _ *prompb.WriteRequest) {
 		// simulates a delay to highlight the difference between lock-based and lock-free algorithms.
 		// See https://github.com/VictoriaMetrics/VictoriaMetrics/pull/8515
 		time.Sleep(time.Millisecond)
@@ -129,7 +129,7 @@ func BenchmarkScrapeWorkScrapeInternalStreamBigData(b *testing.B) {
 	benchmarkScrapeWorkScrapeInternal(b, data, true, pushData)
 }
 
-func benchmarkScrapeWorkScrapeInternal(b *testing.B, data []byte, streamParse bool, pushData func(at *auth.Token, wr *prompbmarshal.WriteRequest)) {
+func benchmarkScrapeWorkScrapeInternal(b *testing.B, data []byte, streamParse bool, pushData func(at *auth.Token, wr *prompb.WriteRequest)) {
 	protoparserutil.StartUnmarshalWorkers()
 	defer protoparserutil.StopUnmarshalWorkers()
 
@@ -161,9 +161,9 @@ func benchmarkScrapeWorkScrapeInternal(b *testing.B, data []byte, streamParse bo
 }
 
 func BenchmarkScrapeWorkGetLabelsHash(b *testing.B) {
-	labels := make([]prompbmarshal.Label, 100)
+	labels := make([]prompb.Label, 100)
 	for i := range labels {
-		labels[i] = prompbmarshal.Label{
+		labels[i] = prompb.Label{
 			Name:  fmt.Sprintf("name%d", i),
 			Value: fmt.Sprintf("value%d", i),
 		}

lib/promutil/labels.go

@@ -10,19 +10,19 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 )
 
 // Labels contains Prometheus labels.
 type Labels struct {
-	Labels []prompbmarshal.Label
+	Labels []prompb.Label
 }
 
 // NewLabels returns Labels with the given capacity.
 func NewLabels(capacity int) *Labels {
 	return &Labels{
-		Labels: make([]prompbmarshal.Label, 0, capacity),
+		Labels: make([]prompb.Label, 0, capacity),
 	}
 }
 
@@ -85,7 +85,7 @@ func (x *Labels) ToMap() map[string]string {
 }
 
 // GetLabels returns the list of labels from x.
-func (x *Labels) GetLabels() []prompbmarshal.Label {
+func (x *Labels) GetLabels() []prompb.Label {
 	if x == nil {
 		return nil
 	}
@@ -124,7 +124,7 @@ func (x *Labels) Reset() {
 // Clone returns a clone of x.
 func (x *Labels) Clone() *Labels {
 	srcLabels := x.GetLabels()
-	labels := append([]prompbmarshal.Label{}, srcLabels...)
+	labels := append([]prompb.Label{}, srcLabels...)
 	return &Labels{
 		Labels: labels,
 	}
@@ -164,7 +164,7 @@ func (x *Labels) Swap(i, j int) {
 
 // Add adds name=value label to x.
 func (x *Labels) Add(name, value string) {
-	x.Labels = append(x.Labels, prompbmarshal.Label{
+	x.Labels = append(x.Labels, prompb.Label{
 		Name:  name,
 		Value: value,
 	})

lib/promutil/labelscompressor.go

@@ -8,10 +8,10 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/encoding"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
-// LabelsCompressor compresses []prompbmarshal.Label into short binary strings
+// LabelsCompressor compresses []prompb.Label into short binary strings
 type LabelsCompressor struct {
 	labelToIdx sync.Map
 	idxToLabel labelsMap
@@ -34,7 +34,7 @@ func (lc *LabelsCompressor) ItemsCount() uint64 {
 // Compress compresses labels, appends the compressed labels to dst and returns the result.
 //
 // It is safe calling Compress from concurrent goroutines.
-func (lc *LabelsCompressor) Compress(dst []byte, labels []prompbmarshal.Label) []byte {
+func (lc *LabelsCompressor) Compress(dst []byte, labels []prompb.Label) []byte {
 	if len(labels) == 0 {
 		// Fast path
 		return append(dst, 0)
@@ -48,7 +48,7 @@ func (lc *LabelsCompressor) Compress(dst []byte, labels []prompbmarshal.Label) [
 	return dst
 }
 
-func (lc *LabelsCompressor) compress(dst []uint64, labels []prompbmarshal.Label) {
+func (lc *LabelsCompressor) compress(dst []uint64, labels []prompb.Label) {
 	if len(labels) == 0 {
 		return
 	}
@@ -82,7 +82,7 @@ func (lc *LabelsCompressor) compress(dst []uint64, labels []prompbmarshal.Label)
 	}
 }
 
-func cloneLabel(label prompbmarshal.Label) prompbmarshal.Label {
+func cloneLabel(label prompb.Label) prompb.Label {
 	// pre-allocate memory for label name and value
 	n := len(label.Name) + len(label.Value)
 	buf := make([]byte, 0, n)
@@ -92,16 +92,16 @@ func cloneLabel(label prompbmarshal.Label) prompbmarshal.Label {
 
 	buf = append(buf, label.Value...)
 	labelValue := bytesutil.ToUnsafeString(buf[len(labelName):])
-	return prompbmarshal.Label{
+	return prompb.Label{
 		Name:  labelName,
 		Value: labelValue,
 	}
 }
 
-// Decompress decompresses src into []prompbmarshal.Label, appends it to dst and returns the result.
+// Decompress decompresses src into []prompb.Label, appends it to dst and returns the result.
 //
 // It is safe calling Decompress from concurrent goroutines.
-func (lc *LabelsCompressor) Decompress(dst []prompbmarshal.Label, src []byte) []prompbmarshal.Label {
+func (lc *LabelsCompressor) Decompress(dst []prompb.Label, src []byte) []prompb.Label {
 	labelsLen, nSize := encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
 		logger.Panicf("BUG: cannot unmarshal labels length from uvarint")
@@ -129,7 +129,7 @@ func (lc *LabelsCompressor) Decompress(dst []prompbmarshal.Label, src []byte) []
 	return dst
 }
 
-func (lc *LabelsCompressor) decompress(dst []prompbmarshal.Label, src []uint64) []prompbmarshal.Label {
+func (lc *LabelsCompressor) decompress(dst []prompb.Label, src []uint64) []prompb.Label {
 	for _, idx := range src {
 		label, ok := lc.idxToLabel.Load(idx)
 		if !ok {
@@ -140,24 +140,24 @@ func (lc *LabelsCompressor) decompress(dst []prompbmarshal.Label, src []uint64)
 	return dst
 }
 
-// labelsMap maps uint64 key to prompbmarshal.Label
+// labelsMap maps uint64 key to prompb.Label
 //
 // uint64 keys must be packed close to 0. Otherwise the labelsMap structure will consume too much memory.
 type labelsMap struct {
-	readOnly atomic.Pointer[[]*prompbmarshal.Label]
+	readOnly atomic.Pointer[[]*prompb.Label]
 
 	mutableLock sync.Mutex
-	mutable     map[uint64]*prompbmarshal.Label
+	mutable     map[uint64]*prompb.Label
 	misses      uint64
 }
 
 // Store stores label under the given idx.
 //
 // It is safe calling Store from concurrent goroutines.
-func (lm *labelsMap) Store(idx uint64, label prompbmarshal.Label) {
+func (lm *labelsMap) Store(idx uint64, label prompb.Label) {
 	lm.mutableLock.Lock()
 	if lm.mutable == nil {
-		lm.mutable = make(map[uint64]*prompbmarshal.Label)
+		lm.mutable = make(map[uint64]*prompb.Label)
 	}
 	lm.mutable[idx] = &label
 	lm.mutableLock.Unlock()
@@ -170,7 +170,7 @@ func (lm *labelsMap) Store(idx uint64, label prompbmarshal.Label) {
 // It is safe calling Load from concurrent goroutines.
 //
 // The performance of Load() scales linearly with CPU cores.
-func (lm *labelsMap) Load(idx uint64) (prompbmarshal.Label, bool) {
+func (lm *labelsMap) Load(idx uint64) (prompb.Label, bool) {
 	if pReadOnly := lm.readOnly.Load(); pReadOnly != nil && idx < uint64(len(*pReadOnly)) {
 		if pLabel := (*pReadOnly)[idx]; pLabel != nil {
 			// Fast path - the label for the given idx has been found in lm.readOnly.
@@ -182,7 +182,7 @@ func (lm *labelsMap) Load(idx uint64) (prompbmarshal.Label, bool) {
 	return lm.loadSlow(idx)
 }
 
-func (lm *labelsMap) loadSlow(idx uint64) (prompbmarshal.Label, bool) {
+func (lm *labelsMap) loadSlow(idx uint64) (prompb.Label, bool) {
 	lm.mutableLock.Lock()
 
 	// Try loading label from readOnly, since it could be updated while acquiring mutableLock.
@@ -204,18 +204,18 @@ func (lm *labelsMap) loadSlow(idx uint64) (prompbmarshal.Label, bool) {
 	lm.mutableLock.Unlock()
 
 	if pLabel == nil {
-		return prompbmarshal.Label{}, false
+		return prompb.Label{}, false
 	}
 	return *pLabel, true
 }
 
-func (lm *labelsMap) moveMutableToReadOnlyLocked(pReadOnly *[]*prompbmarshal.Label) {
+func (lm *labelsMap) moveMutableToReadOnlyLocked(pReadOnly *[]*prompb.Label) {
 	if len(lm.mutable) == 0 {
 		// Nothing to move
 		return
 	}
 
-	var labels []*prompbmarshal.Label
+	var labels []*prompb.Label
 	if pReadOnly != nil {
 		labels = append(labels, *pReadOnly...)
 	}

lib/promutil/labelscompressor_test.go

@@ -5,13 +5,13 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func TestLabelsCompressorSerial(t *testing.T) {
 	var lc LabelsCompressor
 
-	f := func(labels []prompbmarshal.Label) {
+	f := func(labels []prompb.Label) {
 		t.Helper()
 
 		sExpected := labelsToString(labels)
@@ -36,10 +36,10 @@ func TestLabelsCompressorSerial(t *testing.T) {
 
 	// empty labels
 	f(nil)
-	f([]prompbmarshal.Label{})
+	f([]prompb.Label{})
 
 	// non-empty labels
-	f([]prompbmarshal.Label{
+	f([]prompb.Label{
 		{
 			Name:  "instance",
 			Value: "12345.4342.342.3",
@@ -49,7 +49,7 @@ func TestLabelsCompressorSerial(t *testing.T) {
 			Value: "kube-pod-12323",
 		},
 	})
-	f([]prompbmarshal.Label{
+	f([]prompb.Label{
 		{
 			Name:  "instance",
 			Value: "12345.4342.342.3",
@@ -102,19 +102,19 @@ func TestLabelsCompressorConcurrent(t *testing.T) {
 	}
 }
 
-func labelsToString(labels []prompbmarshal.Label) string {
+func labelsToString(labels []prompb.Label) string {
 	l := Labels{
 		Labels: labels,
 	}
 	return l.String()
 }
 
-func newTestSeries(seriesCount, labelsPerSeries int) [][]prompbmarshal.Label {
-	series := make([][]prompbmarshal.Label, seriesCount)
+func newTestSeries(seriesCount, labelsPerSeries int) [][]prompb.Label {
+	series := make([][]prompb.Label, seriesCount)
 	for i := 0; i < seriesCount; i++ {
-		labels := make([]prompbmarshal.Label, labelsPerSeries)
+		labels := make([]prompb.Label, labelsPerSeries)
 		for j := 0; j < labelsPerSeries; j++ {
-			labels[j] = prompbmarshal.Label{
+			labels[j] = prompb.Label{
 				Name:  fmt.Sprintf("label_%d", j),
 				Value: fmt.Sprintf("value_%d_%d", i, j),
 			}

lib/promutil/labelscompressor_timing_test.go

@@ -4,7 +4,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 func BenchmarkLabelsCompressorCompress(b *testing.B) {
@@ -41,7 +41,7 @@ func BenchmarkLabelsCompressorDecompress(b *testing.B) {
 	b.SetBytes(int64(len(series)))
 
 	b.RunParallel(func(pb *testing.PB) {
-		var labels []prompbmarshal.Label
+		var labels []prompb.Label
 		for pb.Next() {
 			for _, data := range datas {
 				labels = lc.Decompress(labels[:0], data)

lib/protoparser/opentelemetry/firehose/parser_test.go

@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/stream"
 )
@@ -225,7 +225,7 @@ func TestProcessRequestBody(t *testing.T) {
 {__name__="amazonaws.com/AWS/EBS/VolumeReadOps",cloud.provider="aws",cloud.account.id="677435890598",cloud.region="us-east-1",aws.exporter.arn="arn:aws:cloudwatch:us-east-1:677435890598:metric-stream/custom_ebs_metric",quantile="1"} 0 1709217300000
 `
 	var callbackCalls atomic.Uint64
-	err := stream.ParseStream(bytes.NewReader(data), "", ProcessRequestBody, func(tss []prompbmarshal.TimeSeries) error {
+	err := stream.ParseStream(bytes.NewReader(data), "", ProcessRequestBody, func(tss []prompb.TimeSeries) error {
 		callbackCalls.Add(1)
 		s := formatTimeseries(tss)
 		if s != sExpected {
@@ -241,7 +241,7 @@ func TestProcessRequestBody(t *testing.T) {
 	}
 }
 
-func formatTimeseries(tss []prompbmarshal.TimeSeries) string {
+func formatTimeseries(tss []prompb.TimeSeries) string {
 	var labels promutil.Labels
 	var a []string
 	for _, ts := range tss {

lib/protoparser/opentelemetry/stream/streamparser.go

@@ -14,7 +14,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/pb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 )
@@ -26,7 +26,7 @@ var maxRequestSize = flagutil.NewBytes("opentelemetry.maxRequestSize", 64*1024*1
 // callback shouldn't hold tss items after returning.
 //
 // optional processBody can be used for pre-processing the read request body from r before parsing it in OpenTelemetry format.
-func ParseStream(r io.Reader, encoding string, processBody func(data []byte) ([]byte, error), callback func(tss []prompbmarshal.TimeSeries) error) error {
+func ParseStream(r io.Reader, encoding string, processBody func(data []byte) ([]byte, error), callback func(tss []prompb.TimeSeries) error) error {
 	err := protoparserutil.ReadUncompressedData(r, encoding, maxRequestSize, func(data []byte) error {
 		if processBody != nil {
 			dataNew, err := processBody(data)
@@ -43,7 +43,7 @@ func ParseStream(r io.Reader, encoding string, processBody func(data []byte) ([]
 	return nil
 }
 
-func parseData(data []byte, callback func(tss []prompbmarshal.TimeSeries) error) error {
+func parseData(data []byte, callback func(tss []prompb.TimeSeries) error) error {
 	var req pb.ExportMetricsServiceRequest
 	if err := req.UnmarshalProtobuf(data); err != nil {
 		return fmt.Errorf("cannot unmarshal request from %d bytes: %w", len(data), err)
@@ -238,14 +238,14 @@ func (wr *writeContext) appendSampleWithExtraLabel(metricName, labelName, labelV
 
 	labelsPool := wr.labelsPool
 	labelsLen := len(labelsPool)
-	labelsPool = append(labelsPool, prompbmarshal.Label{
+	labelsPool = append(labelsPool, prompb.Label{
 		Name:  "__name__",
 		Value: metricName,
 	})
 	labelsPool = append(labelsPool, wr.baseLabels...)
 	labelsPool = append(labelsPool, wr.pointLabels...)
 	if labelName != "" && labelValue != "" {
-		labelsPool = append(labelsPool, prompbmarshal.Label{
+		labelsPool = append(labelsPool, prompb.Label{
 			Name:  labelName,
 			Value: labelValue,
 		})
@@ -253,12 +253,12 @@ func (wr *writeContext) appendSampleWithExtraLabel(metricName, labelName, labelV
 
 	samplesPool := wr.samplesPool
 	samplesLen := len(samplesPool)
-	samplesPool = append(samplesPool, prompbmarshal.Sample{
+	samplesPool = append(samplesPool, prompb.Sample{
 		Timestamp: t,
 		Value:     v,
 	})
 
-	wr.tss = append(wr.tss, prompbmarshal.TimeSeries{
+	wr.tss = append(wr.tss, prompb.TimeSeries{
 		Labels:  labelsPool[labelsLen:],
 		Samples: samplesPool[samplesLen:],
 	})
@@ -270,9 +270,9 @@ func (wr *writeContext) appendSampleWithExtraLabel(metricName, labelName, labelV
 }
 
 // appendAttributesToPromLabels appends attributes to dst and returns the result.
-func appendAttributesToPromLabels(dst []prompbmarshal.Label, attributes []*pb.KeyValue) []prompbmarshal.Label {
+func appendAttributesToPromLabels(dst []prompb.Label, attributes []*pb.KeyValue) []prompb.Label {
 	for _, at := range attributes {
-		dst = append(dst, prompbmarshal.Label{
+		dst = append(dst, prompb.Label{
 			Name:  sanitizeLabelName(at.Key),
 			Value: at.Value.FormatString(true),
 		})
@@ -282,17 +282,17 @@ func appendAttributesToPromLabels(dst []prompbmarshal.Label, attributes []*pb.Ke
 
 type writeContext struct {
 	// tss holds parsed time series
-	tss []prompbmarshal.TimeSeries
+	tss []prompb.TimeSeries
 
 	// baseLabels are labels, which must be added to all the ingested samples
-	baseLabels []prompbmarshal.Label
+	baseLabels []prompb.Label
 
 	// pointLabels are labels, which must be added to the ingested OpenTelemetry points
-	pointLabels []prompbmarshal.Label
+	pointLabels []prompb.Label
 
 	// pools are used for reducing memory allocations when parsing time series
-	labelsPool  []prompbmarshal.Label
-	samplesPool []prompbmarshal.Sample
+	labelsPool  []prompb.Label
+	samplesPool []prompb.Sample
 }
 
 func (wr *writeContext) reset() {
@@ -306,7 +306,7 @@ func (wr *writeContext) reset() {
 	wr.samplesPool = wr.samplesPool[:0]
 }
 
-func resetLabels(labels []prompbmarshal.Label) []prompbmarshal.Label {
+func resetLabels(labels []prompb.Label) []prompb.Label {
 	clear(labels)
 	return labels[:0]
 }

lib/protoparser/opentelemetry/stream/streamparser_test.go

@@ -13,12 +13,12 @@ import (
 	"github.com/klauspost/compress/zstd"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/pb"
 )
 
 func TestParseStream(t *testing.T) {
-	f := func(samples []*pb.Metric, tssExpected []prompbmarshal.TimeSeries, usePromNaming bool) {
+	f := func(samples []*pb.Metric, tssExpected []prompb.TimeSeries, usePromNaming bool) {
 		t.Helper()
 
 		prevPromNaming := *usePrometheusNaming
@@ -27,7 +27,7 @@ func TestParseStream(t *testing.T) {
 			*usePrometheusNaming = prevPromNaming
 		}()
 
-		checkSeries := func(tss []prompbmarshal.TimeSeries) error {
+		checkSeries := func(tss []prompb.TimeSeries) error {
 			if len(tss) != len(tssExpected) {
 				return fmt.Errorf("not expected tss count, got: %d, want: %d", len(tss), len(tssExpected))
 			}
@@ -75,18 +75,18 @@ func TestParseStream(t *testing.T) {
 		}
 	}
 
-	jobLabelValue := prompbmarshal.Label{
+	jobLabelValue := prompb.Label{
 		Name:  "job",
 		Value: "vm",
 	}
-	leLabel := func(value string) prompbmarshal.Label {
-		return prompbmarshal.Label{
+	leLabel := func(value string) prompb.Label {
+		return prompb.Label{
 			Name:  "le",
 			Value: value,
 		}
 	}
-	kvLabel := func(k, v string) prompbmarshal.Label {
-		return prompbmarshal.Label{
+	kvLabel := func(k, v string) prompb.Label {
+		return prompb.Label{
 			Name:  k,
 			Value: v,
 		}
@@ -101,7 +101,7 @@ func TestParseStream(t *testing.T) {
 			generateSum("my-sum", "", false),
 			generateSummary("my-summary", ""),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my-gauge", 15000, 15.0, jobLabelValue, kvLabel("label1", "value1")),
 			newPromPBTs("my-histogram_count", 30000, 15.0, jobLabelValue, kvLabel("label2", "value2")),
 			newPromPBTs("my-histogram_sum", 30000, 30.0, jobLabelValue, kvLabel("label2", "value2")),
@@ -131,7 +131,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateGauge("my-gauge", ""),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my-gauge", 15000, 15.0, jobLabelValue, kvLabel("label1", "value1")),
 		},
 		false,
@@ -142,7 +142,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateGauge("my-gauge", "ms"),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my_gauge_milliseconds", 15000, 15.0, jobLabelValue, kvLabel("label1", "value1")),
 		},
 		true,
@@ -153,7 +153,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateGauge("my-gauge-milliseconds", "ms"),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my_gauge_milliseconds", 15000, 15.0, jobLabelValue, kvLabel("label1", "value1")),
 		},
 		true,
@@ -164,7 +164,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateGauge("my-gauge-milliseconds", "1"),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my_gauge_milliseconds_ratio", 15000, 15.0, jobLabelValue, kvLabel("label1", "value1")),
 		},
 		true,
@@ -175,7 +175,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateSum("my-sum", "ms", true),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my_sum_milliseconds_total", 150000, 15.5, jobLabelValue, kvLabel("label5", "value5")),
 		},
 		true,
@@ -186,7 +186,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateSum("my-total-sum", "ms", true),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my_sum_milliseconds_total", 150000, 15.5, jobLabelValue, kvLabel("label5", "value5")),
 		},
 		true,
@@ -197,7 +197,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateSum("my-total-sum", "m/s", true),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my_sum_meters_per_second_total", 150000, 15.5, jobLabelValue, kvLabel("label5", "value5")),
 		},
 		true,
@@ -208,7 +208,7 @@ func TestParseStream(t *testing.T) {
 		[]*pb.Metric{
 			generateExpHistogram("test-histogram", "m/s"),
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("test_histogram_meters_per_second_bucket", 15000, 5.0, jobLabelValue, kvLabel("label1", "value1"), kvLabel("vmrange", "1.061e+00...1.067e+00")),
 			newPromPBTs("test_histogram_meters_per_second_bucket", 15000, 10.0, jobLabelValue, kvLabel("label1", "value1"), kvLabel("vmrange", "1.067e+00...1.073e+00")),
 			newPromPBTs("test_histogram_meters_per_second_bucket", 15000, 1.0, jobLabelValue, kvLabel("label1", "value1"), kvLabel("vmrange", "1.085e+00...1.091e+00")),
@@ -303,7 +303,7 @@ func TestParseStream(t *testing.T) {
 				},
 			},
 		},
-		[]prompbmarshal.TimeSeries{
+		[]prompb.TimeSeries{
 			newPromPBTs("my-gauge",
 				15000,
 				15.0,
@@ -318,7 +318,7 @@ func TestParseStream(t *testing.T) {
 	)
 }
 
-func checkParseStream(data []byte, checkSeries func(tss []prompbmarshal.TimeSeries) error) error {
+func checkParseStream(data []byte, checkSeries func(tss []prompb.TimeSeries) error) error {
 	// Verify parsing without compression
 	if err := ParseStream(bytes.NewBuffer(data), "", nil, checkSeries); err != nil {
 		return fmt.Errorf("error when parsing data: %w", err)
@@ -492,19 +492,19 @@ func generateOTLPSamples(srcs []*pb.Metric) *pb.ResourceMetrics {
 	return otlpMetrics
 }
 
-func newPromPBTs(metricName string, t int64, v float64, extraLabels ...prompbmarshal.Label) prompbmarshal.TimeSeries {
+func newPromPBTs(metricName string, t int64, v float64, extraLabels ...prompb.Label) prompb.TimeSeries {
 	if t <= 0 {
 		// Set the current timestamp if t isn't set.
 		t = int64(fasttime.UnixTimestamp()) * 1000
 	}
-	ts := prompbmarshal.TimeSeries{
-		Labels: []prompbmarshal.Label{
+	ts := prompb.TimeSeries{
+		Labels: []prompb.Label{
 			{
 				Name:  "__name__",
 				Value: metricName,
 			},
 		},
-		Samples: []prompbmarshal.Sample{
+		Samples: []prompb.Sample{
 			{
 				Value:     v,
 				Timestamp: t,
@@ -515,21 +515,21 @@ func newPromPBTs(metricName string, t int64, v float64, extraLabels ...prompbmar
 	return ts
 }
 
-func prettifyLabel(label prompbmarshal.Label) string {
+func prettifyLabel(label prompb.Label) string {
 	return fmt.Sprintf("name=%q value=%q", label.Name, label.Value)
 }
 
-func prettifySample(sample prompbmarshal.Sample) string {
+func prettifySample(sample prompb.Sample) string {
 	return fmt.Sprintf("sample=%f timestamp: %d", sample.Value, sample.Timestamp)
 }
 
-func sortByMetricName(tss []prompbmarshal.TimeSeries) {
+func sortByMetricName(tss []prompb.TimeSeries) {
 	sort.Slice(tss, func(i, j int) bool {
 		return getMetricName(tss[i].Labels) < getMetricName(tss[j].Labels)
 	})
 }
 
-func getMetricName(labels []prompbmarshal.Label) string {
+func getMetricName(labels []prompb.Label) string {
 	for _, l := range labels {
 		if l.Name == "__name__" {
 			return l.Value
@@ -538,7 +538,7 @@ func getMetricName(labels []prompbmarshal.Label) string {
 	return ""
 }
 
-func sortLabels(labels []prompbmarshal.Label) {
+func sortLabels(labels []prompb.Label) {
 	sort.Slice(labels, func(i, j int) bool {
 		return labels[i].Name < labels[j].Name
 	})

lib/protoparser/opentelemetry/stream/streamparser_timing_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/pb"
 )
 
@@ -24,7 +24,7 @@ func BenchmarkParseStream(b *testing.B) {
 		data := pbRequest.MarshalProtobuf(nil)
 
 		for p.Next() {
-			err := ParseStream(bytes.NewBuffer(data), "", nil, func(_ []prompbmarshal.TimeSeries) error {
+			err := ParseStream(bytes.NewBuffer(data), "", nil, func(_ []prompb.TimeSeries) error {
 				return nil
 			})
 			if err != nil {

lib/protoparser/prometheus/util.go

@@ -3,7 +3,7 @@ package prometheus
 import (
 	"fmt"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
 
 // MustParsePromMetrics parses metrics in Prometheus text exposition format from s and returns them.
@@ -13,31 +13,31 @@ import (
 // offsetMsecs is added to every timestamp in parsed metrics.
 //
 // This function is for testing purposes only. Do not use it in non-test code.
-func MustParsePromMetrics(s string, offsetMsecs int64) []prompbmarshal.TimeSeries {
+func MustParsePromMetrics(s string, offsetMsecs int64) []prompb.TimeSeries {
 	var rows Rows
 	errLogger := func(s string) {
 		panic(fmt.Errorf("unexpected error when parsing Prometheus metrics: %s", s))
 	}
 	rows.UnmarshalWithErrLogger(s, errLogger)
-	tss := make([]prompbmarshal.TimeSeries, 0, len(rows.Rows))
-	samples := make([]prompbmarshal.Sample, 0, len(rows.Rows))
+	tss := make([]prompb.TimeSeries, 0, len(rows.Rows))
+	samples := make([]prompb.Sample, 0, len(rows.Rows))
 	for _, row := range rows.Rows {
-		labels := make([]prompbmarshal.Label, 0, len(row.Tags)+1)
-		labels = append(labels, prompbmarshal.Label{
+		labels := make([]prompb.Label, 0, len(row.Tags)+1)
+		labels = append(labels, prompb.Label{
 			Name:  "__name__",
 			Value: row.Metric,
 		})
 		for _, tag := range row.Tags {
-			labels = append(labels, prompbmarshal.Label{
+			labels = append(labels, prompb.Label{
 				Name:  tag.Key,
 				Value: tag.Value,
 			})
 		}
-		samples = append(samples, prompbmarshal.Sample{
+		samples = append(samples, prompb.Sample{
 			Value:     row.Value,
 			Timestamp: row.Timestamp + offsetMsecs,
 		})
-		ts := prompbmarshal.TimeSeries{
+		ts := prompb.TimeSeries{
 			Labels:  labels,
 			Samples: samples[len(samples)-1:],
 		}