feat(secretmanager): refactor OTel interceptor injection to use centralized helper

Author: chalmerlowe

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/client.py

@@ -35,7 +35,7 @@
 )
 
 import google.protobuf
-from google.api_core import _feature_gating_helpers, gapic_v1
+from google.api_core import _feature_gating_helpers, _otel_helpers, gapic_v1
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
 from google.api_core import retry as retries
@@ -746,19 +746,11 @@ def __init__(
             # Resolve interceptors for gRPC
             interceptors = None
             if transport_init is SecretManagerServiceGrpcTransport:
-                is_tracing_enabled = _feature_gating_helpers.resolve_feature_flags(
-                    env_var="GOOGLE_CLOUD_PYTHON_TRACING_ENABLED",
-                    feature_key="tracer_provider",
-                    configuration=self._client_options,
+                otel_interceptor = _otel_helpers.get_otel_grpc_interceptor(
+                    self._client_options
                 )
-                if is_tracing_enabled:
-                    try:
-                        import opentelemetry.instrumentation.grpc as otel_grpc  # type: ignore[import-not-found]
-                        tracer_provider = getattr(self._client_options, "tracer_provider", None)
-                        interceptor = otel_grpc.client_interceptor(tracer_provider=tracer_provider)
-                        interceptors = [interceptor]
-                    except ImportError:
-                        pass
+                if otel_interceptor:
+                    interceptors = [otel_interceptor]
 
             # initialize with the provided callable or the passed in class
             transport_kwargs = {

packages/google-cloud-secret-manager/tests/unit/gapic/secretmanager_v1/test_secret_manager_service.py

@@ -61,15 +61,14 @@
 from google.auth import credentials as ga_credentials
 from google.auth.exceptions import MutualTLSChannelError
 from google.cloud.location import locations_pb2
-from google.oauth2 import service_account
-
 from google.cloud.secretmanager_v1.services.secret_manager_service import (
     SecretManagerServiceAsyncClient,
     SecretManagerServiceClient,
     pagers,
     transports,
 )
 from google.cloud.secretmanager_v1.types import resources, service
+from google.oauth2 import service_account
 
 CRED_INFO_JSON = {
     "credential_source": "/path/to/file",
@@ -770,6 +769,49 @@ def test_secret_manager_service_client_client_options(
         )
 
 
+def test_secret_manager_service_client_otel_interceptor_injection():
+    # Mock the helper to return a sentinel interceptor
+    mock_interceptor = mock.Mock()
+
+    with mock.patch(
+        "google.cloud.secretmanager_v1.services.secret_manager_service.client._otel_helpers.get_otel_grpc_interceptor"
+    ) as mock_get_interceptor:
+        mock_get_interceptor.return_value = mock_interceptor
+
+        with mock.patch.object(
+            transports.SecretManagerServiceGrpcTransport, "__init__"
+        ) as patched_transport_init:
+            patched_transport_init.return_value = None
+
+            client = SecretManagerServiceClient(transport="grpc")
+
+            mock_get_interceptor.assert_called_once()
+
+            called_kwargs = patched_transport_init.call_args.kwargs
+            assert "interceptors" in called_kwargs
+            assert called_kwargs["interceptors"] == [mock_interceptor]
+
+
+def test_secret_manager_service_client_otel_interceptor_injection_disabled():
+    # The helper does not return an interceptor
+    with mock.patch(
+        "google.cloud.secretmanager_v1.services.secret_manager_service.client._otel_helpers.get_otel_grpc_interceptor"
+    ) as mock_get_interceptor:
+        mock_get_interceptor.return_value = None
+
+        with mock.patch.object(
+            transports.SecretManagerServiceGrpcTransport, "__init__"
+        ) as patched_transport_init:
+            patched_transport_init.return_value = None
+
+            client = SecretManagerServiceClient(transport="grpc")
+
+            mock_get_interceptor.assert_called_once()
+
+            called_kwargs = patched_transport_init.call_args.kwargs
+            assert "interceptors" not in called_kwargs
+
+
 @pytest.mark.parametrize(
     "client_class,transport_class,transport_name,use_client_cert_env",
     [