skip auth_token for emulator

Author: sagnghos

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

@@ -740,9 +740,6 @@ public static CloseableExecutorProvider createAsyncExecutorProvider(
 
   protected SpannerOptions(Builder builder) {
     super(SpannerFactory.class, SpannerRpcFactory.class, builder, new SpannerDefaults());
-    if (builder.emulatorHost != null) {
-      builder.setHost(builder.emulatorHost);
-    }
     numChannels = builder.numChannels == null ? DEFAULT_CHANNELS : builder.numChannels;
     Preconditions.checkArgument(
         numChannels >= 1 && numChannels <= MAX_CHANNELS,
@@ -814,7 +811,7 @@ protected SpannerOptions(Builder builder) {
     enableEndToEndTracing = builder.enableEndToEndTracing;
     monitoringHost = builder.monitoringHost;
     String externalHostTokenPath = System.getenv("EXTERNAL_HOST_AUTH_TOKEN");
-    if (builder.isExternalHost && externalHostTokenPath != null) {
+    if (builder.isExternalHost && builder.emulatorHost == null && externalHostTokenPath != null) {
       String token;
       try {
         token =

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SpannerPool.java

@@ -363,14 +363,10 @@ private void initialize() {
   @VisibleForTesting
   Spanner createSpanner(SpannerPoolKey key, ConnectionOptions options) {
     ConnectionSpannerOptions.Builder builder = ConnectionSpannerOptions.newBuilder();
-    if (options.usesEmulator()) {
-      builder.setEmulatorHost(key.host);
-    } else {
-      builder.setHost(key.host);
-    }
     builder
         .setUseVirtualThreads(key.useVirtualGrpcTransportThreads)
         .setClientLibToken(MoreObjects.firstNonNull(key.userAgent, CONNECTION_API_CLIENT_LIB_TOKEN))
+        .setHost(key.host)
         .setProjectId(key.projectId)
         // Use lazy decoding, so we can use the protobuf values for calculating the checksum that is
         // needed for read/write transactions.
@@ -411,6 +407,9 @@ Spanner createSpanner(SpannerPoolKey key, ConnectionOptions options) {
     if (options.getConfigurator() != null) {
       options.getConfigurator().configure(builder);
     }
+    if (options.usesEmulator()) {
+      builder.setEmulatorHost(key.host);
+    }
     return builder.build().getService();
   }