feat(opentelemetry): add request_tag to span attributes

Author: sinhasubham

google/cloud/spanner_v1/_opentelemetry_tracing.py

@@ -122,6 +122,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["spanner.request_tag"] = request_options.request_tag
+
     if extended_tracing_globally_disabled:
         enable_extended_tracing = False
 

google/cloud/spanner_v1/snapshot.py

@@ -409,7 +409,11 @@ def read(
             method=streaming_read_method,
             request=read_request,
             metadata=metadata,
-            trace_attributes={"table_id": table, "columns": columns},
+            trace_attributes={
+                "table_id": table,
+                "columns": columns,
+                "request_options": request_options,
+            },
             column_info=column_info,
             lazy_decode=lazy_decode,
         )
@@ -601,7 +605,7 @@ def execute_sql(
             method=execute_streaming_sql_method,
             request=execute_sql_request,
             metadata=metadata,
-            trace_attributes={"db.statement": sql},
+            trace_attributes={"db.statement": sql, "request_options": request_options},
             column_info=column_info,
             lazy_decode=lazy_decode,
         )

tests/unit/test_snapshot.py

@@ -116,6 +116,8 @@
 class _Derived(_SnapshotBase):
     """A minimally-implemented _SnapshotBase-derived class for testing"""
 
+    transaction_tag = None
+
     # Use a simplified implementation of _build_transaction_options_pb
     # that always returns the same transaction options.
     TRANSACTION_OPTIONS = TransactionOptions()
@@ -1282,7 +1284,10 @@ def _execute_sql_helper(
 
         expected_attributes = dict(
             BASE_ATTRIBUTES,
-            **{"db.statement": SQL_QUERY_WITH_PARAM, "x_goog_spanner_request_id": req_id},
+            **{
+                "db.statement": SQL_QUERY_WITH_PARAM,
+                "x_goog_spanner_request_id": req_id,
+            },
         )
         if request_options and request_options.request_tag:
             expected_attributes["spanner.request_tag"] = request_options.request_tag

tests/unit/test_spanner_metrics_tracer_factory.py

@@ -14,12 +14,9 @@
 # limitations under the License.
 
 import pytest
-import unittest
-from unittest import mock
 from google.cloud.spanner_v1.metrics.spanner_metrics_tracer_factory import (
     SpannerMetricsTracerFactory,
 )
-from opentelemetry.sdk.resources import Resource
 
 pytest.importorskip("opentelemetry")