feedback changes

Author: lszinv

google/cloud/spanner_v1/client.py

@@ -219,7 +219,7 @@ def __init__(
             warnings.warn(_EMULATOR_HOST_HTTP_SCHEME)
 
         # Check flag to enable Spanner builtin metrics
-        if _get_spanner_enable_builtin_metrics():
+        if _get_spanner_enable_builtin_metrics() and HAS_GOOGLE_CLOUD_MONITORING_INSTALLED:
             meter_provider = metrics.NoOpMeterProvider()
             if not _get_spanner_emulator_host():
                 meter_provider = MeterProvider(

google/cloud/spanner_v1/metrics/metrics_interceptor.py

@@ -1,11 +1,24 @@
-"""Interceptor for collecting Cloud Spanner metrics."""
+# 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.
+
+"""Interceptor for collecting Cloud Spanner metrics."""
 
 from grpc_interceptor import ClientInterceptor
 from .constants import (
     GOOGLE_CLOUD_RESOURCE_KEY,
     SPANNER_METHOD_PREFIX,
 )
-from .metrics_tracer import MetricsTracer
 from typing import Dict
 from .spanner_metrics_tracer_factory import SpannerMetricsTracerFactory
 import re
@@ -88,11 +101,17 @@ def _set_metrics_tracer_attributes(self, resources: Dict[str, str]) -> None:
 
         if resources:
             if "project" in resources:
-                SpannerMetricsTracerFactory.current_metrics_tracer.set_project(resources["project"])
+                SpannerMetricsTracerFactory.current_metrics_tracer.set_project(
+                    resources["project"]
+                )
             if "instance" in resources:
-                SpannerMetricsTracerFactory.current_metrics_tracer.set_instance(resources["instance"])
+                SpannerMetricsTracerFactory.current_metrics_tracer.set_instance(
+                    resources["instance"]
+                )
             if "database" in resources:
-                SpannerMetricsTracerFactory.current_metrics_tracer.set_database(resources["database"])
+                SpannerMetricsTracerFactory.current_metrics_tracer.set_database(
+                    resources["database"]
+                )
 
     def intercept(self, invoked_method, request_or_iterator, call_details):
         """Intercept gRPC calls to collect metrics.
@@ -112,6 +131,7 @@ def intercept(self, invoked_method, request_or_iterator, call_details):
         ## Extract  Project / Instance / Databse from header information
         resources = self._extract_resource_from_path(call_details.metadata)
         self._set_metrics_tracer_attributes(resources)
+
         ## Format method to be be spanner.<method name>
         method_name = self._remove_prefix(
             call_details.method, SPANNER_METHOD_PREFIX

google/cloud/spanner_v1/services/spanner/transports/base.py

@@ -30,8 +30,8 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
-from google.protobuf import empty_pb2  # type: ignore
 from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+from google.protobuf import empty_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
     gapic_version=package_version.__version__

google/cloud/spanner_v1/services/spanner/transports/grpc.py

@@ -30,7 +30,6 @@
 from google.cloud.spanner_v1.types import transaction
 
 from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
-from google.cloud.spanner_v1.metrics.constants import ENABLE_SPANNER_METRICS_ENV_VAR
 from google.protobuf import empty_pb2  # type: ignore
 from .base import SpannerTransport, DEFAULT_CLIENT_INFO
 

google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py

@@ -31,10 +31,10 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import empty_pb2  # type: ignore
 from .base import SpannerTransport, DEFAULT_CLIENT_INFO
 from .grpc import SpannerGrpcTransport
-from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 
 
 class SpannerGrpcAsyncIOTransport(SpannerTransport):

google/cloud/spanner_v1/services/spanner/transports/rest.py

@@ -35,8 +35,8 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
-from google.protobuf import empty_pb2  # type: ignore
 from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
+from google.protobuf import empty_pb2  # type: ignore
 
 from .rest_base import _BaseSpannerRestTransport
 from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO

tests/unit/test_metrics_exporter.py

@@ -1,4 +1,4 @@
-# Copyright 2016 Google LLC All rights reserved.≈rever
+# Copyright 2016 Google LLC All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

tests/unit/test_metrics_interceptor.py

@@ -1,6 +1,8 @@
 import pytest
 from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
-from google.cloud.spanner_v1.metrics.spanner_metrics_tracer_factory import SpannerMetricsTracerFactory
+from google.cloud.spanner_v1.metrics.spanner_metrics_tracer_factory import (
+    SpannerMetricsTracerFactory,
+)
 from unittest.mock import MagicMock
 
 
@@ -65,8 +67,12 @@ def test_intercept_without_tracer(interceptor):
 
 def test_intercept_with_tracer(interceptor):
     SpannerMetricsTracerFactory.current_metrics_tracer = MockMetricTracer()
-    SpannerMetricsTracerFactory.current_metrics_tracer.record_attempt_start = MagicMock()
-    SpannerMetricsTracerFactory.current_metrics_tracer.record_attempt_completion = MagicMock()
+    SpannerMetricsTracerFactory.current_metrics_tracer.record_attempt_start = (
+        MagicMock()
+    )
+    SpannerMetricsTracerFactory.current_metrics_tracer.record_attempt_completion = (
+        MagicMock()
+    )
 
     mock_invoked_method = MagicMock(return_value="response")
     call_details = MagicMock(