Skip to content

chore: update spanner post processing to include handwritten changes #17935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parthea merged 1 commit into from
Jul 29, 2026
+30 −1
Merged

chore: update spanner post processing to include handwritten changes #17935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion .librarian/generator-input/client-post-processing/spanner-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ replacements:
- paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py]
before: '(from grpc\.experimental import aio # type: ignore\n\n)(?!from google\.cloud\.spanner_v1\.metrics)'
after: |
\g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
\g<1>from google.cloud.spanner_v1.metrics.metrics_interceptor import (
AsyncMetricsInterceptor,
MetricsInterceptor,
)
count: 1

- paths: [packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc.py]
Expand Down Expand Up @@ -156,6 +159,32 @@ replacements:

\g<3>\g<4>
count: 1
- paths:
- packages/google-cloud-spanner/google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py
before: '([ \t]+)(\("grpc\.keepalive_time_ms", 120000\),\n[ \t]+\](?:,\n[ \t]*|\n[ \t]*)\)\n+)([ \t]+)(self\._interceptor = _LoggingClientAIOInterceptor\(\)\n)'
after: |
\g<1>\g<2>\g<3>if metrics_interceptor is not None:
self._metrics_interceptor = AsyncMetricsInterceptor()
# Attach interceptor directly since grpc.aio does not provide intercept_channel.
if hasattr(self._grpc_channel, "_unary_unary_interceptors"):
self._grpc_channel._unary_unary_interceptors.append(
self._metrics_interceptor
)
if hasattr(self._grpc_channel, "_unary_stream_interceptors"):
self._grpc_channel._unary_stream_interceptors.append(
self._metrics_interceptor
)
if hasattr(self._grpc_channel, "_stream_unary_interceptors"):
self._grpc_channel._stream_unary_interceptors.append(
self._metrics_interceptor
)
if hasattr(self._grpc_channel, "_stream_stream_interceptors"):
self._grpc_channel._stream_stream_interceptors.append(
self._metrics_interceptor
)
Comment on lines +169 to +184

@gemini-code-assist gemini-code-assist Bot Jul 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The asynchronous gRPC channel (grpc.aio.Channel) does not have separate attributes for each call type (like _unary_unary_interceptors, _unary_stream_interceptors, etc.). Those are specific to the synchronous grpc.Channel implementation.

Instead, grpc.aio.Channel stores all its interceptors in a single list attribute named _interceptors. Because of this, the current hasattr checks will always evaluate to False, and the AsyncMetricsInterceptor will never be attached to the channel.

To fix this, check for and append to _interceptors instead.

                  if hasattr(self._grpc_channel, "_interceptors"):
                      self._grpc_channel._interceptors.append(
                          self._metrics_interceptor
                      )


self._interceptor = _LoggingClientAIOInterceptor()
count: 1
- paths: [packages/google-cloud-spanner/setup.py]
before: '(?s)dependencies = \[.*?\]\nextras = \{\s*\}'
after: |
Expand Down
Loading