chore: merge main into generate-libraries-main

Author: cloud-java-bot

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

@@ -923,16 +923,10 @@ public boolean isEnableBuiltInMetrics() {
 
     @Override
     public boolean isEnableGRPCBuiltInMetrics() {
-      // Enable gRPC built-in metrics if:
-      // 1. The env var SPANNER_DISABLE_DIRECT_ACCESS_GRPC_BUILTIN_METRICS is explicitly set to
-      // "false", OR
-      // 2. DirectPath is enabled AND the env var is not set to "true"
-      // This allows metrics to be enabled by default when DirectPath is on, unless explicitly
+      // Enable gRPC built-in metrics as default unless explicitly
       // disabled via env.
-      String grpcDisableEnv = System.getenv("SPANNER_DISABLE_DIRECT_ACCESS_GRPC_BUILTIN_METRICS");
-      boolean isDirectPathEnabled = GapicSpannerRpc.isEnableDirectPathXdsEnv();
-      return ("false".equalsIgnoreCase(grpcDisableEnv))
-          || (isDirectPathEnabled && !"true".equalsIgnoreCase(grpcDisableEnv));
+      return !Boolean.parseBoolean(
+          System.getenv(SPANNER_DISABLE_DIRECT_ACCESS_GRPC_BUILTIN_METRICS));
     }
 
     @Override

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

@@ -86,8 +86,6 @@
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -239,6 +237,7 @@ public class GapicSpannerRpc implements SpannerRpc {
   private static final String CLIENT_LIBRARY_LANGUAGE = "spanner-java";
   public static final String DEFAULT_USER_AGENT =
       CLIENT_LIBRARY_LANGUAGE + "/" + GaxProperties.getLibraryVersion(GapicSpannerRpc.class);
+  public static boolean DIRECTPATH_CHANNEL_CREATED = false;
   private static final String API_FILE = "grpc-gcp-apiconfig.json";
 
   private boolean rpcIsClosed;
@@ -281,8 +280,6 @@ public class GapicSpannerRpc implements SpannerRpc {
   private final int numChannels;
   private final boolean isGrpcGcpExtensionEnabled;
 
-  private Supplier<Boolean> directPathEnabledSupplier = () -> false;
-
   private final GrpcCallContext baseGrpcCallContext;
 
   public static GapicSpannerRpc create(SpannerOptions options) {
@@ -361,9 +358,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
                   SpannerInterceptorProvider.create(
                           MoreObjects.firstNonNull(
                               options.getInterceptorProvider(),
-                              SpannerInterceptorProvider.createDefault(
-                                  options.getOpenTelemetry(),
-                                  (() -> directPathEnabledSupplier.get()))))
+                              SpannerInterceptorProvider.createDefault(options.getOpenTelemetry())))
                       // This sets the trace context headers.
                       .withTraceContext(endToEndTracingEnabled, options.getOpenTelemetry())
                       // This sets the response compressor (Server -> Client).
@@ -425,12 +420,9 @@ public GapicSpannerRpc(final SpannerOptions options) {
         this.spannerStub =
             GrpcSpannerStubWithStubSettingsAndClientContext.create(
                 spannerStubSettings, clientContext);
-        this.directPathEnabledSupplier =
-            Suppliers.memoize(
-                () -> {
-                  return ((GrpcTransportChannel) clientContext.getTransportChannel()).isDirectPath()
-                      && isAttemptDirectPathXds;
-                });
+        DIRECTPATH_CHANNEL_CREATED =
+            ((GrpcTransportChannel) clientContext.getTransportChannel()).isDirectPath()
+                && isAttemptDirectPathXds;
         this.readRetrySettings =
             options.getSpannerStubSettings().streamingReadSettings().getRetrySettings();
         this.readRetryableCodes =
@@ -682,15 +674,9 @@ private static boolean isEmulatorEnabled(SpannerOptions options, String emulator
   }
 
   public static boolean isEnableAFEServerTiming() {
-    // Enable AFE metrics and add AFE header if:
-    // 1. The env var SPANNER_DISABLE_AFE_SERVER_TIMING is explicitly set to "false", OR
-    // 2. DirectPath is enabled AND the env var is not set to "true"
-    // This allows metrics to be enabled by default when DirectPath is on, unless explicitly
+    // Enable AFE metrics as default unless explicitly
     // disabled via env.
-    String afeDisableEnv = System.getenv("SPANNER_DISABLE_AFE_SERVER_TIMING");
-    boolean isDirectPathEnabled = isEnableDirectPathXdsEnv();
-    return ("false".equalsIgnoreCase(afeDisableEnv))
-        || (isDirectPathEnabled && !"true".equalsIgnoreCase(afeDisableEnv));
+    return !Boolean.parseBoolean(System.getenv("SPANNER_DISABLE_AFE_SERVER_TIMING"));
   }
 
   public static boolean isEnableDirectPathXdsEnv() {

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

@@ -56,7 +56,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -99,12 +98,8 @@ class HeaderInterceptor implements ClientInterceptor {
   private static final Level LEVEL = Level.INFO;
   private final SpannerRpcMetrics spannerRpcMetrics;
 
-  private final Supplier<Boolean> directPathEnabledSupplier;
-
-  HeaderInterceptor(
-      SpannerRpcMetrics spannerRpcMetrics, Supplier<Boolean> directPathEnabledSupplier) {
+  HeaderInterceptor(SpannerRpcMetrics spannerRpcMetrics) {
     this.spannerRpcMetrics = spannerRpcMetrics;
-    this.directPathEnabledSupplier = directPathEnabledSupplier;
   }
 
   @Override
@@ -293,7 +288,7 @@ private Map<String, String> getBuiltInMetricAttributes(String key, DatabaseName
               BuiltInMetricsConstant.INSTANCE_ID_KEY.getKey(), databaseName.getInstance());
           attributes.put(
               BuiltInMetricsConstant.DIRECT_PATH_ENABLED_KEY.getKey(),
-              String.valueOf(this.directPathEnabledSupplier.get()));
+              String.valueOf(GapicSpannerRpc.DIRECTPATH_CHANNEL_CREATED));
           return attributes;
         });
   }

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

@@ -56,14 +56,14 @@ public static SpannerInterceptorProvider createDefault(OpenTelemetry openTelemet
             }));
   }
 
