fix lint

Author: odeke-em

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
 

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()