Unify names of some tests and variables.

Author: jimf5

tests/test_otel.py

@@ -240,7 +240,7 @@ def teardown_class(cls):
         time.sleep(3)  # wait for sending the last batch to collector
 
     @pytest.mark.parametrize(
-        "headers", [None, context], ids=["no context", "with context"]
+        "headers", [None, context], ids=["no context", "context"]
     )
     @pytest.mark.parametrize(
         ("url", "text"),
@@ -275,10 +275,10 @@ def test_do_request(
 @pytest.mark.parametrize("otel_mode", [0, 1], ids=["to mock", "to otelcol"])
 class TestOTelSpans:
     @pytest.mark.parametrize(
-        ("idx", "size"), [(0, 10), (1, 10), (2, 10)], ids=["batch"] * 3
+        ("idx", "value"), [(0, 10), (1, 10), (2, 10)], ids=["batch"] * 3
     )
-    def test_batch_size(self, http_ver, batches, idx, size, otel_mode):
-        assert len(batches[idx][0].scope_spans[0].spans) == size
+    def test_batch_size(self, http_ver, batches, idx, value, otel_mode):
+        assert len(batches[idx][0].scope_spans[0].spans) == value
 
     @pytest.mark.parametrize("idx", [0, 1, 2], ids=["batch"] * 3)
     def test_service_name(self, http_ver, batches, idx, otel_mode):
@@ -289,40 +289,27 @@ def test_service_name(self, http_ver, batches, idx, otel_mode):
 
     @pytest.mark.parametrize("idx", range(30), ids=["span"] * 30)
     @pytest.mark.parametrize(
-        ("name", "size"),
+        ("name", "value"),
         [("trace_id", 16), ("span_id", 8)],
         ids=["trace_id", "span_id"],
     )
-    def test_id_size(self, http_ver, span, idx, name, size, otel_mode):
-        assert len(getattr(span, name)) == size
+    def test_id_size(self, http_ver, span, idx, name, value, otel_mode):
+        assert len(getattr(span, name)) == value
 
     @pytest.mark.parametrize(
-        ("idx", "name"),
-        [
-            (i, n)
-            for (i, n) in enumerate(
-                ["default_location"] * 2
-                + ["context_ignore"] * 2
-                + ["context_extract"] * 2
-                + ["context_inject"] * 2
-                + ["context_propagate"] * 2
-                + ["default_location"] * 20
-            )
-        ],
-        ids=[
-            f"{v}-span{i}"
-            for (i, v) in enumerate(
-                ["default_location"] * 2
-                + ["context_ignore"] * 2
-                + ["context_extract"] * 2
-                + ["context_inject"] * 2
-                + ["context_propagate"] * 2
-                + ["default_location"] * 20
-            )
-        ],
+        ("idx", "value"),
+        enumerate(
+            ["default_location"] * 2
+            + ["context_ignore"] * 2
+            + ["context_extract"] * 2
+            + ["context_inject"] * 2
+            + ["context_propagate"] * 2
+            + ["default_location"] * 20
+        ),
+        ids=["span"] * 30,
     )
-    def test_span_name(self, http_ver, span, name, idx, otel_mode):
-        assert span.name == name
+    def test_span_name(self, http_ver, span, value, idx, otel_mode):
+        assert span.name == value
 
     @pytest.mark.parametrize("idx", range(30), ids=["span"] * 30)
     @pytest.mark.parametrize(
@@ -400,7 +387,7 @@ def test_metrics(self, http_ver, span, idx, name, atype, value, otel_mode):
 
     @pytest.mark.parametrize(
         "idx",
-        [0, 1] + [i for i in range(10, 30)],
+        [0, 1] + list(range(10, 30)),
         ids=["span"] * 2 + [f"span{i}" for i in range(10, 30)],
     )
     @pytest.mark.parametrize(