+  @ObsoleteApi("DirectPathEnabledSupplier is not used")
   public static SpannerInterceptorProvider createDefault(
       OpenTelemetry openTelemetry, Supplier<Boolean> directPathEnabledSupplier) {
     List<ClientInterceptor> defaultInterceptorList = new ArrayList<>();
     defaultInterceptorList.add(new SpannerErrorInterceptor());
     defaultInterceptorList.add(
         new LoggingInterceptor(Logger.getLogger(GapicSpannerRpc.class.getName()), Level.FINER));
-    defaultInterceptorList.add(
-        new HeaderInterceptor(new SpannerRpcMetrics(openTelemetry), directPathEnabledSupplier));
+    defaultInterceptorList.add(new HeaderInterceptor(new SpannerRpcMetrics(openTelemetry)));
     return new SpannerInterceptorProvider(ImmutableList.copyOf(defaultInterceptorList));
   }
 

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

@@ -24,8 +24,6 @@
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 
 import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
@@ -34,7 +32,6 @@
 import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime;
 import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
 import com.google.cloud.spanner.connection.RandomResultSetGenerator;
-import com.google.cloud.spanner.spi.v1.GapicSpannerRpc;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
@@ -51,7 +48,6 @@
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.Collection;
@@ -195,19 +191,11 @@ public void testMetricsSingleUseQuery() {
         checkIfMetricExists(metricReader, BuiltInMetricsConstant.GFE_CONNECTIVITY_ERROR_NAME));
     assertFalse(
         checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME));
