Fix mypy errors

googleapis · Sep 20, 2024 · 7c19e0c · 7c19e0c
1 parent 26a86ec
commit 7c19e0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/google/cloud/pubsub_v1/subscriber/_protocol/leaser.py b/google/cloud/pubsub_v1/subscriber/_protocol/leaser.py
@@ -205,10 +205,10 @@ def maintain_leases(self) -> None:
                 #       is inactive.
                 assert self._manager.dispatcher is not None
                 ack_id_gen = (ack_id for ack_id in ack_ids)
-                opentelemetry_data = [
-                    message.opentelemetry_data
-                    for message in list(leased_messages.values())
-                ]
+                opentelemetry_data = []
+                for message in list(leased_messages.values()):
+                    if message.opentelemetry_data:
+                        opentelemetry_data.append(message.opentelemetry_data)
                 expired_ack_ids = self._manager._send_lease_modacks(
                     ack_id_gen,
                     deadline,

diff --git a/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py b/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py
@@ -1013,7 +1013,7 @@ def _send_lease_modacks(
         self,
         ack_ids: Iterable[str],
         ack_deadline: float,
-        opentelemetry_data: List[Optional[SubscribeOpenTelemetry]],
+        opentelemetry_data: List[SubscribeOpenTelemetry],
         warn_on_invalid=True,
     ) -> Set[str]:
         exactly_once_enabled = False
@@ -1028,6 +1028,7 @@ def _send_lease_modacks(
                 for item, data in zip(
                     items, opentelemetry_data
                 ):  # pragma: NO COVER # Identical code covered in the same function below
+                    assert data is not None
                     data.add_subscribe_span_event("modack start")
                     item._replace(opentelemetry_data=data)
 
@@ -1058,6 +1059,7 @@ def _send_lease_modacks(
             ]
             if self._client.open_telemetry_enabled:
                 for item, data in zip(items, opentelemetry_data):
+                    assert data is not None
                     data.add_subscribe_span_event("modack start")
                     item._replace(opentelemetry_data=data)
             assert self._dispatcher is not None