From be40273b98d142db5910fadc5ed0f2f548112332 Mon Sep 17 00:00:00 2001 From: Emmanuel T Odeke Date: Fri, 29 Nov 2024 10:12:00 -0800 Subject: [PATCH] fix lint --- google/cloud/spanner_v1/merged_result_set.py | 2 ++ tests/system/test_observability_options.py | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/google/cloud/spanner_v1/merged_result_set.py b/google/cloud/spanner_v1/merged_result_set.py index 19cd8950f1..9dc5ee83d8 100644 --- a/google/cloud/spanner_v1/merged_result_set.py +++ b/google/cloud/spanner_v1/merged_result_set.py @@ -17,6 +17,8 @@ from typing import Any, TYPE_CHECKING from threading import Lock, Event +from google.cloud.spanner_v1._opentelemetry_tracing import trace_call + if TYPE_CHECKING: from google.cloud.spanner_v1.database import BatchSnapshot diff --git a/tests/system/test_observability_options.py b/tests/system/test_observability_options.py index e1454dcc0d..d2e467b5e8 100644 --- a/tests/system/test_observability_options.py +++ b/tests/system/test_observability_options.py @@ -117,10 +117,9 @@ def test_propagation(enable_extended_tracing): wantAnnotatedSQL = "SELECT 1" if not enable_extended_tracing: wantAnnotatedSQL = None - assert ( - lastSpan.attributes.get("db.statement", None), - wantAnnotatedSQL, - ) # "Mismatch in annotated sql" + + gotAnnotatedSQL = lastSpan.attributes.get("db.statement", None) + assert gotAnnotatedSQL == wantAnnotatedSQL try: db.delete()