google-cloud-spanner 3.59.0__tar.gz → 3.60.0__tar.gz

{google_cloud_spanner-3.59.0/google_cloud_spanner.egg-info → google_cloud_spanner-3.60.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-spanner
-Version: 3.59.0
+Version: 3.60.0
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Internet
 Requires-Python: >=3.9
@@ -28,13 +29,12 @@ Requires-Dist: sqlparse>=0.4.4
 Requires-Dist: proto-plus<2.0.0,>=1.22.2; python_version >= "3.11"
 Requires-Dist: protobuf!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<7.0.0,>=3.20.2
 Requires-Dist: grpc-interceptor>=0.15.4
-Provides-Extra: tracing
-Requires-Dist: opentelemetry-api>=1.22.0; extra == "tracing"
-Requires-Dist: opentelemetry-sdk>=1.22.0; extra == "tracing"
-Requires-Dist: opentelemetry-semantic-conventions>=0.43b0; extra == "tracing"
-Requires-Dist: opentelemetry-resourcedetector-gcp>=1.8.0a0; extra == "tracing"
-Requires-Dist: google-cloud-monitoring>=2.16.0; extra == "tracing"
-Requires-Dist: mmh3>=4.1.0; extra == "tracing"
+Requires-Dist: opentelemetry-api>=1.22.0
+Requires-Dist: opentelemetry-sdk>=1.22.0
+Requires-Dist: opentelemetry-semantic-conventions>=0.43b0
+Requires-Dist: opentelemetry-resourcedetector-gcp>=1.8.0a0
+Requires-Dist: google-cloud-monitoring>=2.16.0
+Requires-Dist: mmh3>=4.1.0
 Provides-Extra: libcst
 Requires-Dist: libcst>=0.2.5; extra == "libcst"
 Dynamic: author

google_cloud_spanner-3.60.0/google/cloud/spanner_admin_database_v1/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "3.60.0"  # {x-release-please-version}

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_database_v1/services/database_admin/transports/base.py

@@ -81,9 +81,10 @@ class DatabaseAdminTransport(abc.ABC):
                 credentials identify the application to the service; if none
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is mutually exclusive with credentials.
+                This argument is mutually exclusive with credentials. This argument will be
+                removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A list of scopes.
             quota_project_id (Optional[str]): An optional project to use for billing
                 and quota.

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py

@@ -169,9 +169,10 @@ class DatabaseAdminGrpcTransport(DatabaseAdminTransport):
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
                 This argument is ignored if a ``channel`` instance is provided.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
                 This argument is ignored if a ``channel`` instance is provided.
+                This argument will be removed in the next major version of this library.
             scopes (Optional(Sequence[str])): A list of scopes. This argument is
                 ignored if a ``channel`` instance is provided.
             channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
@@ -276,6 +277,7 @@ class DatabaseAdminGrpcTransport(DatabaseAdminTransport):
                 options=[
                     ("grpc.max_send_message_length", -1),
                     ("grpc.max_receive_message_length", -1),
+                    ("grpc.keepalive_time_ms", 120000),
                 ],
             )
 
@@ -305,9 +307,10 @@ class DatabaseAdminGrpcTransport(DatabaseAdminTransport):
                 credentials identify this application to the service. If
                 none are specified, the client will attempt to ascertain
                 the credentials from the environment.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is mutually exclusive with credentials.
+                This argument is mutually exclusive with credentials.  This argument will be
+                removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc_asyncio.py

@@ -166,8 +166,9 @@ class DatabaseAdminGrpcAsyncIOTransport(DatabaseAdminTransport):
                 credentials identify this application to the service. If
                 none are specified, the client will attempt to ascertain
                 the credentials from the environment.
-            credentials_file (Optional[str]): A file with credentials that can
-                be loaded with :func:`google.auth.load_credentials_from_file`.
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
+                be loaded with :func:`google.auth.load_credentials_from_file`. This argument will be
+                removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.
@@ -218,9 +219,10 @@ class DatabaseAdminGrpcAsyncIOTransport(DatabaseAdminTransport):
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
                 This argument is ignored if a ``channel`` instance is provided.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
                 This argument is ignored if a ``channel`` instance is provided.
