Merge branch 'main' into new-library/ces-C4sNZ

Author: jinseopkim0

.kokoro/build.sh

@@ -33,26 +33,17 @@ if [ -f "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secr
   source "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secrets"
 fi
 
-if [[ -n "${BUILD_SUBDIR}" ]]
-then
-  echo "Compiling and building all modules for ${BUILD_SUBDIR}"
-  mvn clean install \
-    -DskipTests \
-    -Dclirr.skip \
-    -Dflatten.skip \
-    -Dcheckstyle.skip \
-    -Djacoco.skip \
-    -Denforcer.skip \
-    --also-make \
-    --projects "${BUILD_SUBDIR}"
-  echo "Running in subdir: ${BUILD_SUBDIR}"
-  pushd "${BUILD_SUBDIR}"
-fi
-
 RETURN_CODE=0
 
 case ${JOB_TYPE} in
   test)
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+    fi
     echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
     retry_with_backoff 3 10 \
       mvn test \
@@ -67,6 +58,12 @@ case ${JOB_TYPE} in
         -Dmaven.wagon.http.retryHandler.count=5 \
         -T 1C ${SUREFIRE_JVM_OPT}
     RETURN_CODE=$?
+
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "restoring directory"
+      popd
+    fi
     echo "Finished running unit tests"
     ;;
   integration)
@@ -85,6 +82,41 @@ case ${JOB_TYPE} in
       echo "No Integration Tests to run"
     fi
     ;;
+  integration-single)
+    generate_modified_modules_list false
+    if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
+      echo "Not running integration checks -- this is Release Please SNAPSHOT pull request."
+    elif [[ ! " ${modified_module_list[*]} " =~ " ${BUILD_SUBDIR} " ]]; then
+      echo "${BUILD_SUBDIR} not modified, skipping split integration test"
+    else
+      echo "${BUILD_SUBDIR} modified, running split integration test"
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+      echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
+      echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
+      mvn verify -Penable-integration-tests \
+        ${INTEGRATION_TEST_ARGS} \
+        -B -ntp -fae \
+        -DtrimStackTrace=false \
+        -Dclirr.skip=true \
+        -Denforcer.skip=true \
+        -Dorg.slf4j.simpleLogger.showDateTime=true \
+        -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+        -Dcheckstyle.skip=true \
+        -Dflatten.skip=true \
+        -Danimal.sniffer.skip=true \
+        -Djacoco.skip=true \
+        -DskipUnitTests=true \
+        -Dmaven.wagon.http.retryHandler.count=5 \
+        -T 1C ${SUREFIRE_JVM_OPT}
+
+      RETURN_CODE=$?
+      popd
+      printf "Finished integration tests for modules:\n%s\n" "${BUILD_SUBDIR}"
+    fi
+    ;;
   graalvm-presubmit)
     generate_graalvm_presubmit_modules_list
     if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
@@ -109,7 +141,44 @@ case ${JOB_TYPE} in
       echo "Not running GraalVM checks -- No changes in relevant modules"
     fi
     ;;
+  graalvm-single)
+    generate_modified_modules_list false    
+    if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
+      echo "Not running GraalVM checks -- this is Release Please SNAPSHOT pull request."
+    elif [[ ! " ${modified_module_list[*]} " =~ " ${BUILD_SUBDIR} " ]]; then
+      echo "${BUILD_SUBDIR} not modified, skipping split GraalVM test"
+    else
+      echo "${BUILD_SUBDIR} modified, running split GraalVM test"
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+      echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
+      mvn test -Pnative \
+        ${INTEGRATION_TEST_ARGS} \
+        -B -ntp -fae \
+        -DtrimStackTrace=false \
+        -Dclirr.skip=true \
+        -Denforcer.skip=true \
+        -Dorg.slf4j.simpleLogger.showDateTime=true \
+        -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+        -Dcheckstyle.skip=true \
+        -Dflatten.skip=true \
+        -Danimal.sniffer.skip=true
+
+      RETURN_CODE=$?
+      popd
+      printf "Finished GraalVM ITs for modules:\n%s\n" "${BUILD_SUBDIR}"
+    fi
+    ;;
   lint)
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+    fi
     if [ -n "${BASE_SHA}" ] && [ -n "${HEAD_SHA}" ]; then
         changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}")
         echo "${changed_file_list}"
@@ -137,17 +206,17 @@ case ${JOB_TYPE} in
       -T 1.5C \
       com.spotify.fmt:fmt-maven-plugin:check
     mvn -B -ntp checkstyle:check@checkstyle
+
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "restoring directory"
+      popd
+    fi
     ;;
   *) ;;
 
 esac
 
-if [[ -n "${BUILD_SUBDIR}" ]]
-then
-  echo "restoring directory"
-  popd
-fi
-
 if [ "${REPORT_COVERAGE}" == "true" ]; then
   bash ${KOKORO_GFILE_DIR}/codecov.sh
 fi

.kokoro/common.sh

