Wire up and revert some prints

Author: odeke-em

google/cloud/spanner_v1/_helpers.py

@@ -752,8 +752,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:

google/cloud/spanner_v1/batch.py

@@ -250,20 +250,15 @@ def commit(
             observability_options=observability_options,
             metadata=metadata,
         ), MetricsCapture():
-            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(
                 "timeout_secs", DEFAULT_RETRY_TIMEOUT_SECS
             )
@@ -382,18 +377,15 @@ def batch_write(self, request_options=None, exclude_txn_from_change_streams=Fals
             observability_options=observability_options,
             metadata=metadata,
         ), MetricsCapture():
-            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(
                 method,
                 allowed_exceptions={

google/cloud/spanner_v1/database.py

@@ -792,7 +792,6 @@ def execute_pdml():
                         query_options=query_options,
                         request_options=request_options,
                     )
-
                     method = functools.partial(
                         api.execute_streaming_sql,
                         metadata=self.metadata_with_request_id(

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 (
@@ -257,7 +255,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(

google/cloud/spanner_v1/services/spanner/transports/grpc.py

@@ -413,9 +413,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]:

google/cloud/spanner_v1/session.py

@@ -207,10 +207,6 @@ def exists(self):
                 )
             )
 
-        all_metadata = database.metadata_with_request_id(
-            database._next_nth_request, 1, metadata
-        )
-
         observability_options = getattr(self._database, "observability_options", None)
         with trace_call(
             "CloudSpanner.GetSession",
@@ -219,7 +215,12 @@ def exists(self):
             metadata=metadata,
         ) as span, MetricsCapture():
             try:
-                api.get_session(name=self.name, metadata=all_metadata)
+                api.get_session(
+                    name=self.name,
+                    metadata=database.metadata_with_request_id(
+                        database._next_nth_request, 1, metadata
+                    ),
+                )
                 if span:
                     span.set_attribute("session_found", True)
             except NotFound: