feat: Enable Multiplex session by default

sakthivelmanii · sakthivelmanii · commit 6fd894e0bf2e · 2025-06-17T14:43:49.000+05:30
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,6 +36,7 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   units-with-multiplexed-session:
     runs-on: ubuntu-latest
     strategy:
@@ -52,7 +53,6 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
         GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
         GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
   units-java8:
@@ -74,6 +74,7 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   units-with-multiplexed-session8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units-with-multiplexed-session (8)"
@@ -93,7 +94,6 @@ jobs:
       - run: .kokoro/build.sh
         env:
           JOB_TYPE: test
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
           GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
           GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
   windows:
@@ -116,6 +116,7 @@ jobs:
     - run: .kokoro/build.bat
       env:
         JOB_TYPE: test
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   dependencies:
     runs-on: ubuntu-latest
     strategy:
diff --git a/.github/workflows/integration-tests-against-emulator-with-multiplexed-session.yaml b/.github/workflows/integration-tests-against-emulator-with-multiplexed-session.yaml
@@ -38,5 +38,4 @@ jobs:
             -Dmaven.main.skip=true -fae verify
       env:
         JOB_TYPE: test
-        SPANNER_EMULATOR_HOST: localhost:9010
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
+        SPANNER_EMULATOR_HOST: localhost:9010
diff --git a/.github/workflows/integration-tests-against-emulator.yaml b/.github/workflows/integration-tests-against-emulator.yaml
@@ -37,6 +37,7 @@ jobs:
             -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \
             -Dmaven.main.skip=true -fae verify
       env:
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
         JOB_TYPE: test
         SPANNER_EMULATOR_HOST: localhost:9010
         GOOGLE_CLOUD_PROJECT: emulator-test-project
diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg
@@ -28,3 +28,8 @@ env_vars: {
   key: "GCLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
+}
diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg
@@ -29,3 +29,7 @@ env_vars: {
   value: "gcloud-devel"
 }
 
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
+}
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -35,4 +35,9 @@ env_vars: {
 env_vars: {
   key: "IT_SERVICE_ACCOUNT_EMAIL"
   value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
 }
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -35,4 +35,9 @@ env_vars: {
 env_vars: {
   key: "IT_SERVICE_ACCOUNT_EMAIL"
   value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
 }
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -35,4 +35,9 @@ env_vars: {
 env_vars: {
   key: "IT_SERVICE_ACCOUNT_EMAIL"
   value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
 }
diff --git a/.kokoro/presubmit/integration-directpath-enabled.cfg b/.kokoro/presubmit/integration-directpath-enabled.cfg
@@ -35,4 +35,9 @@ env_vars: {
 env_vars: {
     key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
     value: "true"
+}
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
 }
diff --git a/.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg b/.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg
@@ -32,11 +32,6 @@ env_vars: {
   value: "java-it-service-account"
 }
 
-env_vars: {
-    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
-    value: "true"
-}
-
 env_vars: {
     key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS"
     value: "true"
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
@@ -32,3 +32,7 @@ env_vars: {
   value: "java-it-service-account"
 }
 
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
+}
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
@@ -36,3 +36,8 @@ env_vars: {
   key: "ENABLE_BUILD_COP"
   value: "true"
 }
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
+    value: "false"
+}
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
@@ -613,7 +613,7 @@ public static class Builder {
 
     // This field controls the default behavior of session management in Java client.
     // Set useMultiplexedSession to true to make multiplexed session the default.
-    private boolean useMultiplexedSession = false;
+    private boolean useMultiplexedSession = true;
 
     // This field controls the default behavior of session management for RW operations in Java
     // client.
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientTest.java
@@ -116,7 +116,7 @@ public void testMaintainer() {
   @Test
   public void testDisableMultiplexedSessionEnvVar() throws Exception {
     assumeTrue(isJava8() && !isWindows());
-    assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
+    assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
 
     // Assert that the mux sessions setting is respected by default.
     assertTrue(
@@ -147,7 +147,7 @@ public void testDisableMultiplexedSessionEnvVar() throws Exception {
   @Test
   public void testEnableMultiplexedSessionEnvVar() throws Exception {
     assumeTrue(isJava8() && !isWindows());
-    assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
+    assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
 
     // Assert that the mux sessions setting is respected by default.
     assertFalse(
@@ -178,7 +178,7 @@ public void testEnableMultiplexedSessionEnvVar() throws Exception {
   @Test
   public void testIgnoreMultiplexedSessionEnvVar() throws Exception {
     assumeTrue(isJava8() && !isWindows());
-    assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
+    assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
 
     // Assert that the mux sessions setting is respected by default.
     assertFalse(
@@ -209,7 +209,7 @@ public void testIgnoreMultiplexedSessionEnvVar() throws Exception {
   @Test
   public void testThrowExceptionMultiplexedSessionEnvVarInvalidValues() throws Exception {
     assumeTrue(isJava8() && !isWindows());
-    assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
+    assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
 
     // Assert that the mux sessions setting is respected by default.
     assertFalse(

Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,8 @@ env_vars: {`
`28`	`28`	`key: "GCLOUD_PROJECT"`
`29`	`29`	`value: "gcloud-devel"`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+env_vars: {`
	`33`	`+ key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"`
	`34`	`+ value: "false"`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,7 @@ env_vars: {`
`29`	`29`	`value: "gcloud-devel"`
`30`	`30`	`}`
`31`	`31`
	`32`	`+env_vars: {`
	`33`	`+ key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"`
	`34`	`+ value: "false"`
	`35`	`+}`