@@ -13,7 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-excluded_modules=('gapic-libraries-bom' 'google-cloud-jar-parent' 'google-cloud-pom-parent' 'java-vertexai')
+excluded_modules=(
+  'gapic-libraries-bom'
+  'google-cloud-jar-parent'
+  'google-cloud-pom-parent'
+  'java-vertexai'
+  'java-logging'
+)
 
 function retry_with_backoff {
   attempts_left=$1
@@ -56,10 +62,8 @@ function retry_with_backoff {
 # Given a folder containing a maven multi-module, assign the variable 'submodules' to a
 # comma-delimited list of <folder>/<submodule>.
 function parse_submodules() {
-  pushd "$1" >/dev/null
-
   submodules_array=()
-  mvn_submodules=$(mvn help:evaluate -Dexpression=project.modules)
+  mvn_submodules=$(mvn help:evaluate -Dexpression=project.modules -pl "$1")
   if mvn_submodules=$(grep '<.*>.*</.*>' <<< "$mvn_submodules"); then
     mvn_submodules=$(sed -e 's/<.*>\(.*\)<\/.*>/\1/g' <<< "$mvn_submodules")
     for submodule in $mvn_submodules; do
@@ -77,8 +81,6 @@ function parse_submodules() {
     echo "${submodules_array[*]}"
   )
   export submodules
-
-  popd >/dev/null
 }
 
 # Given a list of folders containing maven multi-modules, assign the variable 'all_submodules' to a
@@ -155,6 +157,13 @@ function release_please_snapshot_pull_request() {
   fi
 }
 
+# Sets bash variables for maven_modules and modified_module_list
+# maven_modules is the list of all maven submodules of the root pom
+# modified_module_list is the subset of maven_modules that have been touched
+# in the current pull request
+#
+# The first positional argument is a value true/false. If true (default), then
+# exclude modules from the global exclusion list.
 function generate_modified_modules_list() {
   # Find the files changed from when the PR branched to the last commit
   # Filter for java modules and get all the unique elements
@@ -167,11 +176,19 @@ function generate_modified_modules_list() {
   # Generate the list of valid maven modules
   maven_modules_list=$(mvn help:evaluate -Dexpression=project.modules | grep '<.*>.*</.*>' | sed -e 's/<.*>\(.*\)<\/.*>/\1/g')
   maven_modules=()
-  for module in $maven_modules_list; do
-    if [[ ! " ${excluded_modules[*]} " =~ " ${module} " ]]; then
-      maven_modules+=("${module}")
-    fi
-  done
+
+  # If the first argument is "true" (default), then use the module exclusion list
+  use_exclusion_list=${1:-true}
+  if [[ "${use_exclusion_list}" == "true" ]]; then
+    echo "Excluding modules from the global exclusion list"
+    for module in $maven_modules_list; do
+      if [[ ! " ${excluded_modules[*]} " =~ " ${module} " ]]; then
+        maven_modules+=("${module}")
+      fi
+    done
+  else
+    maven_modules=(${maven_modules_list[*]})
+  fi
 
   modified_module_list=()
   # If either parent pom.xml is touched, run ITs on all the modules

.kokoro/dependencies.sh

@@ -51,6 +51,8 @@ export MAVEN_OPTS=$(determineMavenOpts)
 
 if [[ -n "${BUILD_SUBDIR}" ]]
 then
+  echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+  install_modules "${BUILD_SUBDIR}"
   echo "Running in subdir: ${BUILD_SUBDIR}"
   pushd "${BUILD_SUBDIR}"
 fi

.kokoro/presubmit/logging-graalvm-native-presubmit.cfg

@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.56.1"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm-single"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "cloud-java-ci-test"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "cloud-java-ci-test"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/cloud-java-ci-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
+}
+
+env_vars: {
+  key: "BUILD_SUBDIR"
+  value: "java-logging"
+}

.kokoro/presubmit/logging-integration.cfg

@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration-single"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "cloud-java-ci-test"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "cloud-java-ci-test"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/cloud-java-ci-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
+}
+
+env_vars: {
+  key: "BUILD_SUBDIR"
+  value: "java-logging"
+}

generation_config.yaml

@@ -1,5 +1,5 @@
 gapic_generator_version: 2.66.1
-googleapis_commitish: 39bd091b055e331a4917143355ab7afa83b7130c
+googleapis_commitish: 6eead6ed94bddc12fe22189880a0b8f722c70478
 libraries_bom_version: 26.75.0
 libraries:
 - api_shortname: accessapproval

java-aiplatform/README.md

@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-aiplatform</artifactId>
-  <version>3.84.0</version>
+  <version>3.85.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-aiplatform:3.84.0'
+implementation 'com.google.cloud:google-cloud-aiplatform:3.85.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-aiplatform" % "3.84.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-aiplatform" % "3.85.0"
 ```
 
 ## Authentication
@@ -175,7 +175,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-aiplatform/latest/overview
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-aiplatform.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-aiplatform/3.84.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-aiplatform/3.85.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles