Merge origin/main into enhance-error-message

rahul2393 · claude · rahul2393 · commit 4559df92348b · 2026-01-21T15:10:51.000+05:30
Resolved merge conflict in snapshot.py by combining:
- Main's simplified retry approach (iterator = None)
- Feature branch's request_id tracking and error augmentation

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/.librarian/state.yaml b/.librarian/state.yaml
@@ -1,7 +1,7 @@
 image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:b8058df4c45e9a6e07f6b4d65b458d0d059241dd34c814f151c8bf6b89211209
 libraries:
   - id: google-cloud-spanner
-    version: 3.61.0
+    version: 3.62.0
     last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7
     apis:
       - path: google/spanner/admin/instance/v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@
 
 [1]: https://pypi.org/project/google-cloud-spanner/#history
 
+## [3.62.0](https://github.com/googleapis/python-spanner/compare/v3.61.0...v3.62.0) (2026-01-14)
+
+
+### Features
+
+* add uuid support (#1310) ([3b1792aad1d046b6ae1e5c982f5047289dffd95c](https://github.com/googleapis/python-spanner/commit/3b1792aad1d046b6ae1e5c982f5047289dffd95c))
+
+
+### Bug Fixes
+
+* handle errors during stream restart in snapshot (#1471) ([c0668735cb69532f4c852bb7678f63e54da2d34e](https://github.com/googleapis/python-spanner/commit/c0668735cb69532f4c852bb7678f63e54da2d34e))
+* resolve pre-release dependency failures and sqlparse recursion (#1472) ([9ec95b7df5e921112bd58b820722103177e0e5b6](https://github.com/googleapis/python-spanner/commit/9ec95b7df5e921112bd58b820722103177e0e5b6))
+* transaction_tag should be set on BeginTransactionRequest (#1463) ([3d3cea0b5afb414a506ab08eebae733d803f17ac](https://github.com/googleapis/python-spanner/commit/3d3cea0b5afb414a506ab08eebae733d803f17ac))
+
 ## [3.61.0](https://github.com/googleapis/python-spanner/compare/v3.60.0...v3.61.0) (2025-12-16)
 
 
diff --git a/google/cloud/spanner_admin_database_v1/gapic_version.py b/google/cloud/spanner_admin_database_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.61.0"  # {x-release-please-version}
+__version__ = "3.62.0"  # {x-release-please-version}
diff --git a/google/cloud/spanner_admin_instance_v1/gapic_version.py b/google/cloud/spanner_admin_instance_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.61.0"  # {x-release-please-version}
+__version__ = "3.62.0"  # {x-release-please-version}
diff --git a/google/cloud/spanner_dbapi/version.py b/google/cloud/spanner_dbapi/version.py
@@ -15,6 +15,6 @@
 import platform
 
 PY_VERSION = platform.python_version()
-__version__ = "3.61.0"
+__version__ = "3.62.0"
 VERSION = __version__
 DEFAULT_USER_AGENT = "gl-dbapi/" + VERSION
diff --git a/google/cloud/spanner_v1/_opentelemetry_tracing.py b/google/cloud/spanner_v1/_opentelemetry_tracing.py
@@ -36,6 +36,7 @@
 
 TRACER_NAME = "cloud.google.com/python/spanner"
 TRACER_VERSION = gapic_version.__version__
+GCP_RESOURCE_NAME_PREFIX = "//spanner.googleapis.com/"
 extended_tracing_globally_disabled = (
     os.getenv("SPANNER_ENABLE_EXTENDED_TRACING", "").lower() == "false"
 )
@@ -106,6 +107,7 @@ def trace_call(
         "gcp.client.service": "spanner",
         "gcp.client.version": TRACER_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": GCP_RESOURCE_NAME_PREFIX + db_name,
     }
 
     if extra_attributes:
diff --git a/google/cloud/spanner_v1/gapic_version.py b/google/cloud/spanner_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.61.0"  # {x-release-please-version}
+__version__ = "3.62.0"  # {x-release-please-version}
diff --git a/google/cloud/spanner_v1/snapshot.py b/google/cloud/spanner_v1/snapshot.py
@@ -152,31 +152,12 @@ def _restart_on_unavailable(
 
         except ServiceUnavailable:
             del item_buffer[:]
-            with trace_call(
-                trace_name,
-                session,
-                attributes,
-                observability_options=observability_options,
-                metadata=metadata,
-            ) as span, MetricsCapture():
-                request.resume_token = resume_token
-                if transaction is not None:
-                    transaction_selector = transaction._build_transaction_selector_pb()
-                request.transaction = transaction_selector
-                attempt += 1
-                (
-                    call_metadata,
-                    current_request_id,
-                ) = request_id_manager.metadata_and_request_id(
-                    nth_request,
-                    attempt,
-                    metadata,
-                    span,
-                )
-                iterator = method(
-                    request=request,
-                    metadata=call_metadata,
-                )
+            request.resume_token = resume_token
+            if transaction is not None:
+                transaction_selector = transaction._build_transaction_selector_pb()
+            request.transaction = transaction_selector
+            attempt += 1
+            iterator = None
             continue
 
         except InternalServerError as exc:
@@ -187,31 +168,12 @@ def _restart_on_unavailable(
             if not resumable_error:
                 raise _augment_error_with_request_id(exc, current_request_id)
             del item_buffer[:]
-            with trace_call(
-                trace_name,
-                session,
-                attributes,
-                observability_options=observability_options,
-                metadata=metadata,
-            ) as span, MetricsCapture():
-                request.resume_token = resume_token
-                if transaction is not None:
-                    transaction_selector = transaction._build_transaction_selector_pb()
-                attempt += 1
-                request.transaction = transaction_selector
-                (
-                    call_metadata,
-                    current_request_id,
-                ) = request_id_manager.metadata_and_request_id(
-                    nth_request,
-                    attempt,
-                    metadata,
-                    span,
-                )
-                iterator = method(
-                    request=request,
-                    metadata=call_metadata,
-                )
+            request.resume_token = resume_token
+            if transaction is not None:
+                transaction_selector = transaction._build_transaction_selector_pb()
+            attempt += 1
+            request.transaction = transaction_selector
+            iterator = None
             continue
 
         except Exception as exc:
diff --git a/samples/generated_samples/snippet_metadata_google.spanner.admin.database.v1.json b/samples/generated_samples/snippet_metadata_google.spanner.admin.database.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-spanner-admin-database",
-    "version": "3.61.0"
+    "version": "3.62.0"
   },
   "snippets": [
     {
diff --git a/samples/generated_samples/snippet_metadata_google.spanner.admin.instance.v1.json b/samples/generated_samples/snippet_metadata_google.spanner.admin.instance.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-spanner-admin-instance",
-    "version": "3.61.0"
+    "version": "3.62.0"
   },
   "snippets": [
     {
diff --git a/samples/generated_samples/snippet_metadata_google.spanner.v1.json b/samples/generated_samples/snippet_metadata_google.spanner.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-spanner",
-    "version": "3.61.0"
+    "version": "3.62.0"
   },
   "snippets": [
     {
diff --git a/tests/system/test_session_api.py b/tests/system/test_session_api.py
@@ -21,6 +21,7 @@
 import threading
 import time
 import uuid
+from google.cloud.spanner_v1 import _opentelemetry_tracing
 import pytest
 
 import grpc
@@ -362,6 +363,8 @@ def _make_attributes(db_instance, **kwargs):
         "gcp.client.service": "spanner",
         "gcp.client.version": ot_helpers.LIB_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX
+        + db_instance,
     }
     ot_helpers.enrich_with_otel_scope(attributes)
 
diff --git a/tests/unit/test__opentelemetry_tracing.py b/tests/unit/test__opentelemetry_tracing.py
@@ -28,7 +28,10 @@ def _make_rpc_error(error_cls, trailing_metadata=None):
 def _make_session():
     from google.cloud.spanner_v1.session import Session
 
-    return mock.Mock(autospec=Session, instance=True)
+    session = mock.Mock(autospec=Session, instance=True)
+    # Set a string name to allow concatenation
+    session._database.name = "projects/p/instances/i/databases/d"
+    return session
 
 
 class TestTracing(OpenTelemetryBase):
@@ -52,6 +55,8 @@ def test_trace_call(self, mock_region):
                 "gcp.client.service": "spanner",
                 "gcp.client.version": LIB_VERSION,
                 "gcp.client.repo": "googleapis/python-spanner",
+                "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX
+                + "projects/p/instances/i/databases/d",
             }
         )
         expected_attributes.update(extra_attributes)
@@ -87,6 +92,8 @@ def test_trace_error(self, mock_region):
                 "gcp.client.service": "spanner",
                 "gcp.client.version": LIB_VERSION,
                 "gcp.client.repo": "googleapis/python-spanner",
+                "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX
+                + "projects/p/instances/i/databases/d",
             }
         )
         expected_attributes.update(extra_attributes)
diff --git a/tests/unit/test_batch.py b/tests/unit/test_batch.py
@@ -29,6 +29,7 @@
     Mutation,
     BatchWriteResponse,
     DefaultTransactionOptions,
+    _opentelemetry_tracing,
 )
 import mock
 from google.cloud._helpers import UTC, _datetime_to_pb_timestamp
@@ -60,6 +61,7 @@
     "gcp.client.service": "spanner",
     "gcp.client.version": LIB_VERSION,
     "gcp.client.repo": "googleapis/python-spanner",
+    "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX + "testing",
     "cloud.region": "global",
 }
 enrich_with_otel_scope(BASE_ATTRIBUTES)
diff --git a/tests/unit/test_pool.py b/tests/unit/test_pool.py
@@ -19,6 +19,7 @@
 from datetime import datetime, timedelta
 
 import mock
+from google.cloud.spanner_v1 import _opentelemetry_tracing
 from google.cloud.spanner_v1._helpers import (
     _metadata_with_request_id,
     _metadata_with_request_id_and_req_id,
@@ -157,6 +158,7 @@ class TestFixedSizePool(OpenTelemetryBase):
         "gcp.client.service": "spanner",
         "gcp.client.version": LIB_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX + "name",
         "cloud.region": "global",
     }
     enrich_with_otel_scope(BASE_ATTRIBUTES)
@@ -551,6 +553,7 @@ class TestBurstyPool(OpenTelemetryBase):
         "gcp.client.service": "spanner",
         "gcp.client.version": LIB_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX + "name",
         "cloud.region": "global",
     }
     enrich_with_otel_scope(BASE_ATTRIBUTES)
@@ -841,6 +844,7 @@ class TestPingingPool(OpenTelemetryBase):
         "gcp.client.service": "spanner",
         "gcp.client.version": LIB_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX + "name",
         "cloud.region": "global",
     }
     enrich_with_otel_scope(BASE_ATTRIBUTES)
diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py
@@ -14,7 +14,10 @@
 
 
 import google.api_core.gapic_v1.method
-from google.cloud.spanner_v1._opentelemetry_tracing import trace_call
+from google.cloud.spanner_v1._opentelemetry_tracing import (
+    trace_call,
+    GCP_RESOURCE_NAME_PREFIX,
+)
 import mock
 import datetime
 from google.cloud.spanner_v1 import (
@@ -168,6 +171,7 @@ class TestSession(OpenTelemetryBase):
         "gcp.client.service": "spanner",
         "gcp.client.version": LIB_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": GCP_RESOURCE_NAME_PREFIX + DATABASE_NAME,
         "cloud.region": "global",
     }
     enrich_with_otel_scope(BASE_ATTRIBUTES)
diff --git a/tests/unit/test_snapshot.py b/tests/unit/test_snapshot.py
@@ -26,6 +26,7 @@
     BeginTransactionRequest,
     TransactionOptions,
     TransactionSelector,
+    _opentelemetry_tracing,
 )
 from google.cloud.spanner_v1.snapshot import _SnapshotBase
 from tests._builders import (
@@ -82,6 +83,7 @@
     "gcp.client.service": "spanner",
     "gcp.client.version": LIB_VERSION,
     "gcp.client.repo": "googleapis/python-spanner",
+    "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX + "testing",
 }
 enrich_with_otel_scope(BASE_ATTRIBUTES)
 
