refactor(observability): simplify response hook status check to idiomatic is_recording and span.status

Author: chalmerlowe

packages/google-api-core/google/api_core/_observability.py

@@ -19,7 +19,6 @@
 from __future__ import annotations
 
 import urllib.parse
-from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, Callable, Sequence
 
 from google.api_core import _feature_gating_helpers
@@ -189,11 +188,7 @@ def _grpc_client_response_hook(span: Any, response: Any) -> None:
         span: The OpenTelemetry span.
         response: The gRPC response object or details.
     """
-    if span is None or not hasattr(span, "set_attribute"):
-        return
-
-    is_recording = getattr(span, "is_recording", None)
-    if callable(is_recording) and not is_recording():
+    if not span.is_recording():
         return
 
     # Verify the RPC succeeded before recording the OK response status.
@@ -207,13 +202,6 @@ def _grpc_client_response_hook(span: Any, response: Any) -> None:
     ):
         return
 
-    # Confirm the gRPC status code attribute indicates success (0 is StatusCode.OK).
-    attrs = getattr(span, "attributes", None)
-    if not isinstance(attrs, Mapping):
-        attrs = getattr(span, "_attributes", None)
-    if isinstance(attrs, Mapping) and attrs.get("rpc.grpc.status_code", 0) != 0:
-        return
-
     span.set_attribute("rpc.response.status_code", "OK")
 
 

packages/google-api-core/tests/unit/test_observability.py

@@ -561,19 +561,3 @@ def test_grpc_client_response_hook_error_status_value():
     mock_span.status.status_code.value = 2
     _observability._grpc_client_response_hook(mock_span, mock.Mock())
     mock_span.set_attribute.assert_not_called()
-
-
-def test_grpc_client_response_hook_error_attribute():
-    """Proves that _grpc_client_response_hook skips spans with non-zero rpc.grpc.status_code."""
-    mock_span = mock.Mock()
-    mock_span.is_recording.return_value = True
-    mock_span.status = None
-    mock_span._attributes = {"rpc.grpc.status_code": 14}
-    _observability._grpc_client_response_hook(mock_span, mock.Mock())
-    mock_span.set_attribute.assert_not_called()
-
-
-def test_grpc_client_response_hook_none_or_missing_set_attribute():
-    """Proves that _grpc_client_response_hook handles None or invalid span gracefully."""
-    _observability._grpc_client_response_hook(None, mock.Mock())
-    _observability._grpc_client_response_hook(object(), mock.Mock())