Merge branch 'main' into enable_default

Author: mutianf

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.67.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.68.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

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

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

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

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

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

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

README.md

@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.77.0')
+implementation platform('com.google.cloud:libraries-bom:26.79.0')
 
 implementation 'com.google.cloud:google-cloud-bigtable'
 ```

generation_config.yaml

@@ -1,6 +1,6 @@
-gapic_generator_version: 2.67.0
-googleapis_commitish: 6f8a554039638f4a9ca78d5f0c964281a16f4166
-libraries_bom_version: 26.77.0
+gapic_generator_version: 2.68.0
+googleapis_commitish: cd090841ab172574e740c214c99df00aef9c0dee
+libraries_bom_version: 26.79.0
 template_excludes:
   - .gitignore
   - .kokoro/presubmit/integration.cfg

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java

@@ -37,6 +37,7 @@
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.api.gax.rpc.OperationCallSettings;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.PagedCallSettings;
@@ -189,6 +190,7 @@
  * }</pre>
  */
 @Generated("by gapic-generator-java")
+@SuppressWarnings("CanonicalDuration")
 public class BigtableInstanceAdminStubSettings
     extends StubSettings<BigtableInstanceAdminStubSettings> {
   /** The default scopes of the service. */
@@ -867,6 +869,14 @@ protected BigtableInstanceAdminStubSettings(Builder settingsBuilder) throws IOEx
     deleteMaterializedViewSettings = settingsBuilder.deleteMaterializedViewSettings().build();
   }
 
+  @Override
+  protected LibraryMetadata getLibraryMetadata() {
+    return LibraryMetadata.newBuilder()
+        .setArtifactName("com.google.cloud:google-cloud-bigtable")
+        .setRepository("googleapis/java-bigtable")
+        .build();
+  }
+
   /** Builder for BigtableInstanceAdminStubSettings. */
   public static class Builder
       extends StubSettings.Builder<BigtableInstanceAdminStubSettings, Builder> {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java

@@ -38,6 +38,7 @@
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.api.gax.rpc.OperationCallSettings;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.PagedCallSettings;
@@ -197,6 +198,7 @@
  * }</pre>
  */
 @Generated("by gapic-generator-java")
+@SuppressWarnings("CanonicalDuration")
 public class BigtableTableAdminStubSettings extends StubSettings<BigtableTableAdminStubSettings> {
   /** The default scopes of the service. */
   private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
@@ -947,6 +949,14 @@ protected BigtableTableAdminStubSettings(Builder settingsBuilder) throws IOExcep
     deleteSchemaBundleSettings = settingsBuilder.deleteSchemaBundleSettings().build();
   }
 
+  @Override
+  protected LibraryMetadata getLibraryMetadata() {
+    return LibraryMetadata.newBuilder()
+        .setArtifactName("com.google.cloud:google-cloud-bigtable")
+        .setRepository("googleapis/java-bigtable")
+        .build();
+  }
+
   /** Builder for BigtableTableAdminStubSettings. */
   public static class Builder
       extends StubSettings.Builder<BigtableTableAdminStubSettings, Builder> {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/Main.java

@@ -194,7 +194,7 @@ public void onFailure(Throwable throwable) {
               RuntimeException asyncWrapper = new RuntimeException("export failed", throwable);
               asyncWrapper.setStackTrace(stackTrace);
 
-              if (state.get() != State.Closing || state.get() != State.Closed) {
+              if (state.get() != State.Closing && state.get() != State.Closed) {
                 // ignore the export warning when client is shutting down
                 LOGGER.log(Level.WARNING, msg, asyncWrapper);
               }