diff --git a/go.mod b/go.mod index bfd854d27..9d69f352e 100644 --- a/go.mod +++ b/go.mod @@ -21,9 +21,9 @@ require ( github.com/openzipkin/zipkin-go v0.2.5 github.com/performancecopilot/speed/v4 v4.0.0 github.com/prometheus/client_golang v1.11.0 + github.com/rabbitmq/amqp091-go v1.2.0 github.com/sirupsen/logrus v1.8.1 github.com/sony/gobreaker v0.4.1 - github.com/streadway/amqp v1.0.0 github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e go.etcd.io/etcd/client/pkg/v3 v3.5.0 go.etcd.io/etcd/client/v2 v2.305.0 diff --git a/go.sum b/go.sum index ae52a681f..8f4a4e3b3 100644 --- a/go.sum +++ b/go.sum @@ -408,6 +408,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/rabbitmq/amqp091-go v1.2.0 h1:1pHBxAsQh54R9eX/xo679fUEAfv3loMqi0pvRFOj2nk= +github.com/rabbitmq/amqp091-go v1.2.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -427,8 +429,6 @@ github.com/sony/gobreaker v0.4.1 h1:oMnRNZXX5j85zso6xCPRNPtmAycat+WcoKbklScLDgQ= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= -github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e h1:mOtuXaRAbVZsxAHVdPR3IjfmN8T1h2iczJLynhLybf8= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/transport/amqp/encode_decode.go b/transport/amqp/encode_decode.go index cfa1446a3..ccd768e33 100644 --- a/transport/amqp/encode_decode.go +++ b/transport/amqp/encode_decode.go @@ -3,7 +3,7 @@ package amqp import ( "context" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) // DecodeRequestFunc extracts a user-domain request object from diff --git a/transport/amqp/publisher.go b/transport/amqp/publisher.go index ebb3cde25..7c31e2e7a 100644 --- a/transport/amqp/publisher.go +++ b/transport/amqp/publisher.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) // The golang AMQP implementation requires the []byte representation of diff --git a/transport/amqp/publisher_test.go b/transport/amqp/publisher_test.go index 2c62be10b..0afce5732 100644 --- a/transport/amqp/publisher_test.go +++ b/transport/amqp/publisher_test.go @@ -8,7 +8,7 @@ import ( "time" amqptransport "github.com/go-kit/kit/transport/amqp" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) var ( diff --git a/transport/amqp/request_response_func.go b/transport/amqp/request_response_func.go index 1409240a6..8ff6d479b 100644 --- a/transport/amqp/request_response_func.go +++ b/transport/amqp/request_response_func.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) // RequestFunc may take information from a publisher request and put it into a diff --git a/transport/amqp/subscriber.go b/transport/amqp/subscriber.go index 188fb9f6e..c213ef130 100644 --- a/transport/amqp/subscriber.go +++ b/transport/amqp/subscriber.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/kit/endpoint" "github.com/go-kit/kit/transport" "github.com/go-kit/log" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) // Subscriber wraps an endpoint and provides a handler for AMQP Delivery messages. diff --git a/transport/amqp/subscriber_test.go b/transport/amqp/subscriber_test.go index 18b496af5..021424ca6 100644 --- a/transport/amqp/subscriber_test.go +++ b/transport/amqp/subscriber_test.go @@ -8,7 +8,7 @@ import ( "time" amqptransport "github.com/go-kit/kit/transport/amqp" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) var (