chore: Update gapic-generator-python to 1.25.0 (#608)

* chore: Update gapic-generator-python to 1.24.0

PiperOrigin-RevId: 747419463

Source-Link: googleapis/googleapis@340579b

Source-Link: googleapis/googleapis-gen@e8997ec
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTg5OTdlYzUxMzZlY2I2ZWQ5YTk2OWE0YzJmMTNiM2FiNmExN2MxMiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: Update gapic-generator-python to 1.24.1

PiperOrigin-RevId: 748739072

Source-Link: googleapis/googleapis@b947e52

Source-Link: googleapis/googleapis-gen@8c5821a
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGM1ODIxYWE2NWE5MjFkNTliM2Y3NjUzZDZmMzdjOWM2NzQxMGMyZiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: Update gapic-generator-python to 1.25.0

PiperOrigin-RevId: 755914147

Source-Link: googleapis/googleapis@97a83d7

Source-Link: googleapis/googleapis-gen@a9977ef
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTk5NzdlZmVkYzgzNmNjZWNlMWYwMWQ1MjliMDMxNWUxZWZlNTJhZCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: gcf-owl-bot[bot]

packages/google-cloud-datastore/google/cloud/datastore_admin_v1/services/datastore_admin/async_client.py

@@ -37,6 +37,7 @@
 from google.api_core import retry_async as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 
 try:
@@ -1378,5 +1379,8 @@ async def __aexit__(self, exc_type, exc, tb):
     gapic_version=package_version.__version__
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
+
 
 __all__ = ("DatastoreAdminAsyncClient",)

packages/google-cloud-datastore/google/cloud/datastore_admin_v1/services/datastore_admin/client.py

@@ -45,6 +45,7 @@
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
@@ -1779,5 +1780,7 @@ def cancel_operation(
     gapic_version=package_version.__version__
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
 
 __all__ = ("DatastoreAdminClient",)

packages/google-cloud-datastore/google/cloud/datastore_admin_v1/services/datastore_admin/transports/base.py

@@ -26,6 +26,7 @@
 from google.api_core import operations_v1
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 from google.cloud.datastore_admin_v1.types import datastore_admin
 from google.cloud.datastore_admin_v1.types import index
@@ -35,6 +36,9 @@
     gapic_version=package_version.__version__
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
+
 
 class DatastoreAdminTransport(abc.ABC):
     """Abstract transport class for DatastoreAdmin."""

packages/google-cloud-datastore/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc.py

@@ -73,12 +73,11 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
                 f"Sending request for {client_call_details.method}",
                 extra={
                     "serviceName": "google.datastore.admin.v1.DatastoreAdmin",
-                    "rpcName": client_call_details.method,
+                    "rpcName": str(client_call_details.method),
                     "request": grpc_request,
                     "metadata": grpc_request["metadata"],
                 },
             )
-
         response = continuation(client_call_details, request)
         if logging_enabled:  # pragma: NO COVER
             response_metadata = response.trailing_metadata()

packages/google-cloud-datastore/google/cloud/datastore_admin_v1/services/datastore_admin/transports/rest.py

@@ -23,6 +23,7 @@
 from google.api_core import rest_helpers
 from google.api_core import rest_streaming
 from google.api_core import gapic_v1
+import google.protobuf
 
 from google.protobuf import json_format
 from google.api_core import operations_v1
@@ -61,6 +62,9 @@
     rest_version=f"requests@{requests_version}",
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
+
 
 class DatastoreAdminRestInterceptor:
     """Interceptor for DatastoreAdmin.

packages/google-cloud-datastore/google/cloud/datastore_v1/services/datastore/async_client.py

@@ -37,6 +37,7 @@
 from google.api_core import retry_async as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 
 try:
@@ -1512,5 +1513,8 @@ async def __aexit__(self, exc_type, exc, tb):
     gapic_version=package_version.__version__
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
+
 
 __all__ = ("DatastoreAsyncClient",)

packages/google-cloud-datastore/google/cloud/datastore_v1/services/datastore/client.py

@@ -45,6 +45,7 @@
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
@@ -1914,5 +1915,7 @@ def cancel_operation(
     gapic_version=package_version.__version__
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
 
 __all__ = ("DatastoreClient",)

packages/google-cloud-datastore/google/cloud/datastore_v1/services/datastore/transports/base.py

@@ -25,6 +25,7 @@
 from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 from google.cloud.datastore_v1.types import datastore
 from google.longrunning import operations_pb2  # type: ignore
@@ -33,6 +34,9 @@
     gapic_version=package_version.__version__
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
+
 
 class DatastoreTransport(abc.ABC):
     """Abstract transport class for Datastore."""

packages/google-cloud-datastore/google/cloud/datastore_v1/services/datastore/transports/grpc.py

@@ -71,12 +71,11 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
                 f"Sending request for {client_call_details.method}",
                 extra={
                     "serviceName": "google.datastore.v1.Datastore",
-                    "rpcName": client_call_details.method,
+                    "rpcName": str(client_call_details.method),
                     "request": grpc_request,
                     "metadata": grpc_request["metadata"],
                 },
             )
-
         response = continuation(client_call_details, request)
         if logging_enabled:  # pragma: NO COVER
             response_metadata = response.trailing_metadata()

packages/google-cloud-datastore/google/cloud/datastore_v1/services/datastore/transports/rest.py

@@ -23,6 +23,7 @@
 from google.api_core import rest_helpers
 from google.api_core import rest_streaming
 from google.api_core import gapic_v1
+import google.protobuf
 
 from google.protobuf import json_format
 
@@ -59,6 +60,9 @@
     rest_version=f"requests@{requests_version}",
 )
 
+if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"):  # pragma: NO COVER
+    DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__
+
 
 class DatastoreRestInterceptor:
     """Interceptor for Datastore.