-    if (GapicSpannerRpc.isEnableDirectPathXdsEnv()) {
-      // AFE metrics are enabled for DirectPath.
-      MetricData afeLatencyMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.AFE_LATENCIES_NAME);
-      double afeLatencyValue = getAggregatedValue(afeLatencyMetricData, expectedAttributes);
-      assertEquals(fakeAFEServerTiming.get(), afeLatencyValue, 1e-6);
-    } else {
-      MetricData gfeLatencyMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.GFE_LATENCIES_NAME);
-      double gfeLatencyValue = getAggregatedValue(gfeLatencyMetricData, expectedAttributes);
-      assertEquals(fakeServerTiming.get(), gfeLatencyValue, 1e-6);
-      assertFalse(checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_LATENCIES_NAME));
-    }
+    // AFE metrics are enabled for DirectPath.
+    MetricData afeLatencyMetricData =
+        getMetricData(metricReader, BuiltInMetricsConstant.AFE_LATENCIES_NAME);
+    double afeLatencyValue = getAggregatedValue(afeLatencyMetricData, expectedAttributes);
+    assertEquals(fakeAFEServerTiming.get(), afeLatencyValue, 1e-6);
   }
 
   private boolean isJava8() {
@@ -218,75 +206,6 @@ private boolean isWindows() {
     return System.getProperty("os.name").toLowerCase().contains("windows");
   }
 
-  @Test
-  public void testMetricsSingleUseQueryWithAfeEnabled() throws Exception {
-    assumeTrue(isJava8() && !isWindows());
-    assumeFalse(System.getenv().containsKey("SPANNER_DISABLE_AFE_SERVER_TIMING"));
-
-    Class<?> classOfMap = System.getenv().getClass();
-    Field field = classOfMap.getDeclaredField("m");
-    field.setAccessible(true);
-    Map<String, String> writeableEnvironmentVariables =
-        (Map<String, String>) field.get(System.getenv());
-
-    try {
-      writeableEnvironmentVariables.put("SPANNER_DISABLE_AFE_SERVER_TIMING", "false");
-
-      Stopwatch stopwatch = Stopwatch.createStarted();
-      try (ResultSet resultSet = client.singleUse().executeQuery(SELECT_RANDOM)) {
-        assertTrue(resultSet.next());
-        assertFalse(resultSet.next());
-      }
-
-      double elapsed = stopwatch.elapsed(TimeUnit.MILLISECONDS);
-      Attributes expectedAttributes =
-          expectedCommonBaseAttributes.toBuilder()
-              .putAll(expectedCommonRequestAttributes)
-              .put(BuiltInMetricsConstant.STATUS_KEY, "OK")
-              .put(BuiltInMetricsConstant.METHOD_KEY, "Spanner.ExecuteStreamingSql")
-              .build();
-
-      MetricData operationLatencyMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.OPERATION_LATENCIES_NAME);
-      assertNotNull(operationLatencyMetricData);
-      double operationLatencyValue =
-          getAggregatedValue(operationLatencyMetricData, expectedAttributes);
-      assertThat(operationLatencyValue).isIn(Range.closed(MIN_LATENCY, elapsed));
-
-      MetricData attemptLatencyMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.ATTEMPT_LATENCIES_NAME);
-      assertNotNull(attemptLatencyMetricData);
-      double attemptLatencyValue = getAggregatedValue(attemptLatencyMetricData, expectedAttributes);
-      assertThat(attemptLatencyValue).isIn(Range.closed(MIN_LATENCY, elapsed));
-
-      MetricData operationCountMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.OPERATION_COUNT_NAME);
-      assertNotNull(operationCountMetricData);
-      assertThat(getAggregatedValue(operationCountMetricData, expectedAttributes)).isEqualTo(1);
-
-      MetricData attemptCountMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.ATTEMPT_COUNT_NAME);
-      assertNotNull(attemptCountMetricData);
-      assertThat(getAggregatedValue(attemptCountMetricData, expectedAttributes)).isEqualTo(1);
-
-      assertFalse(
-          checkIfMetricExists(metricReader, BuiltInMetricsConstant.GFE_CONNECTIVITY_ERROR_NAME));
-      assertFalse(
-          checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME));
-      MetricData afeLatencyMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.AFE_LATENCIES_NAME);
-      double afeLatencyValue = getAggregatedValue(afeLatencyMetricData, expectedAttributes);
-      assertEquals(fakeAFEServerTiming.get(), afeLatencyValue, 1e-6);
-
-      MetricData gfeLatencyMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.GFE_LATENCIES_NAME);
-      double gfeLatencyValue = getAggregatedValue(gfeLatencyMetricData, expectedAttributes);
-      assertEquals(fakeServerTiming.get(), gfeLatencyValue, 1e-6);
-    } finally {
-      writeableEnvironmentVariables.remove("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS");
-    }
-  }
-
   @Test
   public void testMetricsWithGaxRetryUnaryRpc() {
     Stopwatch stopwatch = Stopwatch.createStarted();
@@ -454,17 +373,9 @@ public void testNoServerTimingHeader() throws IOException, InterruptedException
 
     assertFalse(checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_LATENCIES_NAME));
     assertFalse(checkIfMetricExists(metricReader, BuiltInMetricsConstant.GFE_LATENCIES_NAME));
-    if (GapicSpannerRpc.isEnableDirectPathXdsEnv()) {
-      MetricData afeConnectivityMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME);
-      assertThat(getAggregatedValue(afeConnectivityMetricData, expectedAttributes)).isEqualTo(1);
-    } else {
-      MetricData gfeConnectivityMetricData =
-          getMetricData(metricReader, BuiltInMetricsConstant.GFE_CONNECTIVITY_ERROR_NAME);
-      assertThat(getAggregatedValue(gfeConnectivityMetricData, expectedAttributes)).isEqualTo(1);
-      assertFalse(
-          checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME));
-    }
+    MetricData afeConnectivityMetricData =
+        getMetricData(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME);
+    assertThat(getAggregatedValue(afeConnectivityMetricData, expectedAttributes)).isEqualTo(1);
 
     spannerNoHeader.close();
     serverNoHeader.shutdown();