update

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

@@ -30,6 +30,7 @@
 import com.google.cloud.bigtable.data.v2.stub.BigtableBatchingCallSettings;
 import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStubSettings;
 import com.google.cloud.bigtable.data.v2.stub.metrics.MetricsProvider;
+import com.google.cloud.bigtable.data.v2.stub.metrics.NoopMetricsProvider;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import io.grpc.ManagedChannelBuilder;
@@ -127,6 +128,7 @@ public static Builder newBuilderForEmulator(String hostname, int port) {
         .setEndpoint(hostname + ":" + port)
         // disable channel refreshing when creating an emulator
         .setRefreshingChannel(false)
+        .setMetricsProvider(NoopMetricsProvider.INSTANCE) // disable exporting metrics for emulator
         .setTransportChannelProvider(
             InstantiatingGrpcChannelProvider.newBuilder()
                 .setMaxInboundMessageSize(256 * 1024 * 1024)

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

@@ -73,9 +73,7 @@ public static BigtableClientContext create(EnhancedBigtableStubSettings settings
       // the OTEL instance and log the exception instead.
       openTelemetry =
           getOpenTelemetryFromMetricsProvider(
-              settings.getMetricsProvider(),
-              credentials,
-              settings.getMetricsEndpoint());
+              settings.getMetricsProvider(), credentials, settings.getMetricsEndpoint());
     } catch (Throwable t) {
       logger.log(Level.WARNING, "Failed to get OTEL, will skip exporting client side metrics", t);
     }

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/DefaultMetricsProvider.java

@@ -17,17 +17,11 @@
 
 import com.google.api.core.InternalApi;
 import com.google.auth.Credentials;
-<<<<<<< HEAD
-import com.google.auto.value.AutoValue;
-import com.google.common.base.MoreObjects;
-=======
->>>>>>> main
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
 /**
@@ -45,8 +39,7 @@ private DefaultMetricsProvider() {}
 
   @InternalApi
   public OpenTelemetry getOpenTelemetry(
- @Nullable String metricsEndpoint, @Nullable Credentials credentials)
-      throws IOException {
+      @Nullable String metricsEndpoint, @Nullable Credentials credentials) throws IOException {
     SdkMeterProviderBuilder meterProvider = SdkMeterProvider.builder();
     BuiltinMetricsView.registerBuiltinMetrics(credentials, meterProvider, metricsEndpoint);
     return OpenTelemetrySdk.builder().setMeterProvider(meterProvider.build()).build();

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

@@ -825,15 +825,16 @@ public void testExecuteQueryWaitTimeoutWorksWithMetadataFuture()
     settings.setStreamWatchdogProvider(
         InstantiatingWatchdogProvider.create().withCheckInterval(WATCHDOG_CHECK_DURATION));
 
-    EnhancedBigtableStub stub = EnhancedBigtableStub.create(settings.build());
-    ApiFuture<ResultSetMetadata> future =
-        stub.executeQueryCallable().call(Statement.of(WAIT_TIME_QUERY)).metadataFuture();
-
-    ExecutionException e = assertThrows(ExecutionException.class, future::get);
-    assertThat(e.getCause()).isInstanceOf(WatchdogTimeoutException.class);
-    assertThat(e.getCause().getMessage())
-        .contains("Canceled due to timeout waiting for next response");
-    assertThat(e).hasMessageThat().contains("Canceled due to timeout waiting for next response");
+    try (EnhancedBigtableStub stub = EnhancedBigtableStub.create(settings.build())) {
+      ApiFuture<ResultSetMetadata> future =
+          stub.executeQueryCallable().call(Statement.of(WAIT_TIME_QUERY)).metadataFuture();
+
+      ExecutionException e = assertThrows(ExecutionException.class, future::get);
+      assertThat(e.getCause()).isInstanceOf(WatchdogTimeoutException.class);
+      assertThat(e.getCause().getMessage())
+          .contains("Canceled due to timeout waiting for next response");
+      assertThat(e).hasMessageThat().contains("Canceled due to timeout waiting for next response");
+    }
   }
 
   private static class MetadataInterceptor implements ServerInterceptor {