fix: Stop using api_core default timeouts in publish since they are

broken

Author: mukund-ananthu

google/cloud/pubsub_v1/types.py

@@ -35,6 +35,7 @@
 from google.protobuf import timestamp_pb2
 
 from google.api_core.protobuf_helpers import get_messages
+from google.api_core.timeout import ExponentialTimeout
 
 from google.pubsub_v1.types import pubsub as pubsub_gapic_types
 
@@ -191,7 +192,12 @@ class PublisherOptions(NamedTuple):
         "an instance of :class:`google.api_core.retry.Retry`."
     )
 
-    timeout: "OptionalTimeout" = gapic_v1.method.DEFAULT  # use api_core default
+    # Use ExponentialTimeout instead of api_core default because the default
+    # value results in retries with zero deadline.
+    # Refer https://github.com/googleapis/python-api-core/issues/654
+    timeout: "OptionalTimeout" = ExponentialTimeout(
+        initial=5, maximum=60, multiplier=1.3, deadline=600
+    )
     (
         "Timeout settings for message publishing by the client. It should be "
         "compatible with :class:`~.pubsub_v1.types.TimeoutType`."

tests/unit/pubsub_v1/publisher/test_publisher_client.py

@@ -35,6 +35,7 @@
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
 from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY
+from google.api_core.timeout import ExponentialTimeout
 
 from google.cloud.pubsub_v1 import publisher
 from google.cloud.pubsub_v1 import types
@@ -660,7 +661,9 @@ def test_publish_new_batch_needed(creds):
         batch_done_callback=None,
         commit_when_full=True,
         commit_retry=gapic_v1.method.DEFAULT,
-        commit_timeout=gapic_v1.method.DEFAULT,
+        commit_timeout=ExponentialTimeout(
+            initial=5, maximum=60, multiplier=1.3, deadline=600
+        ),
     )
     message_pb = gapic_types.PubsubMessage(data=b"foo", attributes={"bar": "baz"})
     wrapper = PublishMessageWrapper(message=message_pb)