From 441c1b03c3e976c6304a99fefd93b5c4291e5364 Mon Sep 17 00:00:00 2001
From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
Date: Fri, 4 Aug 2023 11:30:15 +0530
Subject: [PATCH] feat: Enable leader aware routing by default (#2567)

BEGIN_COMMIT_OVERRIDE
feat: Enable leader aware routing by default. This update contains performance optimisations that will reduce the latency of read/write transactions that originate from a region other than the default leader region.
END_COMMIT_OVERRIDE
---
 .../src/main/java/com/google/cloud/spanner/SpannerOptions.java | 2 +-
 .../test/java/com/google/cloud/spanner/SpannerOptionsTest.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
index 2f3bf10f9aa..5df163ecd87 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
@@ -700,7 +700,7 @@ public static class Builder
     private CloseableExecutorProvider asyncExecutorProvider;
     private String compressorName;
     private String emulatorHost = System.getenv("SPANNER_EMULATOR_HOST");
-    private boolean leaderAwareRoutingEnabled = false;
+    private boolean leaderAwareRoutingEnabled = true;
 
     private Builder() {
       // Manually set retry and polling settings that work.
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
index 03844a6b105..7061e255758 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
@@ -680,8 +680,7 @@ public void testCompressorName() {
 
   @Test
   public void testLeaderAwareRoutingEnablement() {
-    assertFalse(
-        SpannerOptions.newBuilder().setProjectId("p").build().isLeaderAwareRoutingEnabled());
+    assertTrue(SpannerOptions.newBuilder().setProjectId("p").build().isLeaderAwareRoutingEnabled());
     assertTrue(
         SpannerOptions.newBuilder()
             .setProjectId("p")