From f762e8f2faeceef50c3011e33624f1f3a2db1fb2 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 10 Nov 2025 16:06:15 +0530 Subject: [PATCH 1/2] chore: Fix AFE metric in cloud-staging --- .../google/cloud/spanner/it/ITBuiltInMetricsTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 5806257fd4..82628eb812 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,9 @@ 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")); + && jobType.contains("devel"); } } From bd39ae95f59312c31ed88150678665751d4bf526 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 10 Nov 2025 10:40:22 +0000 Subject: [PATCH 2/2] chore: generate libraries at Mon Nov 10 10:37:33 UTC 2025 --- .../java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 82628eb812..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 @@ -153,7 +153,6 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception { private boolean isAfeMetricEnabled() { String jobType = System.getenv("JOB_TYPE"); - return !Strings.isNullOrEmpty(jobType) - && jobType.contains("devel"); + return !Strings.isNullOrEmpty(jobType) && jobType.contains("devel"); } }