Add wrapper for trace_is and span_id.

Author: jimf5

tests/test_otel.py

@@ -101,6 +101,12 @@
 _headers = {}
 
 
+def decode_id(span, value):
+    if value in ["trace_id", "span_id"]:
+        return hexlify(getattr(span, value)).decode("utf-8")
+    return value
+
+
 def span_attr(span, attr, atype):
     for value in (atrb.value for atrb in span.attributes if atrb.key == attr):
         return getattr(value, atype)
@@ -442,10 +448,7 @@ def test_variables(
     ):
         if http_ver == 0:
             pytest.skip("no headers support")
-        value = value[idx]
-        if type(value) is str and value in ["trace_id", "span_id"]:
-            value = hexlify(getattr(span, value)).decode("utf-8")
-        assert headers.get(name) == value
+        assert headers.get(name) == decode_id(span, value[idx])
 
     @pytest.mark.xfail(reason="otel variables are present when trace is off")
     @pytest.mark.parametrize("idx", [10, 11], ids=["no context", "context"])
@@ -505,13 +508,6 @@ def test_trace_context(
         if http_ver == 0:
             pytest.skip("no headers support")
         value = value[idx - 2]
-        if type(value) is str:
-            value = "-".join(
-                (
-                    hexlify(getattr(span, val)).decode("utf-8")
-                    if val in ["trace_id", "span_id"]
-                    else val
-                )
-                for val in value.split("-")
-            )
+        if value is not None:
+            value = "-".join(decode_id(span, val) for val in value.split("-"))
         assert headers.get(name) == value