fix: fix conflict

go.mod

@@ -24,7 +24,6 @@ require (
 	github.com/robfig/cron/v3 v3.0.0
 	github.com/sashabaranov/go-openai v1.14.2
 	github.com/sirupsen/logrus v1.9.3
-	github.com/streadway/amqp v1.1.0
 	github.com/stretchr/testify v1.8.4
 	github.com/willf/bloom v2.0.3+incompatible
 	github.com/zsais/go-gin-prometheus v0.1.0

src/services/message/handler.go

@@ -405,7 +405,7 @@ func addMessage(ctx context.Context, fromUserId uint32, toUserId uint32, Context
 
 	} else {
 
-		err = channel.Publish("", strings.MessageActionEvent, false, false,
+		err = channel.PublishWithContext(ctx, "", strings.MessageActionEvent, false, false,
 			amqp.Publishing{
 				DeliveryMode: amqp.Persistent,
 				ContentType:  "text/plain",

src/services/message/main.go

@@ -19,10 +19,6 @@ import (
 	"os"
 	"syscall"
 
-	grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
-	"github.com/oklog/run"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-
 	"github.com/sirupsen/logrus"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"google.golang.org/grpc"

src/services/msgconsumer/main.go

@@ -18,7 +18,6 @@ import (
 	amqp "github.com/rabbitmq/amqp091-go"
 	"github.com/sashabaranov/go-openai"
 	"github.com/sirupsen/logrus"
-	"github.com/streadway/amqp"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -393,7 +392,7 @@ func errorHandler(channel *amqp.Channel, d amqp.Delivery, requeue bool, logger *
 
 			logger.Debugf("Retrying %d times", curRetry)
 
-			err = channel.Publish(
+			err = channel.PublishWithContext(context.Background(),
 				strings.MessageExchange,
 				strings.MessageGptActionEvent,
 				false,