fixup! tests: small refactoring

tests/test_otel.py

@@ -103,9 +103,8 @@
 
 
 def span_attr(span, attr, atype):
-    for a in span.attributes:
-        if a.key == attr:
-            return getattr(a.value, atype)
+    for _value in (a.value for a in span.attributes if a.key == attr):
+        return getattr(_value, atype)
 
 
 def collect_rheaders(headers):
@@ -120,25 +119,16 @@ def rheaders():
 @pytest.fixture
 def span_list(http_ver, spans):
     span_list = []
-    for spn in (
-        sp
-        for sp in (
-            ss[0].spans
-            for ss in (
-                s[0].scope_spans
-                for s in (
-                    batch
-                    for batch in spans
-                    if span_attr(
-                        batch[0].resource, "service.name", "string_value"
-                    )
-                    == f"test_http{http_ver}"
-                )
-            )
+    for _spans in (
+        _res[0].scope_spans[0].spans
+        for _res in (
+            _batch
+            for _batch in spans
+            if span_attr(_batch[0].resource, "service.name", "string_value")
+            == f"test_http{http_ver}"
         )
     ):
-        for _span in spn:
-            span_list.append(_span)
+        span_list += _spans
     return span_list