{{ message }}
This repository was archived by the owner on Apr 7, 2026. It is now read-only.
feat: update with latest from main#4269
Merged
Merged
Conversation
#4252) * fix: Refine connecitivity metrics to capture RPCs with no response headers * test fix
Most transactions that exceed the mutation limit for an atomic transaction will fail with the error "The transaction contains too many mutations.". However, it is also possible that the transaction fails with the more generic error message "Transaction resource limits exceeded". This error did not trigger a retry of the statement using a PDML transaction. Fixes #4253
- Send a RequestID to Spanner for each request - Make sure that the attempt number of the RequestID is increased if the RPC is retried. - Include the RequestID in every error that is thrown due to an error that is returned by Spanner.
This PR enables the gRPC-GCP channel pool extension by default for Cloud Spanner Java client.
**What's Changing for Customers**
**Before this change**
- gRPC-GCP extension was disabled by default
- Default number of channels: 4
- Channel pooling was handled by GAX
**After this change**
- gRPC-GCP extension is enabled by default
- Default number of channels: 8
- Channel pooling is handled by gRPC-GCP extension
**Benefits of gRPC-GCP**
- **Improved resilience:** When a network connection fails on a particular channel, operations can be automatically retried on a different gRPC channel
- **Better channel management:** gRPC-GCP provides more sophisticated channel affinity and load balancing
**How to Disable gRPC-GCP (Switch Back to GAX Channel Pool)**
If you need to disable gRPC-GCP and use the previous GAX channel pooling behavior, use the `disableGrpcGcpExtension()` method:
```
SpannerOptions options = SpannerOptions.newBuilder()
.setProjectId("my-project")
.disableGrpcGcpExtension()
.build();
```
When disabled, the default number of channels reverts to 4 (the previous default).
**When You Might Want to Disable gRPC-GCP**
- **Maintaining previous behavior:** If you want to keep the exact same behavior as before this change (GAX channel pool with 4 default channels).
- **Troubleshooting**: If you experience any unexpected behavior, disabling gRPC-GCP can help isolate whether the issue is related to the channel pooling mechanism.
🤖 I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
* feat: add support of dynamic channel pooling * set initial pool size to 0 make dynamic channel pool work * chore: generate libraries at Tue Dec 16 06:00:50 UTC 2025 * bump grpc-gcp-java version * fix test * incorporate suggestions * chore: generate libraries at Tue Dec 16 09:56:45 UTC 2025 * make dynamic channel pool default disabled * add verifySameChannelId back and fix partitionDML test * support setting GcpChannelPoolOptions directly --------- Co-authored-by: cloud-java-bot <cloud-java-bot@google.com>
* chore(main): release 6.105.0 * chore: generate libraries at Tue Dec 16 17:46:24 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot <cloud-java-bot@google.com>
🤖 I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
product-auto-label
Bot
added
size: l
Contributor
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request appears to be an automated release-please PR, bumping the version and updating the changelog with new features, bug fixes, and dependency updates. The core changes include enabling dynamic channel pooling, making grpc-gcp enabled by default, and a significant refactoring of how request IDs are handled, moving towards a more automated and centralized approach using gRPC interceptors. The changes are extensive but seem well-structured. I've identified one potential issue in the channel number calculation logic that could lead to incorrect behavior in an edge case.
Comment on lines
+2146
to
2154
| private int convertToRequestIdChannelNumber(@Nullable Long affinity) { | ||
| if (affinity == null) { | ||
| return 0; | ||
| } | ||
| int requestIdChannel = affinity.intValue(); | ||
| requestIdChannel = requestIdChannel == Integer.MAX_VALUE ? 0 : Math.abs(requestIdChannel); | ||
| // Start counting at 1, to distinguish between '0 == Unknown and >0 == known'. | ||
| return requestIdChannel % this.numChannels + 1; | ||
| } |
Contributor
There was a problem hiding this comment.
The current implementation for converting an affinity hint to a channel number has a potential issue with integer overflow. When affinity.intValue() returns Integer.MIN_VALUE, Math.abs() will also return Integer.MIN_VALUE (a negative number). The subsequent modulo operation (%) on this negative number can produce a negative result, leading to a negative channel number. This is likely not the intended behavior, as XGoogSpannerRequestId#hasChannelId considers only positive channel IDs as valid.
A safer approach is to work with long to prevent overflow or use bitwise operations to ensure a non-negative value before the modulo operation.
Suggested change
blakeli0
approved these changes
Dec 17, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.