diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java index 5806257fd4..f430ce1060 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java @@ -137,10 +137,10 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception { IntegerSubject subject = assertWithMessage("Metric " + metric + " returned data.") .that(response.getTimeSeriesCount()); - if (isProduction()) { - subject.isEqualTo(0); - } else { + if (isAfeMetricEnabled()) { subject.isGreaterThan(0); + } else { + subject.isEqualTo(0); } } else { @@ -151,9 +151,8 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception { } } - private boolean isProduction() { + private boolean isAfeMetricEnabled() { String jobType = System.getenv("JOB_TYPE"); - return !Strings.isNullOrEmpty(jobType) - && !(jobType.contains("devel") || jobType.contains("staging")); + return !Strings.isNullOrEmpty(jobType) && jobType.contains("devel"); } }