+                This argument will be removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.
@@ -325,6 +327,7 @@ class DatabaseAdminGrpcAsyncIOTransport(DatabaseAdminTransport):
                 options=[
                     ("grpc.max_send_message_length", -1),
                     ("grpc.max_receive_message_length", -1),
+                    ("grpc.keepalive_time_ms", 120000),
                 ],
             )
 

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_database_v1/services/database_admin/transports/rest.py

@@ -1622,9 +1622,10 @@ class DatabaseAdminRestTransport(_BaseDatabaseAdminRestTransport):
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
 
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is ignored if ``channel`` is provided.
+                This argument is ignored if ``channel`` is provided. This argument will be
+                removed in the next major version of this library.
             scopes (Optional(Sequence[str])): A list of scopes. This argument is
                 ignored if ``channel`` is provided.
             client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client

google_cloud_spanner-3.60.0/google/cloud/spanner_admin_instance_v1/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "3.60.0"  # {x-release-please-version}

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/base.py

@@ -75,9 +75,10 @@ class InstanceAdminTransport(abc.ABC):
                 credentials identify the application to the service; if none
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is mutually exclusive with credentials.
+                This argument is mutually exclusive with credentials. This argument will be
+                removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A list of scopes.
             quota_project_id (Optional[str]): An optional project to use for billing
                 and quota.

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py

@@ -178,9 +178,10 @@ class InstanceAdminGrpcTransport(InstanceAdminTransport):
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
                 This argument is ignored if a ``channel`` instance is provided.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
                 This argument is ignored if a ``channel`` instance is provided.
+                This argument will be removed in the next major version of this library.
             scopes (Optional(Sequence[str])): A list of scopes. This argument is
                 ignored if a ``channel`` instance is provided.
             channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
@@ -285,6 +286,7 @@ class InstanceAdminGrpcTransport(InstanceAdminTransport):
                 options=[
                     ("grpc.max_send_message_length", -1),
                     ("grpc.max_receive_message_length", -1),
+                    ("grpc.keepalive_time_ms", 120000),
                 ],
             )
 
@@ -314,9 +316,10 @@ class InstanceAdminGrpcTransport(InstanceAdminTransport):
                 credentials identify this application to the service. If
                 none are specified, the client will attempt to ascertain
                 the credentials from the environment.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is mutually exclusive with credentials.
+                This argument is mutually exclusive with credentials.  This argument will be
+                removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc_asyncio.py

@@ -175,8 +175,9 @@ class InstanceAdminGrpcAsyncIOTransport(InstanceAdminTransport):
                 credentials identify this application to the service. If
                 none are specified, the client will attempt to ascertain
                 the credentials from the environment.
-            credentials_file (Optional[str]): A file with credentials that can
-                be loaded with :func:`google.auth.load_credentials_from_file`.
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
+                be loaded with :func:`google.auth.load_credentials_from_file`. This argument will be
+                removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.
@@ -227,9 +228,10 @@ class InstanceAdminGrpcAsyncIOTransport(InstanceAdminTransport):
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
                 This argument is ignored if a ``channel`` instance is provided.
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
                 This argument is ignored if a ``channel`` instance is provided.
+                This argument will be removed in the next major version of this library.
             scopes (Optional[Sequence[str]]): A optional list of scopes needed for this
                 service. These are only used when credentials are not specified and
                 are passed to :func:`google.auth.default`.
@@ -334,6 +336,7 @@ class InstanceAdminGrpcAsyncIOTransport(InstanceAdminTransport):
                 options=[
                     ("grpc.max_send_message_length", -1),
                     ("grpc.max_receive_message_length", -1),
+                    ("grpc.keepalive_time_ms", 120000),
                 ],
             )
 

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/rest.py

@@ -1355,9 +1355,10 @@ class InstanceAdminRestTransport(_BaseInstanceAdminRestTransport):
                 are specified, the client will attempt to ascertain the
                 credentials from the environment.
 
-            credentials_file (Optional[str]): A file with credentials that can
+            credentials_file (Optional[str]): Deprecated. A file with credentials that can
                 be loaded with :func:`google.auth.load_credentials_from_file`.
-                This argument is ignored if ``channel`` is provided.
+                This argument is ignored if ``channel`` is provided. This argument will be
+                removed in the next major version of this library.
             scopes (Optional(Sequence[str])): A list of scopes. This argument is
                 ignored if ``channel`` is provided.
             client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_admin_instance_v1/types/spanner_instance_admin.py

@@ -1765,6 +1765,12 @@ class InstancePartition(proto.Message):
             that are not yet in the ``READY`` state.
 
             This field is a member of `oneof`_ ``compute_capacity``.
+        autoscaling_config (google.cloud.spanner_admin_instance_v1.types.AutoscalingConfig):
+            Optional. The autoscaling configuration. Autoscaling is
+            enabled if this field is set. When autoscaling is enabled,
+            fields in compute_capacity are treated as OUTPUT_ONLY fields
+            and reflect the current compute capacity allocated to the
+            instance partition.
         state (google.cloud.spanner_admin_instance_v1.types.InstancePartition.State):
             Output only. The current instance partition
             state.
@@ -1848,6 +1854,11 @@ class InstancePartition(proto.Message):
         number=6,
         oneof="compute_capacity",
     )
+    autoscaling_config: "AutoscalingConfig" = proto.Field(
+        proto.MESSAGE,
+        number=13,
+        message="AutoscalingConfig",
+    )
     state: State = proto.Field(
         proto.ENUM,
         number=7,

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_dbapi/connection.py

@@ -15,6 +15,7 @@
 """DB-API Connection for the Google Cloud Spanner."""
 import warnings
 
+from google.api_core.client_options import ClientOptions
 from google.api_core.exceptions import Aborted
 from google.api_core.gapic_v1.client_info import ClientInfo
 from google.auth.credentials import AnonymousCredentials
@@ -734,6 +735,7 @@ def connect(
     client=None,
     route_to_leader_enabled=True,
     database_role=None,
+    experimental_host=None,
     **kwargs,
 ):
     """Creates a connection to a Google Cloud Spanner database.
@@ -805,6 +807,10 @@ def connect(
             client_options = None
             if isinstance(credentials, AnonymousCredentials):
                 client_options = kwargs.get("client_options")
+            if experimental_host is not None:
+                project = "default"
+                credentials = AnonymousCredentials()
+                client_options = ClientOptions(api_endpoint=experimental_host)
             client = spanner.Client(
                 project=project,
                 credentials=credentials,

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_dbapi/version.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import platform
-from google.cloud.spanner_v1 import gapic_version as package_version
 
 PY_VERSION = platform.python_version()
-VERSION = package_version.__version__
+__version__ = "3.60.0"
+VERSION = __version__
 DEFAULT_USER_AGENT = "gl-dbapi/" + VERSION

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_v1/_helpers.py

@@ -20,6 +20,7 @@ import math
 import time
 import base64
 import threading
+import logging
 
 from google.protobuf.struct_pb2 import ListValue
 from google.protobuf.struct_pb2 import Value
@@ -29,16 +30,27 @@ from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
 from google.api_core import datetime_helpers
 from google.api_core.exceptions import Aborted
 from google.cloud._helpers import _date_from_iso8601_date
-from google.cloud.spanner_v1 import TypeCode
-from google.cloud.spanner_v1 import ExecuteSqlRequest
-from google.cloud.spanner_v1 import JsonObject, Interval
-from google.cloud.spanner_v1 import TransactionOptions
+from google.cloud.spanner_v1.types import ExecuteSqlRequest
+from google.cloud.spanner_v1.types import TransactionOptions
+from google.cloud.spanner_v1.data_types import JsonObject, Interval
 from google.cloud.spanner_v1.request_id_header import with_request_id
+from google.cloud.spanner_v1.types import TypeCode
+
 from google.rpc.error_details_pb2 import RetryInfo
 
 try:
     from opentelemetry.propagate import inject
     from opentelemetry.propagators.textmap import Setter
+    from opentelemetry.semconv.resource import ResourceAttributes
+    from opentelemetry.resourcedetector import gcp_resource_detector
+    from opentelemetry.resourcedetector.gcp_resource_detector import (
+        GoogleCloudResourceDetector,
+    )
+
+    # Overwrite the requests timeout for the detector.
+    # This is necessary as the client will wait the full timeout if the
+    # code is not run in a GCP environment, with the location endpoints available.
+    gcp_resource_detector._TIMEOUT_SEC = 0.2
 
     HAS_OPENTELEMETRY_INSTALLED = True
 except ImportError:
@@ -55,6 +67,12 @@ NUMERIC_MAX_PRECISION_ERR_MSG = (
     + "numeric has a whole component with precision {}"
 )
 
+GOOGLE_CLOUD_REGION_GLOBAL = "global"
+
+log = logging.getLogger(__name__)
+
+_cloud_region: str = None
+
 
 if HAS_OPENTELEMETRY_INSTALLED:
 
@@ -79,6 +97,33 @@ if HAS_OPENTELEMETRY_INSTALLED:
             carrier.append((key, value))
 
 
+def _get_cloud_region() -> str:
+    """Get the location of the resource, caching the result.
+
+    Returns:
+        str: The location of the resource. If OpenTelemetry is not installed, returns a global region.
+    """
+    global _cloud_region
+    if _cloud_region is not None:
+        return _cloud_region
+
+    try:
+        detector = GoogleCloudResourceDetector()
+        resources = detector.detect()
+        if ResourceAttributes.CLOUD_REGION in resources.attributes:
+            _cloud_region = resources.attributes[ResourceAttributes.CLOUD_REGION]
+        else:
+            _cloud_region = GOOGLE_CLOUD_REGION_GLOBAL
+    except Exception as e:
+        log.warning(
+            "Failed to detect GCP resource location for Spanner metrics, defaulting to 'global'. Error: %s",
+            e,
+        )
+        _cloud_region = GOOGLE_CLOUD_REGION_GLOBAL
+
+    return _cloud_region
+
+
 def _try_to_coerce_bytes(bytestring):
     """Try to coerce a byte string into the right thing based on Python
     version and whether or not it is base64 encoded.

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_v1/_opentelemetry_tracing.py

@@ -21,20 +21,16 @@ import os
 from google.cloud.spanner_v1 import SpannerClient
 from google.cloud.spanner_v1 import gapic_version
 from google.cloud.spanner_v1._helpers import (
+    _get_cloud_region,
     _metadata_with_span_context,
 )
 
-try:
-    from opentelemetry import trace
-    from opentelemetry.trace.status import Status, StatusCode
-    from opentelemetry.semconv.attributes.otel_attributes import (
-        OTEL_SCOPE_NAME,
-        OTEL_SCOPE_VERSION,
-    )
-
-    HAS_OPENTELEMETRY_INSTALLED = True
-except ImportError:
-    HAS_OPENTELEMETRY_INSTALLED = False
+from opentelemetry import trace
+from opentelemetry.trace.status import Status, StatusCode
+from opentelemetry.semconv.attributes.otel_attributes import (
+    OTEL_SCOPE_NAME,
+    OTEL_SCOPE_VERSION,
+)
 
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 
@@ -70,11 +66,6 @@ def trace_call(
     if session:
         session._last_use_time = datetime.now()
 
-    if not (HAS_OPENTELEMETRY_INSTALLED and name):
-        # Empty context manager. Users will have to check if the generated value is None or a span
-        yield None
-        return
-
     tracer_provider = None
 
     # By default enable_extended_tracing=True because in a bid to minimize
@@ -85,6 +76,7 @@ def trace_call(
     enable_end_to_end_tracing = False
 
     db_name = ""
+    cloud_region = None
     if session and getattr(session, "_database", None):
         db_name = session._database.name
 
@@ -98,6 +90,7 @@ def trace_call(
         )
         db_name = observability_options.get("db_name", db_name)
 
+    cloud_region = _get_cloud_region()
     tracer = get_tracer(tracer_provider)
 
     # Set base attributes that we know for every trace created
@@ -107,6 +100,7 @@ def trace_call(
         "db.instance": db_name,
         "net.host.name": SpannerClient.DEFAULT_ENDPOINT,
         OTEL_SCOPE_NAME: TRACER_NAME,
+        "cloud.region": cloud_region,
         OTEL_SCOPE_VERSION: TRACER_VERSION,
         # Standard GCP attributes for OTel, attributes are used for internal purpose and are subjected to change
         "gcp.client.service": "spanner",
@@ -117,6 +111,11 @@ def trace_call(
     if extra_attributes:
         attributes.update(extra_attributes)
 
+    if "request_options" in attributes:
+        request_options = attributes.pop("request_options")
+        if request_options and request_options.request_tag:
+            attributes["request.tag"] = request_options.request_tag
+
     if extended_tracing_globally_disabled:
         enable_extended_tracing = False
 
@@ -155,11 +154,8 @@ def trace_call(
 
 
 def get_current_span():
-    if not HAS_OPENTELEMETRY_INSTALLED:
-        return None
     return trace.get_current_span()
 
 
 def add_span_event(span, event_name, event_attributes=None):
-    if span:
-        span.add_event(event_name, event_attributes)
+    span.add_event(event_name, event_attributes)

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_v1/client.py

@@ -52,7 +52,6 @@ from google.cloud.spanner_v1._helpers import _merge_query_options
 from google.cloud.spanner_v1._helpers import _metadata_with_prefix
 from google.cloud.spanner_v1.instance import Instance
 from google.cloud.spanner_v1.metrics.constants import (
-    ENABLE_SPANNER_METRICS_ENV_VAR,
     METRIC_EXPORT_INTERVAL_MS,
 )
 from google.cloud.spanner_v1.metrics.spanner_metrics_tracer_factory import (
@@ -75,7 +74,7 @@ from google.cloud.spanner_v1._helpers import AtomicCounter
 
 _CLIENT_INFO = client_info.ClientInfo(client_library_version=__version__)
 EMULATOR_ENV_VAR = "SPANNER_EMULATOR_HOST"
-ENABLE_BUILTIN_METRICS_ENV_VAR = "SPANNER_ENABLE_BUILTIN_METRICS"
+SPANNER_DISABLE_BUILTIN_METRICS_ENV_VAR = "SPANNER_DISABLE_BUILTIN_METRICS"
 _EMULATOR_HOST_HTTP_SCHEME = (
     "%s contains a http scheme. When used with a scheme it may cause gRPC's "
     "DNS resolver to endlessly attempt to resolve. %s is intended to be used "
@@ -101,8 +100,8 @@ def _get_spanner_optimizer_statistics_package():
 log = logging.getLogger(__name__)
 
 
-def _get_spanner_enable_builtin_metrics():
-    return os.getenv(ENABLE_SPANNER_METRICS_ENV_VAR) == "true"
+def _get_spanner_enable_builtin_metrics_env():
+    return os.getenv(SPANNER_DISABLE_BUILTIN_METRICS_ENV_VAR) != "true"
 
 
 class Client(ClientWithProject):
@@ -176,6 +175,15 @@ class Client(ClientWithProject):
         or :class:`dict`
     :param default_transaction_options: (Optional) Default options to use for all transactions.
 
+    :type experimental_host: str
+    :param experimental_host: (Optional) The endpoint for a spanner experimental host deployment.
+        This is intended only for experimental host spanner endpoints.
+        If set, this will override the `api_endpoint` in `client_options`.
+
+    :type disable_builtin_metrics: bool
+    :param disable_builtin_metrics: (Optional) Default False. Set to True to disable
+            the Spanner built-in metrics collection and exporting.
+
     :raises: :class:`ValueError <exceptions.ValueError>` if both ``read_only``
              and ``admin`` are :data:`True`
     """
@@ -200,8 +208,11 @@ class Client(ClientWithProject):
         directed_read_options=None,
         observability_options=None,
         default_transaction_options: Optional[DefaultTransactionOptions] = None,
+        experimental_host=None,
+        disable_builtin_metrics=False,
     ):
         self._emulator_host = _get_spanner_emulator_host()
+        self._experimental_host = experimental_host
 
         if client_options and type(client_options) is dict:
             self._client_options = google.api_core.client_options.from_dict(
@@ -212,6 +223,8 @@ class Client(ClientWithProject):
 
         if self._emulator_host:
             credentials = AnonymousCredentials()
+        elif self._experimental_host:
+            credentials = AnonymousCredentials()
         elif isinstance(credentials, AnonymousCredentials):
             self._emulator_host = self._client_options.api_endpoint
 
@@ -240,7 +253,8 @@ class Client(ClientWithProject):
             warnings.warn(_EMULATOR_HOST_HTTP_SCHEME)
         # Check flag to enable Spanner builtin metrics
         if (
-            _get_spanner_enable_builtin_metrics()
+            _get_spanner_enable_builtin_metrics_env()
+            and not disable_builtin_metrics
             and HAS_GOOGLE_CLOUD_MONITORING_INSTALLED
         ):
             meter_provider = metrics.NoOpMeterProvider()
@@ -324,6 +338,15 @@ class Client(ClientWithProject):
                     client_options=self._client_options,
                     transport=transport,
                 )
+            elif self._experimental_host:
+                transport = InstanceAdminGrpcTransport(
+                    channel=grpc.insecure_channel(target=self._experimental_host)
+                )
+                self._instance_admin_api = InstanceAdminClient(
+                    client_info=self._client_info,
+                    client_options=self._client_options,
+                    transport=transport,
+                )
             else:
                 self._instance_admin_api = InstanceAdminClient(
                     credentials=self.credentials,
@@ -345,6 +368,15 @@ class Client(ClientWithProject):
                     client_options=self._client_options,
                     transport=transport,
                 )
+            elif self._experimental_host:
+                transport = DatabaseAdminGrpcTransport(
+                    channel=grpc.insecure_channel(target=self._experimental_host)
+                )
+                self._database_admin_api = DatabaseAdminClient(
+                    client_info=self._client_info,
+                    client_options=self._client_options,
+                    transport=transport,
+                )
             else:
                 self._database_admin_api = DatabaseAdminClient(
                     credentials=self.credentials,
@@ -485,6 +517,7 @@ class Client(ClientWithProject):
             self._emulator_host,
             labels,
             processing_units,
+            self._experimental_host,
         )
 
     def list_instances(self, filter_="", page_size=None):

{google_cloud_spanner-3.59.0 → google_cloud_spanner-3.60.0}/google/cloud/spanner_v1/database.py

@@ -203,8 +203,11 @@ class Database(object):
 
         self._pool = pool
         pool.bind(self)
+        is_experimental_host = self._instance.experimental_host is not None
 
-        self._sessions_manager = DatabaseSessionsManager(self, pool)
+        self._sessions_manager = DatabaseSessionsManager(
+            self, pool, is_experimental_host
+        )
 
     @classmethod
     def from_pb(cls, database_pb, instance, pool=None):
@@ -449,6 +452,16 @@ class Database(object):
                     client_info=client_info, transport=transport
                 )
                 return self._spanner_api
+            if self._instance.experimental_host is not None:
+                transport = SpannerGrpcTransport(
+                    channel=grpc.insecure_channel(self._instance.experimental_host)
+                )
+                self._spanner_api = SpannerClient(
+                    client_info=client_info,
+                    transport=transport,
+                    client_options=client_options,
+                )
+                return self._spanner_api
             credentials = self._instance._client.credentials
             if isinstance(credentials, google.auth.credentials.Scoped):
                 credentials = credentials.with_scopes((SPANNER_DATA_SCOPE,))
@@ -1012,8 +1025,14 @@ class Database(object):
             reraises any non-ABORT exceptions raised by ``func``.
         """
         observability_options = getattr(self, "observability_options", None)
+        transaction_tag = kw.get("transaction_tag")
+        extra_attributes = {}
+        if transaction_tag:
+            extra_attributes["transaction.tag"] = transaction_tag
+
         with trace_call(
             "CloudSpanner.Database.run_in_transaction",
+            extra_attributes=extra_attributes,
             observability_options=observability_options,
         ), MetricsCapture():
             # Sanity check: Is there a transaction already running?