Add queue URL to the error message (#79)

dashbitco · Oct 10, 2023 · 09271d7 · 09271d7
1 parent db21198
commit 09271d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/broadway_sqs/ex_aws_client.ex b/lib/broadway_sqs/ex_aws_client.ex
@@ -28,7 +28,7 @@ defmodule BroadwaySQS.ExAwsClient do
     opts.queue_url
     |> ExAws.SQS.receive_message(receive_messages_opts)
     |> ExAws.request(opts.config)
-    |> wrap_received_messages(opts.ack_ref)
+    |> wrap_received_messages(opts)
   end
 
   @impl Acknowledger
@@ -62,16 +62,16 @@ defmodule BroadwaySQS.ExAwsClient do
     |> ExAws.request!(ack_options.config)
   end
 
-  defp wrap_received_messages({:ok, %{body: body}}, ack_ref) do
+  defp wrap_received_messages({:ok, %{body: body}}, %{ack_ref: ack_ref}) do
     Enum.map(body.messages, fn message ->
       metadata = Map.delete(message, :body)
       acknowledger = build_acknowledger(message, ack_ref)
       %Message{data: message.body, metadata: metadata, acknowledger: acknowledger}
     end)
   end
 
-  defp wrap_received_messages({:error, reason}, _) do
-    Logger.error("Unable to fetch events from AWS. Reason: #{inspect(reason)}")
+  defp wrap_received_messages({:error, reason}, %{queue_url: queue_url}) do
+    Logger.error("Unable to fetch events from AWS queue #{queue_url}. Reason: #{inspect(reason)}")
     []
   end
 

diff --git a/test/broadway_sqs/ex_aws_client_test.exs b/test/broadway_sqs/ex_aws_client_test.exs
@@ -137,7 +137,8 @@ defmodule BroadwaySQS.ExAwsClientTest do
 
       assert capture_log(fn ->
                assert ExAwsClient.receive_messages(10, opts) == []
-             end) =~ "[error] Unable to fetch events from AWS. Reason: \"Fake error\""
+             end) =~
+               "[error] Unable to fetch events from AWS queue my_queue. Reason: \"Fake error\""
     end
 
     test "send a SQS/ReceiveMessage request with default options", %{opts: base_opts} do