fix clirr and integration test

mutianf · mutianf · commit f9480e8dcb85 · 2024-03-14T18:59:55.000-04:00
diff --git a/google-cloud-bigtable/clirr-ignored-differences.xml b/google-cloud-bigtable/clirr-ignored-differences.xml
@@ -190,6 +190,7 @@
     <difference>
         <differenceType>7004</differenceType>
         <className>com/google/cloud/bigtable/data/v2/stub/metrics/ErrorCountPerConnectionMetricTracker</className>
+        <method>*</method>
     </difference>
     <difference>
         <differenceType>7012</differenceType>
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java
@@ -207,9 +207,9 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception {
     ProjectName name = ProjectName.of(testEnvRule.env().getProjectId());
 
     // Interval is set in the monarch request when query metric timestamps.
-    // Restrict it to before we send to request and 1 minute after we send the request. If
+    // Restrict it to before we send to request and 3 minute after we send the request. If
     // it turns out to be still flaky we can increase the filter range.
-    Instant end = Instant.now().plus(Duration.ofMinutes(1));
+    Instant end = Instant.now().plus(Duration.ofMinutes(3));
     TimeInterval interval =
         TimeInterval.newBuilder()
             .setStartTime(Timestamps.fromMillis(start.toEpochMilli()))
@@ -271,9 +271,9 @@ public void testBuiltinMetricsWithCustomOTEL() throws Exception {
     Collection<MetricData> fromMetricReader = metricReader.collectAllMetrics();
 
     // Interval is set in the monarch request when query metric timestamps.
-    // Restrict it to before we send to request and 1 minute after we send the request. If
+    // Restrict it to before we send to request and 3 minute after we send the request. If
     // it turns out to be still flaky we can increase the filter range.
-    Instant end = start.plus(Duration.ofMinutes(1));
+    Instant end = start.plus(Duration.ofMinutes(3));
     TimeInterval interval =
         TimeInterval.newBuilder()
             .setStartTime(Timestamps.fromMillis(start.toEpochMilli()))
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java
@@ -42,6 +42,7 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.junit.After;
 import org.junit.Before;
@@ -51,6 +52,8 @@
 public class UnaryMetricsMetadataIT {
   @ClassRule public static TestEnvRule testEnvRule = new TestEnvRule();
 
+  private static final Logger LOGGER = Logger.getLogger(UnaryMetricsMetadataIT.class.getName());
+
   private BigtableDataClient client;
   private InMemoryMetricReader metricReader;
 
@@ -147,14 +150,16 @@ public void testFailure() throws Exception {
       }
     }
 
-    List<MetricData> metrics =
-        metricReader.collectAllMetrics().stream()
-            .filter(m -> m.getName().contains(BuiltinMetricsConstants.OPERATION_LATENCIES_NAME))
-            .collect(Collectors.toList());
+    MetricData metricData = null;
+    for (MetricData md : metricReader.collectAllMetrics()) {
+      if (md.getName().contains(BuiltinMetricsConstants.OPERATION_LATENCIES_NAME)) {
+        metricData = md;
+        break;
+      }
+    }
 
-    assertThat(metrics.size()).isEqualTo(1);
+    assertThat(metricData).isNotNull();
 
-    MetricData metricData = metrics.get(0);
     List<PointData> pointData = new ArrayList<>(metricData.getData().getPoints());
     List<String> clusterAttributes =
         pointData.stream()
