[PRW 2.0] Moved rw2 proto to the full path (both package name and pla…

…cement) This is what buf recommends https://buf.build/docs/reference/protobuf-files-and-packages#packages Signed-off-by: bwplotka <bwplotka@gmail.com>
prometheus · Apr 23, 2024 · 0b9e2a1 · 0b9e2a1
1 parent 7b88101
commit 0b9e2a1
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/prompb/write/v2/custom.go → ...b/io/prometheus/remote/write/v2/custom.go b/prompb/write/v2/custom.go → ...b/io/prometheus/remote/write/v2/custom.go
diff --git a/prompb/write/v2/custom_test.go → ...prometheus/remote/write/v2/custom_test.go b/prompb/write/v2/custom_test.go → ...prometheus/remote/write/v2/custom_test.go
diff --git a/prompb/write/v2/types.pb.go → ...io/prometheus/remote/write/v2/types.pb.go b/prompb/write/v2/types.pb.go → ...io/prometheus/remote/write/v2/types.pb.go
diff --git a/prompb/write/v2/types.proto → ...io/prometheus/remote/write/v2/types.proto b/prompb/write/v2/types.proto → ...io/prometheus/remote/write/v2/types.proto
@@ -12,7 +12,7 @@
 // limitations under the License.
 
 syntax = "proto3";
-package write.v2;
+package io.prometheus.remote.write.v2;
 
 option go_package = "writev2";
 

diff --git a/storage/remote/codec.go b/storage/remote/codec.go
@@ -30,12 +30,13 @@ import (
 	"github.com/prometheus/common/model"
 	"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
 
+	writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/remote/write/v2"
+
 	"github.com/prometheus/prometheus/model/exemplar"
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/prompb"
-	writev2 "github.com/prometheus/prometheus/prompb/write/v2"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb/chunkenc"
 	"github.com/prometheus/prometheus/tsdb/chunks"

diff --git a/storage/remote/codec_test.go b/storage/remote/codec_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/prompb"
-	writev2 "github.com/prometheus/prometheus/prompb/write/v2"
+	writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/remote/write/v2"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb/chunkenc"
 	"github.com/prometheus/prometheus/tsdb/chunks"

diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go
@@ -34,14 +34,15 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
 	"go.uber.org/atomic"
 
+	writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/remote/write/v2"
+
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/prometheus/prometheus/model/timestamp"
 	"github.com/prometheus/prometheus/prompb"
-	writev2 "github.com/prometheus/prometheus/prompb/write/v2"
 	"github.com/prometheus/prometheus/scrape"
 	"github.com/prometheus/prometheus/tsdb/chunks"
 	"github.com/prometheus/prometheus/tsdb/record"

diff --git a/storage/remote/queue_manager_test.go b/storage/remote/queue_manager_test.go
@@ -36,13 +36,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
 
+	writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/remote/write/v2"
+
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/prometheus/prometheus/model/timestamp"
 	"github.com/prometheus/prometheus/prompb"
-	writev2 "github.com/prometheus/prometheus/prompb/write/v2"
 	"github.com/prometheus/prometheus/scrape"
 	"github.com/prometheus/prometheus/tsdb/chunks"
 	"github.com/prometheus/prometheus/tsdb/record"

diff --git a/storage/remote/write_handler.go b/storage/remote/write_handler.go
@@ -24,6 +24,8 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
+	writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/remote/write/v2"
+
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/snappy"
 
@@ -33,7 +35,6 @@ import (
 	"github.com/prometheus/prometheus/model/exemplar"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/prompb"
-	writev2 "github.com/prometheus/prometheus/prompb/write/v2"
 	"github.com/prometheus/prometheus/storage"
 	otlptranslator "github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite"
 )