Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

feat: remove grpclb #2760

Merged
olavloite merged 16 commits into from
Apr 20, 2024
Merged

feat: remove grpclb #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3d549ed
chore: add DirectPath fallback integration test
mohanli-ml Nov 30, 2020
7a35667
Merge branch 'dp-branch'
mohanli-ml Dec 3, 2020
9851996
Merge remote-tracking branch 'upstream/master'
mohanli-ml Dec 15, 2020
bddf755
Merge remote-tracking branch 'upstream/master'
mohanli-ml Jan 5, 2021
35ffe0c
Merge remote-tracking branch 'upstream/master'
mohanli-ml Jan 7, 2021
d92dbf4
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml May 12, 2022
bb6efc2
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml Dec 18, 2023
3e3bdbc
feat: remove grpclb
mohanli-ml Dec 18, 2023
3a4f1b8
feat: remove grpclb
mohanli-ml Dec 18, 2023
7cb6952
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml Apr 18, 2024
f4f62ea
feat: remove grpclb
mohanli-ml Apr 18, 2024
1399ded
feat: remove grpclb
mohanli-ml Apr 18, 2024
6de55a9
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml Apr 19, 2024
2e41dba
Merge branch 'master' into remove-grpclb
mohanli-ml Apr 19, 2024
00a2e8d
feat: remove grpclb
mohanli-ml Apr 19, 2024
3a66eb2
Merge branch 'main' into remove-grpclb
olavloite Apr 20, 2024
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
7 changes: 1 addition & 6 deletions google-cloud-spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredDependencies>io.grpc:grpc-protobuf-lite,org.hamcrest:hamcrest,org.hamcrest:hamcrest-core,com.google.errorprone:error_prone_annotations,org.openjdk.jmh:jmh-generator-annprocess,com.google.api.grpc:grpc-google-cloud-spanner-v1,com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1,com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1,javax.annotation:javax.annotation-api,io.opencensus:opencensus-impl,org.graalvm.sdk:graal-sdk,io.grpc:grpc-grpclb,io.grpc:grpc-googleapis,io.grpc:grpc-rls,com.google.api.grpc:proto-google-cloud-spanner-executor-v1,com.google.api.grpc:grpc-google-cloud-spanner-executor-v1</ignoredDependencies>
<ignoredDependencies>io.grpc:grpc-protobuf-lite,org.hamcrest:hamcrest,org.hamcrest:hamcrest-core,com.google.errorprone:error_prone_annotations,org.openjdk.jmh:jmh-generator-annprocess,com.google.api.grpc:grpc-google-cloud-spanner-v1,com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1,com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1,javax.annotation:javax.annotation-api,io.opencensus:opencensus-impl,org.graalvm.sdk:graal-sdk,io.grpc:grpc-googleapis,io.grpc:grpc-rls,com.google.api.grpc:proto-google-cloud-spanner-executor-v1,com.google.api.grpc:grpc-google-cloud-spanner-executor-v1</ignoredDependencies>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -325,11 +325,6 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-alts</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-grpclb</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-googleapis</artifactId>
Expand Down
13 changes: 2 additions & 11 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import com.google.api.gax.rpc.UnavailableException;
import com.google.api.gax.rpc.WatchdogProvider;
import com.google.api.pathtemplate.PathTemplate;
import com.google.cloud.NoCredentials;
import com.google.cloud.RetryHelper;
import com.google.cloud.RetryHelper.RetryHelperException;
import com.google.cloud.grpc.GcpManagedChannelBuilder;
Expand Down Expand Up @@ -344,19 +343,11 @@ public GapicSpannerRpc(final SpannerOptions options) {
// This sets the response compressor (Server -> Client).
.withEncoding(compressorName))
.setHeaderProvider(headerProviderWithUserAgent)
.setAllowNonDefaultServiceAccount(true)
// Attempts direct access to spanner service over gRPC to improve throughput,
// whether the attempt is allowed is totally controlled by service owner.
// We'll only attempt DirectPath if we are using real credentials.
// NoCredentials is used for plain text connections, for example when connecting to
// the emulator.
.setAttemptDirectPath(
options.isAttemptDirectPath()
&& !Objects.equals(
options.getScopedCredentials(), NoCredentials.getInstance()));
.setAllowNonDefaultServiceAccount(true);
String directPathXdsEnv = System.getenv("GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS");
boolean isAttemptDirectPathXds = Boolean.parseBoolean(directPathXdsEnv);
if (isAttemptDirectPathXds) {
defaultChannelProviderBuilder.setAttemptDirectPath(true);
defaultChannelProviderBuilder.setAttemptDirectPathXds();
}
if (options.isUseVirtualThreads()) {
Expand Down
1 change: 1 addition & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public GceTestEnvConfig() {
customChannelProviderBuilder
.setEndpoint(DIRECT_PATH_ENDPOINT)
.setAttemptDirectPath(true)
.setAttemptDirectPathXds()
.setInterceptorProvider(interceptorProvider);
builder.setChannelProvider(customChannelProviderBuilder.build());
}
Expand Down