chore: merge main into generate-libraries-main

Author: cloud-java-bot

.github/workflows/unmanaged_dependency_check.yaml

@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.57.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.58.0
       with:
         bom-path: google-cloud-bigtable-bom/pom.xml

google-cloud-bigtable-bom/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>sdk-platform-java-config</artifactId>
-        <version>3.57.0</version>
+        <version>3.58.0</version>
         <relativePath/>
     </parent>
 

google-cloud-bigtable-deps-bom/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.57.0</version>
+    <version>3.58.0</version>
     <relativePath/>
   </parent>
 
@@ -68,7 +68,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>gapic-libraries-bom</artifactId>
-        <version>1.80.0</version>
+        <version>1.82.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamRetryTest.java

@@ -40,6 +40,7 @@
 import com.google.cloud.bigtable.data.v2.models.CloseStream;
 import com.google.cloud.bigtable.data.v2.models.Heartbeat;
 import com.google.cloud.bigtable.data.v2.models.ReadChangeStreamQuery;
+import com.google.cloud.bigtable.data.v2.stub.metrics.NoopMetricsProvider;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Queues;
 import com.google.common.truth.Truth;
@@ -86,10 +87,12 @@ public void setUp() throws IOException {
     serverRule.getServiceRegistry().addService(service);
 
     BigtableDataSettings.Builder settings =
-        BigtableDataSettings.newBuilderForEmulator(serverRule.getServer().getPort())
+        BigtableDataSettings.newBuilder()
             .setProjectId(PROJECT_ID)
             .setInstanceId(INSTANCE_ID)
-            .setCredentialsProvider(NoCredentialsProvider.create());
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .setMetricsProvider(NoopMetricsProvider.INSTANCE)
+            .disableInternalMetrics();
 
     settings
         .stubSettings()

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>sdk-platform-java-config</artifactId>
-        <version>3.57.0</version>
+        <version>3.58.0</version>
         <relativePath/>
     </parent>