@@ -411,6 +413,56 @@ def test_iteration_w_raw_raising_unavailable_after_token(self):
         self.assertEqual(request.resume_token, RESUME_TOKEN)
         self.assertNoSpans()
 
+    def test_iteration_w_raw_raising_unavailable_during_restart(self):
+        from google.api_core.exceptions import ServiceUnavailable
+
+        FIRST = (self._make_item(0), self._make_item(1, resume_token=RESUME_TOKEN))
+        LAST = (self._make_item(2),)
+        before = _MockIterator(
+            *FIRST, fail_after=True, error=ServiceUnavailable("testing")
+        )
+        after = _MockIterator(*LAST)
+        request = mock.Mock(test="test", spec=["test", "resume_token"])
+        # The second call (the first retry) raises ServiceUnavailable immediately.
+        # The third call (the second retry) succeeds.
+        restart = mock.Mock(
+            spec=[],
+            side_effect=[before, ServiceUnavailable("retry failed"), after],
+        )
+        database = _Database()
+        database.spanner_api = build_spanner_api()
+        session = _Session(database)
+        derived = _build_snapshot_derived(session)
+        resumable = self._call_fut(derived, restart, request, session=session)
+        self.assertEqual(list(resumable), list(FIRST + LAST))
+        self.assertEqual(len(restart.mock_calls), 3)
+        self.assertEqual(request.resume_token, RESUME_TOKEN)
+        self.assertNoSpans()
+
+    def test_iteration_w_raw_raising_resumable_internal_error_during_restart(self):
+        FIRST = (self._make_item(0), self._make_item(1, resume_token=RESUME_TOKEN))
+        LAST = (self._make_item(2),)
+        before = _MockIterator(
+            *FIRST,
+            fail_after=True,
+            error=INTERNAL_SERVER_ERROR_UNEXPECTED_EOS,
+        )
+        after = _MockIterator(*LAST)
+        request = mock.Mock(test="test", spec=["test", "resume_token"])
+        restart = mock.Mock(
+            spec=[],
+            side_effect=[before, INTERNAL_SERVER_ERROR_UNEXPECTED_EOS, after],
+        )
+        database = _Database()
+        database.spanner_api = build_spanner_api()
+        session = _Session(database)
+        derived = _build_snapshot_derived(session)
+        resumable = self._call_fut(derived, restart, request, session=session)
+        self.assertEqual(list(resumable), list(FIRST + LAST))
+        self.assertEqual(len(restart.mock_calls), 3)
+        self.assertEqual(request.resume_token, RESUME_TOKEN)
+        self.assertNoSpans()
+
     def test_iteration_w_raw_w_multiuse(self):
         from google.cloud.spanner_v1 import (
             ReadRequest,
@@ -2265,6 +2317,8 @@ def _build_span_attributes(
         "gcp.client.service": "spanner",
         "gcp.client.version": LIB_VERSION,
         "gcp.client.repo": "googleapis/python-spanner",
+        "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX
+        + database.name,
         "x_goog_spanner_request_id": _build_request_id(database, attempt),
     }
     attributes.update(extra_attributes)
diff --git a/tests/unit/test_transaction.py b/tests/unit/test_transaction.py
@@ -25,6 +25,7 @@
     BeginTransactionRequest,
     TransactionOptions,
     ResultSetMetadata,
+    _opentelemetry_tracing,
 )
 from google.cloud.spanner_v1._helpers import GOOGLE_CLOUD_REGION_GLOBAL
 from google.cloud.spanner_v1 import DefaultTransactionOptions
