From cf9dfea17767c183573db215f91f663c7fb18a7d Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Mon, 16 Dec 2024 06:41:32 -0800
Subject: [PATCH] Address more updates

---
 spanner/read.go              | 9 +++++----
 spanner/request_id_header.go | 4 ----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/spanner/read.go b/spanner/read.go
index 070a4e2719ec..32c3f488050a 100644
--- a/spanner/read.go
+++ b/spanner/read.go
@@ -443,10 +443,12 @@ type resumableStreamDecoder struct {
 
 	gsc *grpcSpannerClient
 
-	// reqIDInjector is generated once per stream, unless the stream gets
-	// broken and this case we generate a new request_number.
+	// reqIDInjector is generated once per stream, unless the stream
+	// gets broken and in that case a fresh one is generated.
 	reqIDInjector *requestIDWrap
-	retryAttempt  uint32
+	// retryAttempt is is incremented whenever a retry happens, and it is
+	// reset whenever a new reqIDInjector is created afresh.
+	retryAttempt uint32
 }
 
 // newResumableStreamDecoder creates a new resumeableStreamDecoder instance.
@@ -615,7 +617,6 @@ func (d *resumableStreamDecoder) next(mt *builtinMetricsTracer) bool {
 					d.resumeToken = d.np.ResumeToken
 					d.changeState(queueingRetryable)
 				}
-				// In this case the stream was connected and we can increment retryAttempt.
 				return true
 			}
 			if d.bytesBetweenResumeTokens >= d.maxBytesBetweenResumeTokens && d.state == queueingRetryable {
diff --git a/spanner/request_id_header.go b/spanner/request_id_header.go
index fcebcc64d7f0..9fcd9377f432 100644
--- a/spanner/request_id_header.go
+++ b/spanner/request_id_header.go
@@ -256,10 +256,6 @@ func (gsc *grpcSpannerClient) generateRequestIDHeaderInjector() *requestIDWrap {
 	return &requestIDWrap{md: md, nthRequest: gsc.nextNthRequest(), gsc: gsc}
 }
 
-func (riw *requestIDWrap) incrementNthRequest() {
-	riw.nthRequest = riw.gsc.nextNthRequest()
-}
-
 func (riw *requestIDWrap) withNextRetryAttempt(attempt uint32) gax.CallOption {
 	riw.gsc.generateAndInsertRequestID(riw.md, riw.nthRequest, attempt)
 	// If no gRPC stream is available, try to initiate one.