Add span events

Author: odeke-em

google/cloud/spanner_v1/pool.py

@@ -223,7 +223,7 @@ def bind(self, database):
             if self._sessions.full():
                 if span:
                     span.add_event(
-                        "Session pool is already full", {"kind": "fixed_size_pool"}
+                        "Session pool is already full", span_event_attributes
                     )
                 return
 
@@ -395,7 +395,6 @@ def get(self):
                     )
                 session = self._new_session()
                 session.create()
-
         return session
 
     def put(self, session):

google/cloud/spanner_v1/session.py

@@ -171,8 +171,16 @@ def exists(self):
         :rtype: bool
         :returns: True if the session exists on the back-end, else False.
         """
+        current_span = get_current_span()
         if self._session_id is None:
+            current_span.add_event("Checking if Session failed due to unset session_id")
             return False
+
+        if current_span:
+            current_span.add_event(
+                "Checking if Session exists", {"session.id": self._session_id}
+            )
+
         api = self._database.spanner_api
         metadata = _metadata_with_prefix(self._database.name)
         if self._database._route_to_leader_enabled:
@@ -206,8 +214,17 @@ def delete(self):
         :raises ValueError: if :attr:`session_id` is not already set.
         :raises NotFound: if the session does not exist
         """
+        current_span = get_current_span()
         if self._session_id is None:
+            if current_span:
+                current_span.add_event(
+                    "Deleting Session failed due to unset session_id"
+                )
             raise ValueError("Session ID not set by back-end")
+
+        if current_span:
+            current_span.add_event("Deleting Session", {"session.id": self._session_id})
+
         api = self._database.spanner_api
         metadata = _metadata_with_prefix(self._database.name)
         observability_options = getattr(self._database, "observability_options", None)

google/cloud/spanner_v1/transaction.py

@@ -261,6 +261,7 @@ def commit(
             request_options = RequestOptions(request_options)
         if self.transaction_tag is not None:
             request_options.transaction_tag = self.transaction_tag
+
         # Request tags are not supported for commit requests.
         request_options.request_tag = None
 
@@ -308,6 +309,7 @@ def beforeNextRetry(nthRetry, delayInSeconds):
 
             if span:
                 span.add_event("Commit Done")
+
         self.committed = response.commit_timestamp
         if return_commit_stats:
             self.commit_stats = response.commit_stats
@@ -449,7 +451,7 @@ def execute_update(
                 response = self._execute_request(
                     method,
                     request,
-                    "CloudSpanner.execute_update",
+                    "CloudSpanner.ReadWriteTransaction",
                     self._session,
                     trace_attributes,
                     observability_options=observability_options,
@@ -466,7 +468,7 @@ def execute_update(
             response = self._execute_request(
                 method,
                 request,
-                "CloudSpanner.execute_update",
+                "CloudSpanner.ReadWriteTransaction",
                 self._session,
                 trace_attributes,
                 observability_options=observability_options,