@@ -1347,6 +1348,8 @@ def _build_span_attributes(
                 "gcp.client.service": "spanner",
                 "gcp.client.version": LIB_VERSION,
                 "gcp.client.repo": "googleapis/python-spanner",
+                "gcp.resource.name": _opentelemetry_tracing.GCP_RESOURCE_NAME_PREFIX
+                + database.name,
                 "cloud.region": GOOGLE_CLOUD_REGION_GLOBAL,
             }
         )

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-__version__ = "3.61.0" # {x-release-please-version}`
	`16`	`+__version__ = "3.62.0" # {x-release-please-version}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`
`37`	`37`	`TRACER_NAME = "cloud.google.com/python/spanner"`
`38`	`38`	`TRACER_VERSION = gapic_version.__version__`
	`39`	`+GCP_RESOURCE_NAME_PREFIX = "//spanner.googleapis.com/"`
`39`	`40`	`extended_tracing_globally_disabled = (`
`40`	`41`	`os.getenv("SPANNER_ENABLE_EXTENDED_TRACING", "").lower() == "false"`
`41`	`42`	`)`
`@@ -106,6 +107,7 @@ def trace_call(`
`106`	`107`	`"gcp.client.service": "spanner",`
`107`	`108`	`"gcp.client.version": TRACER_VERSION,`
`108`	`109`	`"gcp.client.repo": "googleapis/python-spanner",`
	`110`	`+ "gcp.resource.name": GCP_RESOURCE_NAME_PREFIX + db_name,`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`if extra_attributes:`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`],`
`9`	`9`	`"language": "PYTHON",`
`10`	`10`	`"name": "google-cloud-spanner-admin-database",`
`11`		`- "version": "3.61.0"`
	`11`	`+ "version": "3.62.0"`
`12`	`12`	`},`
`13`	`13`	`"snippets": [`
`14`	`14`	`{`