fix mock generation

Author: abbrowne126

google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py

@@ -151,6 +151,14 @@ def _wrap_callback_errors(
         callback: The user callback.
         message: The Pub/Sub message.
     """
+    _CALLBACK_DELIVERY_LOGGER.debug(
+        "Message (id=%s, ack_id=%s, ordering_key=%s, exactly_once=%s) received by subscriber callback",
+        message.message_id,
+        message.ack_id,
+        message.ordering_key,
+        message.exactly_once_enabled,
+    )
+
     try:
         if message.opentelemetry_data:
             message.opentelemetry_data.end_subscribe_concurrency_control_span()
@@ -162,9 +170,15 @@ def _wrap_callback_errors(
         # Note: the likelihood of this failing is extremely low. This just adds
         # a message to a queue, so if this doesn't work the world is in an
         # unrecoverable state and this thread should just bail.
-        _LOGGER.exception(
-            "Top-level exception occurred in callback while processing a message"
+
+        _CALLBACK_EXCEPTION_LOGGER.exception(
+            "Message (id=%s, ack_id=%s, ordering_key=%s, exactly_once=%s)'s callback threw exception, nacking message.",
+            message.message_id,
+            message.ack_id,
+            message.ordering_key,
+            message.exactly_once_enabled,
         )
+
         message.nack()
         on_callback_error(exc)
 

tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py

@@ -59,10 +59,9 @@
 from google.rpc import code_pb2
 from google.rpc import error_details_pb2
 
-_message_mock = mock.create_autospec(message.Message, instance=True)
-
 
 def create_mock_message(**kwargs):
+    _message_mock = mock.create_autospec(message.Message, instance=True)
     msg = _message_mock.return_value
     for k, v in kwargs.items():
         setattr(msg, k, v)