Update trace_context test.

Author: jimf5

tests/test_otel.py

@@ -275,7 +275,7 @@ def test_do_request(
 @pytest.mark.parametrize("otel_mode", [0, 1], ids=["to mock", "to otelcol"])
 class TestOTelSpans:
     @pytest.mark.parametrize(
-        ("idx", "value"), [(0, 10), (1, 10), (2, 10)], ids=["batch"] * 3
+        ("idx", "value"), enumerate([10] * 3), ids=["batch"] * 3
     )
     def test_batch_size(self, http_ver, batches, idx, value, otel_mode):
         assert len(batches[idx][0].scope_spans[0].spans) == value
@@ -442,34 +442,28 @@ def test_no_custom_metrics(
     ):
         assert span_attr(span, name, atype) == value
 
+    @pytest.mark.parametrize("idx", [0, 1], ids=["no context", "context"])
     @pytest.mark.parametrize(
-        ("name", "value", "idx"),
+        ("name", "value"),
         [
-            ("X-Otel-Trace-Id", "trace_id", 0),
-            ("X-Otel-Span-Id", "span_id", 0),
-            ("X-Otel-Parent-Id", None, 0),
-            ("X-Otel-Parent-Sampled", "0", 0),
-            ("X-Otel-Trace-Id", trace_id, 1),
-            ("X-Otel-Span-Id", "span_id", 1),
-            ("X-Otel-Parent-Id", span_id, 1),
-            ("X-Otel-Parent-Sampled", "1", 1),
+            ("X-Otel-Trace-Id", ["trace_id", trace_id]),
+            ("X-Otel-Span-Id", ["span_id"] * 2),
+            ("X-Otel-Parent-Id", [None, span_id]),
+            ("X-Otel-Parent-Sampled", ["0", "1"]),
         ],
         ids=[
-            "otel_trace_id-no context",
-            "otel_span_id-no context",
-            "otel_parent_id-no context",
-            "otel_parent_sampled-no context",
-            "otel_trace_id-context",
-            "otel_span_id-context",
-            "otel_parent_id-context",
-            "otel_parent_sampled-context",
+            "otel_trace_id",
+            "otel_span_id",
+            "otel_parent_id",
+            "otel_parent_sampled",
         ],
     )
     def test_variables(
         self, http_ver, span, headers, name, value, idx, otel_mode
     ):
         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
@@ -497,77 +491,41 @@ def test_no_variables(self, http_ver, headers, name, value, idx, otel_mode):
         assert headers.get(name) == value
 
     @pytest.mark.parametrize(
-        ("name", "value", "idx"),
+        "idx",
+        range(2, 10),
+        ids=["ingnore-no context", "ingnore-context"]
+        + ["extract-no context", "extract-context"]
+        + ["inject-no context", "inject-context"]
+        + ["propagate-no context", "propagate-context"],
+    )
+    @pytest.mark.parametrize(
+        ("name", "value"),
         [
-            ("X-Otel-Parent-Id", None, 2),
-            ("X-Otel-Traceparent", None, 2),
-            ("X-Otel-Tracestate", None, 2),
-            ("X-Otel-Parent-Id", None, 3),
-            ("X-Otel-Traceparent", context["Traceparent"], 3),
-            ("X-Otel-Tracestate", context["Tracestate"], 3),
-        ]
-        + [
-            ("X-Otel-Parent-Id", None, 4),
-            ("X-Otel-Traceparent", None, 4),
-            ("X-Otel-Tracestate", None, 4),
-            ("X-Otel-Parent-Id", span_id, 5),
-            ("X-Otel-Traceparent", context["Traceparent"], 5),
-            ("X-Otel-Tracestate", context["Tracestate"], 5),
-        ]
-        + [
-            ("X-Otel-Parent-Id", None, 6),
-            ("X-Otel-Traceparent", "00-trace_id-span_id-01", 6),
-            ("X-Otel-Tracestate", None, 6),
-            ("X-Otel-Parent-Id", None, 7),
-            ("X-Otel-Traceparent", "00-trace_id-span_id-01", 7),
-            ("X-Otel-Tracestate", None, 7),
-        ]
-        + [
-            ("X-Otel-Parent-Id", None, 8),
-            ("X-Otel-Traceparent", "00-trace_id-span_id-01", 8),
-            ("X-Otel-Tracestate", None, 8),
-            ("X-Otel-Parent-Id", span_id, 9),
-            ("X-Otel-Traceparent", f"00-{trace_id}-span_id-01", 9),
-            ("X-Otel-Tracestate", context["Tracestate"], 9),
-        ],
-        ids=[
-            "ignore-parent id-no context",
-            "ignore-traceparent-no context",
-            "ignore-tracestate-no context",
-            "ignore-parent id-context",
-            "ignore-traceparent-context",
-            "ignore-tracestate-context",
-        ]
-        + [
-            "extract-parent id-no context",
-            "extract-traceparent-no context",
-            "extract-tracestate-no context",
-            "extract-parent id-context",
-            "extract-traceparent-context",
-            "extract-tracestate-context",
-        ]
-        + [
-            "inject-parent id-no context",
-            "inject-traceparent-no context",
-            "inject-tracestate-no context",
-            "inject-parent id-context",
-            "inject-traceparent-context",
-            "inject-tracestate-context",
-        ]
-        + [
-            "propagate-parent id-no context",
-            "propagate-traceparent-no context",
-            "propagate-tracestate-no context",
-            "propagate-parent id-context",
-            "propagate-traceparent-context",
-            "propagate-tracestate-context",
+            (
+                "X-Otel-Parent-Id",
+                [None] * 3 + [span_id] + [None] * 3 + [span_id],
+            ),
+            (
+                "X-Otel-Traceparent",
+                [None, context["Traceparent"]] * 2
+                + ["00-trace_id-span_id-01"] * 3
+                + [f"00-{trace_id}-span_id-01"],
+            ),
+            (
+                "X-Otel-Tracestate",
+                [None, context["Tracestate"]] * 2
+                + [None] * 3
+                + [context["Tracestate"]],
+            ),
         ],
+        ids=["parent id", "traceparent", "tracestate"],
     )
     def test_trace_context(
         self, http_ver, span, headers, name, value, idx, otel_mode
     ):
         if http_ver == 0:
             pytest.skip("no headers support")
+        value = value[idx - 2]
         if type(value) is str:
             value = "-".join(
                 (