chore: make precommit token check emulator-proof

Author: olavloite

.github/workflows/integration-tests-against-emulator.yaml

@@ -10,7 +10,7 @@ jobs:
 
     services:
       emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:1.5.37
+        image: gcr.io/cloud-spanner-emulator/emulator
         ports:
           - 9010:9010
           - 9020:9020

google/cloud/spanner_v1/transaction.py

@@ -328,14 +328,21 @@ def before_next_retry(nth_retry, delay_in_seconds):
             # successfully commit, and must be retried with the new precommit token.
             # The mutations should not be included in the new request, and no further
             # retries or exception handling should be performed.
-            if commit_response_pb.precommit_token:
+            if commit_response_pb._pb.HasField("precommit_token"):
                 add_span_event(span, commit_retry_event_name)
+                attempt = AtomicCounter(0)
+                nth_request = database._next_nth_request
                 commit_response_pb = api.commit(
                     request=CommitRequest(
                         precommit_token=commit_response_pb.precommit_token,
                         **common_commit_request_args,
                     ),
-                    metadata=metadata,
+                    metadata=database.metadata_with_request_id(
+                        nth_request,
+                        attempt.value,
+                        metadata,
+                        span,
+                    ),
                 )
 
             add_span_event(span, "Commit Done")