test: attempt to fix flaky test (#1584)

* test: attempt to fix flaky test * fix format * fix BuiltinMetricsIT * revert BuiltinMetricsIT test * address comment * re-throw exception * create a new DynamicFlowControlStats every time * clean up * create a new instance * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: mutianf

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java

@@ -28,6 +28,7 @@
 import com.google.cloud.bigtable.test_helpers.env.TestEnvRule;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -69,29 +70,49 @@ public void testSuccess() throws Exception {
  List<Cluster> clusters = clustersFuture.get(1, TimeUnit.MINUTES);
 
  // give opencensus some time to populate view data
- Thread.sleep(100);
+ for (int i = 0; i < 10; i++) {
+ if (StatsWrapper.getOperationLatencyViewTagValueStrings()
+ .contains(clusters.get(0).getZone())) {
+ break;
+ }
+ Thread.sleep(100);
+ }
 
  List<String> tagValueStrings = StatsWrapper.getOperationLatencyViewTagValueStrings();
  assertThat(tagValueStrings).contains(clusters.get(0).getZone());
  assertThat(tagValueStrings).contains(clusters.get(0).getId());
  }
 
  @Test
- public void testFailure() throws InterruptedException {
+ public void testFailure() throws Exception {
  String rowKey = UUID.randomUUID().toString();
  String familyId = testEnvRule.env().getFamilyId();
 
+ ApiFuture<Void> future =
+ testEnvRule
+ .env()
+ .getDataClient()
+ .mutateRowCallable()
+ .futureCall(
+ RowMutation.create("non-exist-table", rowKey).setCell(familyId, "q", "myVal"));
+
  try {
- testEnvRule
- .env()
- .getDataClient()
- .mutateRowCallable()
- .call(RowMutation.create("non-exist-table", rowKey).setCell(familyId, "q", "myVal"));
- } catch (NotFoundException e) {
+ future.get(1, TimeUnit.MINUTES);
+ } catch (ExecutionException e) {
+ if (e.getCause() instanceof NotFoundException) {
+ // ignore NotFoundException
+ } else {
+ throw e;
+ }
  }
 
  // give opencensus some time to populate view data
- Thread.sleep(100);
+ for (int i = 0; i < 10; i++) {
+ if (StatsWrapper.getOperationLatencyViewTagValueStrings().contains("unspecified")) {
+ break;
+ }
+ Thread.sleep(100);
+ }
 
  List<String> tagValueStrings = StatsWrapper.getOperationLatencyViewTagValueStrings();
  assertThat(tagValueStrings).contains("unspecified");

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

@@ -20,7 +20,6 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.batching.DynamicFlowControlSettings;
-import com.google.api.gax.batching.FlowControlEventStats;
 import com.google.api.gax.batching.FlowController;
 import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
 import com.google.api.gax.grpc.GrpcCallContext;
@@ -40,6 +39,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -60,7 +60,6 @@ public class DynamicFlowControlCallableTest {
  private static final int DEADLINE_EXCEEDED_LATENCY = 501;
 
  private FlowController flowController;
- private FlowControlEventStats flowControlEvents;
  private DynamicFlowControlStats stats;
  private UnaryCallable innerCallable;
  private ApiCallContext context;
@@ -81,7 +80,6 @@ public void setup() {
  .setMinOutstandingRequestBytes(15L)
  .setLimitExceededBehavior(LimitExceededBehavior.Block)
  .build());
- flowControlEvents = flowController.getFlowControlEventStats();
  stats = new DynamicFlowControlStats();
  context = GrpcCallContext.createDefault();
  innerCallable = new MockInnerCallable();
@@ -94,8 +92,18 @@ public void setup() {
  innerCallable, flowController, stats, TARGET_LATENCY_MS, ADJUSTING_INTERVAL_MS);
  }
 
+ @After
+ public void cleanup() {
+ // reset last adjustedTimestamp after each test
+ stats.setLastAdjustedTimestampMs(stats.getLastAdjustedTimestampMs(), 0);
+ }
+
  @Test
  public void testLatenciesAreRecorded() throws Exception {
+ DynamicFlowControlStats stats = new DynamicFlowControlStats();
+ DynamicFlowControlCallable callableToTest =
+ new DynamicFlowControlCallable(
+ innerCallable, flowController, stats, TARGET_LATENCY_MS, ADJUSTING_INTERVAL_MS);
  Map<String, List<String>> extraHeaders = new HashMap<>();
  extraHeaders.put(LATENCY_HEADER, Arrays.asList("5"));
  ApiCallContext newContext = context.withExtraHeaders(extraHeaders);