chore: Fix AFE metric in cloud-staging (#4202)

sakthivelmanii · cloud-java-bot · web-flow · commit 58f2dd6b89cf · 2025-11-10T16:51:14.000+05:30
* chore: Fix AFE metric in cloud-staging

* chore: generate libraries at Mon Nov 10 10:37:33 UTC 2025

---------

Co-authored-by: cloud-java-bot &lt;cloud-java-bot@google.com&gt;
diff --git a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java b/java-spanner/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");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,10 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception {`
`137`	`137`	`IntegerSubject subject =`
`138`	`138`	`assertWithMessage("Metric " + metric + " returned data.")`
`139`	`139`	`.that(response.getTimeSeriesCount());`
`140`		`- if (isProduction()) {`
`141`		`- subject.isEqualTo(0);`
`142`		`- } else {`
	`140`	`+ if (isAfeMetricEnabled()) {`
`143`	`141`	`subject.isGreaterThan(0);`
	`142`	`+ } else {`
	`143`	`+ subject.isEqualTo(0);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`} else {`
`@@ -151,9 +151,8 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- private boolean isProduction() {`
	`154`	`+ private boolean isAfeMetricEnabled() {`
`155`	`155`	`String jobType = System.getenv("JOB_TYPE");`
`156`		`- return !Strings.isNullOrEmpty(jobType)`
`157`		`- && !(jobType.contains("devel") \|\| jobType.contains("staging"));`
	`156`	`+ return !Strings.isNullOrEmpty(jobType) && jobType.contains("devel");`
`158`	`157`	`}`
`159`	`158`	`}`