fix(gapic): support client_options dict when resolving tracer_provider

Author: chalmerlowe

packages/google-api-core/google/api_core/gapic_v1/method.py

@@ -298,11 +298,11 @@ def __init__(
             try:
                 from opentelemetry import trace
 
-                tracer_provider = (
-                    getattr(client_options, "tracer_provider", None)
-                    if client_options is not None
-                    else None
-                )
+                tracer_provider = None
+                if isinstance(client_options, dict):
+                    tracer_provider = client_options.get("tracer_provider")
+                elif client_options is not None:
+                    tracer_provider = getattr(client_options, "tracer_provider", None)
                 if tracer_provider is not None:
                     tracer = tracer_provider.get_tracer("google.api_core")
                 else:

packages/google-api-core/tests/unit/gapic/test_method.py

@@ -486,6 +486,32 @@ def test_wrap_method_otel_tracing_custom_client_options(mock_otel):
     mock_otel.span.set_attribute.assert_called_with("rpc.response.status_code", "OK")
 
 
+def test_wrap_method_otel_tracing_dict_client_options(mock_otel):
+    """Proves that providing client_options as a dict with tracer_provider uses that provider."""
+    mock_target = mock.Mock(return_value="success")
+
+    mock_provider = mock.Mock()
+    mock_provider.get_tracer.return_value = mock_otel.tracer
+
+    client_options = {"tracer_provider": mock_provider}
+
+    wrapped = google.api_core.gapic_v1.method.wrap_method(
+        mock_target,
+        client_options=client_options,
+        method_name="/google.cloud.secretmanager.v1.SecretManagerService/ListSecrets",
+    )
+    result = wrapped()
+
+    assert result == "success"
+    mock_provider.get_tracer.assert_called_once_with("google.api_core")
+    mock_otel.tracer.start_as_current_span.assert_called_once_with(
+        "google.cloud.secretmanager.v1.SecretManagerService/ListSecrets",
+        kind="CLIENT",
+        attributes=_DEFAULT_SPAN_ATTRIBUTES,
+    )
+    mock_otel.span.set_attribute.assert_called_with("rpc.response.status_code", "OK")
+
+
 def test_wrap_method_otel_tracing_enabled_error(mock_otel):
     """Proves that when an RPC fails, the T3 client span enriches the status code attribute."""
     err = RuntimeError("gRPC connection reset")