diff --git a/go.mod b/go.mod index d3e36b05c..2202e1125 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/dskit -go 1.25.8 +go 1.26 toolchain go1.26.4 @@ -21,7 +21,7 @@ require ( github.com/grafana/gomemcache v0.0.0-20251127154401-74f93547077b github.com/grafana/otel-profiling-go v0.5.1 github.com/grafana/pyroscope-go/godeltaprof v0.1.9 - github.com/hashicorp/consul/api v1.33.7 + github.com/hashicorp/consul/api/v2 v2.0.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-metrics v0.5.4 github.com/hashicorp/go-sockaddr v1.0.7 diff --git a/go.sum b/go.sum index c9db2c047..4b46c0fbb 100644 --- a/go.sum +++ b/go.sum @@ -109,10 +109,10 @@ github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasn github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs= github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= -github.com/hashicorp/consul/api v1.33.7 h1:apLZVzX7O7BLgHyh4pvczcsBzPmYSVXGKZQbOaA1ae0= -github.com/hashicorp/consul/api v1.33.7/go.mod h1:SjR3cjwCUSLLDfVw5dFg76rnnKjOySxr8W8lC5s01C8= -github.com/hashicorp/consul/sdk v0.17.3 h1:oZMMxzQGSsiT+ToOH50y3Qcs0nc9Ud+7L5lRx+EmMU0= -github.com/hashicorp/consul/sdk v0.17.3/go.mod h1:jnOmYjiNfVRpBaujQ1DFFVs0N6g3S1y6wygSjLTzYfc= +github.com/hashicorp/consul/api/v2 v2.0.0 h1:FBzxiwnP8kJoHL2ByDUSvaItbc7jF7LxZLTnHtO75wA= +github.com/hashicorp/consul/api/v2 v2.0.0/go.mod h1:1gEhzpcnl4X4ui7JFpFQvn7QRYQ60IFm6BxBXjrv0dg= +github.com/hashicorp/consul/sdk/v2 v2.0.0 h1:3KJ7oqP5ZY0OGmUUMTTafPNM1CscXw9NMJ329UMMgcs= +github.com/hashicorp/consul/sdk/v2 v2.0.0/go.mod h1:Si3zN9Zw40NHtow0yrGpgJ0wMsL9O2RWDevEzmKzbps= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= diff --git a/kv/consul/client.go b/kv/consul/client.go index 2ea4e98de..a27a543fa 100644 --- a/kv/consul/client.go +++ b/kv/consul/client.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - consul "github.com/hashicorp/consul/api" + consul "github.com/hashicorp/consul/api/v2" "github.com/hashicorp/go-cleanhttp" "github.com/prometheus/client_golang/prometheus" "golang.org/x/time/rate" diff --git a/kv/consul/client_test.go b/kv/consul/client_test.go index 5dc4f7089..5a4f857ba 100644 --- a/kv/consul/client_test.go +++ b/kv/consul/client_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - consul "github.com/hashicorp/consul/api" + consul "github.com/hashicorp/consul/api/v2" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/kv/consul/metrics.go b/kv/consul/metrics.go index 166e79bc9..e3f6f3358 100644 --- a/kv/consul/metrics.go +++ b/kv/consul/metrics.go @@ -3,7 +3,7 @@ package consul import ( "context" - consul "github.com/hashicorp/consul/api" + consul "github.com/hashicorp/consul/api/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/kv/consul/mock.go b/kv/consul/mock.go index ec848e135..d1dd69500 100644 --- a/kv/consul/mock.go +++ b/kv/consul/mock.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - consul "github.com/hashicorp/consul/api" + consul "github.com/hashicorp/consul/api/v2" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/dskit/kv/codec"