Merge branch 'main' into set-creds-to-transport

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-    ".": "2.27.2"
+    ".": "2.27.3"
 }
 

CHANGELOG.md

@@ -5,6 +5,13 @@
 [1]: https://pypi.org/project/google-cloud-pubsub/#history
 
 
+## [2.27.3](https://github.com/googleapis/python-pubsub/compare/v2.27.2...v2.27.3) (2025-01-24)
+
+
+### Bug Fixes
+
+* Stop using api_core default timeouts in publish since they are broken ([#1326](https://github.com/googleapis/python-pubsub/issues/1326)) ([ba2c2ee](https://github.com/googleapis/python-pubsub/commit/ba2c2eef7da89a3c14c14d9b6191cd8738c30341))
+
 ## [2.27.2](https://github.com/googleapis/python-pubsub/compare/v2.27.1...v2.27.2) (2025-01-06)
 
 

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 ConstantTimeout
 
 from google.pubsub_v1.types import pubsub as pubsub_gapic_types
 
@@ -191,7 +192,10 @@ class PublisherOptions(NamedTuple):
         "an instance of :class:`google.api_core.retry.Retry`."
     )
 
-    timeout: "OptionalTimeout" = gapic_v1.method.DEFAULT  # use api_core default
+    # Use ConstantTimeout 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" = ConstantTimeout(60)
     (
         "Timeout settings for message publishing by the client. It should be "
         "compatible with :class:`~.pubsub_v1.types.TimeoutType`."

google/pubsub/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.27.2"  # {x-release-please-version}
+__version__ = "2.27.3"  # {x-release-please-version}

google/pubsub_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.27.2"  # {x-release-please-version}
+__version__ = "2.27.3"  # {x-release-please-version}

samples/generated_samples/snippet_metadata_google.pubsub.v1.json

@@ -9,6 +9,7 @@
     "language": "PYTHON",
     "name": "google-cloud-pubsub",
     "version": "0.1.0"
+    "version": "2.27.3"
   },
   "snippets": [
     {

tests/unit/pubsub_v1/publisher/test_publisher_client.py

@@ -19,6 +19,7 @@
 import sys
 
 import grpc
+import math
 
 # special case python < 3.8
 if sys.version_info.major == 3 and sys.version_info.minor < 8:
@@ -35,6 +36,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 ConstantTimeout
 
 from google.cloud.pubsub_v1 import publisher
 from google.cloud.pubsub_v1 import types
@@ -652,6 +654,8 @@ def test_publish_new_batch_needed(creds):
     future = client.publish(topic, b"foo", bar=b"baz")
     assert future is mock.sentinel.future
 
+    call_args = batch_class.call_args
+
     # Check the mocks.
     batch_class.assert_called_once_with(
         client=mock.ANY,
@@ -660,8 +664,12 @@ 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=mock.ANY,
     )
+    commit_timeout_arg = call_args[1]["commit_timeout"]
+    assert isinstance(commit_timeout_arg, ConstantTimeout)
+    assert math.isclose(commit_timeout_arg._timeout, 60) is True
+
     message_pb = gapic_types.PubsubMessage(data=b"foo", attributes={"bar": "baz"})
     wrapper = PublishMessageWrapper(message=message_pb)
     batch1.publish.assert_called_once_with(wrapper)