feat: make grpc-gcp default enabled

Author: rahul2393

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

@@ -151,7 +151,6 @@ public class SpannerOptions extends ServiceOptions<Spanner, SpannerOptions> {
   private final InstanceAdminStubSettings instanceAdminStubSettings;
   private final DatabaseAdminStubSettings databaseAdminStubSettings;
   private final Duration partitionedDmlTimeout;
-  private final boolean grpcGcpExtensionEnabled;
   private final GcpManagedChannelOptions grpcGcpOptions;
   private final boolean autoThrottleAdministrativeRequests;
   private final RetrySettings retryAdministrativeRequestsSettings;
@@ -798,7 +797,6 @@ protected SpannerOptions(Builder builder) {
       throw SpannerExceptionFactory.newSpannerException(e);
     }
     partitionedDmlTimeout = builder.partitionedDmlTimeout;
-    grpcGcpExtensionEnabled = builder.grpcGcpExtensionEnabled;
     grpcGcpOptions = builder.grpcGcpOptions;
     autoThrottleAdministrativeRequests = builder.autoThrottleAdministrativeRequests;
     retryAdministrativeRequestsSettings = builder.retryAdministrativeRequestsSettings;
@@ -1025,7 +1023,6 @@ public static class Builder
     private DatabaseAdminStubSettings.Builder databaseAdminStubSettingsBuilder =
         DatabaseAdminStubSettings.newBuilder();
     private Duration partitionedDmlTimeout = Duration.ofHours(2L);
-    private boolean grpcGcpExtensionEnabled = false;
     private GcpManagedChannelOptions grpcGcpOptions;
     private RetrySettings retryAdministrativeRequestsSettings =
         DEFAULT_ADMIN_REQUESTS_LIMIT_EXCEEDED_RETRY_SETTINGS;
@@ -1097,7 +1094,6 @@ protected Builder() {
       this.instanceAdminStubSettingsBuilder = options.instanceAdminStubSettings.toBuilder();
       this.databaseAdminStubSettingsBuilder = options.databaseAdminStubSettings.toBuilder();
       this.partitionedDmlTimeout = options.partitionedDmlTimeout;
-      this.grpcGcpExtensionEnabled = options.grpcGcpExtensionEnabled;
       this.grpcGcpOptions = options.grpcGcpOptions;
       this.autoThrottleAdministrativeRequests = options.autoThrottleAdministrativeRequests;
       this.retryAdministrativeRequestsSettings = options.retryAdministrativeRequestsSettings;
@@ -1268,8 +1264,8 @@ public Builder setRetrySettings(RetrySettings retrySettings) {
      * builder
      *     .getSpannerStubSettingsBuilder()
      *     .applyToAllUnaryMethods(
-     *         new ApiFunction&lt;UnaryCallSettings.Builder&lt;?, ?&gt;, Void&gt;() {
-     *           public Void apply(Builder&lt;?, ?&gt; input) {
+     *         new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
+     *           public Void apply(Builder<?, ?> input) {
      *             input.setRetrySettings(retrySettings);
      *             return null;
      *           }
@@ -1296,8 +1292,8 @@ public SpannerStubSettings.Builder getSpannerStubSettingsBuilder() {
      * builder
      *     .getInstanceAdminStubSettingsBuilder()
      *     .applyToAllUnaryMethods(
-     *         new ApiFunction&lt;UnaryCallSettings.Builder&lt;?, ?&gt;, Void&gt;() {
-     *           public Void apply(Builder&lt;?, ?&gt; input) {
+     *         new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
+     *           public Void apply(Builder<?, ?> input) {
      *             input.setRetrySettings(retrySettings);
      *             return null;
      *           }
@@ -1324,8 +1320,8 @@ public InstanceAdminStubSettings.Builder getInstanceAdminStubSettingsBuilder() {
      * builder
      *     .getDatabaseAdminStubSettingsBuilder()
      *     .applyToAllUnaryMethods(
-     *         new ApiFunction&lt;UnaryCallSettings.Builder&lt;?, ?&gt;, Void&gt;() {
-     *           public Void apply(Builder&lt;?, ?&gt; input) {
+     *         new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
+     *           public Void apply(Builder<?, ?> input) {
      *             input.setRetrySettings(retrySettings);
      *             return null;
      *           }
@@ -1573,14 +1569,12 @@ public Builder enableGrpcGcpExtension() {
      * Multiplexed sessions are not supported for gRPC-GCP.
      */
     public Builder enableGrpcGcpExtension(GcpManagedChannelOptions options) {
-      this.grpcGcpExtensionEnabled = true;
       this.grpcGcpOptions = options;
       return this;
     }
 
     /** Disables gRPC-GCP extension. */
     public Builder disableGrpcGcpExtension() {
-      this.grpcGcpExtensionEnabled = false;
       return this;
     }
 
@@ -1793,8 +1787,7 @@ public SpannerOptions build() {
         credentials = environment.getDefaultExperimentalHostCredentials();
       }
       if (this.numChannels == null) {
-        this.numChannels =
-            this.grpcGcpExtensionEnabled ? GRPC_GCP_ENABLED_DEFAULT_CHANNELS : DEFAULT_CHANNELS;
+        this.numChannels = GRPC_GCP_ENABLED_DEFAULT_CHANNELS;
       }
 
       synchronized (lock) {
@@ -1989,7 +1982,7 @@ public Duration getPartitionedDmlTimeoutDuration() {
   }
 
   public boolean isGrpcGcpExtensionEnabled() {
-    return grpcGcpExtensionEnabled;
+    return true;
   }
 
   public GcpManagedChannelOptions getGrpcGcpOptions() {

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

@@ -279,7 +279,6 @@ public class GapicSpannerRpc implements SpannerRpc {
   private final boolean leaderAwareRoutingEnabled;
   private final boolean endToEndTracingEnabled;
   private final int numChannels;
-  private final boolean isGrpcGcpExtensionEnabled;
 
   private final GrpcCallContext baseGrpcCallContext;
 
@@ -335,7 +334,6 @@ public GapicSpannerRpc(final SpannerOptions options) {
     this.leaderAwareRoutingEnabled = options.isLeaderAwareRoutingEnabled();
     this.endToEndTracingEnabled = options.isEndToEndTracingEnabled();
     this.numChannels = options.getNumChannels();
-    this.isGrpcGcpExtensionEnabled = options.isGrpcGcpExtensionEnabled();
     this.baseGrpcCallContext = createBaseCallContext();
 
     if (initializeStubs) {
@@ -592,10 +590,6 @@ private static GcpManagedChannelOptions grpcGcpOptionsWithMetrics(SpannerOptions
   private static void maybeEnableGrpcGcpExtension(
       InstantiatingGrpcChannelProvider.Builder defaultChannelProviderBuilder,
       final SpannerOptions options) {
-    if (!options.isGrpcGcpExtensionEnabled()) {
-      return;
-    }
-
     final String jsonApiConfig = parseGrpcGcpApiConfig();
     final GcpManagedChannelOptions grpcGcpOptions = grpcGcpOptionsWithMetrics(options);
 
@@ -2037,20 +2031,14 @@ <ReqT, RespT> GrpcCallContext newCallContext(
     GrpcCallContext context = this.baseGrpcCallContext;
     Long affinity = options == null ? null : Option.CHANNEL_HINT.getLong(options);
     if (affinity != null) {
-      if (this.isGrpcGcpExtensionEnabled) {
-        // Set channel affinity in gRPC-GCP.
-        // Compute bounded channel hint to prevent gRPC-GCP affinity map from getting unbounded.
-        int boundedChannelHint = affinity.intValue() % this.numChannels;
-        context =
-            context.withCallOptions(
-                context
-                    .getCallOptions()
-                    .withOption(
-                        GcpManagedChannel.AFFINITY_KEY, String.valueOf(boundedChannelHint)));
-      } else {
-        // Set channel affinity in GAX.
-        context = context.withChannelAffinity(affinity.intValue());
-      }
+      // Set channel affinity in gRPC-GCP.
+      // Compute bounded channel hint to prevent gRPC-GCP affinity map from getting unbounded.
+      int boundedChannelHint = affinity.intValue() % this.numChannels;
+      context =
+          context.withCallOptions(
+              context
+                  .getCallOptions()
+                  .withOption(GcpManagedChannel.AFFINITY_KEY, String.valueOf(boundedChannelHint)));
     }
     if (options != null) {
       // TODO(@odeke-em): Infer the affinity if it doesn't match up with in the request-id.

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java

@@ -1100,9 +1100,10 @@ public void testDefaultNumChannelsWithGrpcGcpExtensionDisabled() {
         SpannerOptions.newBuilder()
             .setProjectId("test-project")
             .setCredentials(NoCredentials.getInstance())
+            .disableGrpcGcpExtension()
             .build();
 
-    assertEquals(SpannerOptions.DEFAULT_CHANNELS, options.getNumChannels());
+    assertEquals(SpannerOptions.GRPC_GCP_ENABLED_DEFAULT_CHANNELS, options.getNumChannels());
   }
 
   @Test
@@ -1135,9 +1136,10 @@ public void testNumChannelsWithGrpcGcpExtensionEnabled() {
 
   @Test
   public void checkCreatedInstanceWhenGrpcGcpExtensionDisabled() {
-    SpannerOptions options = SpannerOptions.newBuilder().setProjectId("test-project").build();
+    SpannerOptions options =
+        SpannerOptions.newBuilder().setProjectId("test-project").disableGrpcGcpExtension().build();
     SpannerOptions options1 = options.toBuilder().build();
-    assertEquals(false, options.isGrpcGcpExtensionEnabled());
+    assertEquals(true, options.isGrpcGcpExtensionEnabled());
     assertEquals(options.isGrpcGcpExtensionEnabled(), options1.isGrpcGcpExtensionEnabled());
 
     Spanner spanner1 = options.getService();