diff --git a/app/vmagent/datadogsketches/request_handler.go b/app/vmagent/datadogsketches/request_handler.go index 796aa5bd70..e693f4582e 100644 --- a/app/vmagent/datadogsketches/request_handler.go +++ b/app/vmagent/datadogsketches/request_handler.go @@ -9,7 +9,7 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches/stream" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics" "github.com/VictoriaMetrics/metrics" @@ -56,7 +56,7 @@ func insertRows(at *auth.Token, sketches []*datadogsketches.Sketch, extraLabels }) } for _, tag := range sketch.Tags { - name, value := datadogutils.SplitTag(tag) + name, value := datadogutil.SplitTag(tag) if name == "host" { name = "exported_host" } diff --git a/app/vmagent/datadogv1/request_handler.go b/app/vmagent/datadogv1/request_handler.go index 361b557f72..2369615f96 100644 --- a/app/vmagent/datadogv1/request_handler.go +++ b/app/vmagent/datadogv1/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/prompbmarshal" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1/stream" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" @@ -62,7 +62,7 @@ func insertRows(at *auth.Token, series []datadogv1.Series, extraLabels []prompbm }) } for _, tag := range ss.Tags { - name, value := datadogutils.SplitTag(tag) + name, value := datadogutil.SplitTag(tag) if name == "host" { name = "exported_host" } diff --git a/app/vmagent/datadogv2/request_handler.go b/app/vmagent/datadogv2/request_handler.go index e7f41c1dc5..2b21dd69c0 100644 --- a/app/vmagent/datadogv2/request_handler.go +++ b/app/vmagent/datadogv2/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/prompbmarshal" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2/stream" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" @@ -65,7 +65,7 @@ func insertRows(at *auth.Token, series []datadogv2.Series, extraLabels []prompbm }) } for _, tag := range ss.Tags { - name, value := datadogutils.SplitTag(tag) + name, value := datadogutil.SplitTag(tag) if name == "host" { name = "exported_host" } diff --git a/app/vminsert/datadogsketches/request_handler.go b/app/vminsert/datadogsketches/request_handler.go index d39b0b201c..4d5a5ddb1d 100644 --- a/app/vminsert/datadogsketches/request_handler.go +++ b/app/vminsert/datadogsketches/request_handler.go @@ -8,7 +8,7 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches/stream" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" "github.com/VictoriaMetrics/metrics" ) @@ -50,7 +50,7 @@ func insertRows(sketches []*datadogsketches.Sketch, extraLabels []prompbmarshal. ctx.AddLabel(label.Name, label.Value) } for _, tag := range sketch.Tags { - name, value := datadogutils.SplitTag(tag) + name, value := datadogutil.SplitTag(tag) if name == "host" { name = "exported_host" } diff --git a/app/vminsert/datadogv1/request_handler.go b/app/vminsert/datadogv1/request_handler.go index 4de7b7328e..8291da6b04 100644 --- a/app/vminsert/datadogv1/request_handler.go +++ b/app/vminsert/datadogv1/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/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1/stream" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" @@ -53,7 +53,7 @@ func insertRows(series []datadogv1.Series, extraLabels []prompbmarshal.Label) er ctx.AddLabel("device", ss.Device) } for _, tag := range ss.Tags { - name, value := datadogutils.SplitTag(tag) + name, value := datadogutil.SplitTag(tag) if name == "host" { name = "exported_host" } diff --git a/app/vminsert/datadogv2/request_handler.go b/app/vminsert/datadogv2/request_handler.go index 5f19c5b006..0df7f6aa5b 100644 --- a/app/vminsert/datadogv2/request_handler.go +++ b/app/vminsert/datadogv2/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/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2/stream" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" @@ -53,7 +53,7 @@ func insertRows(series []datadogv2.Series, extraLabels []prompbmarshal.Label) er ctx.AddLabel(rs.Type, rs.Name) } for _, tag := range ss.Tags { - name, value := datadogutils.SplitTag(tag) + name, value := datadogutil.SplitTag(tag) if name == "host" { name = "exported_host" } diff --git a/lib/protoparser/datadogsketches/stream/streamparser.go b/lib/protoparser/datadogsketches/stream/streamparser.go index f95c07ff05..d8b1172400 100644 --- a/lib/protoparser/datadogsketches/stream/streamparser.go +++ b/lib/protoparser/datadogsketches/stream/streamparser.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogsketches" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" "github.com/VictoriaMetrics/metrics" ) @@ -16,7 +16,7 @@ import ( // callback shouldn't hold series after returning. func Parse(r io.Reader, encoding string, callback func(series []*datadogsketches.Sketch) error) error { readCalls.Inc() - err := protoparserutil.ReadUncompressedData(r, encoding, datadogutils.MaxInsertRequestSize, func(data []byte) error { + err := protoparserutil.ReadUncompressedData(r, encoding, datadogutil.MaxInsertRequestSize, func(data []byte) error { return parseData(data, callback) }) if err != nil { @@ -39,8 +39,8 @@ func parseData(data []byte, callback func(series []*datadogsketches.Sketch) erro sketches := req.Sketches for _, sketch := range sketches { rows += sketch.RowsCount() - if *datadogutils.SanitizeMetricName { - sketch.Metric = datadogutils.SanitizeName(sketch.Metric) + if *datadogutil.SanitizeMetricName { + sketch.Metric = datadogutil.SanitizeName(sketch.Metric) } } rowsRead.Add(rows) diff --git a/lib/protoparser/datadogutils/datadogutils.go b/lib/protoparser/datadogutil/datadogutil.go similarity index 99% rename from lib/protoparser/datadogutils/datadogutils.go rename to lib/protoparser/datadogutil/datadogutil.go index d5c4747274..e19626fcde 100644 --- a/lib/protoparser/datadogutils/datadogutils.go +++ b/lib/protoparser/datadogutil/datadogutil.go @@ -1,4 +1,4 @@ -package datadogutils +package datadogutil import ( "flag" diff --git a/lib/protoparser/datadogutils/datadogutils_test.go b/lib/protoparser/datadogutil/datadogutil_test.go similarity index 98% rename from lib/protoparser/datadogutils/datadogutils_test.go rename to lib/protoparser/datadogutil/datadogutil_test.go index 05575530af..9b8192e6ea 100644 --- a/lib/protoparser/datadogutils/datadogutils_test.go +++ b/lib/protoparser/datadogutil/datadogutil_test.go @@ -1,4 +1,4 @@ -package datadogutils +package datadogutil import ( "testing" diff --git a/lib/protoparser/datadogv1/stream/streamparser.go b/lib/protoparser/datadogv1/stream/streamparser.go index 957d3aa2bc..6bc5800468 100644 --- a/lib/protoparser/datadogv1/stream/streamparser.go +++ b/lib/protoparser/datadogv1/stream/streamparser.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv1" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" "github.com/VictoriaMetrics/metrics" @@ -16,7 +16,7 @@ import ( // callback shouldn't hold series after returning. func Parse(r io.Reader, encoding string, callback func(series []datadogv1.Series) error) error { readCalls.Inc() - err := protoparserutil.ReadUncompressedData(r, encoding, datadogutils.MaxInsertRequestSize, func(data []byte) error { + err := protoparserutil.ReadUncompressedData(r, encoding, datadogutil.MaxInsertRequestSize, func(data []byte) error { return parseData(data, callback) }) if err != nil { @@ -39,8 +39,8 @@ func parseData(data []byte, callback func(series []datadogv1.Series) error) erro series := req.Series for i := range series { rows += len(series[i].Points) - if *datadogutils.SanitizeMetricName { - series[i].Metric = datadogutils.SanitizeName(series[i].Metric) + if *datadogutil.SanitizeMetricName { + series[i].Metric = datadogutil.SanitizeName(series[i].Metric) } } rowsRead.Add(rows) diff --git a/lib/protoparser/datadogv2/stream/streamparser.go b/lib/protoparser/datadogv2/stream/streamparser.go index beaf9e7cad..d2a861e7ce 100644 --- a/lib/protoparser/datadogv2/stream/streamparser.go +++ b/lib/protoparser/datadogv2/stream/streamparser.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutils" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/datadogv2" "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil" "github.com/VictoriaMetrics/metrics" @@ -16,7 +16,7 @@ import ( // callback shouldn't hold series after returning. func Parse(r io.Reader, encoding, contentType string, callback func(series []datadogv2.Series) error) error { readCalls.Inc() - err := protoparserutil.ReadUncompressedData(r, encoding, datadogutils.MaxInsertRequestSize, func(data []byte) error { + err := protoparserutil.ReadUncompressedData(r, encoding, datadogutil.MaxInsertRequestSize, func(data []byte) error { return parseData(data, contentType, callback) }) if err != nil { @@ -46,8 +46,8 @@ func parseData(data []byte, contentType string, callback func(series []datadogv2 series := req.Series for i := range series { rows += len(series[i].Points) - if *datadogutils.SanitizeMetricName { - series[i].Metric = datadogutils.SanitizeName(series[i].Metric) + if *datadogutil.SanitizeMetricName { + series[i].Metric = datadogutil.SanitizeName(series[i].Metric) } } rowsRead.Add(rows)