From 7b2b7927450699bab5be7690f4cce0283b16bc44 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 10 Nov 2025 11:53:22 +0530 Subject: [PATCH] chore: Fix AFE tests in cloud-devel and staging --- .../spanner/it/ITBuiltInMetricsTest.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) 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 13dda2c442..5806257fd4 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 @@ -24,6 +24,8 @@ import com.google.cloud.spanner.*; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.base.Stopwatch; +import com.google.common.base.Strings; +import com.google.common.truth.IntegerSubject; import com.google.monitoring.v3.ListTimeSeriesRequest; import com.google.monitoring.v3.ListTimeSeriesResponse; import com.google.monitoring.v3.ProjectName; @@ -132,9 +134,15 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception { // disabled. // Keeping this check to enable this check in the future. if (metric.equals("afe_latencies")) { - assertWithMessage("Metric " + metric + " returned data.") - .that(response.getTimeSeriesCount()) - .isEqualTo(0); + IntegerSubject subject = + assertWithMessage("Metric " + metric + " returned data.") + .that(response.getTimeSeriesCount()); + if (isProduction()) { + subject.isEqualTo(0); + } else { + subject.isGreaterThan(0); + } + } else { assertWithMessage("Metric " + metric + " didn't return any data.") .that(response.getTimeSeriesCount()) @@ -142,4 +150,10 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception { } } } + + private boolean isProduction() { + String jobType = System.getenv("JOB_TYPE"); + return !Strings.isNullOrEmpty(jobType) + && !(jobType.contains("devel") || jobType.contains("staging")); + } }