Skip to content

Commit 5cde7b3

Browse files
committed
fix: E2E tracing metadata none issue
1 parent a8f38cd commit 5cde7b3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

google/cloud/spanner_v1/_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ def _metadata_with_span_context(metadata: List[Tuple[str, str]], **kw) -> None:
592592
Returns:
593593
None
594594
"""
595-
if HAS_OPENTELEMETRY_INSTALLED:
595+
if HAS_OPENTELEMETRY_INSTALLED and metadata is not None:
596596
metadata.append(("x-goog-spanner-end-to-end-tracing", "true"))
597597
inject(setter=OpenTelemetryContextSetter(), carrier=metadata)
598598

tests/unit/test_database.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ def test_run_in_transaction_wo_args(self):
14011401
import datetime
14021402

14031403
NOW = datetime.datetime.now()
1404-
client = _Client()
1404+
client = _Client(observability_options=dict(enable_end_to_end_tracing=True))
14051405
instance = _Instance(self.INSTANCE_NAME, client=client)
14061406
pool = _Pool()
14071407
session = _Session()
@@ -3121,6 +3121,7 @@ def __init__(
31213121
route_to_leader_enabled=True,
31223122
directed_read_options=None,
31233123
default_transaction_options=DefaultTransactionOptions(),
3124+
observability_options=None,
31243125
):
31253126
from google.cloud.spanner_v1 import ExecuteSqlRequest
31263127

@@ -3135,6 +3136,7 @@ def __init__(
31353136
self.route_to_leader_enabled = route_to_leader_enabled
31363137
self.directed_read_options = directed_read_options
31373138
self.default_transaction_options = default_transaction_options
3139+
self.observability_options = observability_options
31383140

31393141

31403142
class _Instance(object):

0 commit comments

Comments
 (0)