Check if span is not None before annotations in beforeNextRetry

googleapis · Nov 15, 2024 · 2d4cbca · 2d4cbca
1 parent b5067da
commit 2d4cbca
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/google/cloud/spanner_v1/transaction.py b/google/cloud/spanner_v1/transaction.py
@@ -169,10 +169,11 @@ def begin(self):
             )
 
             def beforeNextRetry(nthRetry, delayInSeconds):
-                span.add_event(
-                    "Transaction Begin Attempt Failed. Retrying",
-                    {"attempt": nthRetry, "sleep_seconds": delayInSeconds},
-                )
+                if span:
+                    span.add_event(
+                        "Transaction Begin Attempt Failed. Retrying",
+                        {"attempt": nthRetry, "sleep_seconds": delayInSeconds},
+                    )
 
             response = _retry(
                 method,
@@ -294,17 +295,20 @@ def commit(
             )
 
             def beforeNextRetry(nthRetry, delayInSeconds):
-                span.add_event(
-                    "Transaction Commit Attempt Failed. Retrying",
-                    {"attempt": nthRetry, "sleep_seconds": delayInSeconds},
-                )
+                if span:
+                    span.add_event(
+                        "Transaction Commit Attempt Failed. Retrying",
+                        {"attempt": nthRetry, "sleep_seconds": delayInSeconds},
+                    )
 
             response = _retry(
                 method,
                 allowed_exceptions={InternalServerError: _check_rst_stream_error},
                 beforeNextRetry=beforeNextRetry,
             )
-            span.add_event("Commit Done")
+
+            if span:
+                span.add_event("Commit Done")
         self.committed = response.commit_timestamp
         if return_commit_stats:
             self.commit_stats = response.commit_stats