Merge branch 'main' into support_batch_dml_update_count

Author: sakthivelmanii

.kokoro/build.sh

@@ -104,7 +104,7 @@ integration)
       verify
     RETURN_CODE=$?
     ;;
-integration-directpath-enabled)
+integration-regular-sessions)
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
       -Penable-integration-tests \
@@ -113,13 +113,13 @@ integration-directpath-enabled)
       -Dclirr.skip=true \
       -Denforcer.skip=true \
       -Dmaven.main.skip=true \
-      -Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-directpath \
-      -Dspanner.gce.config.project_id=span-cloud-testing \
+      -Dspanner.gce.config.project_id=gcloud-devel \
+      -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-regular-sessions \
       -fae \
       verify
     RETURN_CODE=$?
     ;;
-integration-multiplexed-sessions-enabled)
+integration-directpath-enabled)
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
       -Penable-integration-tests \
@@ -129,7 +129,7 @@ integration-multiplexed-sessions-enabled)
       -Denforcer.skip=true \
       -Dmaven.main.skip=true \
       -Dspanner.gce.config.project_id=gcloud-devel \
-      -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-multiplexed-sessions \
+      -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-directpath \
       -fae \
       verify
     RETURN_CODE=$?
@@ -184,12 +184,14 @@ integration-cloud-staging|integration-cloud-staging-directpath-enabled)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests
+    # NOTE: These integration tests run on the Emulator.
+    mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-graalvm
     RETURN_CODE=$?
     ;;
 graalvm17)
     # Run Unit and Integration Tests with Native Image
-    mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests
+    # NOTE: These integration tests run on the Emulator.
+    mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-graalvm
     RETURN_CODE=$?
     ;;
 slowtests)

.kokoro/presubmit/integration-directpath-enabled.cfg

@@ -24,12 +24,12 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-client-testing"
+  value: "secret_manager/java-it-service-account"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "java-client-testing"
+  value: "java-it-service-account"
 }
 
 env_vars: {

.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg

@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "integration"
+  value: "integration-regular-sessions"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

.kokoro/presubmit/integration-regular-sessions-enabled.cfg

@@ -64,6 +64,7 @@
                 <spanner.testenv.instance>${spanner.testenv.instance}</spanner.testenv.instance>
                 <spanner.gce.config.project_id>${spanner.gce.config.project_id}</spanner.gce.config.project_id>
                 <spanner.testenv.kms_key.name>${spanner.testenv.kms_key.name}</spanner.testenv.kms_key.name>
+                <java.util.logging.config.file>logging.properties</java.util.logging.config.file>
               </systemPropertyVariables>
 
             </configuration>
@@ -88,6 +89,7 @@
             <spanner.testenv.instance>${spanner.testenv.instance}</spanner.testenv.instance>
             <spanner.gce.config.project_id>${spanner.gce.config.project_id}</spanner.gce.config.project_id>
             <spanner.testenv.kms_key.name>${spanner.testenv.kms_key.name}</spanner.testenv.kms_key.name>
+            <java.util.logging.config.file>logging.properties</java.util.logging.config.file>
           </systemPropertyVariables>
           <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
         </configuration>
@@ -124,6 +126,7 @@
             <buildArg>-Dspanner.testenv.instance=${spanner.testenv.instance}</buildArg>
             <buildArg>-Dspanner.gce.config.project_id=${spanner.gce.config.project_id}</buildArg>
             <buildArg>-Dspanner.testenv.kms_key.name=${spanner.testenv.kms_key.name}</buildArg>
+            <buildArg>-Djava.util.logging.config.file=logging.properties</buildArg>
           </buildArgs>
         </configuration>
       </plugin>

google-cloud-spanner/pom.xml

@@ -141,8 +141,7 @@ protected void before() throws Throwable {
         .anyMatch(testEnvOption -> TestEnvOptions.USE_END_TO_END_TRACING.equals(testEnvOption))) {
       // OpenTelemetry set up for enabling End to End tracing for all integration test env.
       // The gRPC stub and connections are created during test env set up using SpannerOptions and
-      // are
-      // reused for executing statements.
+      // are reused for executing statements.
       options = spannerOptionsWithEndToEndTracing(options);
     }
     String instanceProperty = System.getProperty(TEST_INSTANCE_PROPERTY, "");
@@ -293,7 +292,7 @@ static boolean isRetryableResourceExhaustedException(SpannerException exception)
   }
 
   private void cleanUpOldDatabases(InstanceId instanceId) {
-    long OLD_DB_THRESHOLD_SECS = TimeUnit.SECONDS.convert(6L, TimeUnit.HOURS);
+    long OLD_DB_THRESHOLD_SECS = TimeUnit.SECONDS.convert(2L, TimeUnit.HOURS);
     Timestamp currentTimestamp = Timestamp.now();
     int numDropped = 0;
     String TEST_DB_REGEX = "(testdb_(.*)_(.*))|(mysample-(.*))";

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

@@ -44,6 +44,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
 import java.util.logging.StreamHandler;
@@ -211,7 +212,8 @@ private void attachLogCapturer() {
       currentLogger = currentLogger.getParent();
     }
     if (handlers.length == 0) {
-      throw new IllegalStateException("no handlers found for logger");
+      handlers = new Handler[1];
+      handlers[0] = new ConsoleHandler();
     }
     customLogHandler = new StreamHandler(logCapturingStream, handlers[0].getFormatter());
     useParentHandlers = log.getUseParentHandlers();
@@ -267,6 +269,7 @@ public void testRemoveConnectionConnectionAlreadyRemoved() {
 
   @Test
   public void testCloseSpanner() {
+    attachLogCapturer();
     SpannerPool pool = createSubjectAndMocks();
     Spanner spanner = pool.getSpanner(options1, connection1);
     // verify that closing is not possible until all connections have been removed

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SpannerPoolTest.java

@@ -0,0 +1,7 @@
+.level=INFO
+.handlers=java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level=INFO
+java.util.logging.Logger.useParentHandlers=true
+
+# Set log level to WARN for SpannerImpl to prevent log spamming of the Spanner configuration.
+com.google.cloud.spanner.SpannerImpl.LEVEL=WARN