From 2616928b97a8062db32d78fce8973c42231763d6 Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Fri, 17 Jan 2025 22:39:23 -0800
Subject: [PATCH] Wire up and revert some prints

---
 google/cloud/spanner_v1/_helpers.py           |  8 ++++--
 google/cloud/spanner_v1/batch.py              | 27 +++++++------------
 google/cloud/spanner_v1/pool.py               |  3 ---
 .../services/spanner/transports/grpc.py       |  4 +--
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/google/cloud/spanner_v1/_helpers.py b/google/cloud/spanner_v1/_helpers.py
index acc290ff1c..7d471b1bec 100644
--- a/google/cloud/spanner_v1/_helpers.py
+++ b/google/cloud/spanner_v1/_helpers.py
@@ -665,8 +665,12 @@ def inject_retry_header_control(api):
 
     orig_getattribute = getattr(target, "__getattribute__")
 
-    def patched_getattribute(*args, **kwargs):
-        attr = orig_getattribute(*args, **kwargs)
+    def patched_getattribute(obj, key, *args, **kwargs):
+        if key.startswith("_"):
+            return orig_getattribute(obj, key, *args, **kwargs)
+
+        attr = orig_getattribute(obj, key, *args, **kwargs)
+        print("args", args, "attr.dir", dir(attr))
 
         # 0. If we already patched it, we can return immediately.
         if getattr(attr, "_patched", None) is not None:
diff --git a/google/cloud/spanner_v1/batch.py b/google/cloud/spanner_v1/batch.py
index 094e2530db..712a78990d 100644
--- a/google/cloud/spanner_v1/batch.py
+++ b/google/cloud/spanner_v1/batch.py
@@ -25,7 +25,6 @@
 from google.cloud.spanner_v1._helpers import (
     _metadata_with_prefix,
     _metadata_with_leader_aware_routing,
-    AtomicCounter,
 )
 from google.cloud.spanner_v1._opentelemetry_tracing import trace_call
 from google.cloud.spanner_v1 import RequestOptions
@@ -228,18 +227,14 @@ def commit(
             trace_attributes,
             observability_options=observability_options,
         ):
-            attempt = AtomicCounter(0)
-            next_nth_request = database._next_nth_request
-
-            all_metadata = database.metadata_with_request_id(
-                next_nth_request,
-                attempt.increment(),
-                metadata,
-            )
             method = functools.partial(
                 api.commit,
                 request=request,
-                metadata=all_metadata,
+                metadata=database.metadata_with_request_id(
+                    database._next_nth_request,
+                    1,
+                    metadata,
+                ),
             )
 
             deadline = time.time() + kwargs.get(
@@ -359,16 +354,14 @@ def batch_write(self, request_options=None, exclude_txn_from_change_streams=Fals
             trace_attributes,
             observability_options=observability_options,
         ):
-            next_nth_request = database._next_nth_request
-            all_metadata = database.metadata_with_request_id(
-                next_nth_request,
-                0,
-                metadata,
-            )
             method = functools.partial(
                 api.batch_write,
                 request=request,
-                metadata=all_metadata,
+                metadata=database.metadata_with_request_id(
+                    database._next_nth_request,
+                    1,
+                    metadata,
+                ),
             )
 
             response = _retry(
diff --git a/google/cloud/spanner_v1/pool.py b/google/cloud/spanner_v1/pool.py
index 3df85c9d9c..85a2ba4fef 100644
--- a/google/cloud/spanner_v1/pool.py
+++ b/google/cloud/spanner_v1/pool.py
@@ -15,12 +15,10 @@
 """Pools managing shared Session objects."""
 
 import datetime
-import random
 import queue
 import time
 
 from google.cloud.exceptions import NotFound
-from google.api_core.exceptions import ServiceUnavailable
 from google.cloud.spanner_v1 import BatchCreateSessionsRequest
 from google.cloud.spanner_v1 import Session
 from google.cloud.spanner_v1._helpers import (
@@ -253,7 +251,6 @@ def bind(self, database):
                     f"Creating {request.session_count} sessions",
                     span_event_attributes,
                 )
-
                 resp = api.batch_create_sessions(
                     request=request,
                     metadata=database.metadata_with_request_id(
diff --git a/google/cloud/spanner_v1/services/spanner/transports/grpc.py b/google/cloud/spanner_v1/services/spanner/transports/grpc.py
index 239b445d3a..a2afa32174 100644
--- a/google/cloud/spanner_v1/services/spanner/transports/grpc.py
+++ b/google/cloud/spanner_v1/services/spanner/transports/grpc.py
@@ -316,9 +316,7 @@ def batch_create_sessions(
                 request_serializer=spanner.BatchCreateSessionsRequest.serialize,
                 response_deserializer=spanner.BatchCreateSessionsResponse.deserialize,
             )
-        fn = self._stubs["batch_create_sessions"]
-        print("\033[32minvoking batch_create_sessionhex_id", hex(id(fn)), "\033[00m")
-        return fn
+        return self._stubs["batch_create_sessions"]
 
     @property
     def get_session(self) -> Callable[[spanner.GetSessionRequest], spanner.Session]: