Merge branch 'main' into fix-12693-b-494614610

Author: rahul2393

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

@@ -2446,7 +2446,7 @@ public OpenTelemetry getBuiltInOpenTelemetry() {
   }
 
   public void enablegRPCMetrics(InstantiatingGrpcChannelProvider.Builder channelProviderBuilder) {
-    if (SpannerOptions.environment.isEnableGRPCBuiltInMetrics()) {
+    if (isEnableBuiltInMetrics() && SpannerOptions.environment.isEnableGRPCBuiltInMetrics()) {
       this.builtInMetricsProvider.enableGrpcMetrics(
           channelProviderBuilder,
           this.getProjectId(),

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java

@@ -1178,6 +1178,31 @@ public void testGrpcGcpOptionsRetainDynamicChannelPoolSettingsWithDcp() throws E
     assertEquals(
         affinityKeyLifetime, grpcGcpOptions.getChannelPoolOptions().getAffinityKeyLifetime());
     assertEquals(cleanupInterval, grpcGcpOptions.getChannelPoolOptions().getCleanupInterval());
+  public void testBuiltInMetricsDisabledSkipsGrpcBuiltInMetricsConfigurator() {
+    try {
+      SpannerOptions.useEnvironment(
+          new SpannerOptions.SpannerEnvironment() {
+            @Override
+            public boolean isEnableGRPCBuiltInMetrics() {
+              return true;
+            }
+          });
+
+      SpannerOptions options =
+          SpannerOptions.newBuilder()
+              .setProjectId("[PROJECT]")
+              .setCredentials(STATIC_CREDENTIALS)
+              .setBuiltInMetricsEnabled(false)
+              .build();
+      InstantiatingGrpcChannelProvider.Builder channelProviderBuilder =
+          InstantiatingGrpcChannelProvider.newBuilder();
+
+      options.enablegRPCMetrics(channelProviderBuilder);
+
+      assertNull(channelProviderBuilder.getChannelConfigurator());
+    } finally {
+      SpannerOptions.useDefaultEnvironment();
+    }
   }
 
   private static final class RecordingTransportChannelProvider implements TransportChannelProvider {