Unify test names.

Author: jimf5

tests/test_otel.py

@@ -470,12 +470,12 @@ def test_no_custom_metrics(
         ids=[
             "otel_trace_id-no context",
             "otel_span_id-no context",
-            "no otel_parent_id-no context",
-            "otel_parent_sampled is 0-no context",
-            "otel_trace_id-with context",
-            "otel_span_id-with context",
-            "otel_parent_id-with context",
-            "otel_parent_sampled is 1-with 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",
         ],
     )
     def test_variables(
@@ -488,7 +488,7 @@ def test_variables(
         assert headers.get(name) == value
 
     @pytest.mark.xfail(reason="otel variables are present when trace is off")
-    @pytest.mark.parametrize("idx", [10, 11], ids=["trace off"] * 2)
+    @pytest.mark.parametrize("idx", [10, 11], ids=["no context", "context"])
     @pytest.mark.parametrize(
         ("name", "value"),
         [
@@ -544,36 +544,36 @@ def test_no_variables(self, http_ver, headers, name, value, idx, otel_mode):
             ("X-Otel-Tracestate", context["Tracestate"], 9),
         ],
         ids=[
-            "ignore-no parent id-no context",
-            "ignore-no traceparent-no context",
-            "ignore-no tracestate-no context",
-            "ignore-no parent id-with context",
-            "ignore-old traceparent-with context",
-            "ignore-old tracestate-with context",
+            "ignore-parent id-no context",
+            "ignore-traceparent-no context",
+            "ignore-tracestate-no context",
+            "ignore-parent id-context",
+            "ignore-traceparent-context",
+            "ignore-tracestate-context",
         ]
         + [
-            "extract-no parent id-no context",
-            "extract-no traceparent-no context",
-            "extract-no tracestate-no context",
-            "extract-old parent id-with context",
-            "extract-old traceparent-with context",
-            "extract-old tracestate-with 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-no parent id-no context",
-            "inject-new traceparent-no context",
-            "inject-no tracestate-no context",
-            "inject-no parent id-with context",
-            "inject-new traceparent-with context",
-            "inject-no tracestate-with 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-no parent id-no context",
-            "propagate-new traceparent-no context",
-            "propagate-no tracestate-no context",
-            "propagate-old parent id-with context",
-            "propagate-updated traceparent(new span id)-with context",
-            "propagate-old tracestate-with context",
+            "propagate-parent id-no context",
+            "propagate-traceparent-no context",
+            "propagate-tracestate-no context",
+            "propagate-parent id-context",
+            "propagate-traceparent-context",
+            "propagate-tracestate-context",
         ],
     )
     def test_trace_context(