Migrate to Buf remote packages

pkwarren · codebien · commit d86fcd0c62d7 · 2023-07-31T16:22:54.000+02:00
The Buf remote generation alpha is deprecated and projects should migrate to use remote packages. Update the protobuf dependencies to the remote package (and change the import path). Fixes #129.
diff --git a/go.mod b/go.mod
@@ -3,19 +3,20 @@ module github.com/grafana/xk6-output-prometheus-remote
 go 1.18
 
 require (
+	buf.build/gen/go/prometheus/prometheus/protocolbuffers/go v1.31.0-20230627135113-9a12bc2590d2.1
 	github.com/golang/snappy v0.0.4
 	github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd
 	github.com/prometheus/client_golang v1.14.1-0.20221122130035-8b6e68085b10
 	github.com/prometheus/client_model v0.3.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.4
-	go.buf.build/grpc/go/prometheus/prometheus v1.4.4
 	go.k6.io/k6 v0.45.1-0.20230719100510-ac9c6bc85d13
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.31.0
 	gopkg.in/guregu/null.v3 v3.3.0
 )
 
 require (
+	buf.build/gen/go/gogo/protobuf/protocolbuffers/go v1.31.0-20210810001428-4df00b267f94.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -31,8 +32,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/spf13/afero v1.1.2 // indirect
-	go.buf.build/grpc/go/gogo/protobuf v1.4.9 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
 	golang.org/x/sys v0.9.0 // indirect
 	golang.org/x/text v0.10.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
diff --git a/go.sum b/go.sum
diff --git a/pkg/remote/client.go b/pkg/remote/client.go
@@ -11,8 +11,8 @@ import (
 	"net/url"
 	"time"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/golang/snappy"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/pkg/remote/client_test.go b/pkg/remote/client_test.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/grafana/xk6-output-prometheus-remote/pkg/stale"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/golang/snappy"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/pkg/remotewrite/prometheus.go b/pkg/remotewrite/prometheus.go
@@ -3,8 +3,8 @@ package remotewrite
 import (
 	"sort"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/mstoykov/atlas"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"go.k6.io/k6/metrics"
 )
 
diff --git a/pkg/remotewrite/prometheus_test.go b/pkg/remotewrite/prometheus_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"go.k6.io/k6/metrics"
 )
 
diff --git a/pkg/remotewrite/remotewrite.go b/pkg/remotewrite/remotewrite.go
@@ -13,8 +13,8 @@ import (
 	"go.k6.io/k6/metrics"
 	"go.k6.io/k6/output"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/sirupsen/logrus"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 )
 
 var _ output.Output = new(Output)
diff --git a/pkg/remotewrite/remotewrite_test.go b/pkg/remotewrite/remotewrite_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"go.k6.io/k6/lib/testutils"
 	"go.k6.io/k6/lib/types"
 	"go.k6.io/k6/metrics"
diff --git a/pkg/remotewrite/trend.go b/pkg/remotewrite/trend.go
@@ -5,9 +5,9 @@ import (
 	"sort"
 	"time"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"go.k6.io/k6/metrics"
 )
 
diff --git a/pkg/remotewrite/trend_test.go b/pkg/remotewrite/trend_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
+	prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	prompb "go.buf.build/grpc/go/prometheus/prometheus"
 	"go.k6.io/k6/metrics"
 	"google.golang.org/protobuf/encoding/protojson"
 )

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"net/url"`
`12`	`12`	`"time"`
`13`	`13`
	`14`	`+ prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"`
`14`	`15`	`"github.com/golang/snappy"`
`15`		`- prompb "go.buf.build/grpc/go/prometheus/prometheus"`
`16`	`16`	`"google.golang.org/protobuf/proto"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/grafana/xk6-output-prometheus-remote/pkg/stale"`
`14`	`14`
	`15`	`+ prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"`
`15`	`16`	`"github.com/golang/snappy"`
`16`	`17`	`"github.com/stretchr/testify/assert"`
`17`	`18`	`"github.com/stretchr/testify/require"`
`18`		`- prompb "go.buf.build/grpc/go/prometheus/prometheus"`
`19`	`19`	`"google.golang.org/protobuf/proto"`
`20`	`20`	`)`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package remotewrite`
`3`	`3`	`import (`
`4`	`4`	`"sort"`
`5`	`5`
	`6`	`+ prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"`
`6`	`7`	`"github.com/mstoykov/atlas"`
`7`		`- prompb "go.buf.build/grpc/go/prometheus/prometheus"`
`8`	`8`	`"go.k6.io/k6/metrics"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`	`"time"`
`7`	`7`
	`8`	`+ prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"`
`8`	`9`	`"github.com/stretchr/testify/assert"`
`9`	`10`	`"github.com/stretchr/testify/require"`
`10`		`- prompb "go.buf.build/grpc/go/prometheus/prometheus"`
`11`	`11`	`"go.k6.io/k6/metrics"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"go.k6.io/k6/metrics"`
`14`	`14`	`"go.k6.io/k6/output"`
`15`	`15`
	`16`	`+ prompb "buf.build/gen/go/prometheus/prometheus/protocolbuffers/go"`
`16`	`17`	`"github.com/sirupsen/logrus"`
`17`		`- prompb "go.buf.build/grpc/go/prometheus/prometheus"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`var _ output.Output = new(Output)`