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

Commit d40ec4f

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents 255e6c0 + 7245220 commit d40ec4f

22 files changed

Lines changed: 1072 additions & 164 deletions

File tree

‎benchmarks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-spanner-parent</artifactId>
27-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
27+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
2828
</parent>
2929

3030
<properties>

‎google-cloud-spanner-bom/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-bom</artifactId>
6-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -53,43 +53,43 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-spanner</artifactId>
6161
<type>test-jar</type>
62-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
62+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.api.grpc</groupId>
6666
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
67-
<version>6.109.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
67+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.api.grpc</groupId>
7171
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
72-
<version>6.109.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
72+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
77-
<version>6.109.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
77+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
82-
<version>6.109.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
82+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-spanner-v1</artifactId>
87-
<version>6.109.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
87+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.api.grpc</groupId>
9191
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
92-
<version>6.109.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
92+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9393
</dependency>
9494
</dependencies>
9595
</dependencyManagement>

‎google-cloud-spanner-executor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-spanner-executor</artifactId>
8-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
8+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Spanner Executor</name>
1111

1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-spanner-parent</artifactId>
15-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
15+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1616
</parent>
1717

1818
<properties>

‎google-cloud-spanner/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner</artifactId>
6-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Spanner</name>
99
<url>https://github.com/googleapis/java-spanner</url>
1010
<description>Java idiomatic client for Google Cloud Spanner.</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-spanner-parent</artifactId>
14-
<version>6.109.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
14+
<version>6.109.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration;
2020
import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;
21+
import static com.google.cloud.spanner.spi.v1.GapicSpannerRpc.EXPERIMENTAL_LOCATION_API_ENV_VAR;
2122

2223
import com.google.api.core.ApiFunction;
2324
import com.google.api.core.BetaApi;
@@ -257,6 +258,7 @@ public static GcpChannelPoolOptions createDefaultDynamicChannelPoolOptions() {
257258
private final OpenTelemetry openTelemetry;
258259
private final boolean enableApiTracing;
259260
private final boolean enableBuiltInMetrics;
261+
private final boolean enableLocationApi;
260262
private final boolean enableExtendedTracing;
261263
private final boolean enableEndToEndTracing;
262264
private final String monitoringHost;
@@ -926,6 +928,7 @@ protected SpannerOptions(Builder builder) {
926928
} else {
927929
enableBuiltInMetrics = builder.enableBuiltInMetrics;
928930
}
931+
enableLocationApi = builder.enableLocationApi;
929932
enableEndToEndTracing = builder.enableEndToEndTracing;
930933
monitoringHost = builder.monitoringHost;
931934
defaultTransactionOptions = builder.defaultTransactionOptions;
@@ -993,6 +996,10 @@ default boolean isEnableEndToEndTracing() {
993996
return false;
994997
}
995998

999+
default boolean isEnableLocationApi() {
1000+
return false;
1001+
}
1002+
9961003
@Deprecated
9971004
@ObsoleteApi(
9981005
"This will be removed in an upcoming version without a major version bump. You should use"
@@ -1084,6 +1091,11 @@ public boolean isEnableEndToEndTracing() {
10841091
return Boolean.parseBoolean(System.getenv(SPANNER_ENABLE_END_TO_END_TRACING));
10851092
}
10861093

1094+
@Override
1095+
public boolean isEnableLocationApi() {
1096+
return Boolean.parseBoolean(System.getenv(EXPERIMENTAL_LOCATION_API_ENV_VAR));
1097+
}
1098+
10871099
@Override
10881100
public String getMonitoringHost() {
10891101
return System.getenv(SPANNER_MONITORING_HOST);
@@ -1164,6 +1176,7 @@ public static class Builder
11641176
private boolean enableExtendedTracing = SpannerOptions.environment.isEnableExtendedTracing();
11651177
private boolean enableEndToEndTracing = SpannerOptions.environment.isEnableEndToEndTracing();
11661178
private boolean enableBuiltInMetrics = SpannerOptions.environment.isEnableBuiltInMetrics();
1179+
private boolean enableLocationApi = SpannerOptions.environment.isEnableLocationApi();
11671180
private String monitoringHost = SpannerOptions.environment.getMonitoringHost();
11681181
private SslContext mTLSContext = null;
11691182
private String experimentalHost = null;
@@ -1270,6 +1283,7 @@ protected Builder() {
12701283
this.enableApiTracing = options.enableApiTracing;
12711284
this.enableExtendedTracing = options.enableExtendedTracing;
12721285
this.enableBuiltInMetrics = options.enableBuiltInMetrics;
1286+
this.enableLocationApi = options.enableLocationApi;
12731287
this.enableEndToEndTracing = options.enableEndToEndTracing;
12741288
this.monitoringHost = options.monitoringHost;
12751289
this.defaultTransactionOptions = options.defaultTransactionOptions;
@@ -2434,6 +2448,11 @@ public boolean isEnableBuiltInMetrics() {
24342448
return enableBuiltInMetrics;
24352449
}
24362450

2451+
@InternalApi
2452+
public boolean isEnableLocationApi() {
2453+
return enableLocationApi;
2454+
}
2455+
24372456
/** Returns the override metrics Host. */
24382457
String getMonitoringHost() {
24392458
return monitoringHost;

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
public class GapicSpannerRpc implements SpannerRpc {
227227
private static final PathTemplate PROJECT_NAME_TEMPLATE =
228228
PathTemplate.create("projects/{project}");
229-
private static final String EXPERIMENTAL_LOCATION_API_ENV_VAR =
229+
public static final String EXPERIMENTAL_LOCATION_API_ENV_VAR =
230230
"GOOGLE_SPANNER_EXPERIMENTAL_LOCATION_API";
231231
private static final PathTemplate OPERATION_NAME_TEMPLATE =
232232
PathTemplate.create("{database=projects/*/instances/*/databases/*}/operations/{operation}");
@@ -399,8 +399,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
399399
// If it is enabled in options uses the channel pool provided by the gRPC-GCP extension.
400400
maybeEnableGrpcGcpExtension(defaultChannelProviderBuilder, options);
401401

402-
boolean enableLocationApi =
403-
Boolean.parseBoolean(System.getenv(EXPERIMENTAL_LOCATION_API_ENV_VAR));
402+
boolean enableLocationApi = options.isEnableLocationApi();
404403
TransportChannelProvider baseChannelProvider =
405404
MoreObjects.firstNonNull(
406405
options.getChannelProvider(), defaultChannelProviderBuilder.build());

0 commit comments

Comments
 (0)