diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java index 770646be7..0d85c75e9 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java @@ -156,6 +156,7 @@ class RpcViewConstants { BIGTABLE_OP, BIGTABLE_STATUS)); + // use distribution so we can correlate batch throttled time with op_latency static final View BIGTABLE_BATCH_THROTTLED_TIME_VIEW = View.create( View.Name.create("cloud.google.com/java/bigtable/batch_throttled_time"), diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/misc_utilities/MethodComparator.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/misc_utilities/MethodComparator.java index e593913cc..4c3ecd274 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/misc_utilities/MethodComparator.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/misc_utilities/MethodComparator.java @@ -31,12 +31,9 @@ public class MethodComparator { MethodComparator::compareMethods, "compare method names, parameters and return types"); private static boolean compareMethods(Method actual, Method expected) { - if (!actual.getName().equals(expected.getName()) - || !Arrays.equals(actual.getParameterTypes(), expected.getParameterTypes()) - || actual.getModifiers() != expected.getModifiers() - || !actual.getReturnType().equals(expected.getReturnType())) { - return false; - } - return true; + return actual.getName().equals(expected.getName()) + && Arrays.equals(actual.getParameterTypes(), expected.getParameterTypes()) + && actual.getModifiers() == expected.getModifiers() + && actual.getReturnType().equals(expected.getReturnType()); } }