diff --git a/go.mod b/go.mod index 6308cef..43ebc15 100644 --- 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.0 github.com/stretchr/testify v1.8.2 - go.buf.build/grpc/go/prometheus/prometheus v1.4.4 go.k6.io/k6 v0.44.1 - google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 + 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 @@ -32,7 +33,6 @@ require ( 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 golang.org/x/sys v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect golang.org/x/time v0.3.0 // indirect diff --git a/go.sum b/go.sum index 184847b..1eebc83 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,7 @@ +buf.build/gen/go/gogo/protobuf/protocolbuffers/go v1.31.0-20210810001428-4df00b267f94.1 h1:IpfoSUtXcmtXmL672yCeHx96evE7Z4AyWo8R2lVBU3o= +buf.build/gen/go/gogo/protobuf/protocolbuffers/go v1.31.0-20210810001428-4df00b267f94.1/go.mod h1:Az9fvKFYQGtiDa7cPW9T3Nbw8u3hpmD6wG15RsbQlA0= +buf.build/gen/go/prometheus/prometheus/protocolbuffers/go v1.31.0-20230627135113-9a12bc2590d2.1 h1:aAMGEehZVBrkvsvQYwE4yNrXRYkSX84eZpRaKPiDuxg= +buf.build/gen/go/prometheus/prometheus/protocolbuffers/go v1.31.0-20230627135113-9a12bc2590d2.1/go.mod h1:iqW5nSujn3ZJ9ISZQX3K/uWwjckAp8hz0J4/wNgFBZo= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -237,10 +241,6 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.buf.build/grpc/go/gogo/protobuf v1.4.9 h1:IaG7Rh/dtmoY1ZVJwSwyaGjQ8yb8emVMuX888kxpXbo= -go.buf.build/grpc/go/gogo/protobuf v1.4.9/go.mod h1:2rkC/lMWRLTLC2Bmn8BUP3ED9Kxx7FN3OHk+u7KCHDU= -go.buf.build/grpc/go/prometheus/prometheus v1.4.4 h1:ddBWiMMWJsyqalhiUikpUwLsGZ18GqGCzsu8khG2mB4= -go.buf.build/grpc/go/prometheus/prometheus v1.4.4/go.mod h1:QjrcwuvXQEp/Z0H21rmFvy4QTTnyWvfT5sffq/BlEJU= go.k6.io/k6 v0.44.1 h1:6PHo1u+UdwGhM9dT2F4chCGT7Ac3h4YJ96nDIhfJEHk= go.k6.io/k6 v0.44.1/go.mod h1:4D2BnugW3gBWyI+yuKp18f+rFPkZIWBpxNe6Xe6MvGE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -499,7 +499,6 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -513,9 +512,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 h1:KR8+MyP7/qOlV+8Af01LtjL04bu7on42eVsxT4EyBQk= -google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/remote/client.go b/pkg/remote/client.go index 9a85d7a..feec572 100644 --- 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 index 2da5a79..1f11482 100644 --- 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 index f7f5b59..8c5d1d5 100644 --- 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 index f9d17af..74092c9 100644 --- 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 index fc1ecd0..777587b 100644 --- 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 index 3877f39..b80a2c3 100644 --- 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 index e9686d0..6805c16 100644 --- 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 index 831e2e3..8f7852a 100644 --- 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" )