From 8518419a32838e8481e45f77c77abe9816245d80 Mon Sep 17 00:00:00 2001 From: arberkatellari Date: Tue, 7 Feb 2023 11:05:19 -0500 Subject: [PATCH] Move from streadway/amqp to rabbitmq/amqp091-go --- ees/amqp.go | 2 +- ers/amqp.go | 2 +- ers/amqp_it_test.go | 2 +- general_tests/cdrs_onlexp_it_test.go | 2 +- go.mod | 2 +- go.sum | 6 ++++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ees/amqp.go b/ees/amqp.go index 99ca90024..b2c1854c3 100644 --- a/ees/amqp.go +++ b/ees/amqp.go @@ -25,7 +25,7 @@ import ( "github.com/cgrates/birpc/context" "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) // NewAMQPee creates a new amqp poster diff --git a/ers/amqp.go b/ers/amqp.go index f0283bfeb..59c1e1f90 100644 --- a/ers/amqp.go +++ b/ers/amqp.go @@ -29,7 +29,7 @@ import ( "github.com/cgrates/cgrates/ees" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) // NewAMQPER return a new amqp event reader diff --git a/ers/amqp_it_test.go b/ers/amqp_it_test.go index dcaf3c10a..8bbc5a088 100644 --- a/ers/amqp_it_test.go +++ b/ers/amqp_it_test.go @@ -30,7 +30,7 @@ import ( "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" ) func TestAMQPER(t *testing.T) { diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index dd9965614..7d6846168 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -40,7 +40,7 @@ package general_tests // "github.com/cgrates/cgrates/utils" // "github.com/cgrates/rpcclient" // kafka "github.com/segmentio/kafka-go" -// "github.com/streadway/amqp" +// amqp "github.com/rabbitmq/amqp091-go" // ) // var ( diff --git a/go.mod b/go.mod index aa8b76eff..096e98214 100644 --- a/go.mod +++ b/go.mod @@ -35,8 +35,8 @@ require ( github.com/nats-io/nats.go v1.16.0 github.com/nyaruka/phonenumbers v1.1.0 github.com/peterh/liner v1.2.2 + github.com/rabbitmq/amqp091-go v1.5.0 github.com/segmentio/kafka-go v0.4.32 - github.com/streadway/amqp v1.0.0 go.mongodb.org/mongo-driver v1.11.0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e diff --git a/go.sum b/go.sum index aed4b4447..9f143d07c 100644 --- a/go.sum +++ b/go.sum @@ -519,6 +519,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.5.0 h1:VouyHPBu1CrKyJVfteGknGOGCzmOz0zcv/tONLkb7rg= +github.com/rabbitmq/amqp091-go v1.5.0/go.mod h1:JsV0ofX5f1nwOGafb8L5rBItt9GyhfQfcJj+oyz0dGg= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= @@ -548,8 +550,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/steveyen/gtreap v0.1.0 h1:CjhzTa274PyJLJuMZwIzCO1PfC00oRa8d1Kc78bFXJM= github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y= -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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -616,6 +616,8 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=