ref(boto3): Guard SQS ARN and batch-count reads separately

Botocore validates params after our hook, so a bad Entries or ARN value
now only loses that attribute, not every SQS request attribute. Move the
batch error.type code to _utils so SNS can share it, and link the SQS
docs for BatchResultErrorEntry.

Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>

Author: sentry-junior[bot]

sentry_sdk/integrations/boto3/_services/sqs.py

@@ -4,7 +4,10 @@
 
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations.boto3._services.base import _ServiceExtension
-from sentry_sdk.integrations.boto3._utils import _get_aws_arn_attributes
+from sentry_sdk.integrations.boto3._utils import (
+    _get_aws_arn_attributes,
+    _get_batch_error_type,
+)
 from sentry_sdk.utils import capture_internal_exceptions
 
 if TYPE_CHECKING:
@@ -45,9 +48,14 @@ def get_span_name(
         )
 
     def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":
-        attributes = _get_aws_arn_attributes(
-            (ctx.params.get("DestinationArn"), ctx.params.get("SourceArn")), ("sqs",)
-        )
+        attributes: "Attributes" = {}
+        with capture_internal_exceptions():
+            attributes.update(
+                _get_aws_arn_attributes(
+                    (ctx.params.get("DestinationArn"), ctx.params.get("SourceArn")),
+                    ("sqs",),
+                )
+            )
 
         queue_url = ctx.params.get("QueueUrl")
         if queue_url is not None:
@@ -86,9 +94,10 @@ def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":
             if operation_type == "send":
                 attributes[SPANDATA.SENTRY_KIND] = "producer"
             if "Entries" in ctx.params:
-                attributes[SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT] = len(
-                    ctx.params["Entries"]
-                )
+                with capture_internal_exceptions():
+                    attributes[SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT] = len(
+                        ctx.params["Entries"]
+                    )
         return attributes
 
     def get_response_attributes(
@@ -109,11 +118,7 @@ def get_response_attributes(
             if len(messages) == 1:
                 attributes[SPANDATA.MESSAGING_MESSAGE_ID] = messages[0]["MessageId"]
 
-        # failed entries have a `200 OK` response; use their code when they share one.
-        # https://docs.aws.amazon.com/sns/latest/api/API_BatchResultErrorEntry.html
-        error_codes = {entry["Code"] for entry in response.get("Failed", ())}
-        if len(error_codes) == 1:
-            attributes[SPANDATA.ERROR_TYPE] = error_codes.pop()
-        elif error_codes:
-            attributes[SPANDATA.ERROR_TYPE] = "aws_batch_partial_failure"
+        error_type = _get_batch_error_type(response)
+        if error_type is not None:
+            attributes[SPANDATA.ERROR_TYPE] = error_type
         return attributes

sentry_sdk/integrations/boto3/_utils.py

@@ -38,3 +38,18 @@ def _get_aws_arn_attributes(
         return attributes
 
     return {}
+
+
+def _get_batch_error_type(response: "Any") -> "Optional[str]":
+    """
+    `error.type` for a batch call whose response has `Failed` entries.
+    Failed entries come back in a `200 OK` response; use their code when they share one.
+    https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_BatchResultErrorEntry.html
+    https://docs.aws.amazon.com/sns/latest/api/API_BatchResultErrorEntry.html
+    """
+    error_codes = {entry["Code"] for entry in response.get("Failed", ())}
+    if len(error_codes) == 1:
+        return error_codes.pop()
+    if error_codes:
+        return "aws_batch_partial_failure"
+    return None