From 88c6386e48927b6d7ab24e5ee12ec2413c0ea533 Mon Sep 17 00:00:00 2001
From: Surbhi Garg <gargsurbhi@google.com>
Date: Thu, 11 Sep 2025 17:58:37 +0530
Subject: [PATCH 1/2] fix: disable afe_connectivity_error_count metric

---
 .../com/google/cloud/spanner/spi/v1/HeaderInterceptor.java  | 4 +++-
 .../spanner/OpenTelemetryBuiltInMetricsTracerTest.java      | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/HeaderInterceptor.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/HeaderInterceptor.java
index 252dd2f2ae8..bec062db907 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/HeaderInterceptor.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/HeaderInterceptor.java
@@ -189,7 +189,9 @@ private void processHeader(
           float afeLatency = serverTimingMetrics.get(AFE_TIMING_HEADER);
           compositeTracer.recordAFELatency(afeLatency);
         } else {
-          compositeTracer.recordAfeHeaderMissingCount(1L);
+          // Disable afe_connectivity_error_count metric as AFE header is disabled in backend
+          // currently.
+          // compositeTracer.recordAfeHeaderMissingCount(1L);
         }
       }
     } catch (NumberFormatException e) {
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java
index 103d070f9e0..aeb9487e2ec 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java
@@ -390,9 +390,9 @@ public void testNoServerTimingHeader() throws IOException, InterruptedException
 
     assertFalse(checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_LATENCIES_NAME));
     assertFalse(checkIfMetricExists(metricReader, BuiltInMetricsConstant.GFE_LATENCIES_NAME));
-    MetricData afeConnectivityMetricData =
-        getMetricData(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME);
-    assertThat(getAggregatedValue(afeConnectivityMetricData, expectedAttributes)).isEqualTo(1);
+    // Metric is disabled currently
+    assertFalse(
+        checkIfMetricExists(metricReader, BuiltInMetricsConstant.AFE_CONNECTIVITY_ERROR_NAME));
 
     spannerNoHeader.close();
     serverNoHeader.shutdown();

From c183da52e493df21dd3e6cceb8f6cbdcbad3a51c Mon Sep 17 00:00:00 2001
From: cloud-java-bot <cloud-java-bot@google.com>
Date: Thu, 11 Sep 2025 14:06:44 +0000
Subject: [PATCH 2/2] chore: generate libraries at Thu Sep 11 14:04:02 UTC 2025

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3adfd3137fd..34a4f9e90b6 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-spanner</artifactId>
-  <version>6.93.0</version>
+  <version>6.99.0</version>
 </dependency>
 
 ```